@manuscripts/body-editor 3.10.14 → 3.10.16

package/dist/cjs/lib/doc.js

@@ -28,7 +28,10 @@ const upsertSupplementsSection = (tr, supplement) => {
         return { node: supplements.node, pos };
     }
     const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.supplements, doc);
-    const node = transform_1.schema.nodes.supplements.createAndFill({ id: (0, transform_1.generateNodeID)(transform_1.schema.nodes.supplements) }, [supplement]);
+    const node = transform_1.schema.nodes.supplements.createAndFill({ id: (0, transform_1.generateNodeID)(transform_1.schema.nodes.supplements) }, [
+        transform_1.schema.nodes.section_title.create(undefined, transform_1.schema.text('Supplements')),
+        supplement,
+    ]);
     tr.insert(pos, node);
     return {
         node,

package/dist/cjs/lib/popper.js

@@ -22,7 +22,7 @@ class PopperManager {
     constructor() {
         this.isActive = () => !!this.activePopper;
     }
-    show(target, contents, placement = 'bottom', showArrow = true, modifiers = []) {
+    show(target, contents, placement = 'bottom', showArrow = true, modifiers = [], autoFocus = true) {
         this.destroy();
         this.triggerElement = target;
         window.requestAnimationFrame(() => {
@@ -73,7 +73,7 @@ class PopperManager {
                 modifiers,
                 onFirstUpdate: () => {
                     this.addContainerClass(target);
-                    this.focusInput(container);
+                    this.focusInput(container, autoFocus);
                 },
             });
             this.handleDocumentClick = (e) => {
@@ -109,12 +109,15 @@ class PopperManager {
             this.activePopper.update();
         }
     }
-    focusInput(container) {
+    focusInput(container, autoFocus = true) {
         const input = container.querySelector('input');
-        const button = container.querySelector('button:not([disabled])');
-        const element = input || button;
-        if (element) {
-            element.focus();
+        if (input) {
+            input.focus();
+            return;
+        }
+        if (autoFocus) {
+            const button = container.querySelector('button:not([disabled])');
+            button?.focus();
         }
     }
     addContainerClass(referenceElement) {

package/dist/cjs/plugins/comments.js

@@ -206,6 +206,7 @@ const getDecorationPos = (node, pos) => {
         case transform_1.schema.nodes.embed:
         case transform_1.schema.nodes.contributors:
         case transform_1.schema.nodes.hero_image:
+        case transform_1.schema.nodes.supplements:
             return pos;
         case transform_1.schema.nodes.keywords:
             return pos + 2;

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

package/dist/cjs/views/citation_editable.js

@@ -48,7 +48,7 @@ class CitationEditableView extends citation_1.CitationView {
                 element.classList.contains('comment-icon') ||
                 element.parentElement?.classList.contains('comment-icon'));
         };
-        this.handleClick = () => {
+        this.handleClick = (fromKeyboard) => {
             if (!this.can.seeReferencesButtons ||
                 this.dom.classList.contains('inconsistency-highlight')) {
                 this.showPopper();
@@ -56,7 +56,7 @@ class CitationEditableView extends citation_1.CitationView {
             else if (!(0, track_changes_utils_1.isDeleted)(this.node)) {
                 const attrs = this.node.attrs;
                 if (attrs.rids.length) {
-                    this.showContextMenu();
+                    this.showContextMenu(fromKeyboard);
                 }
             }
         };
@@ -75,7 +75,7 @@ class CitationEditableView extends citation_1.CitationView {
             this.editor?.remove();
             this.props.popper.destroy();
         };
-        this.showContextMenu = () => {
+        this.showContextMenu = (autoFocus = true) => {
             this.props.popper.destroy();
             const can = this.props.getCapabilities();
             const actions = [
@@ -96,7 +96,7 @@ class CitationEditableView extends citation_1.CitationView {
                 actions,
             };
             this.contextMenu = (0, ReactSubView_1.default)(this.props, style_guide_1.ContextMenu, componentProps, this.node, this.getPos, this.view, ['context-menu']);
-            this.props.popper.show(this.dom, this.contextMenu, 'right-start', false);
+            this.props.popper.show(this.dom, this.contextMenu, 'right-start', false, [], autoFocus);
         };
         this.showPopper = () => {
             this.props.popper.destroy();
@@ -197,8 +197,8 @@ class CitationEditableView extends citation_1.CitationView {
     }
     createDOM() {
         super.createDOM();
-        this.dom.addEventListener('mouseup', this.handleClick);
-        this.dom.addEventListener('keydown', (0, navigation_utils_1.handleEnterKey)(() => this.handleClick()));
+        this.dom.addEventListener('mouseup', () => this.handleClick(false));
+        this.dom.addEventListener('keydown', (0, navigation_utils_1.handleEnterKey)(() => this.handleClick(true)));
     }
     insertBibliographyNode(attrs) {
         const { doc, tr } = this.view.state;

package/dist/es/lib/doc.js

@@ -24,7 +24,10 @@ export const upsertSupplementsSection = (tr, supplement) => {
         return { node: supplements.node, pos };
     }
     const pos = findInsertionPosition(schema.nodes.supplements, doc);
-    const node = schema.nodes.supplements.createAndFill({ id: generateNodeID(schema.nodes.supplements) }, [supplement]);
+    const node = schema.nodes.supplements.createAndFill({ id: generateNodeID(schema.nodes.supplements) }, [
+        schema.nodes.section_title.create(undefined, schema.text('Supplements')),
+        supplement,
+    ]);
     tr.insert(pos, node);
     return {
         node,

package/dist/es/lib/popper.js

@@ -19,7 +19,7 @@ export class PopperManager {
     constructor() {
         this.isActive = () => !!this.activePopper;
     }
-    show(target, contents, placement = 'bottom', showArrow = true, modifiers = []) {
+    show(target, contents, placement = 'bottom', showArrow = true, modifiers = [], autoFocus = true) {
         this.destroy();
         this.triggerElement = target;
         window.requestAnimationFrame(() => {
@@ -70,7 +70,7 @@ export class PopperManager {
                 modifiers,
                 onFirstUpdate: () => {
                     this.addContainerClass(target);
-                    this.focusInput(container);
+                    this.focusInput(container, autoFocus);
                 },
             });
             this.handleDocumentClick = (e) => {
@@ -106,12 +106,15 @@ export class PopperManager {
             this.activePopper.update();
         }
     }
-    focusInput(container) {
+    focusInput(container, autoFocus = true) {
         const input = container.querySelector('input');
-        const button = container.querySelector('button:not([disabled])');
-        const element = input || button;
-        if (element) {
-            element.focus();
+        if (input) {
+            input.focus();
+            return;
+        }
+        if (autoFocus) {
+            const button = container.querySelector('button:not([disabled])');
+            button?.focus();
         }
     }
     addContainerClass(referenceElement) {

package/dist/es/plugins/comments.js

@@ -201,6 +201,7 @@ const getDecorationPos = (node, pos) => {
         case schema.nodes.embed:
         case schema.nodes.contributors:
         case schema.nodes.hero_image:
+        case schema.nodes.supplements:
             return pos;
         case schema.nodes.keywords:
             return pos + 2;

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.10.14';
+export const VERSION = '3.10.16';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/citation_editable.js

@@ -42,7 +42,7 @@ export class CitationEditableView extends CitationView {
                 element.classList.contains('comment-icon') ||
                 element.parentElement?.classList.contains('comment-icon'));
         };
-        this.handleClick = () => {
+        this.handleClick = (fromKeyboard) => {
             if (!this.can.seeReferencesButtons ||
                 this.dom.classList.contains('inconsistency-highlight')) {
                 this.showPopper();
@@ -50,7 +50,7 @@ export class CitationEditableView extends CitationView {
             else if (!isDeleted(this.node)) {
                 const attrs = this.node.attrs;
                 if (attrs.rids.length) {
-                    this.showContextMenu();
+                    this.showContextMenu(fromKeyboard);
                 }
             }
         };
@@ -69,7 +69,7 @@ export class CitationEditableView extends CitationView {
             this.editor?.remove();
             this.props.popper.destroy();
         };
-        this.showContextMenu = () => {
+        this.showContextMenu = (autoFocus = true) => {
             this.props.popper.destroy();
             const can = this.props.getCapabilities();
             const actions = [
@@ -90,7 +90,7 @@ export class CitationEditableView extends CitationView {
                 actions,
             };
             this.contextMenu = ReactSubView(this.props, ContextMenu, componentProps, this.node, this.getPos, this.view, ['context-menu']);
-            this.props.popper.show(this.dom, this.contextMenu, 'right-start', false);
+            this.props.popper.show(this.dom, this.contextMenu, 'right-start', false, [], autoFocus);
         };
         this.showPopper = () => {
             this.props.popper.destroy();
@@ -191,8 +191,8 @@ export class CitationEditableView extends CitationView {
     }
     createDOM() {
         super.createDOM();
-        this.dom.addEventListener('mouseup', this.handleClick);
-        this.dom.addEventListener('keydown', handleEnterKey(() => this.handleClick()));
+        this.dom.addEventListener('mouseup', () => this.handleClick(false));
+        this.dom.addEventListener('keydown', handleEnterKey(() => this.handleClick(true)));
     }
     insertBibliographyNode(attrs) {
         const { doc, tr } = this.view.state;

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

@@ -19,7 +19,7 @@ export declare class PopperManager {
     private handleDocumentClick?;
     private triggerElement?;
     private container?;
-    show(target: Element, contents: HTMLElement, placement?: Placement, showArrow?: boolean, modifiers?: Array<Partial<StrictModifiers>>): void;
+    show(target: Element, contents: HTMLElement, placement?: Placement, showArrow?: boolean, modifiers?: Array<Partial<StrictModifiers>>, autoFocus?: boolean): void;
     destroy(): void;
     getContainer(): HTMLElement | undefined;
     update(): void;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.10.14";
+export declare const VERSION = "3.10.16";
 export declare const MATHJAX_VERSION = "3.2.2";

package/dist/types/views/citation_editable.d.ts

@@ -20,10 +20,10 @@ export declare class CitationEditableView extends CitationView {
     private can;
     createDOM(): void;
     stopEvent: (event: Event) => boolean;
-    handleClick: () => void;
+    handleClick: (fromKeyboard: boolean) => void;
     selectNode: () => void;
     destroy: () => void;
-    showContextMenu: () => void;
+    showContextMenu: (autoFocus?: boolean) => void;
     showPopper: () => void;
     private handleEdit;
     private handleCancel;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "3.10.14",
+  "version": "3.10.16",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",

package/styles/AdvancedEditor.css

@@ -555,7 +555,8 @@ ProseMirror .block-embed .position-menu {
 
 .comment-marker:has(+ .block-contributors),
 .comment-marker:has(+ .block-affiliations),
-.comment-marker:has(+ .block-hero_image) {
+.comment-marker:has(+ .block-hero_image),
+.comment-marker:has(+ .block-supplements) {
   height: 0;
   top: 0;
   right: 60px;
@@ -563,6 +564,11 @@ ProseMirror .block-embed .position-menu {
   float: right;
 }
 
+.comment-marker:has(+ .block-hero_image),
+.comment-marker:has(+ .block-supplements) {
+  right: 50px;
+}
+
 .block-subtitles .comment-marker {
   top: 0;
   left: -10px;