@gravity-ui/markdown-editor 13.1.0 → 13.1.2

package/build/cjs/core/markdown/MarkdownSerializer.js

@@ -299,7 +299,7 @@ class MarkdownSerializerState {
         node.forEach((child, _, i) => {
             if (i && isTight)
                 this.flushClose(1);
-            this.wrapBlock(delim, firstDelim(i), node, () => this.render(child, node, i));
+            this.wrapBlock(delim, firstDelim(i, child), node, () => this.render(child, node, i));
         });
         this.inTightList = prevTight;
     }

package/build/cjs/extensions/markdown/Lists/ListsSpecs/const.d.ts

@@ -3,3 +3,12 @@ export declare enum ListNode {
     BulletList = "bullet_list",
     OrderedList = "ordered_list"
 }
+export declare enum ListsAttr {
+    Tight = "tight",
+    /** used in bullet list only */
+    Bullet = "bullet",
+    /** used in ordered list only */
+    Order = "order",
+    /** used in list item only */
+    Markup = "markup"
+}

package/build/cjs/extensions/markdown/Lists/ListsSpecs/const.js

@@ -1,9 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ListNode = void 0;
+exports.ListsAttr = exports.ListNode = void 0;
 var ListNode;
 (function (ListNode) {
     ListNode["ListItem"] = "list_item";
     ListNode["BulletList"] = "bullet_list";
     ListNode["OrderedList"] = "ordered_list";
 })(ListNode = exports.ListNode || (exports.ListNode = {}));
+var ListsAttr;
+(function (ListsAttr) {
+    ListsAttr["Tight"] = "tight";
+    /** used in bullet list only */
+    ListsAttr["Bullet"] = "bullet";
+    /** used in ordered list only */
+    ListsAttr["Order"] = "order";
+    /** used in list item only */
+    ListsAttr["Markup"] = "markup";
+})(ListsAttr = exports.ListsAttr || (exports.ListsAttr = {}));

package/build/cjs/extensions/markdown/Lists/ListsSpecs/index.d.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAuto } from '../../../../core';
-export { ListNode } from './const';
+export { ListsAttr, ListNode } from './const';
 export declare const liType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
 export declare const blType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
 export declare const olType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;

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

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ListsSpecs = exports.olType = exports.blType = exports.liType = exports.ListNode = void 0;
+exports.ListsSpecs = exports.olType = exports.blType = exports.liType = exports.ListNode = exports.ListsAttr = void 0;
 const schema_1 = require("../../../../utils/schema");
 const const_1 = require("./const");
 const parser_1 = require("./parser");
 const schema_2 = require("./schema");
 const serializer_1 = require("./serializer");
 var const_2 = require("./const");
+Object.defineProperty(exports, "ListsAttr", { enumerable: true, get: function () { return const_2.ListsAttr; } });
 Object.defineProperty(exports, "ListNode", { enumerable: true, get: function () { return const_2.ListNode; } });
 exports.liType = (0, schema_1.nodeTypeFactory)(const_1.ListNode.ListItem);
 exports.blType = (0, schema_1.nodeTypeFactory)(const_1.ListNode.BulletList);

package/build/cjs/extensions/markdown/Lists/ListsSpecs/parser.js

@@ -3,18 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parserTokens = void 0;
 const const_1 = require("./const");
 exports.parserTokens = {
-    [const_1.ListNode.ListItem]: { name: const_1.ListNode.ListItem, type: 'block' },
+    [const_1.ListNode.ListItem]: {
+        name: const_1.ListNode.ListItem,
+        type: 'block',
+        getAttrs: (token) => ({ [const_1.ListsAttr.Markup]: token.markup }),
+    },
     [const_1.ListNode.BulletList]: {
         name: const_1.ListNode.BulletList,
         type: 'block',
-        getAttrs: (_, tokens, i) => ({ tight: listIsTight(tokens, i) }),
+        getAttrs: (token, tokens, i) => ({
+            [const_1.ListsAttr.Tight]: listIsTight(tokens, i),
+            [const_1.ListsAttr.Bullet]: token.markup,
+        }),
     },
     [const_1.ListNode.OrderedList]: {
         name: const_1.ListNode.OrderedList,
         type: 'block',
-        getAttrs: (tok, tokens, i) => ({
-            order: Number(tok.attrGet('start')) || 1,
-            tight: listIsTight(tokens, i),
+        getAttrs: (token, tokens, i) => ({
+            [const_1.ListsAttr.Order]: Number(token.attrGet('start')) || 1,
+            [const_1.ListsAttr.Tight]: listIsTight(tokens, i),
         }),
     },
 };

package/build/cjs/extensions/markdown/Lists/ListsSpecs/schema.js

@@ -4,7 +4,7 @@ exports.schemaSpecs = void 0;
 const const_1 = require("./const");
 exports.schemaSpecs = {
     [const_1.ListNode.ListItem]: {
-        attrs: { tight: { default: false } },
+        attrs: { [const_1.ListsAttr.Tight]: { default: false }, [const_1.ListsAttr.Markup]: { default: null } },
         content: '(paragraph|block)+',
         defining: true,
         parseDOM: [{ tag: 'li' }],
@@ -19,22 +19,24 @@ exports.schemaSpecs = {
     [const_1.ListNode.BulletList]: {
         content: `${const_1.ListNode.ListItem}+`,
         group: 'block',
-        attrs: { tight: { default: false } },
+        attrs: { [const_1.ListsAttr.Tight]: { default: false }, [const_1.ListsAttr.Bullet]: { default: '*' } },
         parseDOM: [
             {
                 tag: 'ul',
-                getAttrs: (dom) => ({ tight: dom.hasAttribute('data-tight') }),
+                getAttrs: (dom) => ({
+                    [const_1.ListsAttr.Tight]: dom.hasAttribute('data-tight'),
+                }),
             },
         ],
         toDOM(node) {
-            return ['ul', { 'data-tight': node.attrs.tight ? 'true' : null }, 0];
+            return ['ul', { 'data-tight': node.attrs[const_1.ListsAttr.Tight] ? 'true' : null }, 0];
         },
         selectable: false,
         allowSelection: false,
         complex: 'root',
     },
     [const_1.ListNode.OrderedList]: {
-        attrs: { order: { default: 1 }, tight: { default: false } },
+        attrs: { [const_1.ListsAttr.Order]: { default: 1 }, [const_1.ListsAttr.Tight]: { default: false } },
         content: `${const_1.ListNode.ListItem}+`,
         group: 'block',
         parseDOM: [
@@ -42,10 +44,10 @@ exports.schemaSpecs = {
                 tag: 'ol',
                 getAttrs(dom) {
                     return {
-                        order: dom.hasAttribute('start')
+                        [const_1.ListsAttr.Order]: dom.hasAttribute('start')
                             ? Number(dom.getAttribute('start'))
                             : 1,
-                        tight: dom.hasAttribute('data-tight'),
+                        [const_1.ListsAttr.Tight]: dom.hasAttribute('data-tight'),
                     };
                 },
             },
@@ -54,8 +56,8 @@ exports.schemaSpecs = {
             return [
                 'ol',
                 {
-                    start: node.attrs.order === 1 ? null : node.attrs.order,
-                    'data-tight': node.attrs.tight ? 'true' : null,
+                    start: node.attrs[const_1.ListsAttr.Order] === 1 ? null : node.attrs[const_1.ListsAttr.Order],
+                    'data-tight': node.attrs[const_1.ListsAttr.Tight] ? 'true' : null,
                 },
                 0,
             ];

package/build/cjs/extensions/markdown/Lists/ListsSpecs/serializer.js

@@ -7,10 +7,10 @@ exports.serializerTokens = {
         state.renderContent(node);
     },
     [const_1.ListNode.BulletList]: (state, node) => {
-        state.renderList(node, '  ', () => (node.attrs.bullet || '*') + ' ');
+        state.renderList(node, '  ', (_i, li) => (li.attrs[const_1.ListsAttr.Markup] || node.attrs[const_1.ListsAttr.Bullet] || '*') + ' ');
     },
     [const_1.ListNode.OrderedList]: (state, node) => {
-        const start = node.attrs.order || 1;
+        const start = node.attrs[const_1.ListsAttr.Order] || 1;
         const maxW = String(start + node.childCount - 1).length;
         const space = state.repeat(' ', maxW + 2);
         state.renderList(node, space, (i) => {

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

@@ -1,7 +1,7 @@
 import type { Action, ExtensionAuto } from '../../../core';
 import { ListAction } from './const';
 import { ListsInputRulesOptions } from './inputrules';
-export { ListNode, blType, liType, olType } from './ListsSpecs';
+export { ListNode, ListsAttr, blType, liType, olType } from './ListsSpecs';
 export declare type ListsOptions = {
     ulKey?: string | null;
     olKey?: string | null;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Lists = exports.olType = exports.liType = exports.blType = exports.ListNode = void 0;
+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");
@@ -12,6 +12,7 @@ const inputrules_1 = require("./inputrules");
 const MergeListsPlugin_1 = require("./plugins/MergeListsPlugin");
 var ListsSpecs_2 = require("./ListsSpecs");
 Object.defineProperty(exports, "ListNode", { enumerable: true, get: function () { return ListsSpecs_2.ListNode; } });
+Object.defineProperty(exports, "ListsAttr", { enumerable: true, get: function () { return ListsSpecs_2.ListsAttr; } });
 Object.defineProperty(exports, "blType", { enumerable: true, get: function () { return ListsSpecs_2.blType; } });
 Object.defineProperty(exports, "liType", { enumerable: true, get: function () { return ListsSpecs_2.liType; } });
 Object.defineProperty(exports, "olType", { enumerable: true, get: function () { return ListsSpecs_2.olType; } });

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulletListRule = exports.orderedListRule = exports.ListsInputRulesExtension = void 0;
 const inputrules_1 = require("../../../utils/inputrules");
+const ListsSpecs_1 = require("./ListsSpecs");
 const utils_1 = require("./utils");
 const ListsInputRulesExtension = (builder, options) => {
     builder.addInputRules(({ schema }) => {
@@ -20,7 +21,7 @@ exports.ListsInputRulesExtension = ListsInputRulesExtension;
  * followed by a dot at the start of a textblock into an ordered list.
  */
 function orderedListRule(nodeType) {
-    return (0, inputrules_1.wrappingInputRule)(/^(\d+)\.\s$/, nodeType, (match) => ({ order: Number(match[1]) }), (match, node) => node.childCount + node.attrs.order === Number(match[1]));
+    return (0, inputrules_1.wrappingInputRule)(/^(\d+)\.\s$/, nodeType, (match) => ({ [ListsSpecs_1.ListsAttr.Order]: Number(match[1]) }), (match, node) => node.childCount + node.attrs[ListsSpecs_1.ListsAttr.Order] === Number(match[1]));
 }
 exports.orderedListRule = orderedListRule;
 /**
@@ -39,6 +40,6 @@ function bulletListRule(nodeType, config) {
     if (bullets.length === 0)
         return null;
     const regexp = new RegExp(`^\\s*([${bullets.join('')}])\\s$`); // same as /^\s*([-+*])\s$/
-    return (0, inputrules_1.wrappingInputRule)(regexp, nodeType);
+    return (0, inputrules_1.wrappingInputRule)(regexp, nodeType, (match) => ({ [ListsSpecs_1.ListsAttr.Bullet]: match[1] }));
 }
 exports.bulletListRule = bulletListRule;

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

@@ -21,11 +21,10 @@ const mergeListsPlugin = () => new prosemirror_state_1.Plugin({
 });
 exports.mergeListsPlugin = mergeListsPlugin;
 function mergeAdjacentNodesWithSameType(tr, nodes) {
-    for (let i = 0; i < nodes.length - 1; i++) {
-        const current = nodes[i];
-        const next = nodes[i + 1];
-        if (current.node.type === next.node.type &&
-            current.pos + current.node.nodeSize === next.pos) {
+    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);
         }
     }

package/build/cjs/extensions/yfm/YfmTable/plugins/YfmTableControls/yfmTableCellView.d.ts

@@ -1,3 +1,3 @@
-import { NodeViewConstructor } from 'prosemirror-view';
+import type { NodeViewConstructor } from 'prosemirror-view';
 export declare const yfmTableCellCn: import("@bem-react/classname").ClassNameFormatter;
 export declare const yfmTableCellView: NodeViewConstructor;

package/build/cjs/extensions/yfm/YfmTable/plugins/YfmTableControls/yfmTableCellView.js

@@ -6,12 +6,13 @@ const react_1 = tslib_1.__importDefault(require("react"));
 const icons_1 = require("@gravity-ui/icons");
 const uikit_1 = require("@gravity-ui/uikit");
 const prosemirror_utils_1 = require("prosemirror-utils");
-const react_dom_1 = require("react-dom");
 const classname_1 = require("../../../../../classname");
 const core_1 = require("../../../../../core");
 const yfm_table_1 = require("../../../../../i18n/yfm-table");
 const ErrorBoundary_1 = require("../../../../../react-utils/ErrorBoundary");
 const table_utils_1 = require("../../../../../table-utils");
+const node_children_1 = require("../../../../../utils/node-children");
+const nodes_1 = require("../../../../../utils/nodes");
 const ReactRenderer_1 = require("../../../../behavior/ReactRenderer");
 const actions_1 = require("./actions");
 exports.yfmTableCellCn = (0, classname_1.cn)('table-cell-view');
@@ -163,34 +164,30 @@ const Controls = function Controls({ columnNumber, rowNumber, view, getParentTab
     return controls.length ? react_1.default.createElement(react_1.default.Fragment, null, controls) : null;
 };
 const yfmTableCellView = (node, view, getPos) => {
+    const getParentTable = () => (0, prosemirror_utils_1.findParentNodeClosestToPos)(view.state.doc.resolve(getPos()), table_utils_1.isTableNode);
+    const parentTable = getParentTable();
+    const cellCoords = parentTable ? findCellCoords(parentTable.node, node) : null;
+    // @ts-expect-error
+    if (!cellCoords)
+        return {};
+    const { cellIndex, rowIndex } = cellCoords;
+    const isFirstRow = rowIndex === 0;
+    const isFirstColumn = cellIndex === 0;
+    if (!isFirstRow && !isFirstColumn) {
+        // in this case, we don't need custom nodeView.
+        // @ts-expect-error
+        return {};
+    }
     const dom = document.createElement('td');
     const contentDOM = document.createElement('div');
     const control = document.createElement('span');
     control.setAttribute('style', 'width: 0; height: 0; float: left;');
     dom.setAttribute('style', 'position: relative; overflow: visible;');
-    const getParentTable = () => (0, prosemirror_utils_1.findParentNodeClosestToPos)(view.state.doc.resolve(getPos()), table_utils_1.isTableNode);
-    const parentTable = getParentTable();
-    // @ts-expect-error
-    if (!parentTable)
-        return {};
-    const rowNodes = (0, prosemirror_utils_1.findChildren)(parentTable === null || parentTable === void 0 ? void 0 : parentTable.node, table_utils_1.isTableRowNode);
-    const relativeCelPos = getPos() - (parentTable === null || parentTable === void 0 ? void 0 : parentTable.pos);
-    const rowNumber = rowNodes.findIndex((_v, i) => {
-        var _a;
-        return relativeCelPos > rowNodes[i].pos &&
-            relativeCelPos < (((_a = rowNodes[i + 1]) === null || _a === void 0 ? void 0 : _a.pos) || Number.MAX_SAFE_INTEGER);
-    });
-    const parentRow = rowNodes[rowNumber];
-    const columnNumber = (0, prosemirror_utils_1.findChildren)(parentRow.node, table_utils_1.isTableCellNode).findIndex((c) => {
-        return c.pos === relativeCelPos - parentRow.pos - 2;
-    });
-    const isFirstInRow = rowNodes.findIndex((r) => r.pos === relativeCelPos - 2) >= 0;
     dom.appendChild(contentDOM);
     dom.appendChild(control);
-    const renderItem = (0, ReactRenderer_1.getReactRendererFromState)(view.state).createItem('yfm-table-cell-view', () => (0, react_dom_1.createPortal)(react_1.default.createElement(ErrorBoundary_1.ErrorLoggerBoundary, null,
-        react_1.default.createElement(Controls, { columnNumber: columnNumber, rowNumber: rowNumber, isFirstInRow: isFirstInRow, isInFirstRow: rowNumber === 0, getParentTable: getParentTable, view: view })), control));
-    contentDOM.setAttribute('data-row-number', String(rowNumber));
-    contentDOM.setAttribute('data-col-number', String(columnNumber));
+    const renderItem = (0, ReactRenderer_1.getReactRendererFromState)(view.state).createItem('yfm-table-cell-view', () => (react_1.default.createElement(uikit_1.Portal, { container: control },
+        react_1.default.createElement(ErrorBoundary_1.ErrorLoggerBoundary, null,
+            react_1.default.createElement(Controls, { columnNumber: cellIndex, rowNumber: rowIndex, isFirstInRow: isFirstColumn, isInFirstRow: isFirstRow, getParentTable: getParentTable, view: view })))));
     return {
         dom,
         contentDOM,
@@ -208,3 +205,18 @@ const yfmTableCellView = (node, view, getPos) => {
     };
 };
 exports.yfmTableCellView = yfmTableCellView;
+function findCellCoords(table, cell) {
+    if (!table.lastChild)
+        return null;
+    const rows = (0, nodes_1.getChildrenOfNode)(table.lastChild); // children of tBody
+    for (const row of rows) {
+        const node = (0, node_children_1.getChildByNode)(row.node, cell);
+        if (node) {
+            return {
+                rowIndex: row.index,
+                cellIndex: node.index,
+            };
+        }
+    }
+    return null;
+}

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.1.0' !== 'undefined' ? '13.1.0' : 'unknown';
+exports.VERSION = typeof '13.1.2' !== 'undefined' ? '13.1.2' : 'unknown';

package/build/esm/core/markdown/MarkdownSerializer.js

@@ -295,7 +295,7 @@ export class MarkdownSerializerState {
         node.forEach((child, _, i) => {
             if (i && isTight)
                 this.flushClose(1);
-            this.wrapBlock(delim, firstDelim(i), node, () => this.render(child, node, i));
+            this.wrapBlock(delim, firstDelim(i, child), node, () => this.render(child, node, i));
         });
         this.inTightList = prevTight;
     }

package/build/esm/extensions/markdown/Lists/ListsSpecs/const.d.ts

@@ -3,3 +3,12 @@ export declare enum ListNode {
     BulletList = "bullet_list",
     OrderedList = "ordered_list"
 }
+export declare enum ListsAttr {
+    Tight = "tight",
+    /** used in bullet list only */
+    Bullet = "bullet",
+    /** used in ordered list only */
+    Order = "order",
+    /** used in list item only */
+    Markup = "markup"
+}

package/build/esm/extensions/markdown/Lists/ListsSpecs/const.js

@@ -4,3 +4,13 @@ export var ListNode;
     ListNode["BulletList"] = "bullet_list";
     ListNode["OrderedList"] = "ordered_list";
 })(ListNode || (ListNode = {}));
+export var ListsAttr;
+(function (ListsAttr) {
+    ListsAttr["Tight"] = "tight";
+    /** used in bullet list only */
+    ListsAttr["Bullet"] = "bullet";
+    /** used in ordered list only */
+    ListsAttr["Order"] = "order";
+    /** used in list item only */
+    ListsAttr["Markup"] = "markup";
+})(ListsAttr || (ListsAttr = {}));

package/build/esm/extensions/markdown/Lists/ListsSpecs/index.d.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAuto } from '../../../../core';
-export { ListNode } from './const';
+export { ListsAttr, ListNode } from './const';
 export declare const liType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
 export declare const blType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;
 export declare const olType: (schema: import("prosemirror-model").Schema<any, any>) => import("prosemirror-model").NodeType;

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

@@ -3,7 +3,7 @@ import { ListNode } from './const';
 import { parserTokens } from './parser';
 import { schemaSpecs } from './schema';
 import { serializerTokens } from './serializer';
-export { ListNode } from './const';
+export { ListsAttr, ListNode } from './const';
 export const liType = nodeTypeFactory(ListNode.ListItem);
 export const blType = nodeTypeFactory(ListNode.BulletList);
 export const olType = nodeTypeFactory(ListNode.OrderedList);

package/build/esm/extensions/markdown/Lists/ListsSpecs/parser.js

@@ -1,17 +1,24 @@
-import { ListNode } from './const';
+import { ListNode, ListsAttr } from './const';
 export const parserTokens = {
-    [ListNode.ListItem]: { name: ListNode.ListItem, type: 'block' },
+    [ListNode.ListItem]: {
+        name: ListNode.ListItem,
+        type: 'block',
+        getAttrs: (token) => ({ [ListsAttr.Markup]: token.markup }),
+    },
     [ListNode.BulletList]: {
         name: ListNode.BulletList,
         type: 'block',
-        getAttrs: (_, tokens, i) => ({ tight: listIsTight(tokens, i) }),
+        getAttrs: (token, tokens, i) => ({
+            [ListsAttr.Tight]: listIsTight(tokens, i),
+            [ListsAttr.Bullet]: token.markup,
+        }),
     },
     [ListNode.OrderedList]: {
         name: ListNode.OrderedList,
         type: 'block',
-        getAttrs: (tok, tokens, i) => ({
-            order: Number(tok.attrGet('start')) || 1,
-            tight: listIsTight(tokens, i),
+        getAttrs: (token, tokens, i) => ({
+            [ListsAttr.Order]: Number(token.attrGet('start')) || 1,
+            [ListsAttr.Tight]: listIsTight(tokens, i),
         }),
     },
 };

package/build/esm/extensions/markdown/Lists/ListsSpecs/schema.js

@@ -1,7 +1,7 @@
-import { ListNode } from './const';
+import { ListNode, ListsAttr } from './const';
 export const schemaSpecs = {
     [ListNode.ListItem]: {
-        attrs: { tight: { default: false } },
+        attrs: { [ListsAttr.Tight]: { default: false }, [ListsAttr.Markup]: { default: null } },
         content: '(paragraph|block)+',
         defining: true,
         parseDOM: [{ tag: 'li' }],
@@ -16,22 +16,24 @@ export const schemaSpecs = {
     [ListNode.BulletList]: {
         content: `${ListNode.ListItem}+`,
         group: 'block',
-        attrs: { tight: { default: false } },
+        attrs: { [ListsAttr.Tight]: { default: false }, [ListsAttr.Bullet]: { default: '*' } },
         parseDOM: [
             {
                 tag: 'ul',
-                getAttrs: (dom) => ({ tight: dom.hasAttribute('data-tight') }),
+                getAttrs: (dom) => ({
+                    [ListsAttr.Tight]: dom.hasAttribute('data-tight'),
+                }),
             },
         ],
         toDOM(node) {
-            return ['ul', { 'data-tight': node.attrs.tight ? 'true' : null }, 0];
+            return ['ul', { 'data-tight': node.attrs[ListsAttr.Tight] ? 'true' : null }, 0];
         },
         selectable: false,
         allowSelection: false,
         complex: 'root',
     },
     [ListNode.OrderedList]: {
-        attrs: { order: { default: 1 }, tight: { default: false } },
+        attrs: { [ListsAttr.Order]: { default: 1 }, [ListsAttr.Tight]: { default: false } },
         content: `${ListNode.ListItem}+`,
         group: 'block',
         parseDOM: [
@@ -39,10 +41,10 @@ export const schemaSpecs = {
                 tag: 'ol',
                 getAttrs(dom) {
                     return {
-                        order: dom.hasAttribute('start')
+                        [ListsAttr.Order]: dom.hasAttribute('start')
                             ? Number(dom.getAttribute('start'))
                             : 1,
-                        tight: dom.hasAttribute('data-tight'),
+                        [ListsAttr.Tight]: dom.hasAttribute('data-tight'),
                     };
                 },
             },
@@ -51,8 +53,8 @@ export const schemaSpecs = {
             return [
                 'ol',
                 {
-                    start: node.attrs.order === 1 ? null : node.attrs.order,
-                    'data-tight': node.attrs.tight ? 'true' : null,
+                    start: node.attrs[ListsAttr.Order] === 1 ? null : node.attrs[ListsAttr.Order],
+                    'data-tight': node.attrs[ListsAttr.Tight] ? 'true' : null,
                 },
                 0,
             ];

package/build/esm/extensions/markdown/Lists/ListsSpecs/serializer.js

@@ -1,13 +1,13 @@
-import { ListNode } from './const';
+import { ListNode, ListsAttr } from './const';
 export const serializerTokens = {
     [ListNode.ListItem]: (state, node) => {
         state.renderContent(node);
     },
     [ListNode.BulletList]: (state, node) => {
-        state.renderList(node, '  ', () => (node.attrs.bullet || '*') + ' ');
+        state.renderList(node, '  ', (_i, li) => (li.attrs[ListsAttr.Markup] || node.attrs[ListsAttr.Bullet] || '*') + ' ');
     },
     [ListNode.OrderedList]: (state, node) => {
-        const start = node.attrs.order || 1;
+        const start = node.attrs[ListsAttr.Order] || 1;
         const maxW = String(start + node.childCount - 1).length;
         const space = state.repeat(' ', maxW + 2);
         state.renderList(node, space, (i) => {

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

@@ -1,7 +1,7 @@
 import type { Action, ExtensionAuto } from '../../../core';
 import { ListAction } from './const';
 import { ListsInputRulesOptions } from './inputrules';
-export { ListNode, blType, liType, olType } from './ListsSpecs';
+export { ListNode, ListsAttr, blType, liType, olType } from './ListsSpecs';
 export declare type ListsOptions = {
     ulKey?: string | null;
     olKey?: string | null;

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

@@ -7,7 +7,7 @@ import { joinPrevList, liftIfCursorIsAtBeginningOfItem, toList } from './command
 import { ListAction } from './const';
 import { ListsInputRulesExtension } from './inputrules';
 import { mergeListsPlugin } from './plugins/MergeListsPlugin';
-export { ListNode, blType, liType, olType } from './ListsSpecs';
+export { ListNode, ListsAttr, blType, liType, olType } from './ListsSpecs';
 export const Lists = (builder, opts) => {
     builder.use(ListsSpecs);
     builder.addKeymap(({ schema }) => {

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

@@ -1,4 +1,5 @@
 import { wrappingInputRule } from '../../../utils/inputrules';
+import { ListsAttr } from './ListsSpecs';
 import { blType, olType } from './utils';
 export const ListsInputRulesExtension = (builder, options) => {
     builder.addInputRules(({ schema }) => {
@@ -16,7 +17,7 @@ export const ListsInputRulesExtension = (builder, options) => {
  * followed by a dot at the start of a textblock into an ordered list.
  */
 export function orderedListRule(nodeType) {
-    return wrappingInputRule(/^(\d+)\.\s$/, nodeType, (match) => ({ order: Number(match[1]) }), (match, node) => node.childCount + node.attrs.order === Number(match[1]));
+    return wrappingInputRule(/^(\d+)\.\s$/, nodeType, (match) => ({ [ListsAttr.Order]: Number(match[1]) }), (match, node) => node.childCount + node.attrs[ListsAttr.Order] === Number(match[1]));
 }
 /**
  * Given a list node type, returns an input rule that turns a bullet
@@ -34,5 +35,5 @@ export function bulletListRule(nodeType, config) {
     if (bullets.length === 0)
         return null;
     const regexp = new RegExp(`^\\s*([${bullets.join('')}])\\s$`); // same as /^\s*([-+*])\s$/
-    return wrappingInputRule(regexp, nodeType);
+    return wrappingInputRule(regexp, nodeType, (match) => ({ [ListsAttr.Bullet]: match[1] }));
 }

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

@@ -17,11 +17,10 @@ export const mergeListsPlugin = () => new Plugin({
     },
 });
 function mergeAdjacentNodesWithSameType(tr, nodes) {
-    for (let i = 0; i < nodes.length - 1; i++) {
-        const current = nodes[i];
-        const next = nodes[i + 1];
-        if (current.node.type === next.node.type &&
-            current.pos + current.node.nodeSize === next.pos) {
+    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);
         }
     }

package/build/esm/extensions/yfm/YfmTable/plugins/YfmTableControls/yfmTableCellView.d.ts

@@ -1,4 +1,4 @@
-import { NodeViewConstructor } from 'prosemirror-view';
+import type { NodeViewConstructor } from 'prosemirror-view';
 import './yfmTableCellView.css';
 export declare const yfmTableCellCn: import("@bem-react/classname").ClassNameFormatter;
 export declare const yfmTableCellView: NodeViewConstructor;

package/build/esm/extensions/yfm/YfmTable/plugins/YfmTableControls/yfmTableCellView.js

@@ -1,13 +1,14 @@
 import React from 'react';
 import { ArrowDown, ArrowLeft, ArrowRight, ArrowUp, EllipsisVertical, TrashBin, Xmark, } from '@gravity-ui/icons';
-import { Button, DropdownMenu, Icon } from '@gravity-ui/uikit';
-import { findChildren, findParentNodeClosestToPos } from 'prosemirror-utils';
-import { createPortal } from 'react-dom';
+import { Button, DropdownMenu, Icon, Portal } from '@gravity-ui/uikit';
+import { findParentNodeClosestToPos } from 'prosemirror-utils';
 import { cn } from '../../../../../classname';
 import { bindActions } from '../../../../../core';
 import { i18n } from '../../../../../i18n/yfm-table';
 import { ErrorLoggerBoundary } from '../../../../../react-utils/ErrorBoundary';
-import { getTableDimensions, isTableCellNode, isTableNode, isTableRowNode, } from '../../../../../table-utils';
+import { getTableDimensions, isTableNode } from '../../../../../table-utils';
+import { getChildByNode } from '../../../../../utils/node-children';
+import { getChildrenOfNode } from '../../../../../utils/nodes';
 import { getReactRendererFromState } from '../../../../behavior/ReactRenderer';
 import { controlActions } from './actions';
 import './yfmTableCellView.css';
@@ -160,34 +161,30 @@ const Controls = function Controls({ columnNumber, rowNumber, view, getParentTab
     return controls.length ? React.createElement(React.Fragment, null, controls) : null;
 };
 export const yfmTableCellView = (node, view, getPos) => {
+    const getParentTable = () => findParentNodeClosestToPos(view.state.doc.resolve(getPos()), isTableNode);
+    const parentTable = getParentTable();
+    const cellCoords = parentTable ? findCellCoords(parentTable.node, node) : null;
+    // @ts-expect-error
+    if (!cellCoords)
+        return {};
+    const { cellIndex, rowIndex } = cellCoords;
+    const isFirstRow = rowIndex === 0;
+    const isFirstColumn = cellIndex === 0;
+    if (!isFirstRow && !isFirstColumn) {
+        // in this case, we don't need custom nodeView.
+        // @ts-expect-error
+        return {};
+    }
     const dom = document.createElement('td');
     const contentDOM = document.createElement('div');
     const control = document.createElement('span');
     control.setAttribute('style', 'width: 0; height: 0; float: left;');
     dom.setAttribute('style', 'position: relative; overflow: visible;');
-    const getParentTable = () => findParentNodeClosestToPos(view.state.doc.resolve(getPos()), isTableNode);
-    const parentTable = getParentTable();
-    // @ts-expect-error
-    if (!parentTable)
-        return {};
-    const rowNodes = findChildren(parentTable === null || parentTable === void 0 ? void 0 : parentTable.node, isTableRowNode);
-    const relativeCelPos = getPos() - (parentTable === null || parentTable === void 0 ? void 0 : parentTable.pos);
-    const rowNumber = rowNodes.findIndex((_v, i) => {
-        var _a;
-        return relativeCelPos > rowNodes[i].pos &&
-            relativeCelPos < (((_a = rowNodes[i + 1]) === null || _a === void 0 ? void 0 : _a.pos) || Number.MAX_SAFE_INTEGER);
-    });
-    const parentRow = rowNodes[rowNumber];
-    const columnNumber = findChildren(parentRow.node, isTableCellNode).findIndex((c) => {
-        return c.pos === relativeCelPos - parentRow.pos - 2;
-    });
-    const isFirstInRow = rowNodes.findIndex((r) => r.pos === relativeCelPos - 2) >= 0;
     dom.appendChild(contentDOM);
     dom.appendChild(control);
-    const renderItem = getReactRendererFromState(view.state).createItem('yfm-table-cell-view', () => createPortal(React.createElement(ErrorLoggerBoundary, null,
-        React.createElement(Controls, { columnNumber: columnNumber, rowNumber: rowNumber, isFirstInRow: isFirstInRow, isInFirstRow: rowNumber === 0, getParentTable: getParentTable, view: view })), control));
-    contentDOM.setAttribute('data-row-number', String(rowNumber));
-    contentDOM.setAttribute('data-col-number', String(columnNumber));
+    const renderItem = getReactRendererFromState(view.state).createItem('yfm-table-cell-view', () => (React.createElement(Portal, { container: control },
+        React.createElement(ErrorLoggerBoundary, null,
+            React.createElement(Controls, { columnNumber: cellIndex, rowNumber: rowIndex, isFirstInRow: isFirstColumn, isInFirstRow: isFirstRow, getParentTable: getParentTable, view: view })))));
     return {
         dom,
         contentDOM,
@@ -204,3 +201,18 @@ export const yfmTableCellView = (node, view, getPos) => {
         },
     };
 };
+function findCellCoords(table, cell) {
+    if (!table.lastChild)
+        return null;
+    const rows = getChildrenOfNode(table.lastChild); // children of tBody
+    for (const row of rows) {
+        const node = getChildByNode(row.node, cell);
+        if (node) {
+            return {
+                rowIndex: row.index,
+                cellIndex: node.index,
+            };
+        }
+    }
+    return null;
+}

package/build/esm/version.js

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

package/package.json

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