@manuscripts/body-editor 2.6.9-LEAN-4097.0 → 2.6.9

package/dist/cjs/commands.js

@@ -516,36 +516,32 @@ const insertGraphicalAbstract = (state, dispatch, view) => {
 };
 exports.insertGraphicalAbstract = insertGraphicalAbstract;
 const insertSection = (subsection = false) => (state, dispatch, view) => {
-    const nodes = transform_1.schema.nodes;
-    const $pos = state.selection.$from;
-    let pos;
-    if ((0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)($pos, nodes.bibliography_section)) {
-        return false;
-    }
-    else if (subsection) {
-        pos =
-            (0, exports.findPosBeforeFirstSubsection)($pos) || findPosAfterParentSection($pos);
-        if (!pos) {
-            return false;
-        }
-        pos -= 1;
-    }
-    else if ((0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)($pos, nodes.box_element)) {
+    const selection = state.selection;
+    if ((0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.bibliography_section)(selection) ||
+        (!subsection && (0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.box_element)(selection))) {
         return false;
     }
-    else if ((0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)($pos, nodes.body)) {
-        pos = findPosAfterParentSection($pos);
+    let pos;
+    if ((0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.body)(selection) || subsection) {
+        pos = subsection
+            ? (0, exports.findPosBeforeFirstSubsection)(state.selection.$from) ||
+                findPosAfterParentSection(state.selection.$from)
+            : findPosAfterParentSection(state.selection.$from);
     }
-    if (!pos) {
+    else {
         const body = (0, doc_1.findBody)(state.doc);
         pos = body.pos + body.node.content.size + 1;
     }
-    const section = nodes.section.createAndFill({
+    if (!pos) {
+        return false;
+    }
+    const section = transform_1.schema.nodes.section.createAndFill({
         category: subsection ? 'MPSectionCategory:subsection' : '',
     });
-    const tr = state.tr.insert(pos, section);
+    const diff = subsection ? -1 : 0;
+    const tr = state.tr.insert(pos + diff, section);
     if (dispatch) {
-        const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos + 2);
+        const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos + diff + 2);
         view === null || view === void 0 ? void 0 : view.focus();
         dispatch(tr.setSelection(selection).scrollIntoView());
     }

package/dist/cjs/components/views/TableCellContextMenu.js

@@ -48,6 +48,16 @@ const getSelectedCellsCount = (state) => {
         columns: columns > 1 ? `${columns} columns` : `column`,
     };
 };
+const isHeaderCellSelected = (state) => {
+    var _a;
+    if (state.selection instanceof prosemirror_tables_1.CellSelection) {
+        const anchorNode = state.selection.$anchorCell.node(state.selection.$anchorCell.depth).firstChild;
+        const headNode = state.selection.$headCell.node(state.selection.$headCell.depth).firstChild;
+        return ((anchorNode === null || anchorNode === void 0 ? void 0 : anchorNode.type) === transform_1.schema.nodes.table_header ||
+            (headNode === null || headNode === void 0 ? void 0 : headNode.type) === transform_1.schema.nodes.table_header);
+    }
+    return (((_a = state.doc.nodeAt(state.selection.from)) === null || _a === void 0 ? void 0 : _a.type) === transform_1.schema.nodes.table_header);
+};
 const ColumnChangeWarningDialog = ({ isOpen, primaryAction, secondaryAction }) => (react_1.default.createElement(style_guide_1.Dialog, { isOpen: isOpen, category: style_guide_1.Category.confirmation, header: "This change can't be tracked", message: "This column action won't be marked as chnage. Do you want to continue?", actions: {
         primary: {
             action: primaryAction,
@@ -59,19 +69,16 @@ const ColumnChangeWarningDialog = ({ isOpen, primaryAction, secondaryAction }) =
         },
     } }));
 const ContextMenu = ({ view, close, onCancelColumnDialog }) => {
-    var _a;
     const runCommand = (command, noTracking) => {
         command(view.state, (tr) => view.dispatch((noTracking && (0, track_changes_plugin_1.skipTracking)(tr)) || tr));
         close();
     };
     const [columnAction, setColumnAction] = (0, react_1.useState)();
-    const isHeaderCellSelected = ((_a = view.state.doc.nodeAt(view.state.selection.from)) === null || _a === void 0 ? void 0 : _a.type) ===
-        transform_1.schema.nodes.table_header;
     const isCellSelectionMerged = (0, prosemirror_tables_1.mergeCells)(view.state);
     const isCellSelectionSplittable = (0, prosemirror_tables_1.splitCell)(view.state);
     const { rows, columns } = getSelectedCellsCount(view.state);
     return (react_1.default.createElement(MenuDropdownList, { className: 'table-ctx' },
-        react_1.default.createElement(ActionButton, { disabled: isHeaderCellSelected, onClick: () => runCommand((0, commands_1.addRows)('top')) },
+        react_1.default.createElement(ActionButton, { disabled: isHeaderCellSelected(view.state), onClick: () => runCommand((0, commands_1.addRows)('top')) },
             react_1.default.createElement(style_guide_1.PlusIcon, null),
             " Insert ",
             rows,

package/dist/cjs/plugins/elements.js

@@ -26,7 +26,7 @@ exports.default = () => {
                 const decorations = [];
                 state.doc.descendants((node, pos, parent) => {
                     if (parent &&
-                        ((0, transform_1.isSectionNodeType)(parent.type) || parent.type === transform_1.schema.nodes.body) &&
+                        (0, transform_1.isSectionNodeType)(parent.type) &&
                         node.type !== section) {
                         decorations.push(prosemirror_view_1.Decoration.node(pos, pos + node.nodeSize, {}, {
                             element: true,

package/dist/cjs/plugins/placeholder.js

@@ -34,9 +34,6 @@ const getParagraphPlaceholderText = (parent) => {
     if (!parent || parent.textContent.length) {
         return;
     }
-    if (parent.type === transform_1.schema.nodes.body) {
-        return 'Paragraph';
-    }
     if ((0, transform_1.isFootnoteNode)(parent) || (0, transform_1.isGeneralTableFootnoteNode)(parent)) {
         return 'Type new footnote here';
     }

package/dist/cjs/versions.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MATHJAX_VERSION = exports.VERSION = void 0;
-exports.VERSION = '2.6.9-LEAN-4097.0';
+exports.VERSION = '2.6.9';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

@@ -487,36 +487,32 @@ export const insertGraphicalAbstract = (state, dispatch, view) => {
     return true;
 };
 export const insertSection = (subsection = false) => (state, dispatch, view) => {
-    const nodes = schema.nodes;
-    const $pos = state.selection.$from;
-    let pos;
-    if (findParentNodeOfTypeClosestToPos($pos, nodes.bibliography_section)) {
-        return false;
-    }
-    else if (subsection) {
-        pos =
-            findPosBeforeFirstSubsection($pos) || findPosAfterParentSection($pos);
-        if (!pos) {
-            return false;
-        }
-        pos -= 1;
-    }
-    else if (findParentNodeOfTypeClosestToPos($pos, nodes.box_element)) {
+    const selection = state.selection;
+    if (hasParentNodeOfType(schema.nodes.bibliography_section)(selection) ||
+        (!subsection && hasParentNodeOfType(schema.nodes.box_element)(selection))) {
         return false;
     }
-    else if (findParentNodeOfTypeClosestToPos($pos, nodes.body)) {
-        pos = findPosAfterParentSection($pos);
+    let pos;
+    if (hasParentNodeOfType(schema.nodes.body)(selection) || subsection) {
+        pos = subsection
+            ? findPosBeforeFirstSubsection(state.selection.$from) ||
+                findPosAfterParentSection(state.selection.$from)
+            : findPosAfterParentSection(state.selection.$from);
     }
-    if (!pos) {
+    else {
         const body = findBody(state.doc);
         pos = body.pos + body.node.content.size + 1;
     }
-    const section = nodes.section.createAndFill({
+    if (!pos) {
+        return false;
+    }
+    const section = schema.nodes.section.createAndFill({
         category: subsection ? 'MPSectionCategory:subsection' : '',
     });
-    const tr = state.tr.insert(pos, section);
+    const diff = subsection ? -1 : 0;
+    const tr = state.tr.insert(pos + diff, section);
     if (dispatch) {
-        const selection = TextSelection.create(tr.doc, pos + 2);
+        const selection = TextSelection.create(tr.doc, pos + diff + 2);
         view === null || view === void 0 ? void 0 : view.focus();
         dispatch(tr.setSelection(selection).scrollIntoView());
     }

package/dist/es/components/views/TableCellContextMenu.js

@@ -19,6 +19,16 @@ const getSelectedCellsCount = (state) => {
         columns: columns > 1 ? `${columns} columns` : `column`,
     };
 };
+const isHeaderCellSelected = (state) => {
+    var _a;
+    if (state.selection instanceof CellSelection) {
+        const anchorNode = state.selection.$anchorCell.node(state.selection.$anchorCell.depth).firstChild;
+        const headNode = state.selection.$headCell.node(state.selection.$headCell.depth).firstChild;
+        return ((anchorNode === null || anchorNode === void 0 ? void 0 : anchorNode.type) === schema.nodes.table_header ||
+            (headNode === null || headNode === void 0 ? void 0 : headNode.type) === schema.nodes.table_header);
+    }
+    return (((_a = state.doc.nodeAt(state.selection.from)) === null || _a === void 0 ? void 0 : _a.type) === schema.nodes.table_header);
+};
 const ColumnChangeWarningDialog = ({ isOpen, primaryAction, secondaryAction }) => (React.createElement(Dialog, { isOpen: isOpen, category: Category.confirmation, header: "This change can't be tracked", message: "This column action won't be marked as chnage. Do you want to continue?", actions: {
         primary: {
             action: primaryAction,
@@ -30,19 +40,16 @@ const ColumnChangeWarningDialog = ({ isOpen, primaryAction, secondaryAction }) =
         },
     } }));
 export const ContextMenu = ({ view, close, onCancelColumnDialog }) => {
-    var _a;
     const runCommand = (command, noTracking) => {
         command(view.state, (tr) => view.dispatch((noTracking && skipTracking(tr)) || tr));
         close();
     };
     const [columnAction, setColumnAction] = useState();
-    const isHeaderCellSelected = ((_a = view.state.doc.nodeAt(view.state.selection.from)) === null || _a === void 0 ? void 0 : _a.type) ===
-        schema.nodes.table_header;
     const isCellSelectionMerged = mergeCells(view.state);
     const isCellSelectionSplittable = splitCell(view.state);
     const { rows, columns } = getSelectedCellsCount(view.state);
     return (React.createElement(MenuDropdownList, { className: 'table-ctx' },
-        React.createElement(ActionButton, { disabled: isHeaderCellSelected, onClick: () => runCommand(addRows('top')) },
+        React.createElement(ActionButton, { disabled: isHeaderCellSelected(view.state), onClick: () => runCommand(addRows('top')) },
             React.createElement(PlusIcon, null),
             " Insert ",
             rows,

package/dist/es/plugins/elements.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { isSectionNodeType, schema } from '@manuscripts/transform';
+import { isSectionNodeType } from '@manuscripts/transform';
 import { Plugin } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 export default () => {
@@ -24,7 +24,7 @@ export default () => {
                 const decorations = [];
                 state.doc.descendants((node, pos, parent) => {
                     if (parent &&
-                        (isSectionNodeType(parent.type) || parent.type === schema.nodes.body) &&
+                        isSectionNodeType(parent.type) &&
                         node.type !== section) {
                         decorations.push(Decoration.node(pos, pos + node.nodeSize, {}, {
                             element: true,

package/dist/es/plugins/placeholder.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { isFootnoteNode, isGeneralTableFootnoteNode, schema, } from '@manuscripts/transform';
+import { isFootnoteNode, isGeneralTableFootnoteNode, } from '@manuscripts/transform';
 import { Plugin, TextSelection } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 const placeholderWidget = (placeholder) => (view, getPos) => {
@@ -32,9 +32,6 @@ const getParagraphPlaceholderText = (parent) => {
     if (!parent || parent.textContent.length) {
         return;
     }
-    if (parent.type === schema.nodes.body) {
-        return 'Paragraph';
-    }
     if (isFootnoteNode(parent) || isGeneralTableFootnoteNode(parent)) {
         return 'Type new footnote here';
     }

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.6.9-LEAN-4097.0';
+export const VERSION = '2.6.9';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.6.9-LEAN-4097.0";
+export declare const VERSION = "2.6.9";
 export declare const MATHJAX_VERSION = "3.2.2";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "2.6.9-LEAN-4097.0",
+  "version": "2.6.9",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -33,8 +33,8 @@
     "@manuscripts/json-schema": "2.2.11",
     "@manuscripts/library": "1.3.11",
     "@manuscripts/style-guide": "2.0.23",
-    "@manuscripts/track-changes-plugin": "1.8.2-LEAN-4097.0",
-    "@manuscripts/transform": "3.0.15-LEAN-4097.0",
+    "@manuscripts/track-changes-plugin": "1.8.1",
+    "@manuscripts/transform": "3.0.14",
     "@popperjs/core": "^2.11.8",
     "astrocite-eutils": "^0.16.4",
     "codemirror": "^5.58.1",