@gravity-ui/markdown-editor 13.18.1 → 13.18.2

package/build/cjs/extensions/markdown/Lists/commands.d.ts

@@ -1,5 +1,4 @@
 import type { NodeType } from 'prosemirror-model';
 import type { Command } from 'prosemirror-state';
 export declare function toList(listType: NodeType): Command;
-export declare const liftIfCursorIsAtBeginningOfItem: Command;
 export declare const joinPrevList: Command;

package/build/cjs/extensions/markdown/Lists/commands.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinPrevList = exports.liftIfCursorIsAtBeginningOfItem = exports.toList = void 0;
+exports.joinPrevList = exports.toList = void 0;
 const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const join_1 = require("../../../commands/join");
-const selection_1 = require("../../../utils/selection");
 const utils_1 = require("./utils");
 function toList(listType) {
     return (state, dispatch) => {
@@ -18,18 +17,6 @@ function toList(listType) {
     };
 }
 exports.toList = toList;
-const liftIfCursorIsAtBeginningOfItem = (state, dispatch) => {
-    const $cursor = (0, selection_1.get$CursorAtBlockStart)(state.selection);
-    if (!$cursor)
-        return false;
-    const { schema } = state;
-    const parentBlock = $cursor.node($cursor.depth - 1);
-    if (parentBlock.firstChild === $cursor.parent && (0, utils_1.isListItemNode)(parentBlock)) {
-        return (0, prosemirror_schema_list_1.liftListItem)((0, utils_1.liType)(schema))(state, dispatch);
-    }
-    return false;
-};
-exports.liftIfCursorIsAtBeginningOfItem = liftIfCursorIsAtBeginningOfItem;
 exports.joinPrevList = (0, join_1.joinPreviousBlock)({
     checkPrevNode: utils_1.isListNode,
     skipNode: utils_1.isListOrItemNode,

package/build/cjs/extensions/markdown/Lists/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Lists = exports.olType = exports.liType = exports.blType = exports.ListsAttr = exports.ListNode = void 0;
-const prosemirror_commands_1 = require("prosemirror-commands");
 const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const keymap_1 = require("../../../utils/keymap");
 const ListsSpecs_1 = require("./ListsSpecs");
@@ -29,7 +28,7 @@ const Lists = (builder, opts) => {
     }, builder.Priority.High);
     builder.addKeymap(({ schema }) => ({
         Enter: (0, prosemirror_schema_list_1.splitListItem)((0, ListsSpecs_1.liType)(schema)),
-        Backspace: (0, prosemirror_commands_1.chainCommands)(commands_1.liftIfCursorIsAtBeginningOfItem, commands_1.joinPrevList),
+        Backspace: commands_1.joinPrevList,
     }), builder.Priority.Low);
     builder.use(inputrules_1.ListsInputRulesExtension, { bulletListInputRule: opts === null || opts === void 0 ? void 0 : opts.ulInputRules });
     builder.addPlugin(MergeListsPlugin_1.mergeListsPlugin);

package/build/cjs/extensions/markdown/Lists/plugins/MergeListsPlugin.js

@@ -21,11 +21,15 @@ const mergeListsPlugin = () => new prosemirror_state_1.Plugin({
 });
 exports.mergeListsPlugin = mergeListsPlugin;
 function mergeAdjacentNodesWithSameType(tr, nodes) {
-    for (let i = nodes.length - 1; i > 0; i--) {
-        const prev = nodes[i - 1];
-        const next = nodes[i];
-        if (prev.node.type === next.node.type && prev.pos + prev.node.nodeSize === next.pos) {
-            tr.join(next.pos);
+    const posAfterMap = {};
+    for (const item of nodes) {
+        const posBefore = item.pos;
+        const posAfter = posBefore + item.node.nodeSize;
+        posAfterMap[posAfter] = item.node;
+        const nodeBefore = posAfterMap[posBefore];
+        if ((nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === item.node.type) {
+            tr.join(tr.mapping.map(posBefore));
+            posAfterMap[posBefore] = undefined;
         }
     }
 }

package/build/cjs/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 /** During build process, the current version will be injected here */
-exports.VERSION = typeof '13.18.1' !== 'undefined' ? '13.18.1' : 'unknown';
+exports.VERSION = typeof '13.18.2' !== 'undefined' ? '13.18.2' : 'unknown';

package/build/esm/extensions/markdown/Lists/commands.d.ts

@@ -1,5 +1,4 @@
 import type { NodeType } from 'prosemirror-model';
 import type { Command } from 'prosemirror-state';
 export declare function toList(listType: NodeType): Command;
-export declare const liftIfCursorIsAtBeginningOfItem: Command;
 export declare const joinPrevList: Command;

package/build/esm/extensions/markdown/Lists/commands.js

@@ -1,7 +1,6 @@
-import { liftListItem, wrapInList } from 'prosemirror-schema-list';
+import { wrapInList } from 'prosemirror-schema-list';
 import { joinPreviousBlock } from '../../../commands/join';
-import { get$CursorAtBlockStart } from '../../../utils/selection';
-import { findAnyParentList, isListItemNode, isListNode, isListOrItemNode, liType } from './utils';
+import { findAnyParentList, isListNode, isListOrItemNode } from './utils';
 export function toList(listType) {
     return (state, dispatch) => {
         const parentList = findAnyParentList(state.schema)(state.selection);
@@ -14,17 +13,6 @@ export function toList(listType) {
         return wrapInList(listType)(state, dispatch);
     };
 }
-export const liftIfCursorIsAtBeginningOfItem = (state, dispatch) => {
-    const $cursor = get$CursorAtBlockStart(state.selection);
-    if (!$cursor)
-        return false;
-    const { schema } = state;
-    const parentBlock = $cursor.node($cursor.depth - 1);
-    if (parentBlock.firstChild === $cursor.parent && isListItemNode(parentBlock)) {
-        return liftListItem(liType(schema))(state, dispatch);
-    }
-    return false;
-};
 export const joinPrevList = joinPreviousBlock({
     checkPrevNode: isListNode,
     skipNode: isListOrItemNode,

package/build/esm/extensions/markdown/Lists/index.js

@@ -1,9 +1,8 @@
-import { chainCommands } from 'prosemirror-commands';
 import { liftListItem, sinkListItem, splitListItem } from 'prosemirror-schema-list';
 import { withLogAction } from '../../../utils/keymap';
 import { ListsSpecs, blType, liType, olType } from './ListsSpecs';
 import { actions } from './actions';
-import { joinPrevList, liftIfCursorIsAtBeginningOfItem, toList } from './commands';
+import { joinPrevList, toList } from './commands';
 import { ListAction } from './const';
 import { ListsInputRulesExtension } from './inputrules';
 import { mergeListsPlugin } from './plugins/MergeListsPlugin';
@@ -21,7 +20,7 @@ export const Lists = (builder, opts) => {
     }, builder.Priority.High);
     builder.addKeymap(({ schema }) => ({
         Enter: splitListItem(liType(schema)),
-        Backspace: chainCommands(liftIfCursorIsAtBeginningOfItem, joinPrevList),
+        Backspace: joinPrevList,
     }), builder.Priority.Low);
     builder.use(ListsInputRulesExtension, { bulletListInputRule: opts === null || opts === void 0 ? void 0 : opts.ulInputRules });
     builder.addPlugin(mergeListsPlugin);

package/build/esm/extensions/markdown/Lists/plugins/MergeListsPlugin.js

@@ -17,11 +17,15 @@ export const mergeListsPlugin = () => new Plugin({
     },
 });
 function mergeAdjacentNodesWithSameType(tr, nodes) {
-    for (let i = nodes.length - 1; i > 0; i--) {
-        const prev = nodes[i - 1];
-        const next = nodes[i];
-        if (prev.node.type === next.node.type && prev.pos + prev.node.nodeSize === next.pos) {
-            tr.join(next.pos);
+    const posAfterMap = {};
+    for (const item of nodes) {
+        const posBefore = item.pos;
+        const posAfter = posBefore + item.node.nodeSize;
+        posAfterMap[posAfter] = item.node;
+        const nodeBefore = posAfterMap[posBefore];
+        if ((nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === item.node.type) {
+            tr.join(tr.mapping.map(posBefore));
+            posAfterMap[posBefore] = undefined;
         }
     }
 }

package/build/esm/version.js

@@ -1,2 +1,2 @@
 /** During build process, the current version will be injected here */
-export const VERSION = typeof '13.18.1' !== 'undefined' ? '13.18.1' : 'unknown';
+export const VERSION = typeof '13.18.2' !== 'undefined' ? '13.18.2' : 'unknown';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/markdown-editor",
-  "version": "13.18.1",
+  "version": "13.18.2",
   "description": "Markdown wysiwyg and markup editor",
   "license": "MIT",
   "repository": {