@manuscripts/body-editor 3.5.2 → 3.5.3

package/dist/cjs/components/toolbar/helpers.js

@@ -8,6 +8,7 @@ const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const filtered_document_1 = require("../../lib/filtered-document");
 const track_changes_utils_1 = require("../../lib/track-changes-utils");
+const utils_1 = require("../../lib/utils");
 const shouldSkipNode = (node) => {
     return (0, filtered_document_1.isMoved)(node) || (0, track_changes_utils_1.isDeleted)(node);
 };
@@ -31,20 +32,35 @@ const findSelectedOption = (options) => {
     }
 };
 exports.findSelectedOption = findSelectedOption;
-const getDeepestSubsection = (subsection) => {
+const getDeepestSubsectionPosition = (subsection, position) => {
     while (subsection.lastChild && (0, transform_1.isSectionNodeType)(subsection.lastChild.type)) {
+        if ((0, track_changes_utils_1.isDeleted)(subsection.lastChild)) {
+            return (position +
+                jumpToPreviousValidNode(subsection.nodeSize - subsection.lastChild.nodeSize - 2, subsection) +
+                1);
+        }
+        position += subsection.nodeSize - subsection.lastChild.nodeSize;
         subsection = subsection.lastChild;
     }
-    return subsection;
+    return position + subsection.content.size;
+};
+const getInsertDataTracked = (node) => {
+    const dataTracked = node.attrs.dataTracked;
+    const change = dataTracked?.find((c) => c.operation === 'insert');
+    return change ? [change] : null;
 };
-const replaceDeepestSubsection = (parentNode, newSubsection) => {
-    if (!parentNode.lastChild || !(0, transform_1.isSectionNodeType)(parentNode.lastChild.type)) {
-        return newSubsection;
+const jumpToPreviousValidNode = (beforeSection, doc) => {
+    const $beforeSection = doc.resolve(beforeSection);
+    let pos = beforeSection;
+    for (let i = $beforeSection.index() - 1; i >= 0; i--) {
+        pos = $beforeSection.posAtIndex(i);
+        const node = doc.resolve(pos + 1).node();
+        if (!((0, track_changes_utils_1.isDeleted)(node) && node.type === transform_1.schema.nodes.section) && i >= 0) {
+            pos = $beforeSection.posAtIndex(i + 1);
+            break;
+        }
     }
-    const lastSubsectionIndex = parentNode.content.childCount - 1;
-    const lastSubsection = parentNode.content.child(lastSubsectionIndex);
-    const updatedSubsection = replaceDeepestSubsection(lastSubsection, newSubsection);
-    return parentNode.copy(parentNode.content.replaceChild(lastSubsectionIndex, updatedSubsection));
+    return pos;
 };
 const demoteSectionToParagraph = (state, dispatch, view) => {
     const { doc, selection: { $from }, schema, tr, } = state;
@@ -55,40 +71,35 @@ const demoteSectionToParagraph = (state, dispatch, view) => {
     const afterSectionTitleOffset = $afterSectionTitle.parentOffset;
     const sectionDepth = $from.depth - 1;
     const section = $from.node(sectionDepth);
-    const beforeSection = $from.before(sectionDepth);
-    const afterSection = $from.after(sectionDepth);
+    let beforeSection = $from.before(sectionDepth);
+    beforeSection = jumpToPreviousValidNode(beforeSection, doc);
     const $beforeSection = doc.resolve(beforeSection);
     const previousNode = $beforeSection.nodeBefore;
     const paragraph = nodes.paragraph.create({
         id: (0, transform_1.generateNodeID)(nodes.paragraph),
+        dataTracked: getInsertDataTracked(section),
     }, sectionTitle.content);
     let anchor;
-    let fragment;
     const sectionContent = section.content.cut(afterSectionTitleOffset);
     if (previousNode && (0, transform_1.isSectionNodeType)(previousNode.type)) {
         const hasSubsections = previousNode.lastChild && (0, transform_1.isSectionNodeType)(previousNode.lastChild.type);
         if (hasSubsections) {
-            const deepestSubsection = getDeepestSubsection(previousNode.lastChild);
-            const updatedDeepestSubsection = deepestSubsection.copy(deepestSubsection.content
-                .append(prosemirror_model_1.Fragment.from(paragraph))
-                .append(sectionContent));
-            const updatedPreviousNode = replaceDeepestSubsection(previousNode, updatedDeepestSubsection);
-            fragment = updatedPreviousNode.content;
+            beforeSection = getDeepestSubsectionPosition(previousNode, beforeSection - previousNode.nodeSize);
         }
         else {
-            fragment = prosemirror_model_1.Fragment.from(previousNode.content)
-                .append(prosemirror_model_1.Fragment.from(paragraph))
-                .append(sectionContent);
+            beforeSection = beforeSection - 1;
         }
-        tr.replaceWith(beforeSection - previousNode.nodeSize, afterSection, previousNode.copy(fragment));
-        anchor = beforeSection;
+        anchor = beforeSection + 1;
     }
     else {
-        tr.replaceWith(beforeSection, afterSection, prosemirror_model_1.Fragment.from(paragraph).append(sectionContent));
         anchor = beforeSection + 1;
     }
-    tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, anchor, anchor + paragraph.content.size));
-    dispatch((0, track_changes_plugin_1.skipTracking)(tr));
+    const content = (0, utils_1.filterBlockNodes)(prosemirror_model_1.Fragment.from(paragraph).append(sectionContent), (node) => !(0, track_changes_utils_1.isShadowDelete)(node));
+    tr.insert(beforeSection, content);
+    const afterSection = tr.mapping.map($from.after(sectionDepth));
+    tr.delete(afterSection - section.nodeSize, afterSection);
+    tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, anchor));
+    dispatch((0, track_changes_plugin_1.setAction)(tr, track_changes_plugin_1.TrackChangesAction.structuralChangeAction, 'convert-to-paragraph'));
     view && view.focus();
 };
 exports.demoteSectionToParagraph = demoteSectionToParagraph;
@@ -104,18 +115,15 @@ const promoteParagraphToSection = (state, dispatch, view) => {
     const parentSection = $from.node(sectionDepth);
     const startIndex = $from.index(sectionDepth);
     const endIndex = $from.indexAfter(sectionDepth);
-    const beforeParentSection = $from.before(sectionDepth);
-    const afterParentSection = $from.after(sectionDepth);
+    let afterParentSection = $from.after(sectionDepth);
     const items = [];
-    let offset = 0;
     if (startIndex > 0) {
         const precedingSection = parentSection.cut(0, beforeParagraphOffset);
         items.push(precedingSection);
-        offset += precedingSection.nodeSize;
     }
-    const textContent = paragraph.textContent;
+    const textContent = (0, prosemirror_utils_1.findChildrenByType)(paragraph, schema.nodes.text).map(({ node }) => node);
     const sectionTitle = textContent
-        ? nodes.section_title.create({}, schema.text(textContent))
+        ? nodes.section_title.create({}, prosemirror_model_1.Fragment.from(textContent))
         : nodes.section_title.create();
     let sectionContent = prosemirror_model_1.Fragment.from(sectionTitle);
     if (endIndex < parentSection.childCount) {
@@ -125,18 +133,27 @@ const promoteParagraphToSection = (state, dispatch, view) => {
         sectionContent = sectionContent.append(prosemirror_model_1.Fragment.from(paragraph.copy()));
     }
     if (parentSection.type.name === 'body') {
-        const newSection = nodes.section.create({}, sectionContent);
-        items[0] = nodes.body.create({}, items[0]
-            ? items[0].content.append(prosemirror_model_1.Fragment.from(newSection))
-            : prosemirror_model_1.Fragment.from(newSection));
+        sectionContent = prosemirror_model_1.Fragment.from(sectionTitle);
+        afterParentSection = beforeParagraph + paragraph.nodeSize;
+        parentSection.forEach((node, offset, index) => {
+            if (node.type !== nodes.section &&
+                index > tr.doc.resolve(beforeParagraph).index()) {
+                const pos = $from.start($from.depth - 1);
+                afterParentSection = pos + offset + node.nodeSize;
+                sectionContent = sectionContent.append(prosemirror_model_1.Fragment.from(node));
+            }
+        });
+        items[0] = nodes.section.create({ dataTracked: getInsertDataTracked(paragraph) }, sectionContent);
     }
     else {
-        items.push(parentSection.copy(sectionContent));
+        items.push(parentSection.type.create({ dataTracked: getInsertDataTracked(paragraph) }, sectionContent));
     }
-    tr.replaceWith(beforeParentSection, afterParentSection, items);
-    const anchor = beforeParentSection + offset + 2;
-    tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, anchor, anchor + sectionTitle.content.size));
-    dispatch((0, track_changes_plugin_1.skipTracking)(tr));
+    const content = (0, utils_1.filterBlockNodes)(prosemirror_model_1.Fragment.from(items[items.length - 1]), (node) => !(0, track_changes_utils_1.isShadowDelete)(node));
+    tr.insert(afterParentSection, content);
+    tr.delete(beforeParagraph, afterParentSection - 1);
+    const anchor = tr.mapping.map(afterParentSection) - content.size + 2;
+    tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, anchor));
+    dispatch((0, track_changes_plugin_1.setAction)(tr, track_changes_plugin_1.TrackChangesAction.structuralChangeAction, 'convert-to-section'));
     view && view.focus();
 };
 exports.promoteParagraphToSection = promoteParagraphToSection;

package/dist/cjs/components/toolbar/type-selector/TypeSelector.js

@@ -8,6 +8,7 @@ const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const react_1 = __importDefault(require("react"));
 const hierarchy_1 = require("../../../lib/hierarchy");
+const track_changes_utils_1 = require("../../../lib/track-changes-utils");
 const utils_1 = require("../../../lib/utils");
 const helpers_1 = require("../helpers");
 const OptionComponent_1 = require("./OptionComponent");
@@ -30,13 +31,16 @@ const buildOptions = (state) => {
             const beforeSection = $from.before(sectionDepth);
             const $beforeSection = doc.resolve(beforeSection);
             const sectionOffset = $beforeSection.parentOffset;
+            const section = $from.node(sectionDepth);
+            !(0, track_changes_utils_1.isDeleted)(section) &&
+                options.push({
+                    nodeType: nodes.paragraph,
+                    label: 'Paragraph',
+                    action: helpers_1.demoteSectionToParagraph,
+                    isDisabled: (sectionDepth <= 1 && sectionOffset <= 1) || (0, track_changes_utils_1.isDeleted)(section),
+                    isSelected: false,
+                });
             options.push({
-                nodeType: nodes.paragraph,
-                label: 'Paragraph',
-                action: helpers_1.demoteSectionToParagraph,
-                isDisabled: sectionDepth <= 1 && sectionOffset <= 1,
-                isSelected: false,
-            }, {
                 nodeType: nodes.section,
                 label: 'Heading',
                 isDisabled: true,
@@ -45,18 +49,21 @@ const buildOptions = (state) => {
             return options;
         }
         case parentElementType.schema.nodes.paragraph: {
+            const paragraph = $from.node($from.depth);
             options.push({
                 nodeType: nodes.paragraph,
                 label: 'Paragraph',
                 isDisabled: true,
                 isSelected: true,
-            }, {
-                nodeType: nodes.section,
-                label: 'Heading',
-                action: helpers_1.promoteParagraphToSection,
-                isDisabled: false,
-                isSelected: false,
             });
+            !(0, track_changes_utils_1.isDeleted)(paragraph) &&
+                options.push({
+                    nodeType: nodes.section,
+                    label: 'Heading',
+                    action: helpers_1.promoteParagraphToSection,
+                    isDisabled: (0, track_changes_utils_1.isDeleted)(paragraph),
+                    isSelected: false,
+                });
             return options;
         }
         default: {

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

@@ -17,6 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTrackChangesClassNames = exports.addTrackChangesAttributes = exports.getAttrsTrackingButton = void 0;
 exports.isDeleted = isDeleted;
+exports.isShadowDelete = isShadowDelete;
 exports.isPendingInsert = isPendingInsert;
 exports.isPending = isPending;
 exports.isPendingSetAttrs = isPendingSetAttrs;
@@ -38,6 +39,13 @@ function isDeleted(node) {
     }
     return false;
 }
+function isShadowDelete(node) {
+    if (node.attrs.dataTracked) {
+        const changes = node.attrs.dataTracked;
+        return changes.some(({ operation, moveNodeId }) => operation === 'delete' && moveNodeId);
+    }
+    return false;
+}
 function isPendingInsert(node) {
     if (node.attrs.dataTracked) {
         const changes = node.attrs.dataTracked;

package/dist/cjs/lib/utils.js

@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLastTitleNode = exports.getInsertPos = exports.createToggleButton = exports.isEditAllowed = exports.isBodyLocked = exports.cleanItemValues = exports.shouldRenderField = exports.hasParent = exports.isNotNull = exports.createHeader = exports.isSelectionInBody = exports.isSelectionInNode = exports.isChildOfNodeTypes = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = void 0;
+exports.getLastTitleNode = exports.filterBlockNodes = exports.getInsertPos = exports.createToggleButton = exports.isEditAllowed = exports.isBodyLocked = exports.cleanItemValues = exports.shouldRenderField = exports.hasParent = exports.isNotNull = exports.createHeader = exports.isSelectionInBody = exports.isSelectionInNode = exports.isChildOfNodeTypes = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = void 0;
 exports.iterateChildren = iterateChildren;
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const config_1 = require("../components/references/ReferenceForm/config");
 const icons_1 = require("../icons");
@@ -170,6 +171,23 @@ const getInsertPos = (type, parent, pos) => {
     return insertPos;
 };
 exports.getInsertPos = getInsertPos;
+const filterBlockNodes = (fragment, predicate) => {
+    const updatedNodes = [];
+    fragment.forEach((child) => {
+        if (!child.isBlock) {
+            updatedNodes.push(child);
+            return;
+        }
+        const newContent = child.content.size
+            ? (0, exports.filterBlockNodes)(child.content, predicate)
+            : child.content;
+        if (predicate(child)) {
+            updatedNodes.push(child.type.create(child.attrs, newContent, child.marks));
+        }
+    });
+    return prosemirror_model_1.Fragment.fromArray(updatedNodes);
+};
+exports.filterBlockNodes = filterBlockNodes;
 const getLastTitleNode = (state) => {
     const altTitleNode = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.alt_titles)[0];
     if (altTitleNode) {

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

@@ -59,9 +59,6 @@ const getEffectiveSelection = ($pos) => {
                 to: $pos.after(depth),
             };
         }
-        else {
-            break;
-        }
     }
     if (current) {
         return current;
@@ -115,12 +112,18 @@ const buildTextDecoration = (doc, selection) => {
     };
 };
 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',
-    });
+    const decorations = [];
+    if (changes[0].dataTracked.operation === track_changes_plugin_1.CHANGE_OPERATION.structure) {
+        changes.map((c) => decorations.push(prosemirror_view_1.Decoration.node(c.from, c.to, { class: 'selected-suggestion' })));
+    }
+    else {
+        const from = changes[0].from, to = changes[changes.length - 1].to;
+        decorations.push(prosemirror_view_1.Decoration.inline(from, to, {
+            class: 'selected-suggestion',
+        }));
+    }
     return {
-        decorations: prosemirror_view_1.DecorationSet.create(doc, [decoration]),
+        decorations: prosemirror_view_1.DecorationSet.create(doc, decorations),
         suggestion: changes[0].dataTracked,
     };
 };

package/dist/cjs/selection.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSelectionChangeGroup = exports.NodesSelection = void 0;
+exports.getSelectionChangeGroup = exports.NodesSelection = exports.InlineNodesSelection = 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 {
+class InlineNodesSelection extends prosemirror_state_1.Selection {
     constructor($from, $to) {
         super($to, $to);
         this.$startNode = $from;
@@ -28,18 +28,37 @@ class NodesSelection extends prosemirror_state_1.Selection {
         };
     }
 }
+exports.InlineNodesSelection = InlineNodesSelection;
+class NodesSelection extends prosemirror_state_1.NodeSelection {
+    constructor($from, $to) {
+        super($from);
+        this.$startNode = $from;
+        this.$endNode = $to;
+    }
+    toJSON() {
+        return {
+            type: 'nodes',
+            startNode: this.$startNode,
+            endNode: this.$endNode,
+        };
+    }
+}
 exports.NodesSelection = NodesSelection;
 const getSelectionChangeGroup = (state) => {
     const selection = state.selection;
     const $pos = (0, commands_1.isTextSelection)(selection)
         ? selection.$cursor
-        : selection instanceof NodesSelection && selection.$from;
+        : (selection instanceof NodesSelection ||
+            selection instanceof InlineNodesSelection) &&
+            selection.$from;
     if ($pos) {
         return track_changes_plugin_1.trackChangesPluginKey
             .getState(state)
-            ?.changeSet.groupChanges.find((changes) => changes.length > 1 &&
-            $pos.pos >= changes[0].from &&
-            $pos.pos <= changes[changes.length - 1].to);
+            ?.changeSet.groupChanges.find((c) => isPositionAtRange(c, $pos.pos));
     }
 };
 exports.getSelectionChangeGroup = getSelectionChangeGroup;
+const isPositionAtRange = (changes, pos) => (changes.length > 1 ||
+    changes[0].dataTracked.operation === track_changes_plugin_1.CHANGE_OPERATION.structure) &&
+    pos >= changes[0].from &&
+    pos <= changes[changes.length - 1].to;

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

package/dist/es/components/toolbar/helpers.js

@@ -1,10 +1,11 @@
-import { setAction, skipTracking, TrackChangesAction, } from '@manuscripts/track-changes-plugin';
+import { setAction, TrackChangesAction, } from '@manuscripts/track-changes-plugin';
 import { generateNodeID, isSectionNodeType, nodeNames, schema, } from '@manuscripts/transform';
 import { Fragment } from 'prosemirror-model';
 import { TextSelection } from 'prosemirror-state';
-import { hasParentNodeOfType } from 'prosemirror-utils';
+import { findChildrenByType, hasParentNodeOfType } from 'prosemirror-utils';
 import { isMoved } from '../../lib/filtered-document';
-import { isDeleted } from '../../lib/track-changes-utils';
+import { isDeleted, isShadowDelete } from '../../lib/track-changes-utils';
+import { filterBlockNodes } from '../../lib/utils';
 export const shouldSkipNode = (node) => {
     return isMoved(node) || isDeleted(node);
 };
@@ -24,20 +25,35 @@ export const findSelectedOption = (options) => {
         }
     }
 };
-const getDeepestSubsection = (subsection) => {
+const getDeepestSubsectionPosition = (subsection, position) => {
     while (subsection.lastChild && isSectionNodeType(subsection.lastChild.type)) {
+        if (isDeleted(subsection.lastChild)) {
+            return (position +
+                jumpToPreviousValidNode(subsection.nodeSize - subsection.lastChild.nodeSize - 2, subsection) +
+                1);
+        }
+        position += subsection.nodeSize - subsection.lastChild.nodeSize;
         subsection = subsection.lastChild;
     }
-    return subsection;
+    return position + subsection.content.size;
+};
+const getInsertDataTracked = (node) => {
+    const dataTracked = node.attrs.dataTracked;
+    const change = dataTracked?.find((c) => c.operation === 'insert');
+    return change ? [change] : null;
 };
-const replaceDeepestSubsection = (parentNode, newSubsection) => {
-    if (!parentNode.lastChild || !isSectionNodeType(parentNode.lastChild.type)) {
-        return newSubsection;
+const jumpToPreviousValidNode = (beforeSection, doc) => {
+    const $beforeSection = doc.resolve(beforeSection);
+    let pos = beforeSection;
+    for (let i = $beforeSection.index() - 1; i >= 0; i--) {
+        pos = $beforeSection.posAtIndex(i);
+        const node = doc.resolve(pos + 1).node();
+        if (!(isDeleted(node) && node.type === schema.nodes.section) && i >= 0) {
+            pos = $beforeSection.posAtIndex(i + 1);
+            break;
+        }
     }
-    const lastSubsectionIndex = parentNode.content.childCount - 1;
-    const lastSubsection = parentNode.content.child(lastSubsectionIndex);
-    const updatedSubsection = replaceDeepestSubsection(lastSubsection, newSubsection);
-    return parentNode.copy(parentNode.content.replaceChild(lastSubsectionIndex, updatedSubsection));
+    return pos;
 };
 export const demoteSectionToParagraph = (state, dispatch, view) => {
     const { doc, selection: { $from }, schema, tr, } = state;
@@ -48,40 +64,35 @@ export const demoteSectionToParagraph = (state, dispatch, view) => {
     const afterSectionTitleOffset = $afterSectionTitle.parentOffset;
     const sectionDepth = $from.depth - 1;
     const section = $from.node(sectionDepth);
-    const beforeSection = $from.before(sectionDepth);
-    const afterSection = $from.after(sectionDepth);
+    let beforeSection = $from.before(sectionDepth);
+    beforeSection = jumpToPreviousValidNode(beforeSection, doc);
     const $beforeSection = doc.resolve(beforeSection);
     const previousNode = $beforeSection.nodeBefore;
     const paragraph = nodes.paragraph.create({
         id: generateNodeID(nodes.paragraph),
+        dataTracked: getInsertDataTracked(section),
     }, sectionTitle.content);
     let anchor;
-    let fragment;
     const sectionContent = section.content.cut(afterSectionTitleOffset);
     if (previousNode && isSectionNodeType(previousNode.type)) {
         const hasSubsections = previousNode.lastChild && isSectionNodeType(previousNode.lastChild.type);
         if (hasSubsections) {
-            const deepestSubsection = getDeepestSubsection(previousNode.lastChild);
-            const updatedDeepestSubsection = deepestSubsection.copy(deepestSubsection.content
-                .append(Fragment.from(paragraph))
-                .append(sectionContent));
-            const updatedPreviousNode = replaceDeepestSubsection(previousNode, updatedDeepestSubsection);
-            fragment = updatedPreviousNode.content;
+            beforeSection = getDeepestSubsectionPosition(previousNode, beforeSection - previousNode.nodeSize);
         }
         else {
-            fragment = Fragment.from(previousNode.content)
-                .append(Fragment.from(paragraph))
-                .append(sectionContent);
+            beforeSection = beforeSection - 1;
         }
-        tr.replaceWith(beforeSection - previousNode.nodeSize, afterSection, previousNode.copy(fragment));
-        anchor = beforeSection;
+        anchor = beforeSection + 1;
     }
     else {
-        tr.replaceWith(beforeSection, afterSection, Fragment.from(paragraph).append(sectionContent));
         anchor = beforeSection + 1;
     }
-    tr.setSelection(TextSelection.create(tr.doc, anchor, anchor + paragraph.content.size));
-    dispatch(skipTracking(tr));
+    const content = filterBlockNodes(Fragment.from(paragraph).append(sectionContent), (node) => !isShadowDelete(node));
+    tr.insert(beforeSection, content);
+    const afterSection = tr.mapping.map($from.after(sectionDepth));
+    tr.delete(afterSection - section.nodeSize, afterSection);
+    tr.setSelection(TextSelection.create(tr.doc, anchor));
+    dispatch(setAction(tr, TrackChangesAction.structuralChangeAction, 'convert-to-paragraph'));
     view && view.focus();
 };
 export const promoteParagraphToSection = (state, dispatch, view) => {
@@ -96,18 +107,15 @@ export const promoteParagraphToSection = (state, dispatch, view) => {
     const parentSection = $from.node(sectionDepth);
     const startIndex = $from.index(sectionDepth);
     const endIndex = $from.indexAfter(sectionDepth);
-    const beforeParentSection = $from.before(sectionDepth);
-    const afterParentSection = $from.after(sectionDepth);
+    let afterParentSection = $from.after(sectionDepth);
     const items = [];
-    let offset = 0;
     if (startIndex > 0) {
         const precedingSection = parentSection.cut(0, beforeParagraphOffset);
         items.push(precedingSection);
-        offset += precedingSection.nodeSize;
     }
-    const textContent = paragraph.textContent;
+    const textContent = findChildrenByType(paragraph, schema.nodes.text).map(({ node }) => node);
     const sectionTitle = textContent
-        ? nodes.section_title.create({}, schema.text(textContent))
+        ? nodes.section_title.create({}, Fragment.from(textContent))
         : nodes.section_title.create();
     let sectionContent = Fragment.from(sectionTitle);
     if (endIndex < parentSection.childCount) {
@@ -117,18 +125,27 @@ export const promoteParagraphToSection = (state, dispatch, view) => {
         sectionContent = sectionContent.append(Fragment.from(paragraph.copy()));
     }
     if (parentSection.type.name === 'body') {
-        const newSection = nodes.section.create({}, sectionContent);
-        items[0] = nodes.body.create({}, items[0]
-            ? items[0].content.append(Fragment.from(newSection))
-            : Fragment.from(newSection));
+        sectionContent = Fragment.from(sectionTitle);
+        afterParentSection = beforeParagraph + paragraph.nodeSize;
+        parentSection.forEach((node, offset, index) => {
+            if (node.type !== nodes.section &&
+                index > tr.doc.resolve(beforeParagraph).index()) {
+                const pos = $from.start($from.depth - 1);
+                afterParentSection = pos + offset + node.nodeSize;
+                sectionContent = sectionContent.append(Fragment.from(node));
+            }
+        });
+        items[0] = nodes.section.create({ dataTracked: getInsertDataTracked(paragraph) }, sectionContent);
     }
     else {
-        items.push(parentSection.copy(sectionContent));
+        items.push(parentSection.type.create({ dataTracked: getInsertDataTracked(paragraph) }, sectionContent));
     }
-    tr.replaceWith(beforeParentSection, afterParentSection, items);
-    const anchor = beforeParentSection + offset + 2;
-    tr.setSelection(TextSelection.create(tr.doc, anchor, anchor + sectionTitle.content.size));
-    dispatch(skipTracking(tr));
+    const content = filterBlockNodes(Fragment.from(items[items.length - 1]), (node) => !isShadowDelete(node));
+    tr.insert(afterParentSection, content);
+    tr.delete(beforeParagraph, afterParentSection - 1);
+    const anchor = tr.mapping.map(afterParentSection) - content.size + 2;
+    tr.setSelection(TextSelection.create(tr.doc, anchor));
+    dispatch(setAction(tr, TrackChangesAction.structuralChangeAction, 'convert-to-section'));
     view && view.focus();
 };
 export const isIndentationAllowed = (action) => (state) => {

package/dist/es/components/toolbar/type-selector/TypeSelector.js

@@ -2,6 +2,7 @@ import { schema, } from '@manuscripts/transform';
 import { hasParentNodeOfType } from 'prosemirror-utils';
 import React from 'react';
 import { findClosestParentElement } from '../../../lib/hierarchy';
+import { isDeleted } from '../../../lib/track-changes-utils';
 import { isEditAllowed } from '../../../lib/utils';
 import { demoteSectionToParagraph, findSelectedOption, optionName, promoteParagraphToSection, titleCase, } from '../helpers';
 import { OptionComponent } from './OptionComponent';
@@ -24,13 +25,16 @@ const buildOptions = (state) => {
             const beforeSection = $from.before(sectionDepth);
             const $beforeSection = doc.resolve(beforeSection);
             const sectionOffset = $beforeSection.parentOffset;
+            const section = $from.node(sectionDepth);
+            !isDeleted(section) &&
+                options.push({
+                    nodeType: nodes.paragraph,
+                    label: 'Paragraph',
+                    action: demoteSectionToParagraph,
+                    isDisabled: (sectionDepth <= 1 && sectionOffset <= 1) || isDeleted(section),
+                    isSelected: false,
+                });
             options.push({
-                nodeType: nodes.paragraph,
-                label: 'Paragraph',
-                action: demoteSectionToParagraph,
-                isDisabled: sectionDepth <= 1 && sectionOffset <= 1,
-                isSelected: false,
-            }, {
                 nodeType: nodes.section,
                 label: 'Heading',
                 isDisabled: true,
@@ -39,18 +43,21 @@ const buildOptions = (state) => {
             return options;
         }
         case parentElementType.schema.nodes.paragraph: {
+            const paragraph = $from.node($from.depth);
             options.push({
                 nodeType: nodes.paragraph,
                 label: 'Paragraph',
                 isDisabled: true,
                 isSelected: true,
-            }, {
-                nodeType: nodes.section,
-                label: 'Heading',
-                action: promoteParagraphToSection,
-                isDisabled: false,
-                isSelected: false,
             });
+            !isDeleted(paragraph) &&
+                options.push({
+                    nodeType: nodes.section,
+                    label: 'Heading',
+                    action: promoteParagraphToSection,
+                    isDisabled: isDeleted(paragraph),
+                    isSelected: false,
+                });
             return options;
         }
         default: {

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

@@ -25,6 +25,13 @@ export function isDeleted(node) {
     }
     return false;
 }
+export function isShadowDelete(node) {
+    if (node.attrs.dataTracked) {
+        const changes = node.attrs.dataTracked;
+        return changes.some(({ operation, moveNodeId }) => operation === 'delete' && moveNodeId);
+    }
+    return false;
+}
 export function isPendingInsert(node) {
     if (node.attrs.dataTracked) {
         const changes = node.attrs.dataTracked;

package/dist/es/lib/utils.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { isElementNodeType, isSectionNodeType, schema, } from '@manuscripts/transform';
+import { Fragment, } from 'prosemirror-model';
 import { findChildrenByType, findParentNode, findParentNodeOfTypeClosestToPos, } from 'prosemirror-utils';
 import { fieldConfigMap } from '../components/references/ReferenceForm/config';
 import { arrowDown } from '../icons';
@@ -150,6 +151,22 @@ export const getInsertPos = (type, parent, pos) => {
     });
     return insertPos;
 };
+export const filterBlockNodes = (fragment, predicate) => {
+    const updatedNodes = [];
+    fragment.forEach((child) => {
+        if (!child.isBlock) {
+            updatedNodes.push(child);
+            return;
+        }
+        const newContent = child.content.size
+            ? filterBlockNodes(child.content, predicate)
+            : child.content;
+        if (predicate(child)) {
+            updatedNodes.push(child.type.create(child.attrs, newContent, child.marks));
+        }
+    });
+    return Fragment.fromArray(updatedNodes);
+};
 export const getLastTitleNode = (state) => {
     const altTitleNode = findChildrenByType(state.doc, state.schema.nodes.alt_titles)[0];
     if (altTitleNode) {

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

@@ -1,4 +1,4 @@
-import { CHANGE_STATUS, } from '@manuscripts/track-changes-plugin';
+import { CHANGE_OPERATION, CHANGE_STATUS, } from '@manuscripts/track-changes-plugin';
 import { schema, } from '@manuscripts/transform';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
@@ -56,9 +56,6 @@ const getEffectiveSelection = ($pos) => {
                 to: $pos.after(depth),
             };
         }
-        else {
-            break;
-        }
     }
     if (current) {
         return current;
@@ -112,12 +109,18 @@ const buildTextDecoration = (doc, selection) => {
     };
 };
 const buildGroupOfChangesDecoration = (doc, changes) => {
-    const from = changes[0].from, to = changes[changes.length - 1].to;
-    const decoration = Decoration.inline(from, to, {
-        class: 'selected-suggestion',
-    });
+    const decorations = [];
+    if (changes[0].dataTracked.operation === CHANGE_OPERATION.structure) {
+        changes.map((c) => decorations.push(Decoration.node(c.from, c.to, { class: 'selected-suggestion' })));
+    }
+    else {
+        const from = changes[0].from, to = changes[changes.length - 1].to;
+        decorations.push(Decoration.inline(from, to, {
+            class: 'selected-suggestion',
+        }));
+    }
     return {
-        decorations: DecorationSet.create(doc, [decoration]),
+        decorations: DecorationSet.create(doc, decorations),
         suggestion: changes[0].dataTracked,
     };
 };

package/dist/es/selection.js

@@ -1,7 +1,7 @@
-import { trackChangesPluginKey } from '@manuscripts/track-changes-plugin';
-import { Selection } from 'prosemirror-state';
+import { CHANGE_OPERATION, trackChangesPluginKey, } from '@manuscripts/track-changes-plugin';
+import { NodeSelection, Selection } from 'prosemirror-state';
 import { isTextSelection } from './commands';
-export class NodesSelection extends Selection {
+export class InlineNodesSelection extends Selection {
     constructor($from, $to) {
         super($to, $to);
         this.$startNode = $from;
@@ -25,16 +25,34 @@ export class NodesSelection extends Selection {
         };
     }
 }
+export class NodesSelection extends NodeSelection {
+    constructor($from, $to) {
+        super($from);
+        this.$startNode = $from;
+        this.$endNode = $to;
+    }
+    toJSON() {
+        return {
+            type: 'nodes',
+            startNode: this.$startNode,
+            endNode: this.$endNode,
+        };
+    }
+}
 export const getSelectionChangeGroup = (state) => {
     const selection = state.selection;
     const $pos = isTextSelection(selection)
         ? selection.$cursor
-        : selection instanceof NodesSelection && selection.$from;
+        : (selection instanceof NodesSelection ||
+            selection instanceof InlineNodesSelection) &&
+            selection.$from;
     if ($pos) {
         return trackChangesPluginKey
             .getState(state)
-            ?.changeSet.groupChanges.find((changes) => changes.length > 1 &&
-            $pos.pos >= changes[0].from &&
-            $pos.pos <= changes[changes.length - 1].to);
+            ?.changeSet.groupChanges.find((c) => isPositionAtRange(c, $pos.pos));
     }
 };
+const isPositionAtRange = (changes, pos) => (changes.length > 1 ||
+    changes[0].dataTracked.operation === CHANGE_OPERATION.structure) &&
+    pos >= changes[0].from &&
+    pos <= changes[changes.length - 1].to;

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.5.2';
+export const VERSION = '3.5.3';
 export const MATHJAX_VERSION = '3.2.2';

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

@@ -16,6 +16,7 @@
 import { TrackedAttrs } from '@manuscripts/track-changes-plugin';
 import { Attrs, Fragment, Node as ProsemirrorNode } from 'prosemirror-model';
 export declare function isDeleted(node: ProsemirrorNode): 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;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { BibliographyItemAttrs, BibliographyItemType, ManuscriptEditorState, ManuscriptNode, ManuscriptNodeType } from '@manuscripts/transform';
-import { Node as ProseMirrorNode, NodeType, ResolvedPos } from 'prosemirror-model';
+import { Fragment, Node as ProseMirrorNode, NodeType, ResolvedPos } from 'prosemirror-model';
 import { EditorState, Selection } from 'prosemirror-state';
 export declare function iterateChildren(node: ManuscriptNode, recurse?: boolean): Iterable<ManuscriptNode>;
 export declare const getMatchingChild: (parent: ManuscriptNode, matcher: (node: ManuscriptNode) => boolean, deep?: boolean) => ManuscriptNode | undefined;
@@ -36,6 +36,7 @@ export declare const isBodyLocked: (state: EditorState) => boolean;
 export declare const isEditAllowed: (state: EditorState) => boolean;
 export declare const createToggleButton: (listener: () => void) => HTMLButtonElement;
 export declare const getInsertPos: (type: ManuscriptNodeType, parent: ManuscriptNode, pos: number) => number;
+export declare const filterBlockNodes: (fragment: Fragment, predicate: (node: ProseMirrorNode) => boolean) => Fragment;
 export declare const getLastTitleNode: (state: ManuscriptEditorState) => {
     node: ProseMirrorNode;
     pos: number;

package/dist/types/selection.d.ts

@@ -1,13 +1,14 @@
+import { TrackedChange } from '@manuscripts/track-changes-plugin';
 import { ManuscriptEditorState } from '@manuscripts/transform';
 import { Node, ResolvedPos } from 'prosemirror-model';
-import { Selection } from 'prosemirror-state';
+import { NodeSelection, Selection } from 'prosemirror-state';
 import { Mappable } from 'prosemirror-transform';
 interface NodesSelectionJSON {
-    type: 'inlineNodes';
+    type: 'inlineNodes' | 'nodes';
     startNode: ResolvedPos;
     endNode: ResolvedPos;
 }
-export declare class NodesSelection extends Selection {
+export declare class InlineNodesSelection extends Selection {
     $startNode: ResolvedPos;
     $endNode: ResolvedPos;
     constructor($from: ResolvedPos, $to: ResolvedPos);
@@ -15,5 +16,11 @@ export declare class NodesSelection extends Selection {
     map(doc: Node, mapping: Mappable): Selection;
     toJSON(): NodesSelectionJSON;
 }
-export declare const getSelectionChangeGroup: (state: ManuscriptEditorState) => import("@manuscripts/track-changes-plugin").TrackedChange[] | undefined;
+export declare class NodesSelection extends NodeSelection {
+    $startNode: ResolvedPos;
+    $endNode: ResolvedPos;
+    constructor($from: ResolvedPos, $to: ResolvedPos);
+    toJSON(): NodesSelectionJSON;
+}
+export declare const getSelectionChangeGroup: (state: ManuscriptEditorState) => TrackedChange[] | undefined;
 export {};

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.5.2";
+export declare const VERSION = "3.5.3";
 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.2",
+  "version": "3.5.3",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -40,7 +40,7 @@
     "@iarna/word-count": "1.1.2",
     "@manuscripts/json-schema": "2.2.12",
     "@manuscripts/style-guide": "3.3.0",
-    "@manuscripts/track-changes-plugin": "2.0.11",
+    "@manuscripts/track-changes-plugin": "2.0.12",
     "@manuscripts/transform": "4.2.14",
     "@popperjs/core": "2.11.8",
     "citeproc": "2.4.63",

package/styles/AdvancedEditor.css

@@ -1064,7 +1064,7 @@ figure.block:has(.equation.selected-suggestion) {
   [data-track-op='node_split'][data-track-status='pending']
   .block,
 .tracking-visible
-  .selected-suggestion[data-track-op='move'][data-track-status='pending']
+  .selected-suggestion:is([data-track-op='move'], [data-track-op='structure'])
   .block,
 .block:has(
     figure.selected-suggestion,
@@ -1079,7 +1079,7 @@ figure.block:has(.equation.selected-suggestion) {
 .tracking-visible .selected-suggestion[data-track-op='node_split'] .block,
 .tracking-visible figure.block:has(.equation.set_attrs.selected-suggestion),
 .tracking-visible
-  .selected-suggestion[data-track-op='move'][data-track-status='pending']
+  .selected-suggestion:is([data-track-op='move'], [data-track-op='structure'])
   .block {
   box-shadow: inset 6px 0 0 var(--updated-border-color),
     inset 9px 0 0 var(--updated-bg-color) !important;