@manuscripts/body-editor 1.11.5 → 1.11.6-LEAN-3307.4

package/dist/cjs/commands.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.insertTableFootnote = exports.addInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.ifInTableBody = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertSection = exports.insertGraphicalAbstract = exports.insertInlineFootnote = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertFileAsFigure = exports.insertGeneralFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = void 0;
+exports.insertTableFootnote = exports.addInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.ifInTableBody = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertKeywords = exports.insertContributors = exports.insertAbstract = exports.insertBackMatterSection = exports.insertSection = exports.insertGraphicalAbstract = exports.insertInlineFootnote = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertFileAsFigure = exports.insertGeneralFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
@@ -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) {
@@ -129,9 +129,12 @@ exports.createBlock = createBlock;
 const insertGeneralFootnote = (tableNode, position, view, tableElementFooter) => {
     var _a;
     const { state, dispatch } = view;
-    const generalNote = state.schema.nodes.paragraph.create({
+    const paragraph = state.schema.nodes.paragraph.create({
         placeholder: 'Add general note here',
     });
+    const generalNote = state.schema.nodes.general_table_footnote.create({}, [
+        paragraph,
+    ]);
     const tableColGroup = (0, prosemirror_utils_1.findChildrenByType)(tableNode, transform_1.schema.nodes.table_colgroup)[0];
     const tr = state.tr;
     const pos = (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length)
@@ -362,7 +365,7 @@ const insertInlineFootnote = (kind) => (state, dispatch) => {
     return true;
 };
 exports.insertInlineFootnote = insertInlineFootnote;
-const insertGraphicalAbstract = (state, dispatch) => {
+const insertGraphicalAbstract = (state, dispatch, view) => {
     if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.graphical_abstract_section, true)) {
         return false;
     }
@@ -375,29 +378,137 @@ const insertGraphicalAbstract = (state, dispatch) => {
     const tr = state.tr.insert(pos, section);
     if (dispatch) {
         const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos + 1);
+        if (view) {
+            view.focus();
+        }
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
     return true;
 };
 exports.insertGraphicalAbstract = insertGraphicalAbstract;
-const insertSection = (subsection = false) => (state, dispatch) => {
-    const pos = findPosAfterParentSection(state.selection.$from);
-    if (pos === null || (0, transform_1.isInBibliographySection)(state.selection.$from)) {
+const insertSection = (subsection = false) => (state, dispatch, view) => {
+    let pos = findPosAfterParentSection(state.selection.$from);
+    const body = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.body)[0];
+    if ((0, transform_1.isInBibliographySection)(state.selection.$from)) {
         return false;
     }
+    if (pos === null) {
+        pos = body.pos + body.node.content.size + 1;
+    }
     const adjustment = subsection ? -1 : 0;
     const tr = state.tr.insert(pos + adjustment, state.schema.nodes.section.createAndFill());
     if (dispatch) {
         const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos + adjustment + 2);
+        if (view) {
+            view.focus();
+        }
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
     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 insertBackMatterSection = (category) => (state, dispatch, view) => {
+    const bibliographySection = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.bibliography_section)[0];
+    const backmatter = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.backmatter)[0];
+    let pos;
+    if (bibliographySection) {
+        pos = bibliographySection.pos;
+    }
+    else {
+        pos = backmatter.pos + backmatter.node.content.size + 1;
+    }
+    const tr = state.tr.insert(pos, state.schema.nodes.section.createAndFill({
+        category: category,
+    }));
+    if (dispatch) {
+        const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos);
+        if (view) {
+            view.focus();
+        }
+        dispatch(tr.setSelection(selection).scrollIntoView());
+    }
+    return true;
+};
+exports.insertBackMatterSection = insertBackMatterSection;
+const findSelectedList = (0, prosemirror_utils_1.findParentNodeOfType)([transform_1.schema.nodes.list]);
+const insertAbstract = (state, dispatch, view) => {
+    if ((0, utils_1.getMatchingChild)(state.doc, (node) => node.attrs.category === 'MPSectionCategory:abstract', true)) {
+        return false;
+    }
+    const abstracts = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.abstracts)[0];
+    const pos = abstracts.pos + 1;
+    const section = transform_1.schema.nodes.section.createAndFill({ category: 'MPSectionCategory:abstract' }, [
+        transform_1.schema.nodes.section_title.create({}, transform_1.schema.text('Abstract')),
+        transform_1.schema.nodes.paragraph.create({ placeholder: 'Type abstract here...' }),
+    ]);
+    const tr = state.tr.insert(pos, section);
+    if (dispatch) {
+        const sectionStart = tr.doc.resolve(pos);
+        const sectionNode = sectionStart.nodeAfter;
+        if (sectionNode && sectionNode.firstChild) {
+            const paragraphPos = pos + sectionNode.firstChild.nodeSize + 2;
+            const selection = prosemirror_state_1.TextSelection.create(tr.doc, paragraphPos);
+            if (view) {
+                view.focus();
+            }
+            dispatch(tr.setSelection(selection).scrollIntoView());
+        }
+    }
+    return true;
+};
+exports.insertAbstract = insertAbstract;
+const insertContributors = (state, dispatch, view) => {
+    if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.contributors, true)) {
+        return false;
+    }
+    const title = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.title)[0];
+    const pos = title.pos + title.node.nodeSize;
+    const contributors = state.schema.nodes.contributors.create({
+        id: '',
+    });
+    const affiliations = state.schema.nodes.affiliations.create({ id: '' });
+    const fragment = prosemirror_model_1.Fragment.fromArray([contributors, affiliations]);
+    const tr = state.tr.insert(pos, fragment);
+    if (dispatch) {
+        const selection = prosemirror_state_1.NodeSelection.create(tr.doc, pos);
+        if (view) {
+            view.focus();
+        }
+        dispatch(tr.setSelection(selection).scrollIntoView());
+    }
+    return true;
+};
+exports.insertContributors = insertContributors;
+const insertKeywords = (state, dispatch, view) => {
+    if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.keywords, true)) {
+        return false;
+    }
+    const supplements = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.supplements)[0];
+    const abstracts = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.abstracts)[0];
+    let pos;
+    if (supplements) {
+        pos = supplements.pos + supplements.node.nodeSize;
+    }
+    else {
+        pos = abstracts.pos;
+    }
+    const keywords = transform_1.schema.nodes.keywords.createAndFill({}, [
+        transform_1.schema.nodes.section_title.create({}, transform_1.schema.text('Keywords')),
+        transform_1.schema.nodes.keywords_element.create({}, [
+            transform_1.schema.nodes.keyword_group.create({}, []),
+        ]),
+    ]);
+    const tr = state.tr.insert(pos, keywords);
+    if (dispatch) {
+        const selection = prosemirror_state_1.NodeSelection.create(tr.doc, pos);
+        if (view) {
+            view.focus();
+        }
+        dispatch(tr.setSelection(selection).scrollIntoView());
+    }
+    return true;
+};
+exports.insertKeywords = insertKeywords;
 const findRootList = ($pos) => {
     for (let i = 0; i < $pos.depth; i++) {
         const node = $pos.node(i);
@@ -464,7 +575,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 {
@@ -692,14 +803,17 @@ const addNodeComment = (node, state, dispatch) => {
     };
     const comment = transform_1.schema.nodes.comment.create(attrs);
     const comments = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.comments)[0];
-    const pos = comments.pos + 1;
-    const tr = state.tr.insert(pos, comment);
-    const key = (0, comments_1.getCommentKey)(attrs, undefined, node);
-    (0, comments_2.setCommentSelection)(tr, key, attrs.id, true);
-    if (dispatch) {
-        dispatch(tr);
+    if (comments) {
+        const pos = comments.pos + 1;
+        const tr = state.tr.insert(pos, comment);
+        const key = (0, comments_1.getCommentKey)(attrs, undefined, node);
+        (0, comments_2.setCommentSelection)(tr, key, attrs.id, true);
+        if (dispatch) {
+            dispatch(tr);
+        }
+        return true;
     }
-    return true;
+    return false;
 };
 exports.addNodeComment = addNodeComment;
 const addInlineComment = (state, dispatch) => {
@@ -725,36 +839,39 @@ const addInlineComment = (state, dispatch) => {
     };
     const comment = transform_1.schema.nodes.comment.create(attrs);
     const comments = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.comments)[0];
-    const pos = comments.pos + 1;
-    const tr = state.tr.insert(pos, comment);
-    if (from === to) {
-        const point = transform_1.schema.nodes.highlight_marker.create({
-            id: comment.attrs.id,
-            tid: node.attrs.id,
-            position: 'point',
-        });
-        tr.insert(from, point);
-    }
-    else {
-        const start = transform_1.schema.nodes.highlight_marker.create({
-            id: comment.attrs.id,
-            tid: node.attrs.id,
-            position: 'start',
-        });
-        const end = transform_1.schema.nodes.highlight_marker.create({
-            id: comment.attrs.id,
-            tid: node.attrs.id,
-            position: 'end',
-        });
-        tr.insert(from, start).insert(to + 1, end);
-    }
-    const range = (0, comments_1.getCommentRange)(attrs);
-    const key = (0, comments_1.getCommentKey)(attrs, range, node);
-    (0, comments_2.setCommentSelection)(tr, key, attrs.id, true);
-    if (dispatch) {
-        dispatch(tr);
+    if (comments) {
+        const pos = comments.pos + 1;
+        const tr = state.tr.insert(pos, comment);
+        if (from === to) {
+            const point = transform_1.schema.nodes.highlight_marker.create({
+                id: comment.attrs.id,
+                tid: node.attrs.id,
+                position: 'point',
+            });
+            tr.insert(from, point);
+        }
+        else {
+            const start = transform_1.schema.nodes.highlight_marker.create({
+                id: comment.attrs.id,
+                tid: node.attrs.id,
+                position: 'start',
+            });
+            const end = transform_1.schema.nodes.highlight_marker.create({
+                id: comment.attrs.id,
+                tid: node.attrs.id,
+                position: 'end',
+            });
+            tr.insert(from, start).insert(to + 1, end);
+        }
+        const range = (0, comments_1.getCommentRange)(attrs);
+        const key = (0, comments_1.getCommentKey)(attrs, range, node);
+        (0, comments_2.setCommentSelection)(tr, key, attrs.id, true);
+        if (dispatch) {
+            dispatch(tr);
+        }
+        return true;
     }
-    return true;
+    return false;
 };
 exports.addInlineComment = addInlineComment;
 const insertTableFootnote = (node, position, view, inlineFootnote) => {

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;