@manuscripts/body-editor 2.2.21 → 2.3.0

package/dist/es/plugins/footnotes/widgets.js

@@ -21,7 +21,7 @@ import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { DeleteFootnoteDialog, } from '../../components/views/DeleteFootnoteDialog';
 import { getInlineFootnotes } from '../../lib/footnotes';
-import { getActualAttrs, isDeleted } from '../../lib/track-changes-utils';
+import { isDeleted } from '../../lib/track-changes-utils';
 import { getChildOfType } from '../../lib/utils';
 import ReactSubView from '../../views/ReactSubView';
 export const deleteFootnoteWidget = (node, props, id, tableElement, tableElementFooter) => (view, getPos) => {
@@ -104,8 +104,7 @@ export const deleteFootnoteWidget = (node, props, id, tableElement, tableElement
 const scrollToInlineFootnote = (rid, view) => {
     view.state.doc.descendants((node, pos) => {
         const footnote = node;
-        if (isInlineFootnoteNode(node) &&
-            getActualAttrs(footnote).rids.includes(rid)) {
+        if (isInlineFootnoteNode(node) && footnote.attrs.rids.includes(rid)) {
             const selection = NodeSelection.create(view.state.doc, pos);
             view.dispatch(view.state.tr.setSelection(selection).scrollIntoView());
         }

package/dist/es/plugins/section_title/autocompletion.js

@@ -1,7 +1,7 @@
 import { schema, } from '@manuscripts/transform';
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { sectionTitles } from '../../lib/section-titles';
-import { getActualAttrs, getActualTextContent, } from '../../lib/track-changes-utils';
+import { getActualTextContent } from '../../lib/track-changes-utils';
 function cursorAtTheEndOfText(state, nodeSize, nodePos) {
     const { from, to } = state.selection;
     return from === to && to === nodePos + nodeSize - 1;
@@ -9,7 +9,7 @@ function cursorAtTheEndOfText(state, nodeSize, nodePos) {
 const isUpperCase = (test) => test === test.toUpperCase() && test.length > 1;
 export function hasAutoCompletionSlack(parentSection, titleSection) {
     var _a;
-    const category = getActualAttrs(parentSection).category;
+    const category = parentSection.attrs.category;
     const titles = (_a = sectionTitles.get(category)) === null || _a === void 0 ? void 0 : _a.split('|');
     if (category && (titles === null || titles === void 0 ? void 0 : titles.length) && titleSection.textContent) {
         const actualTextContent = getActualTextContent(titleSection.content);

package/dist/es/plugins/section_title/index.js

@@ -2,14 +2,12 @@ import { schema } from '@manuscripts/transform';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { findChildrenByType } from 'prosemirror-utils';
 import { Decoration, DecorationSet } from 'prosemirror-view';
-import { isRejectedInsert } from '../../lib/track-changes-utils';
 import { checkForCompletion } from './autocompletion';
 export const sectionTitleKey = new PluginKey('sectionNumbering');
 const calculateSectionLevels = (node, startPos, sectionNumberMap, numbering = [0]) => {
     node.forEach((childNode, offset) => {
-        if ((childNode.type === schema.nodes.section ||
-            childNode.type === schema.nodes.box_element) &&
-            !isRejectedInsert(childNode)) {
+        if (childNode.type === schema.nodes.section ||
+            childNode.type === schema.nodes.box_element) {
             numbering[numbering.length - 1] += 1;
             const sectionNumber = numbering.join('.');
             const sectionStartPos = startPos + offset + 1;

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.2.21';
+export const VERSION = '2.3.0';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/citation_editable.js

@@ -21,7 +21,7 @@ import { addNodeComment } from '../commands';
 import { CitationEditor, } from '../components/references/CitationEditor';
 import { CitationViewer, } from '../components/references/CitationViewer';
 import { Crossref } from '../lib/crossref';
-import { getActualAttrs, isDeleted } from '../lib/track-changes-utils';
+import { isDeleted } from '../lib/track-changes-utils';
 import { deleteNode, findChildByID, updateNodeAttrs } from '../lib/view';
 import { getBibliographyPluginState } from '../plugins/bibliography';
 import { CitationView } from './citation';
@@ -50,7 +50,7 @@ export class CitationEditableView extends CitationView {
                 this.showPopper();
             }
             else if (!isDeleted(this.node) && event.button === 0) {
-                const attrs = getActualAttrs(this.node);
+                const attrs = this.node.attrs;
                 if (attrs.rids.length) {
                     this.showContextMenu();
                 }
@@ -59,7 +59,7 @@ export class CitationEditableView extends CitationView {
         this.selectNode = () => {
             this.dom.classList.add('ProseMirror-selectednode');
             if (this.can.seeReferencesButtons && !isDeleted(this.node)) {
-                const attrs = getActualAttrs(this.node);
+                const attrs = this.node.attrs;
                 if (!attrs.rids.length) {
                     this.showPopper();
                 }
@@ -92,7 +92,7 @@ export class CitationEditableView extends CitationView {
                 return;
             }
             const can = this.props.getCapabilities();
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             const rids = attrs.rids;
             const items = Array.from(bib.bibliographyItems.values());
             if (can.editArticle) {
@@ -138,7 +138,7 @@ export class CitationEditableView extends CitationView {
             }
         };
         this.handleUncite = (id) => {
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             const rids = attrs.rids.filter((i) => i !== id);
             const pos = this.getPos();
             const tr = this.view.state.tr;
@@ -156,7 +156,7 @@ export class CitationEditableView extends CitationView {
             if (!bib) {
                 return;
             }
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             const rids = [...attrs.rids];
             items = items.filter((i) => !rids.includes(i.id));
             for (const item of items) {

package/dist/es/views/cross_reference.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { getActualAttrs, getChangeClasses } from '../lib/track-changes-utils';
+import { getChangeClasses } from '../lib/track-changes-utils';
 import { objectsKey } from '../plugins/objects';
 import { BaseNodeView } from './base_node_view';
 import { createNodeView } from './creators';
@@ -35,11 +35,8 @@ export class CrossReferenceView extends BaseNodeView {
         this.updateContents = () => {
             var _a;
             const targets = objectsKey.getState(this.view.state);
-            const attrs = getActualAttrs(this.node);
-            const classes = [
-                'cross-reference',
-                ...getChangeClasses(this.node.attrs.dataTracked),
-            ];
+            const attrs = this.node.attrs;
+            const classes = ['cross-reference', ...getChangeClasses(attrs.dataTracked)];
             this.dom.className = classes.join(' ');
             const label = attrs.rids.length && ((_a = targets.get(attrs.rids[0])) === null || _a === void 0 ? void 0 : _a.label);
             this.dom.textContent = attrs.label || label || '';

package/dist/es/views/equation.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { renderMath } from '../lib/math';
-import { getActualAttrs } from '../lib/track-changes-utils';
 import { BaseNodeView } from './base_node_view';
 import { createNodeView } from './creators';
 export class EquationView extends BaseNodeView {
@@ -30,7 +29,7 @@ export class EquationView extends BaseNodeView {
             this.dom.setAttribute('id', this.node.attrs.id);
         };
         this.updateContents = () => {
-            this.dom.innerHTML = getActualAttrs(this.node).contents;
+            this.dom.innerHTML = this.node.attrs.contents;
             renderMath(this.dom);
         };
         this.ignoreMutation = () => true;

package/dist/es/views/figure_editable.js

@@ -27,7 +27,6 @@ import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { FigureOptions, } from '../components/views/FigureDropdown';
 import { groupFiles } from '../lib/files';
-import { getActualAttrs } from '../lib/track-changes-utils';
 import { createEditableNodeView } from './creators';
 import { FigureView } from './figure';
 import { figureUploader } from './figure_uploader';
@@ -46,7 +45,7 @@ export class FigureEditableView extends FigureView {
         };
         this.updateContents = () => {
             var _a, _b;
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             if ((_a = this.node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.length) {
                 const change = this.node.attrs.dataTracked[0];
                 this.dom.setAttribute('data-track-status', change.status);

package/dist/es/views/inline_equation.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { renderMath } from '../lib/math';
-import { getActualAttrs, isRejectedInsert } from '../lib/track-changes-utils';
 import { BaseNodeView } from './base_node_view';
 import { createNodeView } from './creators';
 export class InlineEquationView extends BaseNodeView {
@@ -25,21 +24,14 @@ export class InlineEquationView extends BaseNodeView {
             this.updateContents();
         };
         this.updateContents = () => {
-            if (isRejectedInsert(this.node)) {
-                this.dom.innerHTML = '';
-            }
-            else {
-                this.dom.innerHTML = getActualAttrs(this.node).contents;
-                renderMath(this.dom);
-            }
+            this.dom.innerHTML = this.node.attrs.contents;
+            renderMath(this.dom);
         };
         this.ignoreMutation = () => true;
         this.createDOM = () => {
             this.dom = document.createElement('span');
-            if (!isRejectedInsert(this.node)) {
-                this.dom.classList.add('equation');
-                this.dom.setAttribute('id', this.node.attrs.id);
-            }
+            this.dom.classList.add('equation');
+            this.dom.setAttribute('id', this.node.attrs.id);
         };
     }
 }

package/dist/es/views/inline_footnote.js

@@ -20,7 +20,7 @@ import { findChildrenByType, findParentNodeClosestToPos, } from 'prosemirror-uti
 import { createFootnote, insertFootnote, insertTableFootnote, } from '../commands';
 import { FootnotesSelector } from '../components/views/FootnotesSelector';
 import { buildTableFootnoteLabels } from '../lib/footnotes';
-import { getActualAttrs, getChangeClasses, isDeleted, isPendingInsert, isRejectedInsert, } from '../lib/track-changes-utils';
+import { getChangeClasses, isDeleted, isPendingInsert, } from '../lib/track-changes-utils';
 import { footnotesKey } from '../plugins/footnotes';
 import { BaseNodeView } from './base_node_view';
 import { createNodeView } from './creators';
@@ -84,7 +84,7 @@ export class InlineFootnoteView extends BaseNodeView {
                 this.activateModal({
                     notes: Array.from(fnState.unusedFootnotes.values()).reduce((acc, n) => {
                         const node = n[0];
-                        if (!isDeleted(node) && !isRejectedInsert(node)) {
+                        if (!isDeleted(node)) {
                             acc.push({
                                 node,
                             });
@@ -93,7 +93,7 @@ export class InlineFootnoteView extends BaseNodeView {
                     }, []),
                     onCancel: () => {
                         const { tr } = this.view.state;
-                        if (!getActualAttrs(this.node).rids.length) {
+                        if (this.node.attrs.rids.length) {
                             this.view.dispatch(tr.delete(this.getPos(), this.getPos() + this.node.nodeSize));
                         }
                         this.destroy();
@@ -150,7 +150,7 @@ export class InlineFootnoteView extends BaseNodeView {
             if (footnotesElement) {
                 const tablesFootnoteLabels = buildTableFootnoteLabels(tableElement.node);
                 footnotes = findChildrenByType(footnotesElement, schema.nodes.footnote)
-                    .filter(({ node }) => !isDeleted(node) && !isRejectedInsert(node))
+                    .filter(({ node }) => !isDeleted(node))
                     .map(({ node }) => ({
                     node: node,
                     index: tablesFootnoteLabels.get(node.attrs.id),
@@ -170,8 +170,8 @@ export class InlineFootnoteView extends BaseNodeView {
         };
         this.onInsert = (notes) => {
             if (notes.length) {
-                const contents = getActualAttrs(this.node)
-                    .contents.split(',')
+                const contents = this.node.attrs.contents
+                    .split(',')
                     .map((n) => parseInt(n));
                 const rids = notes.map((note) => note.node.attrs.id);
                 const { tr } = this.view.state;

package/dist/es/views/link_editable.js

@@ -16,7 +16,7 @@
 import { schema } from '@manuscripts/transform';
 import { TextSelection } from 'prosemirror-state';
 import { LinkForm, } from '../components/views/LinkForm';
-import { getActualAttrs, getChangeClasses, isDeleted, isRejectedInsert, } from '../lib/track-changes-utils';
+import { getChangeClasses, isDeleted } from '../lib/track-changes-utils';
 import { allowedHref } from '../lib/url';
 import { createEditableNodeView } from './creators';
 import { LinkView } from './link';
@@ -30,13 +30,8 @@ export class LinkEditableView extends LinkView {
             this.updateContents();
         };
         this.updateContents = () => {
-            if (isRejectedInsert(this.node)) {
-                this.dom.innerHTML = '';
-                this.contentDOM = undefined;
-                return;
-            }
             this.contentDOM = this.dom;
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             const href = attrs.href;
             const title = attrs.title;
             const classes = ['link', ...getChangeClasses(this.node.attrs.dataTracked)];
@@ -58,7 +53,7 @@ export class LinkEditableView extends LinkView {
             this.closeForm();
         };
         this.deselectNode = () => {
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             if (!this.node.content.size || !attrs.href) {
                 this.removeLink();
             }
@@ -68,7 +63,7 @@ export class LinkEditableView extends LinkView {
             if (!this.props.getCapabilities().editArticle) {
                 return;
             }
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             const value = {
                 href: attrs.href,
                 title: attrs.title,
@@ -89,7 +84,7 @@ export class LinkEditableView extends LinkView {
             }
         };
         this.handleCancel = () => {
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             if (!this.node.content.size || !attrs.href) {
                 this.removeLink();
             }
@@ -101,7 +96,7 @@ export class LinkEditableView extends LinkView {
         };
         this.handleSave = (value) => {
             const tr = this.view.state.tr;
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             const pos = this.getPos();
             if (value.href !== attrs.href || value.title !== attrs.title) {
                 tr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, this.node.attrs), { href: value.href, title: value.title }));

package/dist/es/views/list.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { getListType, } from '@manuscripts/transform';
-import { getActualAttrs } from '../lib/track-changes-utils';
 import BlockView from './block_view';
 import { createNodeOrElementView } from './creators';
 import { EditableBlock } from './editable_block';
@@ -24,7 +23,7 @@ export class ListView extends BlockView {
         this.elementType = 'ul';
         this.updateContents = () => {
             var _a;
-            const actualAttrs = getActualAttrs(this.node);
+            const actualAttrs = this.node.attrs;
             if (this.contentDOM) {
                 const type = actualAttrs.listStyleType;
                 this.contentDOM.style.listStyleType = getListType(type).style;

package/dist/es/views/section.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { getActualAttrs } from '../lib/track-changes-utils';
 import { sectionTitleKey } from '../plugins/section_title';
 import BlockView from './block_view';
 import { createNodeView } from './creators';
@@ -41,7 +40,7 @@ export class SectionView extends BlockView {
         };
         this.onUpdateContent = () => {
             const sectionTitles = sectionTitleKey.getState(this.view.state);
-            const attrs = getActualAttrs(this.node);
+            const attrs = this.node.attrs;
             if (this.contentDOM) {
                 this.contentDOM.id = attrs.id;
                 if (attrs.category) {

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

@@ -14,19 +14,15 @@
  * limitations under the License.
  */
 import { TrackedAttrs } from '@manuscripts/track-changes-plugin';
-import { ManuscriptNode } from '@manuscripts/transform';
 import { Fragment, Node as ProsemirrorNode } from 'prosemirror-model';
-export declare function isRejectedInsert(node: ProsemirrorNode): boolean;
 export declare function isDeleted(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 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 isDeletedText(node: ProsemirrorNode): boolean;
-export declare function isRejectedText(node: ProsemirrorNode): boolean;
 export declare function getActualTextContent(fragment: Fragment): string;
 export declare function sanitizeAttrsChange<T extends ProsemirrorNode>(newAttr: T['attrs'], currentAttrs: T['attrs']): T["attrs"];

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.2.21";
+export declare const VERSION = "2.3.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": "2.2.21",
+  "version": "2.3.0",
   "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.21",
-    "@manuscripts/track-changes-plugin": "1.7.23",
+    "@manuscripts/track-changes-plugin": "1.8.0",
     "@manuscripts/transform": "3.0.6",
     "@popperjs/core": "^2.11.8",
     "astrocite-eutils": "^0.16.4",
@@ -47,7 +47,7 @@
     "prosemirror-commands": "^1.5.0",
     "prosemirror-dropcursor": "^1.6.1",
     "prosemirror-gapcursor": "^1.3.1",
-    "prosemirror-history": "^1.3.0",
+    "prosemirror-history": "^1.4.1",
     "prosemirror-inputrules": "^1.2.0",
     "prosemirror-keymap": "^1.2.0",
     "prosemirror-model": "^1.18.3",