@manuscripts/body-editor 3.5.19 → 3.6.0

package/dist/cjs/commands.js

@@ -67,9 +67,19 @@ const addToStart = (state, dispatch) => {
 exports.addToStart = addToStart;
 const markActive = (type) => (state) => {
     const { from, $from, to, empty } = state.selection;
+    let hasMark = false;
+    state.doc.nodesBetween(from, to, (node) => {
+        if (node.isText) {
+            node.marks.forEach((m) => {
+                if (m.type === type && !(0, track_changes_utils_1.isDeleted)(m)) {
+                    hasMark = true;
+                }
+            });
+        }
+    });
     return empty
         ? Boolean(type.isInSet(state.storedMarks || $from.marks()))
-        : state.doc.rangeHasMark(from, to, type);
+        : state.doc.rangeHasMark(from, to, type) && hasMark;
 };
 exports.markActive = markActive;
 const isNodeSelection = (selection) => selection instanceof prosemirror_state_1.NodeSelection;

package/dist/cjs/plugins/selected-suggestion.js

@@ -6,6 +6,7 @@ const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_view_1 = require("prosemirror-view");
 const commands_1 = require("../commands");
+const track_changes_utils_1 = require("../lib/track-changes-utils");
 const selection_1 = require("../selection");
 exports.selectedSuggestionKey = new prosemirror_state_1.PluginKey('selected-suggestion');
 const EMPTY = {
@@ -29,10 +30,12 @@ exports.default = () => {
 const buildPluginState = (state) => {
     const selection = state.selection;
     const changes = (0, selection_1.getSelectionChangeGroup)(state);
-    if (changes) {
+    if (changes.length) {
         return buildGroupOfChangesDecoration(state.doc, changes);
     }
-    const $pos = (0, commands_1.isTextSelection)(selection) ? selection.$cursor : selection.$to;
+    const $pos = (0, commands_1.isTextSelection)(selection) && selection.$cursor
+        ? selection.$cursor
+        : selection.$to;
     if (!$pos) {
         return EMPTY;
     }
@@ -64,7 +67,7 @@ const getEffectiveSelection = ($pos) => {
         return current;
     }
     const parent = $pos.parent;
-    const child = parent.childBefore($pos.parentOffset);
+    const child = parent.childBefore(Math.max($pos.parentOffset - 1, 0));
     const node = child.node;
     if (node) {
         const from = $pos.start() + child.offset;
@@ -96,7 +99,14 @@ const buildNodeDecoration = (doc, selection) => {
 };
 const buildTextDecoration = (doc, selection) => {
     const node = selection.node;
-    const suggestion = getTrackedMark(node)?.attrs.dataTracked;
+    let suggestion = getTrackedMark(node)?.attrs.dataTracked;
+    if (!suggestion) {
+        for (const mark of node.marks) {
+            if ((0, track_changes_utils_1.isTracked)(mark)) {
+                suggestion = mark.attrs.dataTracked[0];
+            }
+        }
+    }
     if (!suggestion) {
         return EMPTY;
     }

package/dist/cjs/selection.js

@@ -52,10 +52,12 @@ const getSelectionChangeGroup = (state) => {
             selection instanceof InlineNodesSelection) &&
             selection.$from;
     if ($pos) {
-        return track_changes_plugin_1.trackChangesPluginKey
+        return (track_changes_plugin_1.trackChangesPluginKey
             .getState(state)
-            ?.changeSet.groupChanges.find((c) => isPositionAtRange(c, $pos.pos));
+            ?.changeSet.groupChanges.find((c) => isPositionAtRange(c, $pos.pos)) ||
+            []);
     }
+    return [];
 };
 exports.getSelectionChangeGroup = getSelectionChangeGroup;
 const isPositionAtRange = (changes, pos) => (changes.length > 1 ||

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

package/dist/es/commands.js

@@ -62,9 +62,19 @@ export const addToStart = (state, dispatch) => {
 };
 export const markActive = (type) => (state) => {
     const { from, $from, to, empty } = state.selection;
+    let hasMark = false;
+    state.doc.nodesBetween(from, to, (node) => {
+        if (node.isText) {
+            node.marks.forEach((m) => {
+                if (m.type === type && !isDeleted(m)) {
+                    hasMark = true;
+                }
+            });
+        }
+    });
     return empty
         ? Boolean(type.isInSet(state.storedMarks || $from.marks()))
-        : state.doc.rangeHasMark(from, to, type);
+        : state.doc.rangeHasMark(from, to, type) && hasMark;
 };
 export const isNodeSelection = (selection) => selection instanceof NodeSelection;
 export const blockActive = (type) => (state) => {

package/dist/es/plugins/selected-suggestion.js

@@ -3,6 +3,7 @@ import { schema, } from '@manuscripts/transform';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { isTextSelection } from '../commands';
+import { isTracked } from '../lib/track-changes-utils';
 import { getSelectionChangeGroup } from '../selection';
 export const selectedSuggestionKey = new PluginKey('selected-suggestion');
 const EMPTY = {
@@ -26,10 +27,12 @@ export default () => {
 const buildPluginState = (state) => {
     const selection = state.selection;
     const changes = getSelectionChangeGroup(state);
-    if (changes) {
+    if (changes.length) {
         return buildGroupOfChangesDecoration(state.doc, changes);
     }
-    const $pos = isTextSelection(selection) ? selection.$cursor : selection.$to;
+    const $pos = isTextSelection(selection) && selection.$cursor
+        ? selection.$cursor
+        : selection.$to;
     if (!$pos) {
         return EMPTY;
     }
@@ -61,7 +64,7 @@ const getEffectiveSelection = ($pos) => {
         return current;
     }
     const parent = $pos.parent;
-    const child = parent.childBefore($pos.parentOffset);
+    const child = parent.childBefore(Math.max($pos.parentOffset - 1, 0));
     const node = child.node;
     if (node) {
         const from = $pos.start() + child.offset;
@@ -93,7 +96,14 @@ const buildNodeDecoration = (doc, selection) => {
 };
 const buildTextDecoration = (doc, selection) => {
     const node = selection.node;
-    const suggestion = getTrackedMark(node)?.attrs.dataTracked;
+    let suggestion = getTrackedMark(node)?.attrs.dataTracked;
+    if (!suggestion) {
+        for (const mark of node.marks) {
+            if (isTracked(mark)) {
+                suggestion = mark.attrs.dataTracked[0];
+            }
+        }
+    }
     if (!suggestion) {
         return EMPTY;
     }

package/dist/es/selection.js

@@ -47,10 +47,12 @@ export const getSelectionChangeGroup = (state) => {
             selection instanceof InlineNodesSelection) &&
             selection.$from;
     if ($pos) {
-        return trackChangesPluginKey
+        return (trackChangesPluginKey
             .getState(state)
-            ?.changeSet.groupChanges.find((c) => isPositionAtRange(c, $pos.pos));
+            ?.changeSet.groupChanges.find((c) => isPositionAtRange(c, $pos.pos)) ||
+            []);
     }
+    return [];
 };
 const isPositionAtRange = (changes, pos) => (changes.length > 1 ||
     changes[0].dataTracked.operation === CHANGE_OPERATION.structure) &&

package/dist/es/versions.js

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

package/dist/types/lib/track-changes-utils.d.ts

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 import { TrackedAttrs } from '@manuscripts/track-changes-plugin';
-import { Attrs, Fragment, Node as ProsemirrorNode } from 'prosemirror-model';
-export declare function isDeleted(node: ProsemirrorNode): boolean;
+import { Attrs, Fragment, Mark, Node as ProsemirrorNode } from 'prosemirror-model';
+export declare function isDeleted(node: ProsemirrorNode | Mark): boolean;
 export declare function isShadowDelete(node: ProsemirrorNode): boolean;
 export declare function isPendingInsert(node: ProsemirrorNode): boolean;
 export declare function isPending(node: ProsemirrorNode): boolean;
 export declare function isPendingSetAttrs(node: ProsemirrorNode): boolean;
 export declare function getChangeClasses(dataTracked?: TrackedAttrs[]): string[];
-export declare function isTracked(node: ProsemirrorNode): boolean;
+export declare function isTracked(node: ProsemirrorNode | Mark): boolean;
 export declare const getAttrsTrackingButton: (changeID: string) => HTMLButtonElement;
 export declare function isHidden(node: ProsemirrorNode): boolean;
 export declare function isDeletedText(node: ProsemirrorNode): boolean;

package/dist/types/selection.d.ts

@@ -22,5 +22,5 @@ export declare class NodesSelection extends NodeSelection {
     constructor($from: ResolvedPos, $to: ResolvedPos);
     toJSON(): NodesSelectionJSON;
 }
-export declare const getSelectionChangeGroup: (state: ManuscriptEditorState) => TrackedChange[] | undefined;
+export declare const getSelectionChangeGroup: (state: ManuscriptEditorState) => TrackedChange[];
 export {};

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.5.19";
+export declare const VERSION = "3.6.0";
 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.5.19",
+  "version": "3.6.0",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -40,8 +40,8 @@
     "@iarna/word-count": "1.1.2",
     "@manuscripts/json-schema": "2.2.12",
     "@manuscripts/style-guide": "3.3.2",
-    "@manuscripts/track-changes-plugin": "2.0.13",
-    "@manuscripts/transform": "4.2.20",
+    "@manuscripts/track-changes-plugin": "2.1.0",
+    "@manuscripts/transform": "4.3.0",
     "@popperjs/core": "2.11.8",
     "citeproc": "2.4.63",
     "codemirror": "5.65.19",

package/styles/AdvancedEditor.css

@@ -975,7 +975,8 @@ figure .selected-suggestion {
   background-color: transparent !important;
 }
 
-.selected-suggestion[data-track-status='pending'] .block:not(.box-element):not(.trans-abstract),
+.selected-suggestion[data-track-status='pending']
+  .block:not(.box-element):not(.trans-abstract),
 .block:has(figure.selected-suggestion),
 figure.block:has(.equation.selected-suggestion) {
   box-shadow: inset 6px 0 0 black, inset 9px 0 0 lightgray;
@@ -1042,7 +1043,7 @@ figure.block:has(.equation.selected-suggestion) {
 }
 
 .selected-suggestion[data-track-status='pending'][data-track-op='delete']
-.block:not(.box-element):not(.trans-abstract) {
+  .block:not(.box-element):not(.trans-abstract) {
   box-shadow: inset 6px 0 0 var(--deleted-color),
     inset 9px 0 0 var(--deleted-pending-bg-color) !important;
   animation: fadeOutBackground 3s forwards;
@@ -1050,7 +1051,10 @@ figure.block:has(.equation.selected-suggestion) {
 }
 
 /* Updated Block */
-.tracking-visible .ProseMirror [data-track-op='set_attrs'] .block:not(.trans-abstract),
+.tracking-visible
+  .ProseMirror
+  [data-track-op='set_attrs']
+  .block:not(.trans-abstract),
 .tracking-visible .block:has(figure[data-track-op='set_attrs']),
 .tracking-visible figure.block:has(.equation.set_attrs),
 .tracking-visible
@@ -1067,7 +1071,9 @@ figure.block:has(.equation.selected-suggestion) {
   box-shadow: inset 3px 0 0 var(--updated-border-color);
 }
 
-.tracking-visible .selected-suggestion[data-track-op='set_attrs'] .block:not(.trans-abstract),
+.tracking-visible
+  .selected-suggestion[data-track-op='set_attrs']
+  .block:not(.trans-abstract),
 .tracking-visible
   .block:has(figure.selected-suggestion[data-track-op='set_attrs']),
 .tracking-visible .selected-suggestion[data-track-op='node_split'] .block,
@@ -1147,6 +1153,26 @@ figure.block:has(.equation.selected-suggestion) {
   border-color: var(--updated-border-color);
 }
 
+b[data-track-status='pending'][data-track-op='insert'],
+i[data-track-status='pending'][data-track-op='insert'],
+sup[data-track-status='pending'][data-track-op='insert'],
+sub[data-track-status='pending'][data-track-op='insert'],
+u[data-track-status='pending'][data-track-op='insert'],
+s[data-track-status='pending'][data-track-op='insert'] {
+  background: var(--inserted-pending-bg-color);
+  color: var(--inserted-pending-color);
+}
+
+b[data-track-status='pending'][data-track-op='delete'],
+i[data-track-status='pending'][data-track-op='delete'],
+sup[data-track-status='pending'][data-track-op='delete'],
+sub[data-track-status='pending'][data-track-op='delete'],
+u[data-track-status='pending'][data-track-op='delete'],
+s[data-track-status='pending'][data-track-op='delete'] {
+  background: var(--deleted-pending-bg-color);
+  color: var(--deleted-color);
+}
+
 /* Needed for the snapshot comparison */
 .tracking-visible
   .block-list
@@ -1582,7 +1608,7 @@ th:hover > .table-context-menu-button,
   border: 1px solid #f2f2f2;
   box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.12);
   background-color: #ffffff;
-  
+
   position: absolute;
   top: -8px;
   right: -8px;
@@ -1668,7 +1694,8 @@ th:hover > .table-context-menu-button,
   margin-bottom: 30px;
 }
 
-.hero-image-container, .attachments-container {
+.hero-image-container,
+.attachments-container {
   border: 1px solid #c9c9c9;
   border-radius: 4px;
   background: #ffffff;
@@ -1812,7 +1839,7 @@ th:hover > .table-context-menu-button,
 }
 .ProseMirror .abstracts .add-translation-text {
   font-size: 14px;
-  color:#353535
+  color: #353535;
 }
 .ProseMirror .abstracts .add-translation-container .add-button {
   margin: 0;
@@ -1838,7 +1865,7 @@ th:hover > .table-context-menu-button,
   display: flex;
   align-items: center;
   font-size: 14px;
-  color: #6E6E6E;
+  color: #6e6e6e;
   cursor: pointer;
 }
 .abstracts-language-dropdown {
@@ -1846,7 +1873,7 @@ th:hover > .table-context-menu-button,
   top: -86px !important;
 }
 
-.ProseMirror .block-trans_abstract p.empty-node[data-placeholder]  {
+.ProseMirror .block-trans_abstract p.empty-node[data-placeholder] {
   font-style: italic;
   color: #c9c9c9;
   margin: 0;
@@ -1930,7 +1957,7 @@ th:hover > .table-context-menu-button,
   cursor: pointer;
 }
 
- .attachments-container .attachment-header {
+.attachments-container .attachment-header {
   display: flex;
   align-items: center;
   margin-bottom: 12px;
@@ -1978,11 +2005,11 @@ th:hover > .table-context-menu-button,
   margin-bottom: 12px;
 }
 
-
-.block-attachments:has(.attachment-item:empty), .block-attachments.empty-node {
+.block-attachments:has(.attachment-item:empty),
+.block-attachments.empty-node {
   display: none !important;
 }
 
 .ProseMirror a.link:empty::before {
-  content: "\00a0";
+  content: '\00a0';
 }