@manuscripts/body-editor 1.9.23-LEAN-3579.0 → 1.10.0

package/dist/cjs/commands.js

@@ -427,12 +427,38 @@ const findListsAtSameLevel = (doc, list) => {
     });
     return lists;
 };
+function toggleOffList(state, dispatch) {
+    const { selection: { $from }, tr, } = state;
+    const rootList = findRootList($from);
+    if (rootList) {
+        state.doc.nodesBetween(rootList.pos, rootList.pos + rootList.node.nodeSize, (node, pos) => {
+            const $fromPos = tr.doc.resolve(tr.mapping.map(pos));
+            const $toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1));
+            const nodeRange = $fromPos.blockRange($toPos);
+            if (!nodeRange) {
+                return;
+            }
+            const targetLiftDepth = (0, prosemirror_transform_1.liftTarget)(nodeRange);
+            if (targetLiftDepth || targetLiftDepth === 0) {
+                tr.lift(nodeRange, targetLiftDepth);
+            }
+        });
+        dispatch((0, track_changes_plugin_1.skipTracking)(tr));
+        return true;
+    }
+    else {
+        return false;
+    }
+}
 const insertList = (type, style) => (state, dispatch) => {
     const list = findSelectedList(state.selection);
     if (list) {
         if (!dispatch) {
             return true;
         }
+        if (list.node.attrs.listStyleType === style) {
+            return toggleOffList(state, dispatch);
+        }
         const nodes = findListsAtSameLevel(state.doc, list);
         const tr = state.tr;
         for (const { node, pos } of nodes) {

package/dist/cjs/keys/list.js

@@ -19,7 +19,6 @@ exports.skipCommandTracking = void 0;
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_commands_1 = require("prosemirror-commands");
-const prosemirror_inputrules_1 = require("prosemirror-inputrules");
 const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const skipCommandTracking = (command) => (state, dispatch) => {
@@ -65,6 +64,6 @@ const listKeymap = {
     'Mod-Alt-k': (0, exports.skipCommandTracking)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.bullet_list)),
     'Shift-Tab': (0, exports.skipCommandTracking)(liftToOuterList(transform_1.schema.nodes.list_item)),
     Tab: (0, exports.skipCommandTracking)((0, prosemirror_schema_list_1.sinkListItem)(transform_1.schema.nodes.list_item)),
-    Backspace: (0, exports.skipCommandTracking)((0, prosemirror_commands_1.chainCommands)(prosemirror_inputrules_1.undoInputRule, listItemBackward, prosemirror_commands_1.deleteSelection)),
+    Backspace: (0, exports.skipCommandTracking)(listItemBackward),
 };
 exports.default = listKeymap;

package/dist/es/commands.js

@@ -19,7 +19,7 @@ import { buildComment, generateID, isElementNodeType, isFootnoteNode, isInBiblio
 import { NodeRange } from 'prosemirror-model';
 import { wrapInList } from 'prosemirror-schema-list';
 import { NodeSelection, TextSelection, } from 'prosemirror-state';
-import { findWrapping } from 'prosemirror-transform';
+import { findWrapping, liftTarget } from 'prosemirror-transform';
 import { findChildrenByType, findParentNodeOfType, } from 'prosemirror-utils';
 import { skipCommandTracking } from './keys/list';
 import { isNodeOfType, nearestAncestor } from './lib/helpers';
@@ -405,12 +405,38 @@ const findListsAtSameLevel = (doc, list) => {
     });
     return lists;
 };
+function toggleOffList(state, dispatch) {
+    const { selection: { $from }, tr, } = state;
+    const rootList = findRootList($from);
+    if (rootList) {
+        state.doc.nodesBetween(rootList.pos, rootList.pos + rootList.node.nodeSize, (node, pos) => {
+            const $fromPos = tr.doc.resolve(tr.mapping.map(pos));
+            const $toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1));
+            const nodeRange = $fromPos.blockRange($toPos);
+            if (!nodeRange) {
+                return;
+            }
+            const targetLiftDepth = liftTarget(nodeRange);
+            if (targetLiftDepth || targetLiftDepth === 0) {
+                tr.lift(nodeRange, targetLiftDepth);
+            }
+        });
+        dispatch(skipTracking(tr));
+        return true;
+    }
+    else {
+        return false;
+    }
+}
 export const insertList = (type, style) => (state, dispatch) => {
     const list = findSelectedList(state.selection);
     if (list) {
         if (!dispatch) {
             return true;
         }
+        if (list.node.attrs.listStyleType === style) {
+            return toggleOffList(state, dispatch);
+        }
         const nodes = findListsAtSameLevel(state.doc, list);
         const tr = state.tr;
         for (const { node, pos } of nodes) {

package/dist/es/keys/list.js

@@ -15,8 +15,7 @@
  */
 import { skipTracking } from '@manuscripts/track-changes-plugin';
 import { schema } from '@manuscripts/transform';
-import { chainCommands, deleteSelection, joinBackward, } from 'prosemirror-commands';
-import { undoInputRule } from 'prosemirror-inputrules';
+import { joinBackward } from 'prosemirror-commands';
 import { liftListItem, sinkListItem, splitListItem, wrapInList, } from 'prosemirror-schema-list';
 import { findParentNodeOfType } from 'prosemirror-utils';
 export const skipCommandTracking = (command) => (state, dispatch) => {
@@ -61,6 +60,6 @@ const listKeymap = {
     'Mod-Alt-k': skipCommandTracking(wrapInList(schema.nodes.bullet_list)),
     'Shift-Tab': skipCommandTracking(liftToOuterList(schema.nodes.list_item)),
     Tab: skipCommandTracking(sinkListItem(schema.nodes.list_item)),
-    Backspace: skipCommandTracking(chainCommands(undoInputRule, listItemBackward, deleteSelection)),
+    Backspace: skipCommandTracking(listItemBackward),
 };
 export default listKeymap;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.9.23-LEAN-3579.0",
+  "version": "1.10.0",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -30,9 +30,9 @@
     "@iarna/word-count": "^1.1.2",
     "@manuscripts/json-schema": "^2.2.7",
     "@manuscripts/library": "^1.3.6",
-    "@manuscripts/style-guide": "1.12.8-LEAN-3579.0",
+    "@manuscripts/style-guide": "1.12.7",
     "@manuscripts/track-changes-plugin": "1.7.11",
-    "@manuscripts/transform": "2.3.4-LEAN-3579.5",
+    "@manuscripts/transform": "2.3.3",
     "astrocite-eutils": "^0.16.4",
     "mathjax-full": "^3.2.2",
     "codemirror": "^5.58.1",