@manuscripts/body-editor 3.12.34 → 3.12.36

package/dist/cjs/commands.js

@@ -198,7 +198,7 @@ const createBlock = (nodeType, position, state, dispatch, attrs) => {
             break;
         case state.schema.nodes.pullquote_element:
             node = state.schema.nodes.pullquote_element.create(attrs, [
-                state.schema.nodes.paragraph.create({}),
+                state.schema.nodes.text_block.create({}),
                 state.schema.nodes.attribution.create({}),
             ]);
             break;

package/dist/cjs/lib/helpers.js

@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findWordBoundaries = exports.handleScrollToSelectedTarget = exports.mergeSimilarItems = exports.nearestAncestor = exports.isNodeOfType = void 0;
+exports.findWordBoundaries = exports.handleScrollToSelectedTarget = exports.selectionForOutlineNavigation = exports.mergeSimilarItems = exports.nearestAncestor = exports.isNodeOfType = void 0;
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_state_1 = require("prosemirror-state");
 const isNodeOfType = (...type) => (node) => {
     const [head, ...tail] = type;
     if (node.type === node.type.schema.nodes[head]) {
@@ -51,6 +52,32 @@ const mergeSimilarItems = (compareFunc, mergeFunc) => (items) => {
     }, []);
 };
 exports.mergeSimilarItems = mergeSimilarItems;
+const selectionForOutlineNavigation = (doc, pos) => {
+    const node = doc.nodeAt(pos);
+    if (!node || (0, transform_1.isExecutableNodeType)(node.type)) {
+        return prosemirror_state_1.NodeSelection.create(doc, pos);
+    }
+    if (node.isTextblock) {
+        return prosemirror_state_1.TextSelection.create(doc, pos + 1);
+    }
+    if (node.type === transform_1.schema.nodes.section) {
+        let textPos = null;
+        node.forEach((child, offset) => {
+            if (textPos !== null) {
+                return;
+            }
+            if (child.type === transform_1.schema.nodes.section_title ||
+                child.type === transform_1.schema.nodes.section_title_plain) {
+                textPos = pos + 1 + offset + 1;
+            }
+        });
+        if (textPos !== null) {
+            return prosemirror_state_1.TextSelection.create(doc, textPos);
+        }
+    }
+    return prosemirror_state_1.NodeSelection.create(doc, pos);
+};
+exports.selectionForOutlineNavigation = selectionForOutlineNavigation;
 const handleScrollToSelectedTarget = (view) => {
     const selection = view.state.selection;
     if (selection.empty) {

package/dist/cjs/plugins/paragraphs.js

@@ -17,6 +17,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
+const isTextBlock = (node) => {
+    return node.type === node.type.schema.nodes.text_block;
+};
+const isTextBlockOrParagraph = (node) => {
+    return (0, transform_1.isParagraphNode)(node) || isTextBlock(node);
+};
+const isTableCell = (node) => {
+    const { schema } = node.type;
+    return (node.type === schema.nodes.table_cell ||
+        node.type === schema.nodes.table_header);
+};
 exports.default = () => {
     return new prosemirror_state_1.Plugin({
         appendTransaction: (transactions, oldState, newState) => {
@@ -27,11 +38,15 @@ exports.default = () => {
             }
             const joinAdjacentParagraphs = (parent, pos) => (node, offset, index) => {
                 const nodePos = pos + offset;
-                if ((0, transform_1.isParagraphNode)(node) &&
+                if (isTableCell(parent)) {
+                    node.forEach(joinAdjacentParagraphs(node, nodePos + 1));
+                    return;
+                }
+                if (isTextBlockOrParagraph(node) &&
                     node.childCount === 0 &&
                     index < parent.childCount - 1) {
                     const nextNode = parent.child(index + 1);
-                    if ((0, transform_1.isParagraphNode)(nextNode) && nextNode.childCount === 0) {
+                    if (isTextBlockOrParagraph(nextNode) && nextNode.childCount === 0) {
                         positionsToJoin.push(nodePos + node.nodeSize);
                     }
                 }

package/dist/cjs/plugins/placeholder.js

@@ -50,7 +50,7 @@ const getParagraphPlaceholderText = (parent, node) => {
     if ((0, transform_1.isPullquoteElement)(parent) && !node.textContent.length) {
         let otherParagraphHasContent = false;
         parent.descendants((child) => {
-            if (child !== node && child.type === child.type.schema.nodes.paragraph) {
+            if (child !== node && child.type === child.type.schema.nodes.text_block) {
                 otherParagraphHasContent = true;
             }
         });
@@ -81,7 +81,8 @@ exports.default = () => new prosemirror_state_1.Plugin({
                     if (node.type === node.type.schema.nodes.attribution) {
                         decorations.push(prosemirror_view_1.Decoration.widget(pos + 1, placeholderWidget('Insert reference here')));
                     }
-                    if (node.type === node.type.schema.nodes.paragraph) {
+                    if (node.type === node.type.schema.nodes.paragraph ||
+                        node.type === node.type.schema.nodes.text_block) {
                         const text = getParagraphPlaceholderText(parent, node);
                         if (text) {
                             decorations.push(prosemirror_view_1.Decoration.widget(pos + 1, placeholderWidget(text)));

package/dist/cjs/useEditor.js

@@ -24,6 +24,7 @@ const react_router_dom_1 = require("react-router-dom");
 const ManuscriptsEditor_1 = require("./configs/ManuscriptsEditor");
 const popper_1 = require("./lib/popper");
 const use_do_with_debounce_1 = require("./lib/use-do-with-debounce");
+const helpers_1 = require("./lib/helpers");
 const search_replace_1 = require("./plugins/search-replace");
 const useEditor = (externalProps) => {
     const view = (0, react_1.useRef)(undefined);
@@ -109,12 +110,14 @@ const useEditor = (externalProps) => {
         if (!id || !currentView || !state) {
             return;
         }
-        state.doc.descendants((node, pos) => {
+        const viewState = currentView.state;
+        viewState.doc.descendants((node, pos) => {
             if (node.attrs.id === id) {
                 currentView.focus();
-                const selection = prosemirror_state_1.NodeSelection.create(state.tr.doc, pos);
-                currentView.dispatch(state.tr.setSelection(selection));
-                const dom = currentView.domAtPos(pos + 1);
+                const selection = (0, helpers_1.selectionForOutlineNavigation)(viewState.doc, pos);
+                currentView.dispatch(viewState.tr.setSelection(selection));
+                const scrollPos = selection instanceof prosemirror_state_1.TextSelection ? selection.from : pos + 1;
+                const dom = currentView.domAtPos(scrollPos);
                 if (dom.node instanceof Element) {
                     dom.node.scrollIntoView({
                         behavior: 'smooth',

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 = '3.12.34';
+exports.VERSION = '3.12.36';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

@@ -188,7 +188,7 @@ export const createBlock = (nodeType, position, state, dispatch, attrs) => {
             break;
         case state.schema.nodes.pullquote_element:
             node = state.schema.nodes.pullquote_element.create(attrs, [
-                state.schema.nodes.paragraph.create({}),
+                state.schema.nodes.text_block.create({}),
                 state.schema.nodes.attribution.create({}),
             ]);
             break;

package/dist/es/lib/helpers.js

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { schema, } from '@manuscripts/transform';
+import { isExecutableNodeType, schema, } from '@manuscripts/transform';
+import { NodeSelection, TextSelection } from 'prosemirror-state';
 export const isNodeOfType = (...type) => (node) => {
     const [head, ...tail] = type;
     if (node.type === node.type.schema.nodes[head]) {
@@ -45,6 +46,31 @@ export const mergeSimilarItems = (compareFunc, mergeFunc) => (items) => {
         ];
     }, []);
 };
+export const selectionForOutlineNavigation = (doc, pos) => {
+    const node = doc.nodeAt(pos);
+    if (!node || isExecutableNodeType(node.type)) {
+        return NodeSelection.create(doc, pos);
+    }
+    if (node.isTextblock) {
+        return TextSelection.create(doc, pos + 1);
+    }
+    if (node.type === schema.nodes.section) {
+        let textPos = null;
+        node.forEach((child, offset) => {
+            if (textPos !== null) {
+                return;
+            }
+            if (child.type === schema.nodes.section_title ||
+                child.type === schema.nodes.section_title_plain) {
+                textPos = pos + 1 + offset + 1;
+            }
+        });
+        if (textPos !== null) {
+            return TextSelection.create(doc, textPos);
+        }
+    }
+    return NodeSelection.create(doc, pos);
+};
 export const handleScrollToSelectedTarget = (view) => {
     const selection = view.state.selection;
     if (selection.empty) {

package/dist/es/plugins/paragraphs.js

@@ -15,6 +15,17 @@
  */
 import { isParagraphNode } from '@manuscripts/transform';
 import { Plugin } from 'prosemirror-state';
+const isTextBlock = (node) => {
+    return node.type === node.type.schema.nodes.text_block;
+};
+const isTextBlockOrParagraph = (node) => {
+    return isParagraphNode(node) || isTextBlock(node);
+};
+const isTableCell = (node) => {
+    const { schema } = node.type;
+    return (node.type === schema.nodes.table_cell ||
+        node.type === schema.nodes.table_header);
+};
 export default () => {
     return new Plugin({
         appendTransaction: (transactions, oldState, newState) => {
@@ -25,11 +36,15 @@ export default () => {
             }
             const joinAdjacentParagraphs = (parent, pos) => (node, offset, index) => {
                 const nodePos = pos + offset;
-                if (isParagraphNode(node) &&
+                if (isTableCell(parent)) {
+                    node.forEach(joinAdjacentParagraphs(node, nodePos + 1));
+                    return;
+                }
+                if (isTextBlockOrParagraph(node) &&
                     node.childCount === 0 &&
                     index < parent.childCount - 1) {
                     const nextNode = parent.child(index + 1);
-                    if (isParagraphNode(nextNode) && nextNode.childCount === 0) {
+                    if (isTextBlockOrParagraph(nextNode) && nextNode.childCount === 0) {
                         positionsToJoin.push(nodePos + node.nodeSize);
                     }
                 }

package/dist/es/plugins/placeholder.js

@@ -48,7 +48,7 @@ const getParagraphPlaceholderText = (parent, node) => {
     if (isPullquoteElement(parent) && !node.textContent.length) {
         let otherParagraphHasContent = false;
         parent.descendants((child) => {
-            if (child !== node && child.type === child.type.schema.nodes.paragraph) {
+            if (child !== node && child.type === child.type.schema.nodes.text_block) {
                 otherParagraphHasContent = true;
             }
         });
@@ -79,7 +79,8 @@ export default () => new Plugin({
                     if (node.type === node.type.schema.nodes.attribution) {
                         decorations.push(Decoration.widget(pos + 1, placeholderWidget('Insert reference here')));
                     }
-                    if (node.type === node.type.schema.nodes.paragraph) {
+                    if (node.type === node.type.schema.nodes.paragraph ||
+                        node.type === node.type.schema.nodes.text_block) {
                         const text = getParagraphPlaceholderText(parent, node);
                         if (text) {
                             decorations.push(Decoration.widget(pos + 1, placeholderWidget(text)));

package/dist/es/useEditor.js

@@ -15,12 +15,13 @@
  */
 import { trackChangesPluginKey, TrackChangesStatus, } from '@manuscripts/track-changes-plugin';
 import { getVersion, receiveTransaction, sendableSteps, } from 'prosemirror-collab';
-import { NodeSelection, } from 'prosemirror-state';
+import { TextSelection, } from 'prosemirror-state';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { createEditorState, createEditorView, } from './configs/ManuscriptsEditor';
 import { PopperManager } from './lib/popper';
 import { useDoWithDebounce } from './lib/use-do-with-debounce';
+import { selectionForOutlineNavigation } from './lib/helpers';
 import { searchReplaceKey } from './plugins/search-replace';
 export const useEditor = (externalProps) => {
     const view = useRef(undefined);
@@ -106,12 +107,14 @@ export const useEditor = (externalProps) => {
         if (!id || !currentView || !state) {
             return;
         }
-        state.doc.descendants((node, pos) => {
+        const viewState = currentView.state;
+        viewState.doc.descendants((node, pos) => {
             if (node.attrs.id === id) {
                 currentView.focus();
-                const selection = NodeSelection.create(state.tr.doc, pos);
-                currentView.dispatch(state.tr.setSelection(selection));
-                const dom = currentView.domAtPos(pos + 1);
+                const selection = selectionForOutlineNavigation(viewState.doc, pos);
+                currentView.dispatch(viewState.tr.setSelection(selection));
+                const scrollPos = selection instanceof TextSelection ? selection.from : pos + 1;
+                const dom = currentView.domAtPos(scrollPos);
                 if (dom.node instanceof Element) {
                     dom.node.scrollIntoView({
                         behavior: 'smooth',

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.12.34';
+export const VERSION = '3.12.36';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/types/lib/helpers.d.ts

@@ -15,10 +15,12 @@
  */
 import { ManuscriptEditorState, ManuscriptNode } from '@manuscripts/transform';
 import { Node, ResolvedPos } from 'prosemirror-model';
+import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 export declare const isNodeOfType: (...type: string[]) => (node: Node) => boolean;
 export declare const nearestAncestor: (func: (node: ManuscriptNode) => boolean) => ($pos: ResolvedPos) => number | null;
 export declare const mergeSimilarItems: <T>(compareFunc: (a: T, b: T) => boolean, mergeFunc: (a: T, b: T) => T) => (items: T[]) => T[];
+export declare const selectionForOutlineNavigation: (doc: Node, pos: number) => NodeSelection | TextSelection;
 export declare const handleScrollToSelectedTarget: (view: EditorView) => boolean;
 export declare const findWordBoundaries: (state: ManuscriptEditorState, position: number) => {
     from: number;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.12.34";
+export declare const VERSION = "3.12.36";
 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": "3.12.34",
+  "version": "3.12.36",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -37,9 +37,9 @@
     "@citation-js/plugin-pubmed": "0.3.0",
     "@citation-js/plugin-ris": "0.7.18",
     "@iarna/word-count": "1.1.2",
-    "@manuscripts/style-guide": "3.5.12",
+    "@manuscripts/style-guide": "3.5.13",
     "@manuscripts/track-changes-plugin": "2.3.10",
-    "@manuscripts/transform": "4.3.38",
+    "@manuscripts/transform": "4.3.39",
     "@popperjs/core": "2.11.8",
     "citeproc": "2.4.63",
     "codemirror": "5.65.19",

package/styles/Editor.css

@@ -92,6 +92,9 @@
   line-height: 2;
   font-size: 16px;
 }
+.ProseMirror .pullquote p {
+  display: flow-root;
+}
 .ProseMirror .pullquote p i {
   font-style: normal;
 }
@@ -128,6 +131,7 @@
 }
 
 .ProseMirror .pullquote footer {
+  display: flow-root;
   padding-left: 1em;
   color: #777;
   position: relative;