@manuscripts/body-editor 1.10.3-LEAN-3608.3 → 1.10.3

package/dist/cjs/commands.js

@@ -24,7 +24,6 @@ const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_transform_1 = require("prosemirror-transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
-const list_1 = require("./keys/list");
 const helpers_1 = require("./lib/helpers");
 const track_changes_utils_1 = require("./lib/track-changes-utils");
 const utils_1 = require("./lib/utils");
@@ -394,7 +393,10 @@ const insertSection = (subsection = false) => (state, dispatch) => {
     return true;
 };
 exports.insertSection = insertSection;
-const findSelectedList = (0, prosemirror_utils_1.findParentNodeOfType)([transform_1.schema.nodes.list]);
+const findSelectedList = (0, prosemirror_utils_1.findParentNodeOfType)([
+    transform_1.schema.nodes.ordered_list,
+    transform_1.schema.nodes.bullet_list,
+]);
 const findRootList = ($pos) => {
     for (let i = 0; i < $pos.depth; i++) {
         const node = $pos.node(i);
@@ -447,7 +449,7 @@ function toggleOffList(state, dispatch) {
         return false;
     }
 }
-const insertList = (type, style) => (state, dispatch) => {
+const insertList = (type, style) => (state, dispatch, view) => {
     const list = findSelectedList(state.selection);
     if (list) {
         if (!dispatch) {
@@ -461,12 +463,27 @@ const insertList = (type, style) => (state, dispatch) => {
         for (const { node, pos } of nodes) {
             tr.setNodeMarkup(pos, type, Object.assign(Object.assign({}, node.attrs), { listStyleType: style }), node.marks);
         }
-        dispatch(tr);
+        dispatch((0, track_changes_plugin_1.skipTracking)(tr));
         return true;
     }
     else {
-        const command = (0, prosemirror_schema_list_1.wrapInList)(type, { listStyleType: style });
-        return (0, list_1.skipCommandTracking)(command)(state, dispatch);
+        const { selection } = state;
+        let tr = state.tr;
+        return (0, prosemirror_schema_list_1.wrapInList)(type, { listStyleType: style })(state, (tempTr) => {
+            const range = selection.$from.blockRange(selection.$to);
+            if (range && dispatch) {
+                tempTr.steps.map((step) => {
+                    if (step instanceof prosemirror_transform_1.ReplaceAroundStep) {
+                        dispatch(tr.step(step));
+                        tr = (view === null || view === void 0 ? void 0 : view.state.tr) || tr;
+                    }
+                    else {
+                        tr.step(step);
+                    }
+                });
+                dispatch(tr);
+            }
+        });
     }
 };
 exports.insertList = insertList;

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

@@ -225,13 +225,13 @@ const buildOptions = (state, dispatch, view) => {
                     isDisabled: sectionDepth <= 1 && sectionOffset <= 1,
                 }),
                 buildOption({
-                    nodeType: nodes.list,
+                    nodeType: nodes.ordered_list,
                     value: -3,
                     depth: 1,
                     isDisabled: true,
                 }),
                 buildOption({
-                    nodeType: nodes.list,
+                    nodeType: nodes.bullet_list,
                     value: -2,
                     depth: 1,
                     isDisabled: true,
@@ -291,16 +291,16 @@ const buildOptions = (state, dispatch, view) => {
                     isSelected: true,
                 }),
                 buildOption({
-                    nodeType: nodes.list,
+                    nodeType: nodes.ordered_list,
                     value: -3,
                     depth: 1,
-                    action: convertParagraphToList(nodes.list),
+                    action: convertParagraphToList(nodes.ordered_list),
                 }),
                 buildOption({
-                    nodeType: nodes.list,
+                    nodeType: nodes.bullet_list,
                     value: -2,
                     depth: 1,
-                    action: convertParagraphToList(nodes.list),
+                    action: convertParagraphToList(nodes.bullet_list),
                 }),
             ];
             const sectionOptions = [];
@@ -326,7 +326,7 @@ const buildOptions = (state, dispatch, view) => {
             }));
             return [{ options: typeOptions }, { options: sectionOptions }];
         }
-        case schema.nodes.list: {
+        case schema.nodes.bullet_list: {
             return [
                 {
                     options: [
@@ -342,16 +342,16 @@ const buildOptions = (state, dispatch, view) => {
                 {
                     options: [
                         buildOption({
-                            nodeType: nodes.list,
+                            nodeType: nodes.ordered_list,
                             value: -3,
                             depth: 1,
-                            action: convertListType(nodes.list, parentElement),
+                            action: convertListType(nodes.ordered_list, parentElement),
                         }),
                     ],
                 },
             ];
         }
-        case parentElementType.schema.nodes.list: {
+        case parentElementType.schema.nodes.ordered_list: {
             return [
                 {
                     options: [
@@ -367,10 +367,10 @@ const buildOptions = (state, dispatch, view) => {
                 {
                     options: [
                         buildOption({
-                            nodeType: nodes.list,
+                            nodeType: nodes.bullet_list,
                             value: -3,
                             depth: 1,
-                            action: convertListType(nodes.list, parentElement),
+                            action: convertListType(nodes.bullet_list, parentElement),
                         }),
                     ],
                 },

package/dist/cjs/configs/editor-views.js

@@ -21,6 +21,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const affiliations_1 = __importDefault(require("../views/affiliations"));
 const bibliography_element_editable_1 = __importDefault(require("../views/bibliography_element_editable"));
 const blockquote_element_editable_1 = __importDefault(require("../views/blockquote_element_editable"));
+const bullet_list_editable_1 = __importDefault(require("../views/bullet_list_editable"));
 const citation_editable_1 = __importDefault(require("../views/citation_editable"));
 const contributors_1 = __importDefault(require("../views/contributors"));
 const cross_reference_editable_1 = __importDefault(require("../views/cross_reference_editable"));
@@ -36,9 +37,10 @@ const inline_footnote_editable_1 = __importDefault(require("../views/inline_foot
 const keyword_1 = __importDefault(require("../views/keyword"));
 const keyword_group_1 = __importDefault(require("../views/keyword_group"));
 const link_editable_1 = __importDefault(require("../views/link_editable"));
-const list_editable_1 = __importDefault(require("../views/list_editable"));
+const list_item_1 = __importDefault(require("../views/list_item"));
 const listing_editable_1 = __importDefault(require("../views/listing_editable"));
 const listing_element_editable_1 = __importDefault(require("../views/listing_element_editable"));
+const ordered_list_editable_1 = __importDefault(require("../views/ordered_list_editable"));
 const paragraph_editable_1 = __importDefault(require("../views/paragraph_editable"));
 const placeholder_1 = __importDefault(require("../views/placeholder"));
 const placeholder_element_editable_1 = __importDefault(require("../views/placeholder_element_editable"));
@@ -54,7 +56,7 @@ exports.default = (props, dispatch) => {
         title: (0, title_editable_1.default)(props, dispatch),
         bibliography_element: (0, bibliography_element_editable_1.default)(props, dispatch),
         blockquote_element: (0, blockquote_element_editable_1.default)(props),
-        list: (0, list_editable_1.default)(props),
+        bullet_list: (0, bullet_list_editable_1.default)(props),
         citation: (0, citation_editable_1.default)(props, dispatch),
         cross_reference: (0, cross_reference_editable_1.default)(props, dispatch),
         contributors: (0, contributors_1.default)(props, dispatch),
@@ -72,6 +74,8 @@ exports.default = (props, dispatch) => {
         link: (0, link_editable_1.default)(props, dispatch),
         listing: (0, listing_editable_1.default)(props),
         listing_element: (0, listing_element_editable_1.default)(props),
+        list_item: (0, list_item_1.default)(props),
+        ordered_list: (0, ordered_list_editable_1.default)(props),
         paragraph: (0, paragraph_editable_1.default)(props),
         placeholder: (0, placeholder_1.default)(props),
         placeholder_element: (0, placeholder_element_editable_1.default)(props),

package/dist/cjs/keys/list.js

@@ -60,8 +60,8 @@ const listKeymap = {
     Enter: (0, prosemirror_schema_list_1.splitListItem)(transform_1.schema.nodes.list_item),
     'Mod-[': (0, exports.skipCommandTracking)(liftToOuterList(transform_1.schema.nodes.list_item)),
     'Mod-]': (0, exports.skipCommandTracking)((0, prosemirror_schema_list_1.sinkListItem)(transform_1.schema.nodes.list_item)),
-    'Mod-Alt-o': (0, exports.skipCommandTracking)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.list, { listStyleType: 'order' })),
-    'Mod-Alt-k': (0, exports.skipCommandTracking)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.list, { listStyleType: 'bullet' })),
+    'Mod-Alt-o': (0, exports.skipCommandTracking)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.ordered_list)),
+    '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)(listItemBackward),

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

@@ -28,6 +28,7 @@ const ReactSubView_1 = __importDefault(require("../views/ReactSubView"));
 const popper_1 = require("./popper");
 const track_changes_utils_1 = require("./track-changes-utils");
 const popper = new popper_1.PopperManager();
+const listTypes = [transform_1.schema.nodes.ordered_list, transform_1.schema.nodes.bullet_list];
 const readonlyTypes = [transform_1.schema.nodes.keywords, transform_1.schema.nodes.bibliography_element];
 const sectionLevel = (depth) => {
     switch (depth) {
@@ -85,7 +86,7 @@ class ContextMenu {
                     }
                 }));
             }
-            if (hasAny(types, 'paragraph', 'list')) {
+            if (hasAny(types, 'paragraph', 'ordered_list', 'bullet_list')) {
                 menu.appendChild(this.createMenuSection((section) => {
                     if (types.has('paragraph')) {
                         section.appendChild(this.createMenuItem('Paragraph', () => {
@@ -93,9 +94,15 @@ class ContextMenu {
                             popper.destroy();
                         }));
                     }
-                    if (types.has('list')) {
-                        section.appendChild(this.createMenuItem('List', () => {
-                            insertNode(transform_1.schema.nodes.list);
+                    if (types.has('ordered_list')) {
+                        section.appendChild(this.createMenuItem('Numbered List', () => {
+                            insertNode(transform_1.schema.nodes.ordered_list);
+                            popper.destroy();
+                        }));
+                    }
+                    if (types.has('bullet_list')) {
+                        section.appendChild(this.createMenuItem('Bullet List', () => {
+                            insertNode(transform_1.schema.nodes.bullet_list);
                             popper.destroy();
                         }));
                     }
@@ -140,18 +147,17 @@ class ContextMenu {
             menu.className = 'menu';
             const $pos = this.resolvePos();
             const type = this.node.type;
-            if (type === transform_1.schema.nodes.list) {
+            if (listTypes.includes(type)) {
                 menu.appendChild(this.createMenuSection((section) => {
-                    const list_type = transform_1.JATS_HTML_LIST_STYLE_MAPPING[this.node.attrs.listStyleType].type;
-                    if (list_type === 'ul') {
+                    if (type === transform_1.schema.nodes.bullet_list) {
                         section.appendChild(this.createMenuItem('Change to Numbered List', () => {
-                            this.changeNodeType(transform_1.schema.nodes.list, 'order');
+                            this.changeNodeType(transform_1.schema.nodes.ordered_list);
                             popper.destroy();
                         }));
                     }
-                    if (list_type === 'ol') {
+                    if (type === transform_1.schema.nodes.ordered_list) {
                         section.appendChild(this.createMenuItem('Change to Bullet List', () => {
-                            this.changeNodeType(transform_1.schema.nodes.list, 'bullet');
+                            this.changeNodeType(transform_1.schema.nodes.bullet_list);
                             popper.destroy();
                         }));
                     }
@@ -311,7 +317,8 @@ class ContextMenu {
             }
             checkNode('section', insertPos);
             checkNode('paragraph');
-            checkNode('list');
+            checkNode('ordered_list');
+            checkNode('bullet_list');
             checkNode('figure_element');
             checkNode('table_element');
             checkNode('equation_element');
@@ -319,10 +326,9 @@ class ContextMenu {
             checkNode('pullquote_element');
             return insertable;
         };
-        this.changeNodeType = (nodeType, listType) => {
+        this.changeNodeType = (nodeType) => {
             this.view.dispatch(this.view.state.tr.setNodeMarkup(this.getPos(), nodeType, {
                 id: this.node.attrs.id,
-                listStyleType: listType,
             }));
             popper.destroy();
         };

package/dist/cjs/menus.js

@@ -300,15 +300,15 @@ const getEditorMenus = (editor) => {
             {
                 id: 'insert-bullet-list',
                 label: 'Bullet List',
-                isEnabled: isCommandValid((0, commands_1.insertList)(transform_1.schema.nodes.list, 'bullet')),
+                isEnabled: isCommandValid((0, commands_1.insertList)(transform_1.schema.nodes.bullet_list)),
                 submenu: [
                     {
                         id: 'bullet-list-context-menu',
                         label: '',
                         isEnabled: true,
                         options: {
-                            bullet: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.list, 'bullet')),
-                            simple: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.list, 'simple')),
+                            bullet: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet')),
+                            simple: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'simple')),
                         },
                     },
                 ],
@@ -316,18 +316,18 @@ const getEditorMenus = (editor) => {
             {
                 id: 'insert-ordered-list',
                 label: 'Ordered List',
-                isEnabled: isCommandValid((0, commands_1.insertList)(transform_1.schema.nodes.list, 'order')),
+                isEnabled: isCommandValid((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list)),
                 submenu: [
                     {
                         id: 'ordered-list-context-menu',
                         label: '',
                         isEnabled: true,
                         options: {
-                            order: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.list, 'order')),
-                            'alpha-upper': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.list, 'alpha-upper')),
-                            'alpha-lower': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.list, 'alpha-lower')),
-                            'roman-upper': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.list, 'roman-upper')),
-                            'roman-lower': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.list, 'roman-lower')),
+                            order: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'order')),
+                            'alpha-upper': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'alpha-upper')),
+                            'alpha-lower': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'alpha-lower')),
+                            'roman-upper': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'roman-upper')),
+                            'roman-lower': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'roman-lower')),
                         },
                     },
                 ],

package/dist/cjs/rules.js

@@ -35,7 +35,8 @@ exports.default = (0, prosemirror_inputrules_1.inputRules)({
         ...prosemirror_inputrules_1.smartQuotes,
         prosemirror_inputrules_1.ellipsis,
         prosemirror_inputrules_1.emDash,
-        creatingInputRule(/^(\d+[.)]\s|\s*\*\s)$/, transform_1.schema.nodes.list),
+        creatingInputRule(/^\d+[.)]\s$/, transform_1.schema.nodes.ordered_list),
+        creatingInputRule(/^\s*\*\s$/, transform_1.schema.nodes.bullet_list),
         creatingInputRule(/^\s*>\s$/, transform_1.schema.nodes.blockquote_element),
         creatingInputRule(/^```$/, transform_1.schema.nodes.listing_element),
         creatingInputRule(/^#\s$/, transform_1.schema.nodes.section),

package/dist/cjs/toolbar.js

@@ -68,26 +68,26 @@ exports.toolbar = {
         bullet_list: {
             title: 'Wrap in bullet list',
             content: react_1.default.createElement(style_guide_1.ToolbarUnorderedListIcon, null),
-            isActive: (0, commands_1.blockActive)(transform_1.schema.nodes.list),
-            isEnabled: (0, commands_1.insertList)(transform_1.schema.nodes.list, 'bullet'),
-            run: (0, commands_1.insertList)(transform_1.schema.nodes.list, 'bullet'),
+            isActive: (0, commands_1.blockActive)(transform_1.schema.nodes.bullet_list),
+            isEnabled: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet'),
+            run: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet'),
             options: {
-                bullet: (0, commands_1.insertList)(transform_1.schema.nodes.list, 'bullet'),
-                simple: (0, commands_1.insertList)(transform_1.schema.nodes.list, 'simple'),
+                bullet: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet'),
+                simple: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'simple'),
             },
         },
         ordered_list: {
             title: 'Wrap in ordered list',
             content: react_1.default.createElement(style_guide_1.ToolbarOrderedListIcon, null),
-            isActive: (0, commands_1.blockActive)(transform_1.schema.nodes.list),
-            isEnabled: (0, commands_1.insertList)(transform_1.schema.nodes.list, 'order'),
-            run: (0, commands_1.insertList)(transform_1.schema.nodes.list, 'order'),
+            isActive: (0, commands_1.blockActive)(transform_1.schema.nodes.ordered_list),
+            isEnabled: (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'order'),
+            run: (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'order'),
             options: {
-                order: (0, commands_1.insertList)(transform_1.schema.nodes.list, 'order'),
-                'alpha-upper': (0, commands_1.insertList)(transform_1.schema.nodes.list, 'alpha-upper'),
-                'alpha-lower': (0, commands_1.insertList)(transform_1.schema.nodes.list, 'alpha-lower'),
-                'roman-upper': (0, commands_1.insertList)(transform_1.schema.nodes.list, 'roman-upper'),
-                'roman-lower': (0, commands_1.insertList)(transform_1.schema.nodes.list, 'roman-lower'),
+                order: (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'order'),
+                'alpha-upper': (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'alpha-upper'),
+                'alpha-lower': (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'alpha-lower'),
+                'roman-upper': (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'roman-upper'),
+                'roman-lower': (0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'roman-lower'),
             },
         },
     },

package/dist/cjs/views/bullet_list.js

@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulletListCallback = exports.BulletListView = void 0;
+const track_changes_utils_1 = require("../lib/track-changes-utils");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
 const ordered_list_1 = require("./ordered_list");
@@ -30,6 +31,19 @@ class BulletListView extends block_view_1.default {
             if (this.contentDOM) {
                 const type = this.node.attrs.listStyleType || 'bullet';
                 this.contentDOM.style.listStyleType = ordered_list_1.JATS_HTML_LIST_STYLE_MAPPING[type];
+                const classes = [
+                    'block',
+                    ...(0, track_changes_utils_1.getChangeClasses)(this.node.attrs.dataTracked),
+                ];
+                if (this.node.attrs.dataTracked) {
+                    this.dom.setAttribute('data-track-status', this.node.attrs.dataTracked[0].status);
+                    this.dom.setAttribute('data-track-op', this.node.attrs.dataTracked[0].operation);
+                }
+                else {
+                    this.dom.removeAttribute('data-track-status');
+                    this.dom.removeAttribute('data-track-op');
+                }
+                this.contentDOM.className = classes.join(' ');
             }
         };
     }

package/dist/cjs/views/list_item.js

@@ -0,0 +1,39 @@
+"use strict";
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listItemCallback = exports.ListItemView = void 0;
+const track_changes_utils_1 = require("../lib/track-changes-utils");
+const block_view_1 = __importDefault(require("./block_view"));
+const creators_1 = require("./creators");
+class ListItemView extends block_view_1.default {
+    constructor() {
+        super(...arguments);
+        this.elementType = 'li';
+    }
+}
+exports.ListItemView = ListItemView;
+const listItemCallback = (node, dom) => {
+    if (node.attrs.dataTracked) {
+        const classes = (0, track_changes_utils_1.getChangeClasses)(node.attrs.dataTracked);
+        dom.className = classes.join(' ');
+    }
+};
+exports.listItemCallback = listItemCallback;
+exports.default = (0, creators_1.createNodeOrElementView)(ListItemView, 'li', exports.listItemCallback);

package/dist/cjs/views/ordered_list.js

@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.orderedListCallback = exports.OrderedListView = exports.JATS_HTML_LIST_STYLE_MAPPING = void 0;
+const track_changes_utils_1 = require("../lib/track-changes-utils");
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
 exports.JATS_HTML_LIST_STYLE_MAPPING = {
@@ -38,6 +39,19 @@ class OrderedListView extends block_view_1.default {
             if (this.contentDOM) {
                 const type = this.node.attrs.listStyleType || 'order';
                 this.contentDOM.style.listStyleType = exports.JATS_HTML_LIST_STYLE_MAPPING[type];
+                const classes = [
+                    'block',
+                    ...(0, track_changes_utils_1.getChangeClasses)(this.node.attrs.dataTracked),
+                ];
+                if (this.node.attrs.dataTracked) {
+                    this.dom.setAttribute('data-track-status', this.node.attrs.dataTracked[0].status);
+                    this.dom.setAttribute('data-track-op', this.node.attrs.dataTracked[0].operation);
+                }
+                else {
+                    this.dom.removeAttribute('data-track-status');
+                    this.dom.removeAttribute('data-track-op');
+                }
+                this.contentDOM.className = classes.join(' ');
             }
         };
     }

package/dist/es/commands.js

@@ -19,9 +19,8 @@ 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, liftTarget } from 'prosemirror-transform';
+import { findWrapping, liftTarget, ReplaceAroundStep, } from 'prosemirror-transform';
 import { findChildrenByType, findParentNodeOfType, } from 'prosemirror-utils';
-import { skipCommandTracking } from './keys/list';
 import { isNodeOfType, nearestAncestor } from './lib/helpers';
 import { isDeleted, isRejectedInsert } from './lib/track-changes-utils';
 import { findParentNodeWithId, getChildOfType } from './lib/utils';
@@ -372,7 +371,10 @@ export const insertSection = (subsection = false) => (state, dispatch) => {
     }
     return true;
 };
-const findSelectedList = findParentNodeOfType([schema.nodes.list]);
+const findSelectedList = findParentNodeOfType([
+    schema.nodes.ordered_list,
+    schema.nodes.bullet_list,
+]);
 const findRootList = ($pos) => {
     for (let i = 0; i < $pos.depth; i++) {
         const node = $pos.node(i);
@@ -425,7 +427,7 @@ function toggleOffList(state, dispatch) {
         return false;
     }
 }
-export const insertList = (type, style) => (state, dispatch) => {
+export const insertList = (type, style) => (state, dispatch, view) => {
     const list = findSelectedList(state.selection);
     if (list) {
         if (!dispatch) {
@@ -439,12 +441,27 @@ export const insertList = (type, style) => (state, dispatch) => {
         for (const { node, pos } of nodes) {
             tr.setNodeMarkup(pos, type, Object.assign(Object.assign({}, node.attrs), { listStyleType: style }), node.marks);
         }
-        dispatch(tr);
+        dispatch(skipTracking(tr));
         return true;
     }
     else {
-        const command = wrapInList(type, { listStyleType: style });
-        return skipCommandTracking(command)(state, dispatch);
+        const { selection } = state;
+        let tr = state.tr;
+        return wrapInList(type, { listStyleType: style })(state, (tempTr) => {
+            const range = selection.$from.blockRange(selection.$to);
+            if (range && dispatch) {
+                tempTr.steps.map((step) => {
+                    if (step instanceof ReplaceAroundStep) {
+                        dispatch(tr.step(step));
+                        tr = (view === null || view === void 0 ? void 0 : view.state.tr) || tr;
+                    }
+                    else {
+                        tr.step(step);
+                    }
+                });
+                dispatch(tr);
+            }
+        });
     }
 };
 export const insertBibliographySection = () => {

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

@@ -219,13 +219,13 @@ const buildOptions = (state, dispatch, view) => {
                     isDisabled: sectionDepth <= 1 && sectionOffset <= 1,
                 }),
                 buildOption({
-                    nodeType: nodes.list,
+                    nodeType: nodes.ordered_list,
                     value: -3,
                     depth: 1,
                     isDisabled: true,
                 }),
                 buildOption({
-                    nodeType: nodes.list,
+                    nodeType: nodes.bullet_list,
                     value: -2,
                     depth: 1,
                     isDisabled: true,
@@ -285,16 +285,16 @@ const buildOptions = (state, dispatch, view) => {
                     isSelected: true,
                 }),
                 buildOption({
-                    nodeType: nodes.list,
+                    nodeType: nodes.ordered_list,
                     value: -3,
                     depth: 1,
-                    action: convertParagraphToList(nodes.list),
+                    action: convertParagraphToList(nodes.ordered_list),
                 }),
                 buildOption({
-                    nodeType: nodes.list,
+                    nodeType: nodes.bullet_list,
                     value: -2,
                     depth: 1,
-                    action: convertParagraphToList(nodes.list),
+                    action: convertParagraphToList(nodes.bullet_list),
                 }),
             ];
             const sectionOptions = [];
@@ -320,7 +320,7 @@ const buildOptions = (state, dispatch, view) => {
             }));
             return [{ options: typeOptions }, { options: sectionOptions }];
         }
-        case schema.nodes.list: {
+        case schema.nodes.bullet_list: {
             return [
                 {
                     options: [
@@ -336,16 +336,16 @@ const buildOptions = (state, dispatch, view) => {
                 {
                     options: [
                         buildOption({
-                            nodeType: nodes.list,
+                            nodeType: nodes.ordered_list,
                             value: -3,
                             depth: 1,
-                            action: convertListType(nodes.list, parentElement),
+                            action: convertListType(nodes.ordered_list, parentElement),
                         }),
                     ],
                 },
             ];
         }
-        case parentElementType.schema.nodes.list: {
+        case parentElementType.schema.nodes.ordered_list: {
             return [
                 {
                     options: [
@@ -361,10 +361,10 @@ const buildOptions = (state, dispatch, view) => {
                 {
                     options: [
                         buildOption({
-                            nodeType: nodes.list,
+                            nodeType: nodes.bullet_list,
                             value: -3,
                             depth: 1,
-                            action: convertListType(nodes.list, parentElement),
+                            action: convertListType(nodes.bullet_list, parentElement),
                         }),
                     ],
                 },

package/dist/es/configs/editor-views.js

@@ -16,6 +16,7 @@
 import affiliations from '../views/affiliations';
 import bibliographyElement from '../views/bibliography_element_editable';
 import blockquoteElement from '../views/blockquote_element_editable';
+import bulletList from '../views/bullet_list_editable';
 import citation from '../views/citation_editable';
 import contributors from '../views/contributors';
 import crossReference from '../views/cross_reference_editable';
@@ -31,9 +32,10 @@ import inlineFootnote from '../views/inline_footnote_editable';
 import keyword from '../views/keyword';
 import keywordGroup from '../views/keyword_group';
 import link from '../views/link_editable';
-import list from '../views/list_editable';
+import list_item from '../views/list_item';
 import listing from '../views/listing_editable';
 import listingElement from '../views/listing_element_editable';
+import orderedList from '../views/ordered_list_editable';
 import paragraph from '../views/paragraph_editable';
 import placeholder from '../views/placeholder';
 import placeholderElement from '../views/placeholder_element_editable';
@@ -49,7 +51,7 @@ export default (props, dispatch) => {
         title: title(props, dispatch),
         bibliography_element: bibliographyElement(props, dispatch),
         blockquote_element: blockquoteElement(props),
-        list: list(props),
+        bullet_list: bulletList(props),
         citation: citation(props, dispatch),
         cross_reference: crossReference(props, dispatch),
         contributors: contributors(props, dispatch),
@@ -67,6 +69,8 @@ export default (props, dispatch) => {
         link: link(props, dispatch),
         listing: listing(props),
         listing_element: listingElement(props),
+        list_item: list_item(props),
+        ordered_list: orderedList(props),
         paragraph: paragraph(props),
         placeholder: placeholder(props),
         placeholder_element: placeholderElement(props),