@manuscripts/body-editor 3.6.18 → 3.6.19

package/dist/cjs/commands.js

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addRows = exports.addInlineComment = exports.addNodeComment = exports.isCommentingAllowed = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertKeywords = exports.insertAward = exports.insertAffiliation = exports.insertContributors = exports.insertGraphicalAbstract = exports.insertBackmatterSection = exports.insertAbstractSection = exports.insertSection = exports.insertBoxElement = exports.insertInlineFootnote = exports.insertFootnotesElement = exports.insertTableElementFooter = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.findPosBeforeFirstSubsection = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertAttachment = exports.insertSupplement = exports.insertTable = exports.insertEmbed = exports.insertFigure = exports.insertGeneralTableFootnote = exports.insertInlineTableFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = exports.addToStart = void 0;
-exports.ignoreEnterInSubtitles = exports.insertHeroImage = exports.activateSearchReplace = exports.activateSearch = exports.autoComplete = exports.addColumns = exports.addHeaderRow = void 0;
+exports.addHeaderRow = exports.addRows = exports.addInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertKeywords = exports.insertAward = exports.insertAffiliation = exports.insertContributors = exports.insertGraphicalAbstract = exports.insertBackmatterSection = exports.insertAbstractSection = exports.insertSection = exports.insertBoxElement = exports.insertInlineFootnote = exports.insertFootnotesElement = exports.insertTableElementFooter = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.findPosBeforeFirstSubsection = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertAttachment = exports.insertSupplement = exports.insertTable = exports.insertEmbed = exports.insertFigure = exports.insertGeneralTableFootnote = exports.insertInlineTableFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = exports.addToStart = void 0;
+exports.ignoreEnterInSubtitles = exports.insertHeroImage = exports.activateSearchReplace = exports.activateSearch = exports.autoComplete = exports.addColumns = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
@@ -1118,31 +1118,7 @@ const getParentNode = (selection) => {
     }
     return node;
 };
-const isCommentingAllowed = (type) => type === transform_1.schema.nodes.title ||
-    type === transform_1.schema.nodes.subtitles ||
-    type === transform_1.schema.nodes.section ||
-    type === transform_1.schema.nodes.citation ||
-    type === transform_1.schema.nodes.bibliography_item ||
-    type === transform_1.schema.nodes.footnotes_section ||
-    type === transform_1.schema.nodes.bibliography_section ||
-    type === transform_1.schema.nodes.box_element ||
-    type === transform_1.schema.nodes.graphical_abstract_section ||
-    type === transform_1.schema.nodes.keyword_group ||
-    type === transform_1.schema.nodes.paragraph ||
-    type === transform_1.schema.nodes.figure_element ||
-    type === transform_1.schema.nodes.list ||
-    type === transform_1.schema.nodes.table_element ||
-    type === transform_1.schema.nodes.embed ||
-    type === transform_1.schema.nodes.affiliations ||
-    type === transform_1.schema.nodes.contributors ||
-    type === transform_1.schema.nodes.image_element ||
-    type === transform_1.schema.nodes.hero_image ||
-    type === transform_1.schema.nodes.trans_abstract;
-exports.isCommentingAllowed = isCommentingAllowed;
 const addNodeComment = (node, state, dispatch) => {
-    if (!(0, exports.isCommentingAllowed)(node.type)) {
-        return false;
-    }
     const props = (0, editor_props_1.getEditorProps)(state);
     const contribution = (0, json_schema_1.buildContribution)(props.userID);
     const attrs = {
@@ -1169,7 +1145,7 @@ exports.addNodeComment = addNodeComment;
 const addInlineComment = (state, dispatch) => {
     const selection = state.selection;
     const node = getParentNode(selection);
-    if (!node || !(0, exports.isCommentingAllowed)(node.type)) {
+    if (!node) {
         return false;
     }
     let from = selection.from;

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

@@ -209,14 +209,12 @@ class ContextMenu {
                 }
             }
             const commentTarget = this.getCommentTarget();
-            if ((0, commands_1.isCommentingAllowed)(commentTarget.type)) {
-                menu.appendChild(this.createMenuSection((section) => {
-                    section.appendChild(this.createMenuItem('Comment', () => {
-                        (0, commands_1.addNodeComment)(commentTarget, this.view.state, this.view.dispatch);
-                        popper.destroy();
-                    }));
+            menu.appendChild(this.createMenuSection((section) => {
+                section.appendChild(this.createMenuItem('Comment', () => {
+                    (0, commands_1.addNodeComment)(commentTarget, this.view.state, this.view.dispatch);
+                    popper.destroy();
                 }));
-            }
+            }));
             if (type === transform_1.schema.nodes.table_element) {
                 const items = [];
                 const isInsideNode = (0, utils_1.isSelectionInNode)(this.view.state, this.node);

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

package/dist/cjs/views/pullquote_element.js

@@ -21,7 +21,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PullquoteElementView = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_utils_1 = require("prosemirror-utils");
+const comments_1 = require("../plugins/comments");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
 const ReactSubView_1 = __importDefault(require("./ReactSubView"));
@@ -31,11 +33,24 @@ class PullquoteElementView extends block_view_1.default {
         this.elementType = 'aside';
         this.ignoreMutation = () => true;
         this.stopEvent = () => true;
+        this.handleClick = (event) => {
+            const element = event.target;
+            const marker = element.closest('.comment-marker');
+            if (marker) {
+                const key = marker.dataset.key;
+                const tr = this.view.state.tr;
+                (0, comments_1.setCommentSelection)(tr, key, undefined, false);
+                tr.setSelection(prosemirror_state_1.NodeSelection.create(this.view.state.doc, this.getPos()));
+                this.view.dispatch(tr);
+                return;
+            }
+        };
         this.createElement = () => {
             this.contentDOM = document.createElement(this.elementType);
             this.contentDOM.className = 'block';
             this.contentDOM.classList.add('pullquote');
             this.dom.appendChild(this.contentDOM);
+            this.dom.addEventListener('click', this.handleClick);
         };
         this.actionGutterButtons = () => {
             const contextMenu = this.addFigureContextMenu();
@@ -59,6 +74,10 @@ class PullquoteElementView extends block_view_1.default {
             }
             return undefined;
         };
+        this.destroy = () => {
+            this.dom.removeEventListener('click', this.handleClick);
+            super.destroy();
+        };
     }
     handleAddFigure() {
         const tr = this.view.state.tr;

package/dist/es/commands.js

@@ -1068,30 +1068,7 @@ const getParentNode = (selection) => {
     }
     return node;
 };
-export const isCommentingAllowed = (type) => type === schema.nodes.title ||
-    type === schema.nodes.subtitles ||
-    type === schema.nodes.section ||
-    type === schema.nodes.citation ||
-    type === schema.nodes.bibliography_item ||
-    type === schema.nodes.footnotes_section ||
-    type === schema.nodes.bibliography_section ||
-    type === schema.nodes.box_element ||
-    type === schema.nodes.graphical_abstract_section ||
-    type === schema.nodes.keyword_group ||
-    type === schema.nodes.paragraph ||
-    type === schema.nodes.figure_element ||
-    type === schema.nodes.list ||
-    type === schema.nodes.table_element ||
-    type === schema.nodes.embed ||
-    type === schema.nodes.affiliations ||
-    type === schema.nodes.contributors ||
-    type === schema.nodes.image_element ||
-    type === schema.nodes.hero_image ||
-    type === schema.nodes.trans_abstract;
 export const addNodeComment = (node, state, dispatch) => {
-    if (!isCommentingAllowed(node.type)) {
-        return false;
-    }
     const props = getEditorProps(state);
     const contribution = buildContribution(props.userID);
     const attrs = {
@@ -1117,7 +1094,7 @@ export const addNodeComment = (node, state, dispatch) => {
 export const addInlineComment = (state, dispatch) => {
     const selection = state.selection;
     const node = getParentNode(selection);
-    if (!node || !isCommentingAllowed(node.type)) {
+    if (!node) {
         return false;
     }
     let from = selection.from;

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

@@ -19,7 +19,7 @@ import { TextSelection } from 'prosemirror-state';
 import { findChildrenByType } from 'prosemirror-utils';
 import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
-import { addNodeComment, createBlock, findPosBeforeFirstSubsection, insertGeneralTableFootnote, insertInlineTableFootnote, isCommentingAllowed, } from '../commands';
+import { addNodeComment, createBlock, findPosBeforeFirstSubsection, insertGeneralTableFootnote, insertInlineTableFootnote, } from '../commands';
 import { PopperManager } from './popper';
 import { createPositionOptions } from './position-menu';
 import { templateAllows } from './template';
@@ -205,14 +205,12 @@ export class ContextMenu {
                 }
             }
             const commentTarget = this.getCommentTarget();
-            if (isCommentingAllowed(commentTarget.type)) {
-                menu.appendChild(this.createMenuSection((section) => {
-                    section.appendChild(this.createMenuItem('Comment', () => {
-                        addNodeComment(commentTarget, this.view.state, this.view.dispatch);
-                        popper.destroy();
-                    }));
+            menu.appendChild(this.createMenuSection((section) => {
+                section.appendChild(this.createMenuItem('Comment', () => {
+                    addNodeComment(commentTarget, this.view.state, this.view.dispatch);
+                    popper.destroy();
                 }));
-            }
+            }));
             if (type === schema.nodes.table_element) {
                 const items = [];
                 const isInsideNode = isSelectionInNode(this.view.state, this.node);

package/dist/es/versions.js

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

package/dist/es/views/pullquote_element.js

@@ -15,7 +15,9 @@
  */
 import { ContextMenu } from '@manuscripts/style-guide';
 import { schema } from '@manuscripts/transform';
+import { NodeSelection } from 'prosemirror-state';
 import { findChildrenByType } from 'prosemirror-utils';
+import { setCommentSelection } from '../plugins/comments';
 import BlockView from './block_view';
 import { createNodeOrElementView } from './creators';
 import ReactSubView from './ReactSubView';
@@ -25,11 +27,24 @@ export class PullquoteElementView extends BlockView {
         this.elementType = 'aside';
         this.ignoreMutation = () => true;
         this.stopEvent = () => true;
+        this.handleClick = (event) => {
+            const element = event.target;
+            const marker = element.closest('.comment-marker');
+            if (marker) {
+                const key = marker.dataset.key;
+                const tr = this.view.state.tr;
+                setCommentSelection(tr, key, undefined, false);
+                tr.setSelection(NodeSelection.create(this.view.state.doc, this.getPos()));
+                this.view.dispatch(tr);
+                return;
+            }
+        };
         this.createElement = () => {
             this.contentDOM = document.createElement(this.elementType);
             this.contentDOM.className = 'block';
             this.contentDOM.classList.add('pullquote');
             this.dom.appendChild(this.contentDOM);
+            this.dom.addEventListener('click', this.handleClick);
         };
         this.actionGutterButtons = () => {
             const contextMenu = this.addFigureContextMenu();
@@ -53,6 +68,10 @@ export class PullquoteElementView extends BlockView {
             }
             return undefined;
         };
+        this.destroy = () => {
+            this.dom.removeEventListener('click', this.handleClick);
+            super.destroy();
+        };
     }
     handleAddFigure() {
         const tr = this.view.state.tr;

package/dist/types/commands.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { FootnotesElementNode, ManuscriptEditorState, ManuscriptEditorView, ManuscriptMarkType, ManuscriptNode, ManuscriptNodeSelection, ManuscriptNodeType, ManuscriptResolvedPos, ManuscriptTextSelection, ManuscriptTransaction, SectionCategory } from '@manuscripts/transform';
-import { Attrs, NodeType, ResolvedPos } from 'prosemirror-model';
+import { Attrs, ResolvedPos } from 'prosemirror-model';
 import { EditorState, Selection, Transaction } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { FileAttachment } from './lib/files';
@@ -74,7 +74,6 @@ export type TableConfig = {
     includeHeader: boolean;
 };
 export declare const createAndFillTableElement: (attrs?: Attrs, config?: TableConfig) => import("prosemirror-model").Node;
-export declare const isCommentingAllowed: (type: NodeType) => boolean;
 export declare const addNodeComment: (node: ManuscriptNode, state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const addInlineComment: (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const addRows: (direction: "top" | "bottom") => (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.6.18";
+export declare const VERSION = "3.6.19";
 export declare const MATHJAX_VERSION = "3.2.2";

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

@@ -20,10 +20,12 @@ export declare class PullquoteElementView extends BlockView<PullquoteElementNode
     contextMenu: HTMLElement;
     ignoreMutation: () => boolean;
     stopEvent: () => boolean;
+    private handleClick;
     createElement: () => void;
     handleAddFigure(): void;
     actionGutterButtons: () => HTMLElement[];
     addFigureContextMenu: () => HTMLElement | undefined;
+    destroy: () => void;
 }
 declare const _default: (props: import("../configs/ManuscriptsEditor").EditorProps) => import("../types").NodeViewCreator<PullquoteElementView>;
 export default _default;

package/package.json

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

package/styles/AdvancedEditor.css

@@ -2044,3 +2044,7 @@ th:hover > .table-context-menu-button,
 .ProseMirror a.link:empty::before {
   content: '\00a0';
 }
+.block-pullquote_element .tools-panel {
+  top: 35px;
+  right: 26px;
+}