@manuscripts/body-editor 3.2.0 → 3.2.2

package/dist/cjs/components/authors/AuthorList.js

@@ -37,7 +37,7 @@ const AuthorListTitle = styled_components_1.default.h2 `
   margin-top: 20px;
 `;
 const AuthorList = ({ author, authors, onSelect, onDelete, moveAuthor, lastSavedAuthor, }) => {
-    return (react_1.default.createElement(react_dnd_1.DndProvider, { backend: react_dnd_html5_backend_1.HTML5Backend },
+    return (react_1.default.createElement(react_dnd_1.DndProvider, { backend: react_dnd_html5_backend_1.HTML5Backend, context: window },
         react_1.default.createElement(AuthorListTitle, null, "Existing Authors"),
         react_1.default.createElement(AuthorListContainer, { "data-cy": "authors-list" }, authors.map((a) => {
             return (react_1.default.createElement(DraggableAuthor_1.DraggableAuthor, { key: a.id, author: a, isSelected: a.id === author?.id, onClick: () => onSelect(a), onDelete: () => onDelete(), moveAuthor: moveAuthor, showSuccessIcon: lastSavedAuthor === a.id }));

package/dist/cjs/lib/context-menu.js

@@ -51,20 +51,17 @@ exports.contextMenuBtnClass = 'btn-context-menu';
 const contextSubmenuBtnClass = 'context-submenu-trigger';
 class ContextMenu {
     constructor(node, view, getPos) {
-        this.showAddMenu = (target, after) => {
+        this.showAddMenu = (target) => {
             const menu = document.createElement('div');
             menu.className = 'menu';
             const $pos = this.resolvePos();
-            if ((0, transform_1.isInBibliographySection)($pos)) {
-                after = false;
-            }
-            const insertPos = after ? $pos.after($pos.depth) : $pos.before($pos.depth);
+            const insertPos = $pos.after($pos.depth);
             const endPos = $pos.end();
-            const types = this.insertableTypes(after, insertPos, endPos);
+            const types = this.insertableTypes(insertPos, endPos);
             const insertNode = (type, pos, attrs) => {
                 const { state, dispatch } = this.view;
                 if (pos === undefined) {
-                    pos = after ? this.getPos() + this.node.nodeSize : this.getPos();
+                    pos = this.getPos() + this.node.nodeSize;
                 }
                 (0, commands_1.createBlock)(type, pos, state, dispatch, attrs);
             };
@@ -79,7 +76,7 @@ class ContextMenu {
                             transform_1.schema.nodes.abstracts,
                             transform_1.schema.nodes.backmatter,
                         ])) {
-                        const labelPosition = after ? 'After' : 'Before';
+                        const labelPosition = 'After';
                         const level = (0, exports.sectionLevel)($pos.depth - 1);
                         const label = `New ${level} ${labelPosition} ${itemTitle}`;
                         section.appendChild(this.createMenuItem(label, () => {
@@ -267,7 +264,9 @@ class ContextMenu {
                     menu.append(this.createMenuSection((e) => e.append(...items)));
                 }
             }
-            if (!readonlyTypes.includes(type) &&
+            if (!(type === transform_1.schema.nodes.figure_element &&
+                (0, transform_1.isInGraphicalAbstractSection)($pos)) &&
+                !readonlyTypes.includes(type) &&
                 !readonlyTypes.includes($pos.parent.type)) {
                 menu.appendChild(this.createMenuSection((section) => {
                     let nodeName = transform_1.nodeNames.get(type) || '';
@@ -325,13 +324,13 @@ class ContextMenu {
             }, true));
             return submenu;
         };
-        this.insertableTypes = (after, insertPos, endPos) => {
+        this.insertableTypes = (insertPos, endPos) => {
             const { nodes } = transform_1.schema;
             const insertable = new Set();
             const doc = this.view.state.doc;
             const getPos = (pos) => {
                 if (pos === undefined) {
-                    pos = after ? this.getPos() + this.node.nodeSize : this.getPos();
+                    pos = this.getPos() + this.node.nodeSize;
                 }
                 return pos;
             };

package/dist/cjs/lib/utils.js

@@ -105,6 +105,9 @@ exports.createHeader = createHeader;
 const isNotNull = (a) => a !== null;
 exports.isNotNull = isNotNull;
 const hasParent = ($pos, type) => {
+    if (Array.isArray(type)) {
+        return type.some((nodeType) => !!(0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)($pos, nodeType));
+    }
     return !!(0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)($pos, type);
 };
 exports.hasParent = hasParent;

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

package/dist/cjs/views/editable_block.js

@@ -39,19 +39,24 @@ const EditableBlock = (Base) => {
                 return null;
             }
             const $pos = this.view.state.doc.resolve(this.getPos());
-            if ((0, utils_1.hasParent)($pos, transform_1.schema.nodes.keywords)) {
+            const nodeType = this.node.type;
+            if (nodeType === transform_1.schema.nodes.hero_image ||
+                (0, utils_1.hasParent)($pos, [
+                    transform_1.schema.nodes.keywords,
+                    transform_1.schema.nodes.bibliography_section,
+                    transform_1.schema.nodes.footnotes_section,
+                ])) {
                 return null;
             }
-            const after = !(0, utils_1.hasParent)($pos, transform_1.schema.nodes.bibliography_section);
             const button = document.createElement('a');
             button.classList.add('add-block', context_menu_1.contextMenuBtnClass);
-            button.classList.add(after ? 'add-block-after' : 'add-block-before');
-            button.setAttribute('aria-label', `Add an element ${after ? 'below' : 'above'}`);
+            button.classList.add('add-block-after');
+            button.setAttribute('aria-label', `Add an element below`);
             button.setAttribute('data-balloon-pos', 'down-left');
             button.addEventListener('mousedown', (event) => {
                 event.preventDefault();
                 const menu = this.createMenu();
-                menu.showAddMenu(event.currentTarget, after);
+                menu.showAddMenu(event.currentTarget);
             });
             return button;
         }

package/dist/es/components/authors/AuthorList.js

@@ -31,7 +31,7 @@ const AuthorListTitle = styled.h2 `
   margin-top: 20px;
 `;
 export const AuthorList = ({ author, authors, onSelect, onDelete, moveAuthor, lastSavedAuthor, }) => {
-    return (React.createElement(DndProvider, { backend: HTML5Backend },
+    return (React.createElement(DndProvider, { backend: HTML5Backend, context: window },
         React.createElement(AuthorListTitle, null, "Existing Authors"),
         React.createElement(AuthorListContainer, { "data-cy": "authors-list" }, authors.map((a) => {
             return (React.createElement(DraggableAuthor, { key: a.id, author: a, isSelected: a.id === author?.id, onClick: () => onSelect(a), onDelete: () => onDelete(), moveAuthor: moveAuthor, showSuccessIcon: lastSavedAuthor === a.id }));

package/dist/es/lib/context-menu.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ImageDefaultIcon, ImageLeftIcon, ImageRightIcon, TriangleCollapsedIcon, } from '@manuscripts/style-guide';
-import { isInBibliographySection, isSectionTitleNode, nodeNames, schema, } from '@manuscripts/transform';
+import { isInGraphicalAbstractSection, isSectionTitleNode, nodeNames, schema, } from '@manuscripts/transform';
 import { findChildrenByType } from 'prosemirror-utils';
 import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
@@ -47,20 +47,17 @@ export const contextMenuBtnClass = 'btn-context-menu';
 const contextSubmenuBtnClass = 'context-submenu-trigger';
 export class ContextMenu {
     constructor(node, view, getPos) {
-        this.showAddMenu = (target, after) => {
+        this.showAddMenu = (target) => {
             const menu = document.createElement('div');
             menu.className = 'menu';
             const $pos = this.resolvePos();
-            if (isInBibliographySection($pos)) {
-                after = false;
-            }
-            const insertPos = after ? $pos.after($pos.depth) : $pos.before($pos.depth);
+            const insertPos = $pos.after($pos.depth);
             const endPos = $pos.end();
-            const types = this.insertableTypes(after, insertPos, endPos);
+            const types = this.insertableTypes(insertPos, endPos);
             const insertNode = (type, pos, attrs) => {
                 const { state, dispatch } = this.view;
                 if (pos === undefined) {
-                    pos = after ? this.getPos() + this.node.nodeSize : this.getPos();
+                    pos = this.getPos() + this.node.nodeSize;
                 }
                 createBlock(type, pos, state, dispatch, attrs);
             };
@@ -75,7 +72,7 @@ export class ContextMenu {
                             schema.nodes.abstracts,
                             schema.nodes.backmatter,
                         ])) {
-                        const labelPosition = after ? 'After' : 'Before';
+                        const labelPosition = 'After';
                         const level = sectionLevel($pos.depth - 1);
                         const label = `New ${level} ${labelPosition} ${itemTitle}`;
                         section.appendChild(this.createMenuItem(label, () => {
@@ -263,7 +260,9 @@ export class ContextMenu {
                     menu.append(this.createMenuSection((e) => e.append(...items)));
                 }
             }
-            if (!readonlyTypes.includes(type) &&
+            if (!(type === schema.nodes.figure_element &&
+                isInGraphicalAbstractSection($pos)) &&
+                !readonlyTypes.includes(type) &&
                 !readonlyTypes.includes($pos.parent.type)) {
                 menu.appendChild(this.createMenuSection((section) => {
                     let nodeName = nodeNames.get(type) || '';
@@ -321,13 +320,13 @@ export class ContextMenu {
             }, true));
             return submenu;
         };
-        this.insertableTypes = (after, insertPos, endPos) => {
+        this.insertableTypes = (insertPos, endPos) => {
             const { nodes } = schema;
             const insertable = new Set();
             const doc = this.view.state.doc;
             const getPos = (pos) => {
                 if (pos === undefined) {
-                    pos = after ? this.getPos() + this.node.nodeSize : this.getPos();
+                    pos = this.getPos() + this.node.nodeSize;
                 }
                 return pos;
             };

package/dist/es/lib/utils.js

@@ -92,6 +92,9 @@ export const createHeader = (typeName, text) => {
 };
 export const isNotNull = (a) => a !== null;
 export const hasParent = ($pos, type) => {
+    if (Array.isArray(type)) {
+        return type.some((nodeType) => !!findParentNodeOfTypeClosestToPos($pos, nodeType));
+    }
     return !!findParentNodeOfTypeClosestToPos($pos, type);
 };
 export const shouldRenderField = (field, type) => {

package/dist/es/versions.js

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

package/dist/es/views/editable_block.js

@@ -36,19 +36,24 @@ export const EditableBlock = (Base) => {
                 return null;
             }
             const $pos = this.view.state.doc.resolve(this.getPos());
-            if (hasParent($pos, schema.nodes.keywords)) {
+            const nodeType = this.node.type;
+            if (nodeType === schema.nodes.hero_image ||
+                hasParent($pos, [
+                    schema.nodes.keywords,
+                    schema.nodes.bibliography_section,
+                    schema.nodes.footnotes_section,
+                ])) {
                 return null;
             }
-            const after = !hasParent($pos, schema.nodes.bibliography_section);
             const button = document.createElement('a');
             button.classList.add('add-block', contextMenuBtnClass);
-            button.classList.add(after ? 'add-block-after' : 'add-block-before');
-            button.setAttribute('aria-label', `Add an element ${after ? 'below' : 'above'}`);
+            button.classList.add('add-block-after');
+            button.setAttribute('aria-label', `Add an element below`);
             button.setAttribute('data-balloon-pos', 'down-left');
             button.addEventListener('mousedown', (event) => {
                 event.preventDefault();
                 const menu = this.createMenu();
-                menu.showAddMenu(event.currentTarget, after);
+                menu.showAddMenu(event.currentTarget);
             });
             return button;
         }

package/dist/types/lib/context-menu.d.ts

@@ -21,7 +21,7 @@ export declare class ContextMenu {
     private readonly view;
     private readonly getPos;
     constructor(node: ManuscriptNode, view: ManuscriptEditorView, getPos: () => number);
-    showAddMenu: (target: Element, after: boolean) => void;
+    showAddMenu: (target: Element) => void;
     showEditMenu: (target: Element) => void;
     private createSubmenuTrigger;
     private createMenuItem;

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

@@ -29,7 +29,7 @@ export declare const isSelectionInNode: (state: EditorState, targetNode: ProseMi
 export declare const isSelectionInBody: (state: EditorState) => boolean;
 export declare const createHeader: (typeName: string, text: string) => HTMLHeadingElement;
 export declare const isNotNull: <T>(a: T | null) => a is T;
-export declare const hasParent: ($pos: ResolvedPos, type: ManuscriptNodeType) => boolean;
+export declare const hasParent: ($pos: ResolvedPos, type: ManuscriptNodeType | ManuscriptNodeType[]) => boolean;
 export declare const shouldRenderField: (field: string, type: BibliographyItemType) => boolean;
 export declare const cleanItemValues: (item: BibliographyItemAttrs) => BibliographyItemAttrs;
 export declare const isBodyLocked: (state: EditorState) => boolean;

package/dist/types/versions.d.ts

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

package/styles/Editor.css

@@ -780,6 +780,8 @@
   cursor: ns-resize;
   opacity: 0;
   transition: 0.2s all;
+  display: flex;
+  justify-content: flex-end;
 }
 
 .ProseMirror .action-gutter {