@manuscripts/body-editor 3.2.13 → 3.2.15

package/dist/cjs/commands.js

@@ -689,7 +689,7 @@ const insertContributors = (state, dispatch, view) => {
     if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.contributors, true)) {
         return false;
     }
-    const title = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.title)[0];
+    const title = (0, utils_1.getLastTitleNode)(state);
     const pos = title.pos + title.node.nodeSize;
     const contributors = state.schema.nodes.contributors.create({
         id: '',
@@ -709,7 +709,7 @@ const insertAffiliation = (state, dispatch, view) => {
     if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.affiliations, true)) {
         return false;
     }
-    const title = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.title)[0];
+    const title = (0, utils_1.getLastTitleNode)(state);
     let pos = title.pos + title.node.nodeSize;
     const contributors = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.contributors)[0];
     if (contributors) {

package/dist/cjs/components/outline/DraggableTree.js

@@ -34,6 +34,7 @@ const dnd_1 = require("../../lib/dnd");
 const track_changes_utils_1 = require("../../lib/track-changes-utils");
 const utils_1 = require("../../lib/utils");
 const node_type_icons_1 = require("../../node-type-icons");
+const section_title_1 = require("../../plugins/section_title");
 const Outline_1 = require("./Outline");
 const excludedTypes = [
     transform_1.schema.nodes.table,
@@ -104,13 +105,22 @@ const DraggableTree = ({ tree, view, depth, can, }) => {
         ? (0, utils_1.isBodyLocked)(view.state) || !can?.editArticle
         : true;
     const { node, items, parent } = tree;
+    const sectionTitleState = view
+        ? section_title_1.sectionTitleKey.getState(view.state)
+        : undefined;
     const itemText = (node) => {
         const text = (0, transform_1.nodeTitle)(node);
+        let sectionNumber = node.type.name === 'section' && sectionTitleState
+            ? sectionTitleState.get(node.attrs.id) ?? ''
+            : '';
+        sectionNumber = sectionNumber ? `${sectionNumber}.` : '';
         if (text) {
-            return text.trim();
+            return `${sectionNumber}${sectionNumber ? ' ' : ''}${text.trim()}`;
         }
         const placeholder = (0, transform_1.nodeTitlePlaceholder)(node.type);
-        return react_1.default.createElement(Outline_1.OutlineItemPlaceholder, null, placeholder);
+        return (react_1.default.createElement(Outline_1.OutlineItemPlaceholder, null,
+            sectionNumber && `${sectionNumber} `,
+            placeholder));
     };
     const toggleOpen = () => {
         setOpen(!isOpen);

package/dist/cjs/components/outline/ManuscriptOutline.js

@@ -59,6 +59,6 @@ const ManuscriptOutline = (props) => {
             setValues(undefined);
         }
     }, [debouncedProps, props.can]);
-    return values ? react_1.default.createElement(DraggableTree_1.DraggableTree, { ...values, depth: 0 }) : null;
+    return values && values.view ? react_1.default.createElement(DraggableTree_1.DraggableTree, { ...values, depth: 0 }) : null;
 };
 exports.ManuscriptOutline = ManuscriptOutline;

package/dist/cjs/lib/utils.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInsertPos = exports.createToggleButton = exports.isEditAllowed = exports.isBodyLocked = exports.cleanItemValues = exports.shouldRenderField = exports.hasParent = exports.isNotNull = exports.createHeader = exports.isSelectionInBody = exports.isSelectionInNode = exports.isChildOfNodeTypes = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = exports.iterateChildren = void 0;
+exports.getLastTitleNode = exports.getInsertPos = exports.createToggleButton = exports.isEditAllowed = exports.isBodyLocked = exports.cleanItemValues = exports.shouldRenderField = exports.hasParent = exports.isNotNull = exports.createHeader = exports.isSelectionInBody = exports.isSelectionInNode = exports.isChildOfNodeTypes = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = exports.iterateChildren = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const config_1 = require("../components/references/ReferenceForm/config");
@@ -170,3 +170,12 @@ const getInsertPos = (type, parent, pos) => {
     return insertPos;
 };
 exports.getInsertPos = getInsertPos;
+const getLastTitleNode = (state) => {
+    const altTitleNode = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.alt_titles)[0];
+    if (altTitleNode) {
+        return altTitleNode;
+    }
+    const titleNode = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.title)[0];
+    return titleNode;
+};
+exports.getLastTitleNode = getLastTitleNode;

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

package/dist/es/commands.js

@@ -27,7 +27,7 @@ import { findAbstractsNode, findBackmatter, findBibliographySection, findBody, f
 import { createFootnote, findFootnotesContainerNode, getFootnotesElementState, } from './lib/footnotes';
 import { findWordBoundaries, isNodeOfType, nearestAncestor, } from './lib/helpers';
 import { isDeleted } from './lib/track-changes-utils';
-import { findParentNodeWithId, getChildOfType, getInsertPos, isBodyLocked, } from './lib/utils';
+import { findParentNodeWithId, getChildOfType, getInsertPos, getLastTitleNode, isBodyLocked, } from './lib/utils';
 import { expandAccessibilitySection } from './plugins/accessibility_element';
 import { setCommentSelection } from './plugins/comments';
 import { getEditorProps } from './plugins/editor-props';
@@ -654,7 +654,7 @@ export const insertContributors = (state, dispatch, view) => {
     if (getChildOfType(state.doc, schema.nodes.contributors, true)) {
         return false;
     }
-    const title = findChildrenByType(state.doc, state.schema.nodes.title)[0];
+    const title = getLastTitleNode(state);
     const pos = title.pos + title.node.nodeSize;
     const contributors = state.schema.nodes.contributors.create({
         id: '',
@@ -673,7 +673,7 @@ export const insertAffiliation = (state, dispatch, view) => {
     if (getChildOfType(state.doc, schema.nodes.affiliations, true)) {
         return false;
     }
-    const title = findChildrenByType(state.doc, state.schema.nodes.title)[0];
+    const title = getLastTitleNode(state);
     let pos = title.pos + title.node.nodeSize;
     const contributors = findChildrenByType(state.doc, state.schema.nodes.contributors)[0];
     if (contributors) {

package/dist/es/components/outline/DraggableTree.js

@@ -8,6 +8,7 @@ import { getDropSide } from '../../lib/dnd';
 import { isDeleted } from '../../lib/track-changes-utils';
 import { isBodyLocked } from '../../lib/utils';
 import { nodeTypeIcon } from '../../node-type-icons';
+import { sectionTitleKey } from '../../plugins/section_title';
 import { Outline, OutlineItem, OutlineItemArrow, OutlineItemIcon, OutlineItemLink, OutlineItemLinkText, OutlineItemNoArrow, OutlineItemPlaceholder, } from './Outline';
 const excludedTypes = [
     schema.nodes.table,
@@ -77,13 +78,22 @@ export const DraggableTree = ({ tree, view, depth, can, }) => {
         ? isBodyLocked(view.state) || !can?.editArticle
         : true;
     const { node, items, parent } = tree;
+    const sectionTitleState = view
+        ? sectionTitleKey.getState(view.state)
+        : undefined;
     const itemText = (node) => {
         const text = nodeTitle(node);
+        let sectionNumber = node.type.name === 'section' && sectionTitleState
+            ? sectionTitleState.get(node.attrs.id) ?? ''
+            : '';
+        sectionNumber = sectionNumber ? `${sectionNumber}.` : '';
         if (text) {
-            return text.trim();
+            return `${sectionNumber}${sectionNumber ? ' ' : ''}${text.trim()}`;
         }
         const placeholder = nodeTitlePlaceholder(node.type);
-        return React.createElement(OutlineItemPlaceholder, null, placeholder);
+        return (React.createElement(OutlineItemPlaceholder, null,
+            sectionNumber && `${sectionNumber} `,
+            placeholder));
     };
     const toggleOpen = () => {
         setOpen(!isOpen);

package/dist/es/components/outline/ManuscriptOutline.js

@@ -33,5 +33,5 @@ export const ManuscriptOutline = (props) => {
             setValues(undefined);
         }
     }, [debouncedProps, props.can]);
-    return values ? React.createElement(DraggableTree, { ...values, depth: 0 }) : null;
+    return values && values.view ? React.createElement(DraggableTree, { ...values, depth: 0 }) : null;
 };

package/dist/es/lib/utils.js

@@ -150,3 +150,11 @@ export const getInsertPos = (type, parent, pos) => {
     });
     return insertPos;
 };
+export const getLastTitleNode = (state) => {
+    const altTitleNode = findChildrenByType(state.doc, state.schema.nodes.alt_titles)[0];
+    if (altTitleNode) {
+        return altTitleNode;
+    }
+    const titleNode = findChildrenByType(state.doc, state.schema.nodes.title)[0];
+    return titleNode;
+};

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.2.13';
+export const VERSION = '3.2.15';
 export const MATHJAX_VERSION = '3.2.2';

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { BibliographyItemAttrs, BibliographyItemType, ManuscriptNode, ManuscriptNodeType } from '@manuscripts/transform';
+import { BibliographyItemAttrs, BibliographyItemType, ManuscriptEditorState, ManuscriptNode, ManuscriptNodeType } from '@manuscripts/transform';
 import { Node as ProseMirrorNode, NodeType, ResolvedPos } from 'prosemirror-model';
 import { EditorState, Selection } from 'prosemirror-state';
 export declare function iterateChildren(node: ManuscriptNode, recurse?: boolean): Iterable<ManuscriptNode>;
@@ -36,3 +36,7 @@ export declare const isBodyLocked: (state: EditorState) => boolean;
 export declare const isEditAllowed: (state: EditorState) => boolean;
 export declare const createToggleButton: (listener: () => void) => HTMLButtonElement;
 export declare const getInsertPos: (type: ManuscriptNodeType, parent: ManuscriptNode, pos: number) => number;
+export declare const getLastTitleNode: (state: ManuscriptEditorState) => {
+    node: ProseMirrorNode;
+    pos: number;
+};

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.2.13";
+export declare const VERSION = "3.2.15";
 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.2.13",
+  "version": "3.2.15",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",