@manuscripts/body-editor 2.2.21 → 2.3.0

package/dist/cjs/views/inline_footnote.js

@@ -90,7 +90,7 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
                 this.activateModal({
                     notes: Array.from(fnState.unusedFootnotes.values()).reduce((acc, n) => {
                         const node = n[0];
-                        if (!(0, track_changes_utils_1.isDeleted)(node) && !(0, track_changes_utils_1.isRejectedInsert)(node)) {
+                        if (!(0, track_changes_utils_1.isDeleted)(node)) {
                             acc.push({
                                 node,
                             });
@@ -99,7 +99,7 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
                     }, []),
                     onCancel: () => {
                         const { tr } = this.view.state;
-                        if (!(0, track_changes_utils_1.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();
@@ -156,7 +156,7 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
             if (footnotesElement) {
                 const tablesFootnoteLabels = (0, footnotes_1.buildTableFootnoteLabels)(tableElement.node);
                 footnotes = (0, prosemirror_utils_1.findChildrenByType)(footnotesElement, transform_1.schema.nodes.footnote)
-                    .filter(({ node }) => !(0, track_changes_utils_1.isDeleted)(node) && !(0, track_changes_utils_1.isRejectedInsert)(node))
+                    .filter(({ node }) => !(0, track_changes_utils_1.isDeleted)(node))
                     .map(({ node }) => ({
                     node: node,
                     index: tablesFootnoteLabels.get(node.attrs.id),
@@ -176,8 +176,8 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
         };
         this.onInsert = (notes) => {
             if (notes.length) {
-                const contents = (0, track_changes_utils_1.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/cjs/views/link_editable.js

@@ -36,13 +36,8 @@ class LinkEditableView extends link_1.LinkView {
             this.updateContents();
         };
         this.updateContents = () => {
-            if ((0, track_changes_utils_1.isRejectedInsert)(this.node)) {
-                this.dom.innerHTML = '';
-                this.contentDOM = undefined;
-                return;
-            }
             this.contentDOM = this.dom;
-            const attrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
+            const attrs = this.node.attrs;
             const href = attrs.href;
             const title = attrs.title;
             const classes = ['link', ...(0, track_changes_utils_1.getChangeClasses)(this.node.attrs.dataTracked)];
@@ -64,7 +59,7 @@ class LinkEditableView extends link_1.LinkView {
             this.closeForm();
         };
         this.deselectNode = () => {
-            const attrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
+            const attrs = this.node.attrs;
             if (!this.node.content.size || !attrs.href) {
                 this.removeLink();
             }
@@ -74,7 +69,7 @@ class LinkEditableView extends link_1.LinkView {
             if (!this.props.getCapabilities().editArticle) {
                 return;
             }
-            const attrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
+            const attrs = this.node.attrs;
             const value = {
                 href: attrs.href,
                 title: attrs.title,
@@ -95,7 +90,7 @@ class LinkEditableView extends link_1.LinkView {
             }
         };
         this.handleCancel = () => {
-            const attrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
+            const attrs = this.node.attrs;
             if (!this.node.content.size || !attrs.href) {
                 this.removeLink();
             }
@@ -107,7 +102,7 @@ class LinkEditableView extends link_1.LinkView {
         };
         this.handleSave = (value) => {
             const tr = this.view.state.tr;
-            const attrs = (0, track_changes_utils_1.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/cjs/views/list.js

@@ -20,7 +20,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listCallback = exports.ListView = void 0;
 const transform_1 = require("@manuscripts/transform");
-const track_changes_utils_1 = require("../lib/track-changes-utils");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
 const editable_block_1 = require("./editable_block");
@@ -30,7 +29,7 @@ class ListView extends block_view_1.default {
         this.elementType = 'ul';
         this.updateContents = () => {
             var _a;
-            const actualAttrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
+            const actualAttrs = this.node.attrs;
             if (this.contentDOM) {
                 const type = actualAttrs.listStyleType;
                 this.contentDOM.style.listStyleType = (0, transform_1.getListType)(type).style;

package/dist/cjs/views/section.js

@@ -19,7 +19,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SectionView = exports.handleSectionNumbering = void 0;
-const track_changes_utils_1 = require("../lib/track-changes-utils");
 const section_title_1 = require("../plugins/section_title");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
@@ -48,7 +47,7 @@ class SectionView extends block_view_1.default {
         };
         this.onUpdateContent = () => {
             const sectionTitles = section_title_1.sectionTitleKey.getState(this.view.state);
-            const attrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
+            const attrs = this.node.attrs;
             if (this.contentDOM) {
                 this.contentDOM.id = attrs.id;
                 if (attrs.category) {

package/dist/es/commands.js

@@ -27,7 +27,7 @@ import { findBackmatter, findBibliographySection, findBody, insertSupplementsNod
 import { getNewFootnotePos } from './lib/footnotes';
 import { findWordBoundaries, isNodeOfType, nearestAncestor, } from './lib/helpers';
 import { sectionTitles } from './lib/section-titles';
-import { isDeleted, isRejectedInsert } from './lib/track-changes-utils';
+import { isDeleted } from './lib/track-changes-utils';
 import { findParentNodeWithId, getChildOfType, getMatchingChild, } from './lib/utils';
 import { setCommentSelection } from './plugins/comments';
 import { getEditorProps } from './plugins/editor-props';
@@ -47,7 +47,11 @@ export const addToStart = (state, dispatch) => {
         endOffset === parentSize) {
         const side = (!$from.parentOffset && $to.index() < $to.parent.childCount ? $from : $to)
             .pos - (startOffset === 0 ? 1 : 0);
-        const tr = state.tr.insert(side, $from.node().type.createAndFill());
+        const tr = state.tr;
+        const from = $from.node().type.createAndFill();
+        if (from) {
+            tr.insert(side, from);
+        }
         tr.setSelection(TextSelection.create(tr.doc, side + 1));
         dispatch(tr.scrollIntoView());
         return true;
@@ -168,8 +172,7 @@ export const insertGeneralFootnote = (tableElementNode, position, view, tableEle
                 ? table.pos + table.node.nodeSize
                 : tableColGroup.pos + tableColGroup.node.nodeSize);
     if (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length) {
-        if (isDeleted(tableElementFooter[0].node) ||
-            isRejectedInsert(tableElementFooter[0].node)) {
+        if (isDeleted(tableElementFooter[0].node)) {
             const tableElementFooterPos = tr.mapping.map(position + tableElementFooter[0].pos + 1);
             undoFootnoteDelete(tr, tableElementFooter[0], tableElementFooterPos);
         }
@@ -408,8 +411,7 @@ export const insertFootnote = (state, tr, footnote) => {
     else {
         const footnoteElement = findChildrenByType(footnotesSection.node, schema.nodes.footnotes_element).pop();
         if (footnoteElement) {
-            if (isDeleted(footnoteElement.node) ||
-                isRejectedInsert(footnoteElement.node)) {
+            if (isDeleted(footnoteElement.node)) {
                 const footnoteElementPos = footnotesSection.pos + footnoteElement.pos + 1;
                 undoFootnoteDelete(tr, footnoteElement, footnoteElementPos);
                 const updatedAttrs = Object.assign(Object.assign({}, footnoteElement.node.attrs), { dataTracked: null });
@@ -456,9 +458,7 @@ export const insertInlineFootnote = (kind) => (state, dispatch) => {
     return true;
 };
 export const insertGraphicalAbstract = (state, dispatch, view) => {
-    const GraphicalAbstractSectionNode = findChildrenByType(state.doc, schema.nodes.graphical_abstract_section)[0];
-    if (getChildOfType(state.doc, schema.nodes.graphical_abstract_section, true) &&
-        !isRejectedInsert(GraphicalAbstractSectionNode.node)) {
+    if (getChildOfType(state.doc, schema.nodes.graphical_abstract_section, true)) {
         return false;
     }
     const abstracts = findChildrenByType(state.doc, schema.nodes.abstracts)[0];
@@ -992,7 +992,8 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
     else {
         const inlineFootnotes = findChildrenByType(tableElementNode, schema.nodes.inline_footnote);
         footnoteIndex =
-            inlineFootnotes.filter(({ pos }) => !isRejectedInsert(tableElementNode) && position + pos <= insertedAt).length + 1;
+            inlineFootnotes.filter(({ pos }) => position + pos <= insertedAt).length +
+                1;
         const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
             rids: [footnote.attrs.id],
             contents: footnoteIndex === -1 ? inlineFootnotes.length : footnoteIndex,
@@ -1002,8 +1003,7 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
     let insertionPos = position;
     const footnotesElement = findChildrenByType(tableElementNode, schema.nodes.footnotes_element).pop();
     if (footnotesElement) {
-        if (isDeleted(footnotesElement.node) ||
-            isRejectedInsert(footnotesElement.node)) {
+        if (isDeleted(footnotesElement.node)) {
             const footnotesElementPos = tr.mapping.map(position + footnotesElement.pos + 1);
             undoFootnoteDelete(tr, footnotesElement, footnotesElementPos);
         }
@@ -1015,8 +1015,7 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
         const footnoteElement = state.schema.nodes.footnotes_element.create({}, footnote);
         const tableElementFooter = findChildrenByType(tableElementNode, schema.nodes.table_element_footer)[0];
         if (tableElementFooter) {
-            if (isDeleted(tableElementFooter.node) ||
-                isRejectedInsert(tableElementFooter.node)) {
+            if (isDeleted(tableElementFooter.node)) {
                 const tableElementFooterPos = tr.mapping.map(position + tableElementFooter.pos + 1);
                 undoFootnoteDelete(tr, tableElementFooter, tableElementFooterPos);
             }

package/dist/es/components/keywords/AddKeywordInline.js

@@ -2,7 +2,7 @@ import { buildKeyword } from '@manuscripts/json-schema';
 import { Category, Dialog, PlusIcon } from '@manuscripts/style-guide';
 import React, { useCallback, useEffect, useRef, useState, } from 'react';
 import styled from 'styled-components';
-import { isDeleted, isRejectedInsert } from '../../lib/track-changes-utils';
+import { isDeleted } from '../../lib/track-changes-utils';
 const AddNewKeyword = styled.div `
   position: relative;
   display: inline-block;
@@ -60,8 +60,7 @@ export const AddKeywordInline = ({ viewProps, getUpdatedNode }) => {
         const keywords = [];
         node.content.descendants((descNode) => {
             if (descNode.type === descNode.type.schema.nodes.keyword &&
-                !isDeleted(descNode) &&
-                !isRejectedInsert(descNode)) {
+                !isDeleted(descNode)) {
                 keywords.push({
                     id: descNode.attrs.id,
                     contents: descNode.textContent,

package/dist/es/components/outline/DraggableTree.js

@@ -5,7 +5,7 @@ import React, { useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { ContextMenu } from '../../lib/context-menu';
 import { getDropSide } from '../../lib/dnd';
-import { isDeleted, isRejectedInsert } from '../../lib/track-changes-utils';
+import { isDeleted } from '../../lib/track-changes-utils';
 import { nodeTypeIcon } from '../../node-type-icons';
 import { Outline, OutlineItem, OutlineItemArrow, OutlineItemIcon, OutlineItemLink, OutlineItemLinkText, OutlineItemNoArrow, OutlineItemPlaceholder, } from './Outline';
 const excludedTypes = [
@@ -133,11 +133,7 @@ export const DraggableTree = ({ tree, view, depth, can, }) => {
         }),
     });
     const isDeletedItem = isDeleted(node);
-    const isRejectedItem = isRejectedInsert(node);
     const isTop = isManuscriptNode(parent);
-    if (isRejectedItem) {
-        return null;
-    }
     const handleContextMenu = (e) => {
         e.preventDefault();
         e.stopPropagation();

package/dist/es/components/views/FootnotesSelector.js

@@ -16,7 +16,6 @@
 import { AddedIcon, AddIcon, AddNewIcon, ButtonGroup, IconTextButton, PrimaryButton, SecondaryButton, } from '@manuscripts/style-guide';
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { getActualAttrs } from '../../lib/track-changes-utils';
 const NotesContainer = styled.div `
   height: 90vh;
   max-height: 400px;
@@ -51,7 +50,7 @@ const AddNewFootnote = styled(ButtonGroup) `
 export const FootnotesSelector = ({ notes, inlineFootnote, onAdd, onInsert, onCancel, addNewLabel }) => {
     let selectedNotesMap;
     if (inlineFootnote) {
-        const rids = getActualAttrs(inlineFootnote).rids;
+        const rids = inlineFootnote.attrs.rids;
         const selectedNotes = notes.filter(({ node }) => rids.includes(node.attrs.id));
         selectedNotesMap = new Map(selectedNotes.map(({ node }) => [node.attrs.id, node]));
     }
@@ -89,8 +88,7 @@ const FootnotesList = ({ notes, isSelected, onSelect, inlineFootnote }) => {
     const selectedNotes = [];
     const remainingNotes = [];
     notes.forEach((note) => {
-        const isNoteSelected = inlineFootnote &&
-            getActualAttrs(inlineFootnote).rids.includes(note.node.attrs.id);
+        const isNoteSelected = inlineFootnote && inlineFootnote.attrs.rids.includes(note.node.attrs.id);
         if (isNoteSelected) {
             selectedNotes.push(note);
         }

package/dist/es/keys/list.js

@@ -20,7 +20,6 @@ import { Fragment, Slice } from 'prosemirror-model';
 import { liftListItem, splitListItem, wrapInList, } from 'prosemirror-schema-list';
 import { ReplaceAroundStep } from 'prosemirror-transform';
 import { findParentNodeOfType } from 'prosemirror-utils';
-import { getActualAttrs } from '../lib/track-changes-utils';
 export const skipCommandTracking = (command) => (state, dispatch) => {
     return command(state, (tr) => {
         if (dispatch) {
@@ -72,8 +71,7 @@ export function sinkListItem(itemType) {
         }
         if (dispatch) {
             const nestedBefore = nodeBefore.lastChild && nodeBefore.lastChild.type == parent.type;
-            const actualAttrs = getActualAttrs(parent);
-            const listType = actualAttrs.listStyleType;
+            const listType = parent.attrs.listStyleType;
             const inner = Fragment.from(nestedBefore ? itemType.create() : null);
             const slice = new Slice(Fragment.from(itemType.create(null, Fragment.from(parent.type.create({ listStyleType: listType }, inner)))), nestedBefore ? 3 : 1, 0);
             const before = range.start, after = range.end;

package/dist/es/lib/context-menu.js

@@ -20,7 +20,7 @@ import { FootnotesSelector } from '../components/views/FootnotesSelector';
 import ReactSubView from '../views/ReactSubView';
 import { buildTableFootnoteLabels } from './footnotes';
 import { PopperManager } from './popper';
-import { getActualAttrs, isDeleted, isRejectedInsert, } from './track-changes-utils';
+import { isDeleted } from './track-changes-utils';
 import { getChildOfType, isChildOfNodeTypes } from './utils';
 const popper = new PopperManager();
 const readonlyTypes = [schema.nodes.keywords, schema.nodes.bibliography_element];
@@ -151,8 +151,8 @@ export class ContextMenu {
             const type = isBox ? schema.nodes.box_element : this.node.type;
             if (type === schema.nodes.list) {
                 menu.appendChild(this.createMenuSection((section) => {
-                    const actualAttrs = getActualAttrs(this.node);
-                    const listType = getListType(actualAttrs.listStyleType).style;
+                    const attrs = this.node.attrs;
+                    const listType = getListType(attrs.listStyleType).style;
                     if (listType === 'none' || listType === 'disc') {
                         section.appendChild(this.createMenuItem('Change to Numbered List', () => {
                             this.changeNodeType(null, 'order');
@@ -180,17 +180,16 @@ export class ContextMenu {
             if (type === schema.nodes.table_element) {
                 const isInTable = hasParentNodeOfType(schema.nodes.table)(this.view.state.selection);
                 const tableElementFooter = findChildrenByType(this.node, schema.nodes.table_element_footer);
-                let isDeletedOrRejected = false;
+                let isDeletedInsert = false;
                 const hasGeneralNote = tableElementFooter.length &&
                     getChildOfType(tableElementFooter[0].node, schema.nodes.general_table_footnote, true);
                 if (hasGeneralNote) {
                     const generalFootnote = (_a = tableElementFooter[0]) === null || _a === void 0 ? void 0 : _a.node.firstChild;
                     if (generalFootnote) {
-                        isDeletedOrRejected =
-                            isDeleted(generalFootnote) || isRejectedInsert(generalFootnote);
+                        isDeletedInsert = isDeleted(generalFootnote);
                     }
                 }
-                if (!hasGeneralNote || isDeletedOrRejected) {
+                if (!hasGeneralNote || isDeletedInsert) {
                     menu.appendChild(this.createMenuSection((section) => {
                         section.appendChild(this.createMenuItem('Add General Note', () => {
                             insertGeneralFootnote(this.node, this.getPos(), this.view, tableElementFooter);
@@ -204,15 +203,14 @@ export class ContextMenu {
                             const footnotesElementWithPos = findChildrenByType(this.node, schema.nodes.footnotes_element).pop();
                             if (!footnotesElementWithPos ||
                                 !(footnotesElementWithPos === null || footnotesElementWithPos === void 0 ? void 0 : footnotesElementWithPos.node.content.childCount) ||
-                                isDeleted(footnotesElementWithPos.node) ||
-                                isRejectedInsert(footnotesElementWithPos.node)) {
+                                isDeleted(footnotesElementWithPos.node)) {
                                 insertTableFootnote(this.node, this.getPos(), this.view);
                             }
                             else {
                                 const tablesFootnoteLabels = buildTableFootnoteLabels(this.node);
                                 const footnotesWithPos = findChildrenByType(footnotesElementWithPos.node, schema.nodes.footnote);
                                 const footnotes = footnotesWithPos
-                                    .filter(({ node }) => !isDeleted(node) && !isRejectedInsert(node))
+                                    .filter(({ node }) => !isDeleted(node))
                                     .map(({ node }) => ({
                                     node: node,
                                     index: tablesFootnoteLabels.get(node.attrs.id),
@@ -236,8 +234,7 @@ export class ContextMenu {
                                             this.view.state.doc
                                                 .slice(this.getPos(), insertedAt)
                                                 .content.descendants((node) => {
-                                                if (node.type === schema.nodes.inline_footnote &&
-                                                    !isRejectedInsert(node)) {
+                                                if (node.type === schema.nodes.inline_footnote) {
                                                     inlineFootnoteIndex++;
                                                     return false;
                                                 }

package/dist/es/lib/files.js

@@ -1,7 +1,7 @@
 import { schema } from '@manuscripts/transform';
 import { findChildrenByType } from 'prosemirror-utils';
 import { findGraphicalAbstractFigureElement } from './doc';
-import { getActualAttrs, isHidden } from './track-changes-utils';
+import { isHidden } from './track-changes-utils';
 const MISSING_FILE = {
     id: '',
     name: 'Missing file',
@@ -19,7 +19,7 @@ export const groupFiles = (doc, files) => {
             if (isHidden(figure.node)) {
                 continue;
             }
-            const src = getActualAttrs(figure.node).src;
+            const src = figure.node.attrs.src;
             if (!src) {
                 continue;
             }
@@ -56,7 +56,7 @@ export const groupFiles = (doc, files) => {
             if (isHidden(node)) {
                 return;
             }
-            const href = getActualAttrs(node).href;
+            const href = node.attrs.href;
             let file = fileMap.get(href);
             if (file) {
                 fileMap.delete(href);

package/dist/es/lib/footnotes.js

@@ -17,13 +17,11 @@ import { skipTracking } from '@manuscripts/track-changes-plugin';
 import { isFootnoteNode, schema, } from '@manuscripts/transform';
 import { Fragment } from 'prosemirror-model';
 import { findChildren, findChildrenByType, findParentNodeClosestToPos, } from 'prosemirror-utils';
-import { isRejectedInsert } from './track-changes-utils';
 export const findTableInlineFootnoteIds = ($pos) => {
     var _a;
     const tableElement = (_a = findParentNodeClosestToPos($pos, (node) => node.type === schema.nodes.table_element)) === null || _a === void 0 ? void 0 : _a.node;
     return new Set(tableElement
         ? findChildren(tableElement, (node) => node.type === schema.nodes.inline_footnote)
-            .filter(({ node }) => !isRejectedInsert(node))
             .map(({ node }) => node.attrs.rids)
             .flat()
         : []);
@@ -46,7 +44,6 @@ export const buildTableFootnoteLabels = (node) => {
     ]));
     let index = 0;
     findChildrenByType(node, schema.nodes.inline_footnote)
-        .filter(({ node }) => !isRejectedInsert(node))
         .map(({ node }) => node.attrs.rids)
         .flat()
         .map((rid) => {
@@ -85,9 +82,7 @@ export const orderTableFootnotes = (tr, footnotesElementWithPos, position) => {
 };
 export const updateTableInlineFootnoteLabels = (tr, table) => {
     const labels = buildTableFootnoteLabels(table.node);
-    findChildrenByType(table.node, schema.nodes.inline_footnote)
-        .filter(({ node }) => !isRejectedInsert(node))
-        .map(({ node, pos }) => {
+    findChildrenByType(table.node, schema.nodes.inline_footnote).map(({ node, pos }) => {
         const contents = node.attrs.rids
             .map((rid) => labels.get(rid))
             .join(',');

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

@@ -17,17 +17,10 @@ import { EditAttrsTrackingIcon } from '@manuscripts/style-guide';
 import { schema } from '@manuscripts/transform';
 import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
-export function isRejectedInsert(node) {
-    if (node.attrs.dataTracked) {
-        const changes = node.attrs.dataTracked;
-        return changes.some(({ operation, status }) => operation === 'insert' && status == 'rejected');
-    }
-    return false;
-}
 export function isDeleted(node) {
     if (node.attrs.dataTracked) {
         const changes = node.attrs.dataTracked;
-        return changes.some(({ operation, status }) => operation === 'delete' && status !== 'rejected');
+        return changes.some(({ operation }) => operation === 'delete');
     }
     return false;
 }
@@ -74,24 +67,6 @@ export function isTracked(node) {
     }
     return false;
 }
-export function getActualAttrs(node) {
-    var _a;
-    const attrs = node.attrs;
-    if ((_a = attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.length) {
-        const changes = attrs.dataTracked.filter((c) => c.operation === 'set_attrs');
-        const hasPendingAttrs = changes.some((c) => c.status === 'pending');
-        if (hasPendingAttrs) {
-            return attrs;
-        }
-        const rejected = changes
-            .filter((c) => c.status === 'rejected')
-            .sort((a, b) => b.statusUpdateAt - a.statusUpdateAt)[0];
-        if (rejected && rejected.status === 'rejected') {
-            return rejected.oldAttrs;
-        }
-    }
-    return attrs;
-}
 export const getAttrsTrackingButton = (changeID) => {
     const el = document.createElement('button');
     el.className = 'attrs-popper-button';
@@ -100,7 +75,7 @@ export const getAttrsTrackingButton = (changeID) => {
     return el;
 };
 export function isHidden(node) {
-    return isDeleted(node) || isRejectedInsert(node);
+    return isDeleted(node);
 }
 export function isDeletedText(node) {
     var _a, _b, _c, _d;
@@ -108,17 +83,7 @@ export function isDeletedText(node) {
         const deleteMark = node.marks.find((mark) => mark.type === schema.marks.tracked_delete);
         if (deleteMark &&
             ((_b = (_a = deleteMark.attrs) === null || _a === void 0 ? void 0 : _a.dataTracked) === null || _b === void 0 ? void 0 : _b.status) &&
-            ['pending', 'approved'].includes((_d = (_c = deleteMark.attrs) === null || _c === void 0 ? void 0 : _c.dataTracked) === null || _d === void 0 ? void 0 : _d.status)) {
-            return true;
-        }
-    }
-    return false;
-}
-export function isRejectedText(node) {
-    var _a, _b;
-    if (node.type === schema.nodes.text) {
-        const insertMark = node.marks.find((mark) => mark.type === schema.marks.tracked_insert);
-        if (insertMark && ((_b = (_a = insertMark.attrs) === null || _a === void 0 ? void 0 : _a.dataTracked) === null || _b === void 0 ? void 0 : _b.status) === 'rejected') {
+            'pending' === ((_d = (_c = deleteMark.attrs) === null || _c === void 0 ? void 0 : _c.dataTracked) === null || _d === void 0 ? void 0 : _d.status)) {
             return true;
         }
     }
@@ -131,7 +96,7 @@ export function getActualTextContent(fragment) {
             if (node.type !== schema.nodes.text) {
                 finalContent += getContent(node.content);
             }
-            if (!isDeletedText(node) && !isRejectedText(node)) {
+            if (!isDeletedText(node)) {
                 finalContent += node.textContent;
             }
         });

package/dist/es/lib/view.js

@@ -15,7 +15,7 @@
  */
 import { schema, } from '@manuscripts/transform';
 import * as utils from 'prosemirror-utils';
-import { getActualAttrs, isHidden, sanitizeAttrsChange, } from './track-changes-utils';
+import { isHidden, sanitizeAttrsChange } from './track-changes-utils';
 const metaNodeTypes = [
     schema.nodes.bibliography_item,
     schema.nodes.affiliation,
@@ -36,7 +36,7 @@ export const findChildrenByType = (view, type) => {
     return utils.findChildrenByType(doc, type).filter((n) => !isHidden(n.node));
 };
 export const findChildrenAttrsByType = (view, type) => {
-    return findChildrenByType(view, type).map((n) => getActualAttrs(n.node));
+    return findChildrenByType(view, type).map((n) => n.node.attrs);
 };
 export const updateNodeAttrs = (view, type, attrs) => {
     const child = findChildByID(view, attrs.id);

package/dist/es/plugins/affiliations.js

@@ -18,7 +18,7 @@ import { isEqual } from 'lodash';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { authorComparator, } from '../lib/authors';
-import { getActualAttrs, isDeleted, isPendingInsert, } from '../lib/track-changes-utils';
+import { isDeleted, isPendingInsert } from '../lib/track-changes-utils';
 export const affiliationsKey = new PluginKey('affiliations');
 let id = 1;
 export const buildPluginState = (doc, $old) => {
@@ -27,7 +27,7 @@ export const buildPluginState = (doc, $old) => {
     const affiliations = [];
     const deletedContribId = new Set();
     doc.descendants((node, pos) => {
-        const attrs = isDeleted(node) ? node.attrs : getActualAttrs(node);
+        const attrs = node.attrs;
         if (isAffiliationNode(node)) {
             nodes.push([node, pos]);
             affiliations.push(attrs);

package/dist/es/plugins/bibliography/bibliography-utils.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { Decoration } from 'prosemirror-view';
-import { getActualAttrs } from '../../lib/track-changes-utils';
 export const isBibliographyElement = (node) => node.type === node.type.schema.nodes.bibliography_element;
 export const buildDecorations = (state, doc) => {
     const decorations = [];
@@ -66,7 +65,7 @@ export const buildDecorations = (state, doc) => {
 };
 export const getLatest = (a, b) => a.updatedAt > b.updatedAt ? a : b;
 export const buildCitations = (citations) => citations
-    .map((c) => getActualAttrs(c[0]))
+    .map((c) => c[0].attrs)
     .map((attrs) => ({
     citationID: attrs.id,
     citationItems: attrs.rids.map((rid) => ({

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

@@ -31,7 +31,7 @@ import { isEqual, pickBy } from 'lodash';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { findChildrenByType } from 'prosemirror-utils';
 import { DecorationSet } from 'prosemirror-view';
-import { getActualAttrs, isHidden, isRejectedInsert, } from '../../lib/track-changes-utils';
+import { isHidden } from '../../lib/track-changes-utils';
 import { buildCitations, buildDecorations, } from './bibliography-utils';
 export const bibliographyKey = new PluginKey('bibliography');
 export default (props) => {
@@ -60,7 +60,7 @@ let version = 1;
 const buildBibliographyPluginState = (doc, csl, $old) => {
     const nodes = [];
     doc.descendants((node, pos) => {
-        if (isCitationNode(node) && !isRejectedInsert(node)) {
+        if (isCitationNode(node)) {
             nodes.push([node, pos]);
         }
     });
@@ -114,7 +114,7 @@ const getBibliographyItemAttrs = (doc) => {
     const attrs = new Map();
     findChildrenByType(doc, schema.nodes.bibliography_item)
         .filter((n) => !isHidden(n.node))
-        .map((n) => getActualAttrs(n.node))
+        .map((n) => n.node.attrs)
         .forEach((a) => attrs.set(a.id, a));
     return attrs;
 };

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

@@ -21,7 +21,6 @@ import { findParentNodeClosestToPos, findParentNodeOfType, } from 'prosemirror-u
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { isTextSelection } from '../../commands';
 import { findTableInlineFootnoteIds, getAlphaOrderIndices, } from '../../lib/footnotes';
-import { getActualAttrs } from '../../lib/track-changes-utils';
 import { placeholderWidget } from '../placeholder';
 import { deleteFootnoteWidget, labelWidget, uncitedFootnoteWidget, } from './widgets';
 export const footnotesKey = new PluginKey('footnotes');
@@ -51,7 +50,7 @@ export const buildPluginState = (doc) => {
     const labels = new Map();
     inlineFootnotes.sort((a, b) => a[1] - b[1]);
     inlineFootnotes.forEach(([node]) => {
-        getActualAttrs(node).rids.forEach((rid) => {
+        node.attrs.rids.forEach((rid) => {
             labels.set(rid, getAlphaOrderIndices(index++));
         });
     });
@@ -59,7 +58,7 @@ export const buildPluginState = (doc) => {
     const unusedFootnotes = new Map(footnotes);
     inlineFootnotes.forEach(([node]) => {
         const footnote = node;
-        getActualAttrs(footnote).rids.forEach((rid) => {
+        footnote.attrs.rids.forEach((rid) => {
             const currentFnNode = unusedFootnotes.get(rid);
             if (currentFnNode) {
                 footnotesReordered.push(currentFnNode[0]);
@@ -93,8 +92,8 @@ export default (props) => {
         appendTransaction(transactions, oldState, newState) {
             const { inlineFootnotes: oldInlineFootnoteNodes } = footnotesKey.getState(oldState);
             const { inlineFootnotes: inlineFootnoteNodes, footnotes, labels, footnoteElement, unusedFootnotes, } = footnotesKey.getState(newState);
-            const prevIds = oldInlineFootnoteNodes.map(([node]) => getActualAttrs(node).rids);
-            const newIds = inlineFootnoteNodes.map(([node]) => getActualAttrs(node).rids);
+            const prevIds = oldInlineFootnoteNodes.map(([node]) => node.attrs.rids);
+            const newIds = inlineFootnoteNodes.map(([node]) => node.attrs.rids);
             const initTransaction = transactions.find((t) => t.getMeta('INIT'));
             if (!footnoteElement || (!initTransaction && isEqual(prevIds, newIds))) {
                 return null;
@@ -103,7 +102,7 @@ export default (props) => {
             const footnotesReordered = [];
             inlineFootnoteNodes.forEach(([node, pos]) => {
                 const footnote = node;
-                const attrs = getActualAttrs(footnote);
+                const attrs = footnote.attrs;
                 const contents = attrs.rids
                     .map((rid) => {
                     const currentFnNode = footnotes.get(rid);