@manuscripts/body-editor 2.6.36 → 2.6.37

package/dist/cjs/index.js

@@ -52,6 +52,7 @@ __exportStar(require("./lib/doc"), exports);
 __exportStar(require("./plugins/comments"), exports);
 var selected_suggestion_1 = require("./plugins/selected-suggestion");
 Object.defineProperty(exports, "selectedSuggestionKey", { enumerable: true, get: function () { return selected_suggestion_1.selectedSuggestionKey; } });
+__exportStar(require("./selection"), exports);
 __exportStar(require("./lib/utils"), exports);
 __exportStar(require("./lib/track-changes-utils"), exports);
 __exportStar(require("./useEditor"), exports);

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 selection_1 = require("../selection");
 exports.selectedSuggestionKey = new prosemirror_state_1.PluginKey('selected-suggestion');
 const EMPTY = {
     decorations: prosemirror_view_1.DecorationSet.empty,
@@ -27,6 +28,10 @@ exports.default = () => {
 };
 const buildPluginState = (state) => {
     const selection = state.selection;
+    const changes = (0, selection_1.getSelectionChangeGroup)(state);
+    if (changes) {
+        return buildGroupOfChangesDecoration(state.doc, changes);
+    }
     const $pos = (0, commands_1.isTextSelection)(selection) ? selection.$cursor : selection.$to;
     if (!$pos) {
         return EMPTY;
@@ -112,6 +117,16 @@ const buildTextDecoration = (doc, selection) => {
         decorations: prosemirror_view_1.DecorationSet.create(doc, [decoration]),
     };
 };
+const buildGroupOfChangesDecoration = (doc, changes) => {
+    const from = changes[0].from, to = changes[changes.length - 1].to;
+    const decoration = prosemirror_view_1.Decoration.inline(from, to, {
+        class: 'selected-suggestion',
+    });
+    return {
+        decorations: prosemirror_view_1.DecorationSet.create(doc, [decoration]),
+        suggestion: changes[0].dataTracked,
+    };
+};
 const trackedMarkTypes = new Set([
     transform_1.schema.marks.tracked_insert,
     transform_1.schema.marks.tracked_delete,

package/dist/cjs/selection.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSelectionChangeGroup = exports.NodesSelection = void 0;
+const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
+const prosemirror_state_1 = require("prosemirror-state");
+const commands_1 = require("./commands");
+class NodesSelection extends prosemirror_state_1.Selection {
+    constructor($from, $to) {
+        super($to, $to);
+        this.$startNode = $from;
+        this.$endNode = $to;
+    }
+    eq(selection) {
+        return (selection instanceof NodesSelection &&
+            selection.$startNode.pos == this.$startNode.pos &&
+            selection.$endNode.pos == this.$endNode.pos);
+    }
+    map(doc, mapping) {
+        const $from = doc.resolve(mapping.map(this.$startNode.pos));
+        const $to = doc.resolve(mapping.map(this.$endNode.pos));
+        return new NodesSelection($from, $to);
+    }
+    toJSON() {
+        return {
+            type: 'inlineNodes',
+            startNode: this.$startNode,
+            endNode: this.$endNode,
+        };
+    }
+}
+exports.NodesSelection = NodesSelection;
+const getSelectionChangeGroup = (state) => {
+    var _a;
+    const selection = state.selection;
+    const $pos = (0, commands_1.isTextSelection)(selection)
+        ? selection.$cursor
+        : selection instanceof NodesSelection && selection.$from;
+    if ($pos) {
+        return (_a = track_changes_plugin_1.trackChangesPluginKey
+            .getState(state)) === null || _a === void 0 ? void 0 : _a.changeSet.groupChanges.find((changes) => changes.length > 1 &&
+            $pos.pos >= changes[0].from &&
+            $pos.pos <= changes[changes.length - 1].to);
+    }
+};
+exports.getSelectionChangeGroup = getSelectionChangeGroup;

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

package/dist/es/index.js

@@ -29,6 +29,7 @@ export * from './lib/footnotes';
 export * from './lib/doc';
 export * from './plugins/comments';
 export { selectedSuggestionKey } from './plugins/selected-suggestion';
+export * from './selection';
 export * from './lib/utils';
 export * from './lib/track-changes-utils';
 export * from './useEditor';

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

@@ -1,8 +1,9 @@
-import { CHANGE_STATUS } from '@manuscripts/track-changes-plugin';
+import { CHANGE_STATUS, } from '@manuscripts/track-changes-plugin';
 import { schema, } from '@manuscripts/transform';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { isTextSelection } from '../commands';
+import { getSelectionChangeGroup } from '../selection';
 export const selectedSuggestionKey = new PluginKey('selected-suggestion');
 const EMPTY = {
     decorations: DecorationSet.empty,
@@ -24,6 +25,10 @@ export default () => {
 };
 const buildPluginState = (state) => {
     const selection = state.selection;
+    const changes = getSelectionChangeGroup(state);
+    if (changes) {
+        return buildGroupOfChangesDecoration(state.doc, changes);
+    }
     const $pos = isTextSelection(selection) ? selection.$cursor : selection.$to;
     if (!$pos) {
         return EMPTY;
@@ -109,6 +114,16 @@ const buildTextDecoration = (doc, selection) => {
         decorations: DecorationSet.create(doc, [decoration]),
     };
 };
+const buildGroupOfChangesDecoration = (doc, changes) => {
+    const from = changes[0].from, to = changes[changes.length - 1].to;
+    const decoration = Decoration.inline(from, to, {
+        class: 'selected-suggestion',
+    });
+    return {
+        decorations: DecorationSet.create(doc, [decoration]),
+        suggestion: changes[0].dataTracked,
+    };
+};
 const trackedMarkTypes = new Set([
     schema.marks.tracked_insert,
     schema.marks.tracked_delete,

package/dist/es/selection.js

@@ -0,0 +1,40 @@
+import { trackChangesPluginKey } from '@manuscripts/track-changes-plugin';
+import { Selection } from 'prosemirror-state';
+import { isTextSelection } from './commands';
+export class NodesSelection extends Selection {
+    constructor($from, $to) {
+        super($to, $to);
+        this.$startNode = $from;
+        this.$endNode = $to;
+    }
+    eq(selection) {
+        return (selection instanceof NodesSelection &&
+            selection.$startNode.pos == this.$startNode.pos &&
+            selection.$endNode.pos == this.$endNode.pos);
+    }
+    map(doc, mapping) {
+        const $from = doc.resolve(mapping.map(this.$startNode.pos));
+        const $to = doc.resolve(mapping.map(this.$endNode.pos));
+        return new NodesSelection($from, $to);
+    }
+    toJSON() {
+        return {
+            type: 'inlineNodes',
+            startNode: this.$startNode,
+            endNode: this.$endNode,
+        };
+    }
+}
+export const getSelectionChangeGroup = (state) => {
+    var _a;
+    const selection = state.selection;
+    const $pos = isTextSelection(selection)
+        ? selection.$cursor
+        : selection instanceof NodesSelection && selection.$from;
+    if ($pos) {
+        return (_a = trackChangesPluginKey
+            .getState(state)) === null || _a === void 0 ? void 0 : _a.changeSet.groupChanges.find((changes) => changes.length > 1 &&
+            $pos.pos >= changes[0].from &&
+            $pos.pos <= changes[changes.length - 1].to);
+    }
+};

package/dist/es/versions.js

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

package/dist/types/index.d.ts

@@ -30,6 +30,7 @@ export * from './lib/footnotes';
 export * from './lib/doc';
 export * from './plugins/comments';
 export { selectedSuggestionKey } from './plugins/selected-suggestion';
+export * from './selection';
 export * from './lib/utils';
 export * from './lib/track-changes-utils';
 export * from './useEditor';

package/dist/types/selection.d.ts

@@ -0,0 +1,13 @@
+import { ManuscriptEditorState } from '@manuscripts/transform';
+import { Node, ResolvedPos } from 'prosemirror-model';
+import { Selection } from 'prosemirror-state';
+import { Mappable } from 'prosemirror-transform';
+export declare class NodesSelection extends Selection {
+    $startNode: ResolvedPos;
+    $endNode: ResolvedPos;
+    constructor($from: ResolvedPos, $to: ResolvedPos);
+    eq(selection: Selection): boolean;
+    map(doc: Node, mapping: Mappable): Selection;
+    toJSON(): any;
+}
+export declare const getSelectionChangeGroup: (state: ManuscriptEditorState) => import("@manuscripts/track-changes-plugin").TrackedChange[] | undefined;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.6.36";
+export declare const VERSION = "2.6.37";
 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": "2.6.36",
+  "version": "2.6.37",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -33,7 +33,7 @@
     "@manuscripts/json-schema": "2.2.11",
     "@manuscripts/library": "1.3.11",
     "@manuscripts/style-guide": "2.0.27",
-    "@manuscripts/track-changes-plugin": "1.8.5",
+    "@manuscripts/track-changes-plugin": "1.8.6",
     "@manuscripts/transform": "3.0.27",
     "@popperjs/core": "^2.11.8",
     "astrocite-eutils": "^0.16.4",

package/styles/AdvancedEditor.css

@@ -555,7 +555,6 @@ span.comment-marker {
     .keywords
   ):not(figure):not(figure .equation) {
   border-width: 2px 0 2px 0 !important;
-  border-radius: 3px !important;
   border-style: solid !important;
 }
 

package/styles/Editor.css

@@ -171,7 +171,6 @@
 .ProseMirror .cross-reference {
   font-weight: bold;
   background-color: #ddf3fa;
-  border-radius: 5px;
   color: #353535;
   padding: 0 2px;
   cursor: pointer;
@@ -715,7 +714,7 @@
 .ProseMirror p .equation {
   display: inline;
   vertical-align: baseline;
-  margin: 0 5px;
+  padding: 0 5px;
 }
 
 .ProseMirror figcaption .equation-placeholder,
@@ -987,7 +986,7 @@
   position: absolute;
   background: #E2E2E2;
   pointer-events: none;
-} 
+}
 .ProseMirror .block-container:not(.block-footnotes_element) .footnote-marker::before {
   left: 0;
 }