@manuscripts/body-editor 1.11.7-LEAN-3572.0 → 1.11.7

package/dist/cjs/commands.js

@@ -96,7 +96,7 @@ const createSelection = (nodeType, position, doc) => {
     }
 };
 exports.createSelection = createSelection;
-const createBlock = (nodeType, position, state, dispatch) => {
+const createBlock = (nodeType, position, state, dispatch, attrs) => {
     let node;
     switch (nodeType) {
         case state.schema.nodes.table_element:
@@ -117,7 +117,7 @@ const createBlock = (nodeType, position, state, dispatch) => {
             ]);
             break;
         default:
-            node = nodeType.createAndFill();
+            node = nodeType.createAndFill(attrs);
     }
     const tr = state.tr.insert(position, node);
     if (dispatch) {
@@ -397,10 +397,7 @@ const insertSection = (subsection = false) => (state, dispatch) => {
     return true;
 };
 exports.insertSection = insertSection;
-const findSelectedList = (0, prosemirror_utils_1.findParentNodeOfType)([
-    transform_1.schema.nodes.ordered_list,
-    transform_1.schema.nodes.bullet_list,
-]);
+const findSelectedList = (0, prosemirror_utils_1.findParentNodeOfType)([transform_1.schema.nodes.list]);
 const findRootList = ($pos) => {
     for (let i = 0; i < $pos.depth; i++) {
         const node = $pos.node(i);
@@ -467,7 +464,7 @@ const insertList = (type, style) => (state, dispatch, view) => {
         for (const { node, pos } of nodes) {
             tr.setNodeMarkup(pos, type, Object.assign(Object.assign({}, node.attrs), { listStyleType: style }), node.marks);
         }
-        dispatch((0, track_changes_plugin_1.skipTracking)(tr));
+        dispatch(tr);
         return true;
     }
     else {

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

@@ -27,16 +27,18 @@ const react_select_1 = __importDefault(require("react-select"));
 const styled_components_1 = __importDefault(require("styled-components"));
 const hierarchy_1 = require("../../lib/hierarchy");
 const node_type_icons_1 = require("../../node-type-icons");
-const optionName = (nodeType, depth) => {
+const optionName = (nodeType, depth, listType) => {
     switch (nodeType) {
         case nodeType.schema.nodes.section:
             return (depth > 0 ? 'sub'.repeat(depth - 1) : '') + 'section heading';
+        case nodeType.schema.nodes.list:
+            return listType === 'order' ? 'Ordered List' : 'Bullet List';
         default:
             return transform_1.nodeNames.get(nodeType) || nodeType.name;
     }
 };
 const titleCase = (text) => text.replace(/\b([a-z])/g, (match) => match.toUpperCase());
-const buildOption = (props) => (Object.assign(Object.assign({}, props), { icon: (0, node_type_icons_1.nodeTypeIcon)(props.nodeType), label: titleCase(optionName(props.nodeType, props.depth)), isDisabled: Boolean(props.isDisabled), isSelected: Boolean(props.isSelected), isFocused: Boolean(props.isFocused) }));
+const buildOption = (props) => (Object.assign(Object.assign({}, props), { icon: (0, node_type_icons_1.nodeTypeIcon)(props.nodeType, props.listType), label: titleCase(optionName(props.nodeType, props.depth, props.listType)), isDisabled: Boolean(props.isDisabled), isSelected: Boolean(props.isSelected), isFocused: Boolean(props.isFocused) }));
 const buildOptions = (state, dispatch, view) => {
     const { doc, selection: { $from, $to }, schema, tr, } = state;
     const { nodes } = schema;
@@ -189,12 +191,13 @@ const buildOptions = (state, dispatch, view) => {
         dispatch(tr.scrollIntoView());
         view && view.focus();
     };
-    const convertParagraphToList = (nodeType) => () => {
+    const convertParagraphToList = (nodeType, listType) => () => {
         const paragraph = $from.node($from.depth);
         const beforeParagraph = $from.before($from.depth);
         const afterParagraph = $from.after($from.depth);
         const list = nodeType.create({
             id: (0, transform_1.generateNodeID)(nodeType),
+            listStyleType: listType,
         }, nodes.list_item.create({}, schema.nodes.paragraph.create({}, paragraph.content)));
         tr.replaceWith(beforeParagraph, afterParagraph, list);
         const anchor = beforeParagraph + 3;
@@ -202,8 +205,8 @@ const buildOptions = (state, dispatch, view) => {
         dispatch(tr.scrollIntoView());
         view && view.focus();
     };
-    const convertListType = (nodeType, list) => () => {
-        tr.setNodeMarkup(list.before, nodeType, list.node.attrs);
+    const convertListType = (nodeType, list, listType) => () => {
+        tr.setNodeMarkup(list.before, nodeType, Object.assign(Object.assign({}, list.node.attrs), { listStyleType: listType }));
         dispatch(tr.scrollIntoView());
         view && view.focus();
     };
@@ -225,16 +228,18 @@ const buildOptions = (state, dispatch, view) => {
                     isDisabled: sectionDepth <= 1 && sectionOffset <= 1,
                 }),
                 buildOption({
-                    nodeType: nodes.ordered_list,
+                    nodeType: nodes.list,
                     value: -3,
                     depth: 1,
                     isDisabled: true,
+                    listType: 'order',
                 }),
                 buildOption({
-                    nodeType: nodes.bullet_list,
+                    nodeType: nodes.list,
                     value: -2,
                     depth: 1,
                     isDisabled: true,
+                    listType: 'bullet',
                 }),
             ];
             const sectionOptions = [];
@@ -291,16 +296,18 @@ const buildOptions = (state, dispatch, view) => {
                     isSelected: true,
                 }),
                 buildOption({
-                    nodeType: nodes.ordered_list,
+                    nodeType: nodes.list,
                     value: -3,
                     depth: 1,
-                    action: convertParagraphToList(nodes.ordered_list),
+                    action: convertParagraphToList(nodes.list, 'order'),
+                    listType: 'order',
                 }),
                 buildOption({
-                    nodeType: nodes.bullet_list,
+                    nodeType: nodes.list,
                     value: -2,
                     depth: 1,
-                    action: convertParagraphToList(nodes.bullet_list),
+                    action: convertParagraphToList(nodes.list, 'bullet'),
+                    listType: 'bullet',
                 }),
             ];
             const sectionOptions = [];
@@ -326,7 +333,8 @@ const buildOptions = (state, dispatch, view) => {
             }));
             return [{ options: typeOptions }, { options: sectionOptions }];
         }
-        case schema.nodes.bullet_list: {
+        case schema.nodes.list: {
+            const { style } = (0, transform_1.getListType)(parentElement.node.attrs.listStyleType);
             return [
                 {
                     options: [
@@ -342,35 +350,11 @@ const buildOptions = (state, dispatch, view) => {
                 {
                     options: [
                         buildOption({
-                            nodeType: nodes.ordered_list,
+                            nodeType: nodes.list,
                             value: -3,
                             depth: 1,
-                            action: convertListType(nodes.ordered_list, parentElement),
-                        }),
-                    ],
-                },
-            ];
-        }
-        case parentElementType.schema.nodes.ordered_list: {
-            return [
-                {
-                    options: [
-                        buildOption({
-                            nodeType: parentElementType,
-                            value: -4,
-                            depth: 1,
-                            isDisabled: true,
-                            isSelected: true,
-                        }),
-                    ],
-                },
-                {
-                    options: [
-                        buildOption({
-                            nodeType: nodes.bullet_list,
-                            value: -3,
-                            depth: 1,
-                            action: convertListType(nodes.bullet_list, parentElement),
+                            action: convertListType(nodes.list, parentElement, style),
+                            listType: style === 'none' || style === 'disc' ? 'bullet' : 'order',
                         }),
                     ],
                 },
@@ -458,7 +442,7 @@ const LevelSelector = ({ state, dispatch, view }) => {
                     style.opacity = 0.4;
                 }
                 return (react_1.default.createElement(OptionContainer, Object.assign({}, props.innerProps, { ref: null, style: style }),
-                    react_1.default.createElement(OptionIcon, null, (0, node_type_icons_1.nodeTypeIcon)(data.nodeType)),
+                    react_1.default.createElement(OptionIcon, null, (0, node_type_icons_1.nodeTypeIcon)(data.nodeType, data.listType)),
                     react_1.default.createElement(OptionLabel, null, data.label)));
             },
         }, onChange: (value) => {

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

@@ -21,7 +21,6 @@ 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"));
@@ -37,10 +36,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_1 = __importDefault(require("../views/list"));
 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"));
@@ -56,7 +55,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),
-        bullet_list: (0, bullet_list_editable_1.default)(props),
+        list: (0, list_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),
@@ -75,7 +74,6 @@ exports.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

@@ -15,12 +15,15 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipCommandTracking = void 0;
+exports.sinkListItem = 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_model_1 = require("prosemirror-model");
 const prosemirror_schema_list_1 = require("prosemirror-schema-list");
+const prosemirror_transform_1 = require("prosemirror-transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
+const track_changes_utils_1 = require("../lib/track-changes-utils");
 const skipCommandTracking = (command) => (state, dispatch) => {
     return command(state, (tr) => {
         if (dispatch) {
@@ -56,14 +59,44 @@ const liftToOuterList = (itemType) => {
         }
     };
 };
+function sinkListItem(itemType) {
+    return function (state, dispatch) {
+        const { $from, $to } = state.selection;
+        const range = $from.blockRange($to, (node) => { var _a; return node.childCount > 0 && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.type) == itemType; });
+        if (!range) {
+            return false;
+        }
+        const startIndex = range.startIndex;
+        if (startIndex == 0) {
+            return false;
+        }
+        const parent = range.parent, nodeBefore = parent.child(startIndex - 1);
+        if (nodeBefore.type != itemType) {
+            return false;
+        }
+        if (dispatch) {
+            const nestedBefore = nodeBefore.lastChild && nodeBefore.lastChild.type == parent.type;
+            const actualAttrs = (0, track_changes_utils_1.getActualAttrs)(parent);
+            const listType = actualAttrs.listStyleType;
+            const inner = prosemirror_model_1.Fragment.from(nestedBefore ? itemType.create() : null);
+            const slice = new prosemirror_model_1.Slice(prosemirror_model_1.Fragment.from(itemType.create(null, prosemirror_model_1.Fragment.from(parent.type.create({ listStyleType: listType }, inner)))), nestedBefore ? 3 : 1, 0);
+            const before = range.start, after = range.end;
+            dispatch(state.tr
+                .step(new prosemirror_transform_1.ReplaceAroundStep(before - (nestedBefore ? 3 : 1), after, before, after, slice, 1, true))
+                .scrollIntoView());
+        }
+        return true;
+    };
+}
+exports.sinkListItem = sinkListItem;
 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.ordered_list)),
-    'Mod-Alt-k': (0, exports.skipCommandTracking)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.bullet_list)),
+    'Mod-]': (0, exports.skipCommandTracking)(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' })),
     '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)),
+    Tab: (0, exports.skipCommandTracking)(sinkListItem(transform_1.schema.nodes.list_item)),
     Backspace: (0, exports.skipCommandTracking)(listItemBackward),
 };
 exports.default = listKeymap;

package/dist/cjs/lib/comments.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCommentMarker = exports.getCommentRange = exports.getCommentKey = exports.isNodeComment = void 0;
-const isNodeComment = (c) => !c.range;
+const isNodeComment = (comment) => !comment.range;
 exports.isNodeComment = isNodeComment;
 const getCommentKey = (comment, range, target) => {
     if (!range) {

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

@@ -29,7 +29,6 @@ const popper_1 = require("./popper");
 const track_changes_utils_1 = require("./track-changes-utils");
 const utils_1 = require("./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) {
@@ -56,12 +55,12 @@ class ContextMenu {
             const insertPos = after ? $pos.after($pos.depth) : $pos.before($pos.depth);
             const endPos = $pos.end();
             const types = this.insertableTypes(after, insertPos, endPos);
-            const insertNode = (type, pos) => {
+            const insertNode = (type, pos, attrs) => {
                 const { state, dispatch } = this.view;
                 if (pos === undefined) {
                     pos = after ? this.getPos() + this.node.nodeSize : this.getPos();
                 }
-                (0, commands_1.createBlock)(type, pos, state, dispatch);
+                (0, commands_1.createBlock)(type, pos, state, dispatch, attrs);
             };
             if (hasAny(types, 'section', 'subsection')) {
                 menu.appendChild(this.createMenuSection((section) => {
@@ -88,7 +87,7 @@ class ContextMenu {
                     }
                 }));
             }
-            if (hasAny(types, 'paragraph', 'ordered_list', 'bullet_list')) {
+            if (hasAny(types, 'paragraph', 'list')) {
                 menu.appendChild(this.createMenuSection((section) => {
                     if (types.has('paragraph')) {
                         section.appendChild(this.createMenuItem('Paragraph', () => {
@@ -96,15 +95,17 @@ class ContextMenu {
                             popper.destroy();
                         }));
                     }
-                    if (types.has('ordered_list')) {
-                        section.appendChild(this.createMenuItem('Numbered List', () => {
-                            insertNode(transform_1.schema.nodes.ordered_list);
+                    if (types.has('list')) {
+                        section.appendChild(this.createMenuItem('Bullet List', () => {
+                            insertNode(transform_1.schema.nodes.list, undefined, {
+                                listStyleType: 'bullet',
+                            });
                             popper.destroy();
                         }));
-                    }
-                    if (types.has('bullet_list')) {
-                        section.appendChild(this.createMenuItem('Bullet List', () => {
-                            insertNode(transform_1.schema.nodes.bullet_list);
+                        section.appendChild(this.createMenuItem('Ordered List', () => {
+                            insertNode(transform_1.schema.nodes.list, undefined, {
+                                listStyleType: 'order',
+                            });
                             popper.destroy();
                         }));
                     }
@@ -149,17 +150,19 @@ class ContextMenu {
             menu.className = 'menu';
             const $pos = this.resolvePos();
             const type = this.node.type;
-            if (listTypes.includes(type)) {
+            if (type === transform_1.schema.nodes.list) {
                 menu.appendChild(this.createMenuSection((section) => {
-                    if (type === transform_1.schema.nodes.bullet_list) {
+                    const actualAttrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
+                    const listType = (0, transform_1.getListType)(actualAttrs.listStyleType).style;
+                    if (listType === 'none' || listType === 'disc') {
                         section.appendChild(this.createMenuItem('Change to Numbered List', () => {
-                            this.changeNodeType(transform_1.schema.nodes.ordered_list);
+                            this.changeNodeType(null, 'order');
                             popper.destroy();
                         }));
                     }
-                    if (type === transform_1.schema.nodes.ordered_list) {
+                    else {
                         section.appendChild(this.createMenuItem('Change to Bullet List', () => {
-                            this.changeNodeType(transform_1.schema.nodes.bullet_list);
+                            this.changeNodeType(null, 'bullet');
                             popper.destroy();
                         }));
                     }
@@ -319,8 +322,7 @@ class ContextMenu {
             }
             checkNode('section', insertPos);
             checkNode('paragraph');
-            checkNode('ordered_list');
-            checkNode('bullet_list');
+            checkNode('list');
             checkNode('figure_element');
             checkNode('table_element');
             checkNode('equation_element');
@@ -328,9 +330,10 @@ class ContextMenu {
             checkNode('pullquote_element');
             return insertable;
         };
-        this.changeNodeType = (nodeType) => {
+        this.changeNodeType = (nodeType, listType) => {
             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.bullet_list)),
+                isEnabled: isCommandValid((0, commands_1.insertList)(transform_1.schema.nodes.list, 'bullet')),
                 submenu: [
                     {
                         id: 'bullet-list-context-menu',
                         label: '',
                         isEnabled: true,
                         options: {
-                            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')),
+                            bullet: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.list, 'bullet')),
+                            simple: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.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.ordered_list)),
+                isEnabled: isCommandValid((0, commands_1.insertList)(transform_1.schema.nodes.list, 'order')),
                 submenu: [
                     {
                         id: 'ordered-list-context-menu',
                         label: '',
                         isEnabled: true,
                         options: {
-                            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')),
+                            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')),
                         },
                     },
                 ],

package/dist/cjs/node-type-icons.js

@@ -27,10 +27,8 @@ const icons = new Map([
     [nodes.manuscript, style_guide_1.OutlineManuscriptIcon],
     [nodes.bibliography_section, style_guide_1.OutlineSectionIcon],
     [nodes.blockquote_element, style_guide_1.OutlineBlockQuoteIcon],
-    [nodes.bullet_list, style_guide_1.OutlineUnorderedListIcon],
     [nodes.equation_element, style_guide_1.OutlineEquationIcon],
     [nodes.figure_element, style_guide_1.OutlineFigureIcon],
-    [nodes.ordered_list, style_guide_1.OutlineOrderedListIcon],
     [nodes.paragraph, style_guide_1.OutlineParagraphIcon],
     [nodes.pullquote_element, style_guide_1.OutlinePullQuoteIcon],
     [nodes.section, style_guide_1.OutlineSectionIcon],
@@ -39,7 +37,15 @@ const icons = new Map([
     [nodes.graphical_abstract_section, style_guide_1.OutlineSectionIcon],
     [nodes.footnotes_section, style_guide_1.OutlineSectionIcon],
 ]);
-const nodeTypeIcon = (nodeType) => {
+const nodeTypeIcon = (nodeType, listType) => {
+    if (nodeType === transform_1.schema.nodes.list) {
+        if (listType === 'bullet') {
+            return react_1.default.createElement(style_guide_1.OutlineUnorderedListIcon, null);
+        }
+        else {
+            return react_1.default.createElement(style_guide_1.OutlineOrderedListIcon, null);
+        }
+    }
     const Icon = icons.get(nodeType);
     return Icon ? react_1.default.createElement(Icon, null) : null;
 };

package/dist/cjs/plugins/comments.js

@@ -90,12 +90,13 @@ const findCommentRanges = (doc) => {
     return ranges;
 };
 const findComments = (doc) => {
-    const comments = (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.comment);
+    const nodes = (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.comment);
     const commentsByTarget = new Map();
-    for (const comment of comments) {
-        const targetID = comment.node.attrs.target;
-        const list = commentsByTarget.get(targetID) || [];
-        commentsByTarget.set(targetID, [...list, comment]);
+    for (const { node } of nodes) {
+        const attrs = node.attrs;
+        const targetID = attrs.target;
+        const comments = commentsByTarget.get(targetID) || [];
+        commentsByTarget.set(targetID, [...comments, attrs]);
     }
     return commentsByTarget;
 };
@@ -117,32 +118,27 @@ const buildPluginState = (doc, selection) => {
         const nodeComments = [];
         const highlightComments = [];
         const pointComments = [];
-        comments
-            .map((c) => {
-            const attrs = c.node.attrs;
+        for (const attrs of comments) {
             const id = attrs.id;
             const range = ranges.get(id);
             const key = (0, comments_1.getCommentKey)(attrs, range, node);
-            return {
+            const comment = {
                 key,
-                node: c.node,
-                pos: c.pos,
+                attrs,
                 target,
                 range,
             };
-        })
-            .forEach((c) => {
-            allComments.push(c);
-            if (!c.range) {
-                nodeComments.push(c);
+            allComments.push(comment);
+            if (!comment.range) {
+                nodeComments.push(comment);
             }
-            else if (c.range.size) {
-                highlightComments.push(c);
+            else if (comment.range.size) {
+                highlightComments.push(comment);
             }
             else {
-                pointComments.push(c);
+                pointComments.push(comment);
             }
-        });
+        }
         for (const comment of highlightComments) {
             const key = comment.key;
             const range = comment.range;
@@ -165,7 +161,7 @@ const buildPluginState = (doc, selection) => {
     });
     return {
         decorations: prosemirror_view_1.DecorationSet.create(doc, decorations),
-        comments: new Map(allComments.map((c) => [c.node.attrs.id, c])),
+        comments: new Map(allComments.map((c) => [c.attrs.id, c])),
         commentsByKey: groupByKey(allComments),
         selection,
     };

package/dist/cjs/rules.js

@@ -35,8 +35,7 @@ exports.default = (0, prosemirror_inputrules_1.inputRules)({
         ...prosemirror_inputrules_1.smartQuotes,
         prosemirror_inputrules_1.ellipsis,
         prosemirror_inputrules_1.emDash,
-        creatingInputRule(/^\d+[.)]\s$/, transform_1.schema.nodes.ordered_list),
-        creatingInputRule(/^\s*\*\s$/, transform_1.schema.nodes.bullet_list),
+        creatingInputRule(/^(\d+[.)]\s|\s*\*\s)$/, transform_1.schema.nodes.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.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'),
+            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'),
             options: {
-                bullet: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet'),
-                simple: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'simple'),
+                bullet: (0, commands_1.insertList)(transform_1.schema.nodes.list, 'bullet'),
+                simple: (0, commands_1.insertList)(transform_1.schema.nodes.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.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'),
+            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'),
             options: {
-                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'),
+                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'),
             },
         },
     },