@manuscripts/body-editor 1.7.32 → 1.7.34

package/dist/cjs/lib/track-changes-utils.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isHidden = exports.getAttrsTrackingButton = exports.getActualAttrs = exports.isTracked = exports.getChangeClasses = exports.isPendingSetAttrs = exports.isPending = exports.isPendingInsert = exports.isDeleted = exports.isRejectedInsert = void 0;
+exports.sanitizeAttrsChange = exports.isHidden = exports.getAttrsTrackingButton = exports.getActualAttrs = exports.isTracked = exports.getChangeClasses = exports.isPendingSetAttrs = exports.isPending = exports.isPendingInsert = exports.isDeleted = exports.isRejectedInsert = void 0;
 const assets_1 = require("../assets");
 function isRejectedInsert(node) {
     if (node.attrs.dataTracked) {
@@ -103,3 +103,14 @@ function isHidden(node) {
     return isDeleted(node) || isRejectedInsert(node);
 }
 exports.isHidden = isHidden;
+function sanitizeAttrsChange(newAttr, currentAttrs) {
+    return Object.keys(newAttr).reduce((acc, attr) => {
+        const key = attr;
+        if (!currentAttrs[key] && currentAttrs[key] !== 0 && !newAttr[key]) {
+            return acc;
+        }
+        acc[key] = newAttr[key];
+        return acc;
+    }, {});
+}
+exports.sanitizeAttrsChange = sanitizeAttrsChange;

package/dist/cjs/lib/view.js

@@ -38,7 +38,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteNode = exports.updateNodeAttrs = exports.updateNode = exports.findChildrenAttrsByType = exports.findChildrenByType = exports.findChildByType = exports.findChildByID = void 0;
+exports.deleteNode = exports.updateNodeAttrs = exports.findChildrenAttrsByType = exports.findChildrenByType = exports.findChildByType = exports.findChildByID = void 0;
 const transform_1 = require("@manuscripts/transform");
 const utils = __importStar(require("prosemirror-utils"));
 const track_changes_utils_1 = require("./track-changes-utils");
@@ -68,22 +68,20 @@ const findChildrenAttrsByType = (view, type) => {
     return (0, exports.findChildrenByType)(view, type).map((n) => (0, track_changes_utils_1.getActualAttrs)(n.node));
 };
 exports.findChildrenAttrsByType = findChildrenAttrsByType;
-const updateNode = (view, node) => {
-    (0, exports.updateNodeAttrs)(view, node.type, node.attrs);
-};
-exports.updateNode = updateNode;
 const updateNodeAttrs = (view, type, attrs) => {
-    const copy = Object.assign({}, attrs);
-    delete copy.dataTracked;
     const child = (0, exports.findChildByID)(view, attrs.id);
     if (child) {
+        const copy = (0, track_changes_utils_1.sanitizeAttrsChange)(attrs, child.node.attrs);
+        delete copy.dataTracked;
         const pos = child.pos;
-        const tr = view.state.tr.setNodeMarkup(pos, undefined, attrs);
+        const tr = view.state.tr.setNodeMarkup(pos, undefined, copy);
         if (metaNodeTypes.includes(type)) {
             tr.setMeta(updateMetaNode, true);
         }
         view.dispatch(tr);
+        return true;
     }
+    return false;
 };
 exports.updateNodeAttrs = updateNodeAttrs;
 const deleteNode = (view, id) => {

package/dist/cjs/views/bibliography_element.js

@@ -31,6 +31,7 @@ exports.BibliographyElementBlockView = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_state_1 = require("prosemirror-state");
 const dompurify_1 = require("../lib/dompurify");
 const track_changes_utils_1 = require("../lib/track-changes-utils");
 const view_1 = require("../lib/view");
@@ -95,19 +96,23 @@ class BibliographyElementBlockView extends block_view_1.default {
             this.clickedElementId = elementId;
             const isSelectedSuggestion = !!((_a = selected_suggestion_ui_1.selectedSuggestionKey
                 .getState(this.view.state)) === null || _a === void 0 ? void 0 : _a.find(this.getPos(), this.getPos() + this.node.nodeSize).length);
+            const { tr, doc } = this.view.state;
+            tr.setSelection(prosemirror_state_1.NodeSelection.create(doc, this.getPos()));
             if (dataTracked && dataTracked.status !== track_changes_plugin_1.CHANGE_STATUS.rejected) {
-                this.view.dispatch(this.view.state.tr.setMeta(selected_suggestion_ui_1.SET_SUGGESTION_ID, dataTracked.id));
+                tr.setMeta(selected_suggestion_ui_1.SET_SUGGESTION_ID, dataTracked.id);
             }
             else {
                 if (isSelectedSuggestion) {
-                    this.view.dispatch(this.view.state.tr.setMeta(selected_suggestion_ui_1.CLEAR_SUGGESTION_ID, true));
+                    tr.setMeta(selected_suggestion_ui_1.CLEAR_SUGGESTION_ID, true);
                 }
                 else {
                     this.showContextMenu(elementId);
                 }
             }
+            this.view.dispatch(tr);
         };
         this.updateContents = () => __awaiter(this, void 0, void 0, function* () {
+            this.props.popper.destroy();
             const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
             const commentsDecorationSet = comment_annotation_1.commentAnnotation.getState(this.view.state);
             const selectedSuggestion = selected_suggestion_ui_1.selectedSuggestionKey.getState(this.view.state);
@@ -178,7 +183,7 @@ class BibliographyElementBlockView extends block_view_1.default {
         };
         this.handleSave = (item) => {
             const node = this.decoder.decode(item);
-            (0, view_1.updateNode)(this.view, node);
+            (0, view_1.updateNodeAttrs)(this.view, node.type, node.attrs);
         };
         this.handleDelete = (item) => {
             (0, view_1.deleteNode)(this.view, item._id);

package/dist/cjs/views/contributors.js

@@ -191,12 +191,10 @@ class ContributorsView extends block_view_1.default {
             this.container.appendChild(this.popper);
         };
         this.handleSaveAuthor = (author) => {
-            if (!(0, view_1.findChildByID)(this.view, author.id)) {
+            const update = (0, view_1.updateNodeAttrs)(this.view, transform_1.schema.nodes.contributor, author);
+            if (!update) {
                 this.insertAuthorNode(author);
             }
-            else {
-                (0, view_1.updateNodeAttrs)(this.view, transform_1.schema.nodes.contributor, author);
-            }
         };
         this.handleDeleteAuthor = (author) => {
             (0, view_1.deleteNode)(this.view, author.id);

package/dist/es/lib/track-changes-utils.js

@@ -90,3 +90,13 @@ export const getAttrsTrackingButton = (changeID) => {
 export function isHidden(node) {
     return isDeleted(node) || isRejectedInsert(node);
 }
+export function sanitizeAttrsChange(newAttr, currentAttrs) {
+    return Object.keys(newAttr).reduce((acc, attr) => {
+        const key = attr;
+        if (!currentAttrs[key] && currentAttrs[key] !== 0 && !newAttr[key]) {
+            return acc;
+        }
+        acc[key] = newAttr[key];
+        return acc;
+    }, {});
+}

package/dist/es/lib/view.js

@@ -15,7 +15,7 @@
  */
 import { schema, } from '@manuscripts/transform';
 import * as utils from 'prosemirror-utils';
-import { getActualAttrs, isHidden } from './track-changes-utils';
+import { getActualAttrs, isHidden, sanitizeAttrsChange, } from './track-changes-utils';
 const metaNodeTypes = [
     schema.nodes.bibliography_item,
     schema.nodes.affiliation,
@@ -38,21 +38,20 @@ export const findChildrenByType = (view, type) => {
 export const findChildrenAttrsByType = (view, type) => {
     return findChildrenByType(view, type).map((n) => getActualAttrs(n.node));
 };
-export const updateNode = (view, node) => {
-    updateNodeAttrs(view, node.type, node.attrs);
-};
 export const updateNodeAttrs = (view, type, attrs) => {
-    const copy = Object.assign({}, attrs);
-    delete copy.dataTracked;
     const child = findChildByID(view, attrs.id);
     if (child) {
+        const copy = sanitizeAttrsChange(attrs, child.node.attrs);
+        delete copy.dataTracked;
         const pos = child.pos;
-        const tr = view.state.tr.setNodeMarkup(pos, undefined, attrs);
+        const tr = view.state.tr.setNodeMarkup(pos, undefined, copy);
         if (metaNodeTypes.includes(type)) {
             tr.setMeta(updateMetaNode, true);
         }
         view.dispatch(tr);
+        return true;
     }
+    return false;
 };
 export const deleteNode = (view, id) => {
     const child = findChildByID(view, id);

package/dist/es/views/bibliography_element.js

@@ -25,9 +25,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { ContextMenu } from '@manuscripts/style-guide';
 import { CHANGE_STATUS } from '@manuscripts/track-changes-plugin';
 import { buildComment, Decoder, } from '@manuscripts/transform';
+import { NodeSelection } from 'prosemirror-state';
 import { sanitize } from '../lib/dompurify';
 import { getChangeClasses } from '../lib/track-changes-utils';
-import { deleteNode, updateNode } from '../lib/view';
+import { deleteNode, updateNodeAttrs } from '../lib/view';
 import { getBibliographyPluginState } from '../plugins/bibliography';
 import { commentAnnotation } from '../plugins/comment_annotation';
 import { CLEAR_SUGGESTION_ID, selectedSuggestionKey, SET_SUGGESTION_ID, } from '../plugins/selected-suggestion-ui';
@@ -89,19 +90,23 @@ export class BibliographyElementBlockView extends BlockView {
             this.clickedElementId = elementId;
             const isSelectedSuggestion = !!((_a = selectedSuggestionKey
                 .getState(this.view.state)) === null || _a === void 0 ? void 0 : _a.find(this.getPos(), this.getPos() + this.node.nodeSize).length);
+            const { tr, doc } = this.view.state;
+            tr.setSelection(NodeSelection.create(doc, this.getPos()));
             if (dataTracked && dataTracked.status !== CHANGE_STATUS.rejected) {
-                this.view.dispatch(this.view.state.tr.setMeta(SET_SUGGESTION_ID, dataTracked.id));
+                tr.setMeta(SET_SUGGESTION_ID, dataTracked.id);
             }
             else {
                 if (isSelectedSuggestion) {
-                    this.view.dispatch(this.view.state.tr.setMeta(CLEAR_SUGGESTION_ID, true));
+                    tr.setMeta(CLEAR_SUGGESTION_ID, true);
                 }
                 else {
                     this.showContextMenu(elementId);
                 }
             }
+            this.view.dispatch(tr);
         };
         this.updateContents = () => __awaiter(this, void 0, void 0, function* () {
+            this.props.popper.destroy();
             const bib = getBibliographyPluginState(this.view.state);
             const commentsDecorationSet = commentAnnotation.getState(this.view.state);
             const selectedSuggestion = selectedSuggestionKey.getState(this.view.state);
@@ -172,7 +177,7 @@ export class BibliographyElementBlockView extends BlockView {
         };
         this.handleSave = (item) => {
             const node = this.decoder.decode(item);
-            updateNode(this.view, node);
+            updateNodeAttrs(this.view, node.type, node.attrs);
         };
         this.handleDelete = (item) => {
             deleteNode(this.view, item._id);

package/dist/es/views/contributors.js

@@ -185,12 +185,10 @@ export class ContributorsView extends BlockView {
             this.container.appendChild(this.popper);
         };
         this.handleSaveAuthor = (author) => {
-            if (!findChildByID(this.view, author.id)) {
+            const update = updateNodeAttrs(this.view, schema.nodes.contributor, author);
+            if (!update) {
                 this.insertAuthorNode(author);
             }
-            else {
-                updateNodeAttrs(this.view, schema.nodes.contributor, author);
-            }
         };
         this.handleDeleteAuthor = (author) => {
             deleteNode(this.view, author.id);

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

@@ -26,3 +26,4 @@ export declare function isTracked(node: ProsemirrorNode): boolean;
 export declare function getActualAttrs<T extends ManuscriptNode>(node: T): T["attrs"];
 export declare const getAttrsTrackingButton: (changeID: string) => HTMLButtonElement;
 export declare function isHidden(node: ProsemirrorNode): boolean;
+export declare function sanitizeAttrsChange<T extends ProsemirrorNode>(newAttr: T['attrs'], currentAttrs: T['attrs']): T["attrs"];

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

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ManuscriptEditorView, ManuscriptNode, ManuscriptNodeType } from '@manuscripts/transform';
+import { ManuscriptEditorView, ManuscriptNodeType } from '@manuscripts/transform';
 import { Attrs } from 'prosemirror-model';
 import * as utils from 'prosemirror-utils';
 export declare const findChildByID: (view: ManuscriptEditorView, id: string) => utils.NodeWithPos | undefined;
 export declare const findChildByType: (view: ManuscriptEditorView, type: ManuscriptNodeType) => utils.NodeWithPos | undefined;
 export declare const findChildrenByType: (view: ManuscriptEditorView, type: ManuscriptNodeType) => utils.NodeWithPos[];
 export declare const findChildrenAttrsByType: <T extends Attrs>(view: ManuscriptEditorView, type: ManuscriptNodeType) => T[];
-export declare const updateNode: (view: ManuscriptEditorView, node: ManuscriptNode) => void;
-export declare const updateNodeAttrs: (view: ManuscriptEditorView, type: ManuscriptNodeType, attrs: Attrs) => void;
+export declare const updateNodeAttrs: (view: ManuscriptEditorView, type: ManuscriptNodeType, attrs: Attrs) => boolean;
 export declare const deleteNode: (view: ManuscriptEditorView, id: string) => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.7.32",
+  "version": "1.7.34",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -112,4 +112,4 @@
     "@types/react": "^17.0.2",
     "prosemirror-tables": "^1.3.5"
   }
-}
+}

package/styles/Editor.css

@@ -188,6 +188,7 @@
   text-decoration: line-through;
 }
 
+.ProseMirror .bib-item.ProseMirror-selectednode,
 .ProseMirror .citation.ProseMirror-selectednode,
 .ProseMirror .cross-reference.ProseMirror-selectednode {
   background-color: #bce7f6;