@manuscripts/body-editor 3.18.2 → 3.18.3

package/dist/cjs/commands.js

@@ -16,7 +16,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.insertTransGraphicalAbstract = exports.insertTransAbstract = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertKeywords = exports.insertAward = exports.insertAffiliation = exports.insertContributors = exports.insertGraphicalAbstract = exports.insertBackmatterSection = exports.insertAbstractSection = exports.insertSection = exports.insertHeadshotGrid = exports.insertBoxElement = exports.insertInlineFootnote = exports.insertFootnotesElement = exports.insertTableElementFooter = exports.insertInlineEquation = exports.insertCrossReference = exports.canInsertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.findPosBeforeFirstSubsection = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertAttachment = exports.updateSupplementWeblink = exports.convertLinkToSupplementWeblink = exports.insertSupplementWeblink = 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.paste = exports.copySelection = exports.exitEditorToContainer = exports.ignoreEnterInSubtitles = exports.insertHeroImage = exports.activateSearchReplace = exports.activateSearch = exports.autoComplete = exports.addColumns = exports.addHeaderRow = exports.addRows = exports.addInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = void 0;
+exports.paste = exports.copySelection = exports.exitEditorToContainer = exports.ignoreEnterInSubtitles = exports.insertHeroImage = exports.activateSearchReplace = exports.activateSearch = exports.autoComplete = exports.addColumns = exports.addHeaderRow = exports.addRows = exports.addInlineComment = exports.canInsertInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = void 0;
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_model_1 = require("prosemirror-model");
@@ -1289,12 +1289,17 @@ const addNodeComment = (node, state, dispatch) => {
     return false;
 };
 exports.addNodeComment = addNodeComment;
+const canInsertInlineComment = ($pos) => $pos.parent.canReplaceWith($pos.index(), $pos.index(), transform_1.schema.nodes.highlight_marker);
+exports.canInsertInlineComment = canInsertInlineComment;
 const addInlineComment = (state, dispatch) => {
     const selection = state.selection;
     const node = getParentNode(selection);
     if (!node) {
         return false;
     }
+    if (!(0, exports.canInsertInlineComment)(selection.$from)) {
+        return false;
+    }
     let from = selection.from;
     let to = selection.to;
     if (from === to) {

package/dist/cjs/toolbar.js

@@ -116,7 +116,7 @@ exports.toolbar = {
         comment: {
             title: 'Insert comment',
             content: react_1.default.createElement(style_guide_1.AddCommentIcon, null),
-            isEnabled: isEnabled((0, commands_1.canInsert)(transform_1.schema.nodes.highlight_marker)),
+            isEnabled: isEnabled((state) => (0, commands_1.canInsertInlineComment)(state.selection.$from)),
             run: commands_1.addInlineComment,
         },
         cross_reference: {

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

package/dist/es/commands.js

@@ -1231,12 +1231,16 @@ export const addNodeComment = (node, state, dispatch) => {
     }
     return false;
 };
+export const canInsertInlineComment = ($pos) => $pos.parent.canReplaceWith($pos.index(), $pos.index(), schema.nodes.highlight_marker);
 export const addInlineComment = (state, dispatch) => {
     const selection = state.selection;
     const node = getParentNode(selection);
     if (!node) {
         return false;
     }
+    if (!canInsertInlineComment(selection.$from)) {
+        return false;
+    }
     let from = selection.from;
     let to = selection.to;
     if (from === to) {

package/dist/es/toolbar.js

@@ -17,7 +17,7 @@ import { AddCommentIcon, FileImageIcon, LinkIcon, OutlineBlockQuoteIcon, Outline
 import { schema } from '@manuscripts/transform';
 import { toggleMark } from 'prosemirror-commands';
 import React from 'react';
-import { addInlineComment, blockActive, canInsert, canInsertCrossReference, insertBlock, insertBoxElement, insertCrossReference, insertEmbed, insertInlineCitation, insertLink, insertList, markActive, } from './commands';
+import { addInlineComment, blockActive, canInsert, canInsertCrossReference, canInsertInlineComment, insertBlock, insertBoxElement, insertCrossReference, insertEmbed, insertInlineCitation, insertLink, insertList, markActive, } from './commands';
 import { changeIndentation, isIndentationAllowed, } from './components/toolbar/helpers';
 import { openInsertTableDialog } from './components/toolbar/InsertTableDialog';
 import { openInsertSpecialCharacterDialog } from './components/views/InsertSpecialCharacter';
@@ -110,7 +110,7 @@ export const toolbar = {
         comment: {
             title: 'Insert comment',
             content: React.createElement(AddCommentIcon, null),
-            isEnabled: isEnabled(canInsert(schema.nodes.highlight_marker)),
+            isEnabled: isEnabled((state) => canInsertInlineComment(state.selection.$from)),
             run: addInlineComment,
         },
         cross_reference: {

package/dist/es/versions.js

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

package/dist/types/commands.d.ts

@@ -83,6 +83,7 @@ export type TableConfig = {
 };
 export declare const createAndFillTableElement: (attrs?: Attrs, config?: TableConfig) => import("prosemirror-model").Node;
 export declare const addNodeComment: (node: ManuscriptNode, state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
+export declare const canInsertInlineComment: ($pos: ResolvedPos) => boolean;
 export declare const addInlineComment: (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const addRows: (direction: "top" | "bottom") => (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 export declare const addHeaderRow: (direction: "above" | "below") => (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;

package/dist/types/versions.d.ts

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

package/src/commands.ts

@@ -1942,6 +1942,13 @@ export const addNodeComment = (
   return false
 }
 
+export const canInsertInlineComment = ($pos: ResolvedPos) =>
+  $pos.parent.canReplaceWith(
+    $pos.index(),
+    $pos.index(),
+    schema.nodes.highlight_marker
+  )
+
 export const addInlineComment = (
   state: ManuscriptEditorState,
   dispatch?: Dispatch
@@ -1951,6 +1958,11 @@ export const addInlineComment = (
   if (!node) {
     return false
   }
+
+  if (!canInsertInlineComment(selection.$from)) {
+    return false
+  }
+
   let from = selection.from
   let to = selection.to
 

package/src/toolbar.tsx

@@ -49,6 +49,7 @@ import {
   blockActive,
   canInsert,
   canInsertCrossReference,
+  canInsertInlineComment,
   Dispatch,
   insertBlock,
   insertBoxElement,
@@ -179,7 +180,9 @@ export const toolbar: ToolbarConfig = {
     comment: {
       title: 'Insert comment',
       content: <AddCommentIcon />,
-      isEnabled: isEnabled(canInsert(schema.nodes.highlight_marker)), // TODO: check both ends of selection
+      isEnabled: isEnabled((state) =>
+        canInsertInlineComment(state.selection.$from)
+      ),
       run: addInlineComment,
     },
     cross_reference: {

package/src/versions.ts

@@ -1,3 +1,3 @@
 //THIS FILE WAS GENERATED BY versions.mjs
-export const VERSION = '3.18.2';
+export const VERSION = '3.18.3';
 export const MATHJAX_VERSION = '3.2.2';