@manuscripts/body-editor 1.10.8 → 1.10.10-LEAN-3608.0

package/dist/cjs/commands.js

@@ -95,7 +95,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:
@@ -116,7 +116,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) {
@@ -393,10 +393,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);
@@ -463,7 +460,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

@@ -36,7 +36,7 @@ const optionName = (nodeType, depth) => {
     }
 };
 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)), 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 +189,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 +203,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 +226,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 +294,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 +331,8 @@ const buildOptions = (state, dispatch, view) => {
             }));
             return [{ options: typeOptions }, { options: sectionOptions }];
         }
-        case schema.nodes.bullet_list: {
+        case schema.nodes.list: {
+            const { style, type } = (0, transform_1.getListType)(parentElement.node.attrs.listStyleType);
             return [
                 {
                     options: [
@@ -342,35 +348,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: type === 'ol' ? 'order' : 'bullet',
                         }),
                     ],
                 },
@@ -458,7 +440,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

@@ -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.ordered_list)),
-    'Mod-Alt-k': (0, exports.skipCommandTracking)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.bullet_list)),
+    '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)),
     Backspace: (0, exports.skipCommandTracking)(listItemBackward),

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

@@ -28,7 +28,6 @@ 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) {
@@ -55,12 +54,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) => {
@@ -87,7 +86,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', () => {
@@ -95,15 +94,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();
                         }));
                     }
@@ -148,17 +149,18 @@ 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 listType = (0, transform_1.getListType)(this.node.attrs.listStyleType).type;
+                    if (listType === 'ul') {
                         section.appendChild(this.createMenuItem('Change to Numbered List', () => {
-                            this.changeNodeType(transform_1.schema.nodes.ordered_list);
+                            this.changeNodeType(transform_1.schema.nodes.list, 'order');
                             popper.destroy();
                         }));
                     }
-                    if (type === transform_1.schema.nodes.ordered_list) {
+                    if (listType === 'ol') {
                         section.appendChild(this.createMenuItem('Change to Bullet List', () => {
-                            this.changeNodeType(transform_1.schema.nodes.bullet_list);
+                            this.changeNodeType(transform_1.schema.nodes.list, 'bullet');
                             popper.destroy();
                         }));
                     }
@@ -318,8 +320,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');
@@ -327,9 +328,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/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'),
             },
         },
     },

package/dist/cjs/views/list.js

@@ -0,0 +1,56 @@
+"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.listCallback = exports.ListView = void 0;
+const transform_1 = require("@manuscripts/transform");
+const track_changes_utils_1 = require("../lib/track-changes-utils");
+const block_view_1 = __importDefault(require("./block_view"));
+const creators_1 = require("./creators");
+const editable_block_1 = require("./editable_block");
+class ListView extends block_view_1.default {
+    constructor() {
+        super(...arguments);
+        this.elementType = 'ul';
+        this.updateContents = () => {
+            var _a;
+            const actualAttrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
+            if (this.contentDOM) {
+                const type = actualAttrs.listStyleType;
+                this.contentDOM.style.listStyleType = (0, transform_1.getListType)(type).style;
+            }
+            if ((_a = this.node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.length) {
+                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-type');
+            }
+        };
+    }
+}
+exports.ListView = ListView;
+const listCallback = (node, dom) => {
+    dom.classList.add('list');
+    const type = node.attrs.listStyleType;
+    dom.style.listStyleType = (0, transform_1.getListType)(type).style;
+};
+exports.listCallback = listCallback;
+exports.default = (0, creators_1.createNodeOrElementView)((0, editable_block_1.EditableBlock)(ListView), 'ul', exports.listCallback);

package/dist/es/commands.js

@@ -87,7 +87,7 @@ export const createSelection = (nodeType, position, doc) => {
                 : TextSelection.near(doc.resolve(position + 1));
     }
 };
-export const createBlock = (nodeType, position, state, dispatch) => {
+export const createBlock = (nodeType, position, state, dispatch, attrs) => {
     let node;
     switch (nodeType) {
         case state.schema.nodes.table_element:
@@ -108,7 +108,7 @@ export const createBlock = (nodeType, position, state, dispatch) => {
             ]);
             break;
         default:
-            node = nodeType.createAndFill();
+            node = nodeType.createAndFill(attrs);
     }
     const tr = state.tr.insert(position, node);
     if (dispatch) {
@@ -371,10 +371,7 @@ export const insertSection = (subsection = false) => (state, dispatch) => {
     }
     return true;
 };
-const findSelectedList = findParentNodeOfType([
-    schema.nodes.ordered_list,
-    schema.nodes.bullet_list,
-]);
+const findSelectedList = findParentNodeOfType([schema.nodes.list]);
 const findRootList = ($pos) => {
     for (let i = 0; i < $pos.depth; i++) {
         const node = $pos.node(i);
@@ -441,7 +438,7 @@ export 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(skipTracking(tr));
+        dispatch(tr);
         return true;
     }
     else {

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { generateNodeID, isSectionNodeType, nodeNames, } from '@manuscripts/transform';
+import { generateNodeID, getListType, isSectionNodeType, nodeNames, } from '@manuscripts/transform';
 import { Fragment } from 'prosemirror-model';
 import { TextSelection } from 'prosemirror-state';
 import React from 'react';
@@ -30,7 +30,7 @@ const optionName = (nodeType, depth) => {
     }
 };
 const titleCase = (text) => text.replace(/\b([a-z])/g, (match) => match.toUpperCase());
-const buildOption = (props) => (Object.assign(Object.assign({}, props), { icon: 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: nodeTypeIcon(props.nodeType, props.listType), label: titleCase(optionName(props.nodeType, props.depth)), 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;
@@ -183,12 +183,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: generateNodeID(nodeType),
+            listStyleType: listType,
         }, nodes.list_item.create({}, schema.nodes.paragraph.create({}, paragraph.content)));
         tr.replaceWith(beforeParagraph, afterParagraph, list);
         const anchor = beforeParagraph + 3;
@@ -196,8 +197,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();
     };
@@ -219,16 +220,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 = [];
@@ -285,16 +288,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 = [];
@@ -320,7 +325,8 @@ const buildOptions = (state, dispatch, view) => {
             }));
             return [{ options: typeOptions }, { options: sectionOptions }];
         }
-        case schema.nodes.bullet_list: {
+        case schema.nodes.list: {
+            const { style, type } = getListType(parentElement.node.attrs.listStyleType);
             return [
                 {
                     options: [
@@ -336,35 +342,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: type === 'ol' ? 'order' : 'bullet',
                         }),
                     ],
                 },
@@ -452,7 +434,7 @@ export const LevelSelector = ({ state, dispatch, view }) => {
                     style.opacity = 0.4;
                 }
                 return (React.createElement(OptionContainer, Object.assign({}, props.innerProps, { ref: null, style: style }),
-                    React.createElement(OptionIcon, null, nodeTypeIcon(data.nodeType)),
+                    React.createElement(OptionIcon, null, nodeTypeIcon(data.nodeType, data.listType)),
                     React.createElement(OptionLabel, null, data.label)));
             },
         }, onChange: (value) => {

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

@@ -16,7 +16,6 @@
 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';
@@ -32,10 +31,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';
 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';
@@ -51,7 +50,7 @@ export default (props, dispatch) => {
         title: title(props, dispatch),
         bibliography_element: bibliographyElement(props, dispatch),
         blockquote_element: blockquoteElement(props),
-        bullet_list: bulletList(props),
+        list: list(props),
         citation: citation(props, dispatch),
         cross_reference: crossReference(props, dispatch),
         contributors: contributors(props, dispatch),
@@ -70,7 +69,6 @@ export default (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),

package/dist/es/keys/list.js

@@ -56,8 +56,8 @@ const listKeymap = {
     Enter: splitListItem(schema.nodes.list_item),
     'Mod-[': skipCommandTracking(liftToOuterList(schema.nodes.list_item)),
     'Mod-]': skipCommandTracking(sinkListItem(schema.nodes.list_item)),
-    'Mod-Alt-o': skipCommandTracking(wrapInList(schema.nodes.ordered_list)),
-    'Mod-Alt-k': skipCommandTracking(wrapInList(schema.nodes.bullet_list)),
+    'Mod-Alt-o': skipCommandTracking(wrapInList(schema.nodes.list, { listStyleType: 'order' })),
+    'Mod-Alt-k': skipCommandTracking(wrapInList(schema.nodes.list, { listStyleType: 'bullet' })),
     'Shift-Tab': skipCommandTracking(liftToOuterList(schema.nodes.list_item)),
     Tab: skipCommandTracking(sinkListItem(schema.nodes.list_item)),
     Backspace: skipCommandTracking(listItemBackward),

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { TableFootnotesSelector, } from '@manuscripts/style-guide';
-import { isInBibliographySection, nodeNames, schema, } from '@manuscripts/transform';
+import { getListType, isInBibliographySection, nodeNames, schema, } from '@manuscripts/transform';
 import { findChildrenByType, hasParentNodeOfType } from 'prosemirror-utils';
 import { addComment, createBlock, insertGeneralFootnote, insertTableFootnote, } from '../commands';
 import { buildTableFootnoteLabels } from '../plugins/footnotes/footnotes-utils';
@@ -22,7 +22,6 @@ import ReactSubView from '../views/ReactSubView';
 import { PopperManager } from './popper';
 import { isDeleted, isRejectedInsert } from './track-changes-utils';
 const popper = new PopperManager();
-const listTypes = [schema.nodes.ordered_list, schema.nodes.bullet_list];
 const readonlyTypes = [schema.nodes.keywords, schema.nodes.bibliography_element];
 export const sectionLevel = (depth) => {
     switch (depth) {
@@ -48,12 +47,12 @@ export 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();
                 }
-                createBlock(type, pos, state, dispatch);
+                createBlock(type, pos, state, dispatch, attrs);
             };
             if (hasAny(types, 'section', 'subsection')) {
                 menu.appendChild(this.createMenuSection((section) => {
@@ -80,7 +79,7 @@ export 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', () => {
@@ -88,15 +87,17 @@ export class ContextMenu {
                             popper.destroy();
                         }));
                     }
-                    if (types.has('ordered_list')) {
-                        section.appendChild(this.createMenuItem('Numbered List', () => {
-                            insertNode(schema.nodes.ordered_list);
+                    if (types.has('list')) {
+                        section.appendChild(this.createMenuItem('Bullet List', () => {
+                            insertNode(schema.nodes.list, undefined, {
+                                listStyleType: 'bullet',
+                            });
                             popper.destroy();
                         }));
-                    }
-                    if (types.has('bullet_list')) {
-                        section.appendChild(this.createMenuItem('Bullet List', () => {
-                            insertNode(schema.nodes.bullet_list);
+                        section.appendChild(this.createMenuItem('Ordered List', () => {
+                            insertNode(schema.nodes.list, undefined, {
+                                listStyleType: 'order',
+                            });
                             popper.destroy();
                         }));
                     }
@@ -141,17 +142,18 @@ export class ContextMenu {
             menu.className = 'menu';
             const $pos = this.resolvePos();
             const type = this.node.type;
-            if (listTypes.includes(type)) {
+            if (type === schema.nodes.list) {
                 menu.appendChild(this.createMenuSection((section) => {
-                    if (type === schema.nodes.bullet_list) {
+                    const listType = getListType(this.node.attrs.listStyleType).type;
+                    if (listType === 'ul') {
                         section.appendChild(this.createMenuItem('Change to Numbered List', () => {
-                            this.changeNodeType(schema.nodes.ordered_list);
+                            this.changeNodeType(schema.nodes.list, 'order');
                             popper.destroy();
                         }));
                     }
-                    if (type === schema.nodes.ordered_list) {
+                    if (listType === 'ol') {
                         section.appendChild(this.createMenuItem('Change to Bullet List', () => {
-                            this.changeNodeType(schema.nodes.bullet_list);
+                            this.changeNodeType(schema.nodes.list, 'bullet');
                             popper.destroy();
                         }));
                     }
@@ -311,8 +313,7 @@ export class ContextMenu {
             }
             checkNode('section', insertPos);
             checkNode('paragraph');
-            checkNode('ordered_list');
-            checkNode('bullet_list');
+            checkNode('list');
             checkNode('figure_element');
             checkNode('table_element');
             checkNode('equation_element');
@@ -320,9 +321,10 @@ export 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/es/menus.js

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

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

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

package/dist/es/rules.js

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

package/dist/es/toolbar.js

@@ -62,26 +62,26 @@ export const toolbar = {
         bullet_list: {
             title: 'Wrap in bullet list',
             content: React.createElement(ToolbarUnorderedListIcon, null),
-            isActive: blockActive(schema.nodes.bullet_list),
-            isEnabled: insertList(schema.nodes.bullet_list, 'bullet'),
-            run: insertList(schema.nodes.bullet_list, 'bullet'),
+            isActive: blockActive(schema.nodes.list),
+            isEnabled: insertList(schema.nodes.list, 'bullet'),
+            run: insertList(schema.nodes.list, 'bullet'),
             options: {
-                bullet: insertList(schema.nodes.bullet_list, 'bullet'),
-                simple: insertList(schema.nodes.bullet_list, 'simple'),
+                bullet: insertList(schema.nodes.list, 'bullet'),
+                simple: insertList(schema.nodes.list, 'simple'),
             },
         },
         ordered_list: {
             title: 'Wrap in ordered list',
             content: React.createElement(ToolbarOrderedListIcon, null),
-            isActive: blockActive(schema.nodes.ordered_list),
-            isEnabled: insertList(schema.nodes.ordered_list, 'order'),
-            run: insertList(schema.nodes.ordered_list, 'order'),
+            isActive: blockActive(schema.nodes.list),
+            isEnabled: insertList(schema.nodes.list, 'order'),
+            run: insertList(schema.nodes.list, 'order'),
             options: {
-                order: insertList(schema.nodes.ordered_list, 'order'),
-                'alpha-upper': insertList(schema.nodes.ordered_list, 'alpha-upper'),
-                'alpha-lower': insertList(schema.nodes.ordered_list, 'alpha-lower'),
-                'roman-upper': insertList(schema.nodes.ordered_list, 'roman-upper'),
-                'roman-lower': insertList(schema.nodes.ordered_list, 'roman-lower'),
+                order: insertList(schema.nodes.list, 'order'),
+                'alpha-upper': insertList(schema.nodes.list, 'alpha-upper'),
+                'alpha-lower': insertList(schema.nodes.list, 'alpha-lower'),
+                'roman-upper': insertList(schema.nodes.list, 'roman-upper'),
+                'roman-lower': insertList(schema.nodes.list, 'roman-lower'),
             },
         },
     },

package/dist/es/views/list.js

@@ -0,0 +1,48 @@
+/*!
+ * © 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.
+ */
+import { getListType, } from '@manuscripts/transform';
+import { getActualAttrs } from '../lib/track-changes-utils';
+import BlockView from './block_view';
+import { createNodeOrElementView } from './creators';
+import { EditableBlock } from './editable_block';
+export class ListView extends BlockView {
+    constructor() {
+        super(...arguments);
+        this.elementType = 'ul';
+        this.updateContents = () => {
+            var _a;
+            const actualAttrs = getActualAttrs(this.node);
+            if (this.contentDOM) {
+                const type = actualAttrs.listStyleType;
+                this.contentDOM.style.listStyleType = getListType(type).style;
+            }
+            if ((_a = this.node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.length) {
+                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-type');
+            }
+        };
+    }
+}
+export const listCallback = (node, dom) => {
+    dom.classList.add('list');
+    const type = node.attrs.listStyleType;
+    dom.style.listStyleType = getListType(type).style;
+};
+export default createNodeOrElementView(EditableBlock(ListView), 'ul', listCallback);

package/dist/types/commands.d.ts

@@ -16,7 +16,7 @@
 import { CommentAnnotation } from '@manuscripts/json-schema';
 import { FileAttachment } from '@manuscripts/style-guide';
 import { InlineFootnoteNode, ManuscriptEditorState, ManuscriptEditorView, ManuscriptMarkType, ManuscriptNode, ManuscriptNodeType, ManuscriptTransaction } from '@manuscripts/transform';
-import { ResolvedPos } from 'prosemirror-model';
+import { Attrs, ResolvedPos } from 'prosemirror-model';
 import { Command, NodeSelection, Selection, TextSelection, Transaction } from 'prosemirror-state';
 import { NodeWithPos } from 'prosemirror-utils';
 import { EditorView } from 'prosemirror-view';
@@ -27,7 +27,7 @@ export declare const isNodeSelection: (selection: Selection) => selection is Nod
 export declare const blockActive: (type: ManuscriptNodeType) => (state: ManuscriptEditorState) => boolean;
 export declare const canInsert: (type: ManuscriptNodeType) => (state: ManuscriptEditorState) => boolean;
 export declare const createSelection: (nodeType: ManuscriptNodeType, position: number, doc: ManuscriptNode) => Selection;
-export declare const createBlock: (nodeType: ManuscriptNodeType, position: number, state: ManuscriptEditorState, dispatch?: Dispatch) => void;
+export declare const createBlock: (nodeType: ManuscriptNodeType, position: number, state: ManuscriptEditorState, dispatch?: Dispatch, attrs?: Attrs) => void;
 export declare const insertGeneralFootnote: (tableNode: ManuscriptNode, position: number, view: ManuscriptEditorView, tableElementFooter?: NodeWithPos[]) => void;
 export declare const insertFileAsFigure: (file: FileAttachment, state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const insertBlock: (nodeType: ManuscriptNodeType) => (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;

package/dist/types/configs/editor-views.d.ts

@@ -92,7 +92,7 @@ declare const _default: (props: EditorProps, dispatch: Dispatch) => {
         destroy: () => void;
         handleDecorations: (decorations: readonly import("prosemirror-view").Decoration[]) => void;
     } & import("../views/blockquote_element").BlockquoteElementView<any>>;
-    bullet_list: import("../types").NodeViewCreator<{
+    list: import("../types").NodeViewCreator<{
         gutterButtons: () => HTMLElement[];
         actionGutterButtons: () => HTMLElement[];
         createAddButton: () => HTMLElement | null;
@@ -126,7 +126,7 @@ declare const _default: (props: EditorProps, dispatch: Dispatch) => {
         deselectNode: () => void;
         destroy: () => void;
         handleDecorations: (decorations: readonly import("prosemirror-view").Decoration[]) => void;
-    } & import("../views/bullet_list").BulletListView<any>>;
+    } & import("../views/list").ListView<any>>;
     citation: import("../types").NodeViewCreator<import("../views/citation_editable").CitationEditableView>;
     cross_reference: import("../types").NodeViewCreator<import("../views/cross_reference_editable").CrossReferenceEditableView>;
     contributors: import("../types").NodeViewCreator<import("../views/contributors").ContributorsView>;
@@ -281,41 +281,6 @@ declare const _default: (props: EditorProps, dispatch: Dispatch) => {
         handleDecorations: (decorations: readonly import("prosemirror-view").Decoration[]) => void;
     } & import("../views/listing_element").ListingElementView<any>>;
     list_item: import("../types").NodeViewCreator<import("../views/list_item").ListItemView<any>>;
-    ordered_list: import("../types").NodeViewCreator<{
-        gutterButtons: () => HTMLElement[];
-        actionGutterButtons: () => HTMLElement[];
-        createAddButton: () => HTMLElement | null;
-        createEditButton: () => HTMLElement | null;
-        createMenu: () => import("../lib/context-menu").ContextMenu;
-        viewAttributes: {
-            id: string;
-            placeholder: string;
-            paragraphStyle: string;
-        };
-        initialise: () => void;
-        updateContents: () => void;
-        onUpdateContent(): void;
-        updateClasses: () => void;
-        updateAttributes: () => void;
-        createElement: () => void;
-        createDOM: () => void;
-        createGutter: (className: string, buttons: HTMLElement[]) => void;
-        dom: HTMLElement;
-        contentDOM?: HTMLElement | undefined;
-        syncErrors: import("../types").SyncError[];
-        elementType: string;
-        readonly props: EditableBlockProps;
-        node: import("prosemirror-model").Node;
-        readonly view: import("prosemirror-view").EditorView;
-        readonly getPos: () => number;
-        decorations: readonly import("prosemirror-view").Decoration[];
-        update: (newNode: import("prosemirror-model").Node, decorations: readonly import("prosemirror-view").Decoration[]) => boolean;
-        setDomAttrs(node: import("prosemirror-model").Node, element: HTMLElement, omit?: string[]): void;
-        selectNode: () => void;
-        deselectNode: () => void;
-        destroy: () => void;
-        handleDecorations: (decorations: readonly import("prosemirror-view").Decoration[]) => void;
-    } & import("../views/ordered_list").OrderedListView<any>>;
     paragraph: import("../types").NodeViewCreator<{
         gutterButtons: () => HTMLElement[];
         actionGutterButtons: () => HTMLElement[];

package/dist/types/node-type-icons.d.ts

@@ -15,4 +15,4 @@
  */
 import { NodeType } from 'prosemirror-model';
 import React from 'react';
-export declare const nodeTypeIcon: (nodeType: NodeType) => React.JSX.Element | null;
+export declare const nodeTypeIcon: (nodeType: NodeType, listType?: string) => React.JSX.Element | null;

package/dist/types/views/list.d.ts

@@ -0,0 +1,59 @@
+/*!
+ * © 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.
+ */
+import { ManuscriptNode } from '@manuscripts/transform';
+import { BaseNodeProps } from './base_node_view';
+import BlockView from './block_view';
+export declare class ListView<PropsType extends BaseNodeProps> extends BlockView<PropsType> {
+    elementType: string;
+    updateContents: () => void;
+}
+export declare const listCallback: (node: ManuscriptNode, dom: HTMLElement) => void;
+declare const _default: (props: BaseNodeProps) => import("../types").NodeViewCreator<{
+    gutterButtons: () => HTMLElement[];
+    actionGutterButtons: () => HTMLElement[];
+    createAddButton: () => HTMLElement | null;
+    createEditButton: () => HTMLElement | null;
+    createMenu: () => import("../lib/context-menu").ContextMenu;
+    viewAttributes: {
+        id: string;
+        placeholder: string;
+        paragraphStyle: string;
+    };
+    initialise: () => void;
+    updateContents: () => void;
+    onUpdateContent(): void;
+    updateClasses: () => void;
+    updateAttributes: () => void;
+    createElement: () => void;
+    createDOM: () => void;
+    createGutter: (className: string, buttons: HTMLElement[]) => void;
+    dom: HTMLElement;
+    contentDOM?: HTMLElement | undefined;
+    syncErrors: import("../types").SyncError[];
+    elementType: string;
+    readonly props: import("./editable_block").EditableBlockProps;
+    node: import("prosemirror-model").Node;
+    readonly view: import("prosemirror-view").EditorView;
+    readonly getPos: () => number;
+    decorations: readonly import("prosemirror-view").Decoration[];
+    update: (newNode: import("prosemirror-model").Node, decorations: readonly import("prosemirror-view").Decoration[]) => boolean;
+    setDomAttrs(node: import("prosemirror-model").Node, element: HTMLElement, omit?: string[]): void;
+    selectNode: () => void;
+    deselectNode: () => void;
+    destroy: () => void;
+    handleDecorations: (decorations: readonly import("prosemirror-view").Decoration[]) => void;
+} & ListView<any>>;
+export default _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.10.8",
+  "version": "1.10.10-LEAN-3608.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.8",
     "@manuscripts/library": "1.3.7",
-    "@manuscripts/style-guide": "1.12.10",
+    "@manuscripts/style-guide": "1.12.11-LEAN-3608.0",
     "@manuscripts/track-changes-plugin": "1.7.12",
-    "@manuscripts/transform": "2.3.5",
+    "@manuscripts/transform": "2.3.7-LEAN-3608.1",
     "astrocite-eutils": "^0.16.4",
     "mathjax-full": "^3.2.2",
     "codemirror": "^5.58.1",
@@ -110,4 +110,4 @@
     "@types/react": "^17.0.2",
     "prosemirror-tables": "^1.3.5"
   }
-}
+}