@gravity-ui/markdown-editor 13.17.1 → 13.18.1

package/build/esm/i18n/gpt/dialog/en.json

@@ -0,0 +1,16 @@
+{
+  "answer-title": "What do you want to do with the response?",
+  "close-button": "Close",
+  "dislike": "Bad response",
+  "error": "An error occurred",
+  "feedback-message": "Thanks for your feedback!",
+  "fresh-start-button": "Start again",
+  "like": "Good response",
+  "more": "More",
+  "only-presets-title": "Help with text",
+  "refetch": "Try again",
+  "replace": "Replace the selected text",
+  "replace-disabled": "Insert text",
+  "try-again": "Try again",
+  "alert-gpt-presets-info": "Highlight text to see Yandex GPT presets"
+}

package/build/esm/i18n/gpt/dialog/index.d.ts

@@ -0,0 +1,19 @@
+export declare const i18n: <G extends "error" | "replace" | "answer-title" | "close-button" | "dislike" | "feedback-message" | "fresh-start-button" | "like" | "more" | "only-presets-title" | "refetch" | "replace-disabled" | "try-again" | "alert-gpt-presets-info", S extends string>(key: G | (string extends S ? S : never), params?: {
+    [key: string]: any;
+} | undefined) => S extends G ? {
+    "answer-title": string;
+    "close-button": string;
+    dislike: string;
+    error: string;
+    "feedback-message": string;
+    "fresh-start-button": string;
+    like: string;
+    more: string;
+    "only-presets-title": string;
+    refetch: string;
+    replace: string;
+    "replace-disabled": string;
+    "try-again": string;
+    "alert-gpt-presets-info": string;
+}[G] : string;
+export declare type I18nKey = Parameters<typeof i18n>[0];

package/build/esm/i18n/gpt/dialog/index.js

@@ -0,0 +1,4 @@
+import { registerKeyset } from '../../i18n';
+import en from './en.json';
+import ru from './ru.json';
+export const i18n = registerKeyset('gpt-dialog', { en, ru });

package/build/esm/i18n/gpt/dialog/ru.json

@@ -0,0 +1,16 @@
+{
+  "answer-title": "Что вы хотите сделать с ответом?",
+  "close-button": "Закрыть",
+  "dislike": "Плохой ответ",
+  "error": "Произошла ошибка",
+  "feedback-message": "Ваш голос учтён!",
+  "fresh-start-button": "Начать сначала",
+  "like": "Хороший ответ",
+  "more": "Ещё",
+  "only-presets-title": "Помощь с текстом",
+  "refetch": "Попробовать ещё",
+  "replace": "Заменить выделенный текст",
+  "replace-disabled": "Вставить текст",
+  "try-again": "Иначе",
+  "alert-gpt-presets-info": "Выделите текст, чтобы увидеть пресеты Yandex GPT"
+}

package/build/esm/i18n/gpt/errors/en.json

@@ -0,0 +1,5 @@
+{
+  "error-text": "An error occurred while generating a reply, please retry the request",
+  "retry-button": "Try again",
+  "start-again-button": "To the beginning"
+}

package/build/esm/i18n/gpt/errors/index.d.ts

@@ -0,0 +1,8 @@
+export declare const i18n: <G extends "error-text" | "retry-button" | "start-again-button", S extends string>(key: G | (string extends S ? S : never), params?: {
+    [key: string]: any;
+} | undefined) => S extends G ? {
+    "error-text": string;
+    "retry-button": string;
+    "start-again-button": string;
+}[G] : string;
+export declare type I18nKey = Parameters<typeof i18n>[0];

package/build/esm/i18n/gpt/errors/index.js

@@ -0,0 +1,4 @@
+import { registerKeyset } from '../../i18n';
+import en from './en.json';
+import ru from './ru.json';
+export const i18n = registerKeyset('gpt-dialog-error-screen', { en, ru });

package/build/esm/i18n/gpt/errors/ru.json

@@ -0,0 +1,5 @@
+{
+  "error-text": "Ошибка при генерации ответа, попробуйте повторить запрос",
+  "retry-button": "Повторить",
+  "start-again-button": "В начало"
+}

package/build/esm/i18n/gpt/extension/en.json

@@ -0,0 +1,6 @@
+{
+  "confirm-cancel": "Cancel",
+  "confirm-ok": "Close",
+  "confirm-title": "Do you want to close the GPT editor?",
+  "help-with-text": "Help with text"
+}

package/build/esm/i18n/gpt/extension/index.d.ts

@@ -0,0 +1,9 @@
+export declare const i18n: <G extends "confirm-cancel" | "confirm-ok" | "confirm-title" | "help-with-text", S extends string>(key: G | (string extends S ? S : never), params?: {
+    [key: string]: any;
+} | undefined) => S extends G ? {
+    "confirm-cancel": string;
+    "confirm-ok": string;
+    "confirm-title": string;
+    "help-with-text": string;
+}[G] : string;
+export declare type I18nKey = Parameters<typeof i18n>[0];

package/build/esm/i18n/gpt/extension/index.js

@@ -0,0 +1,4 @@
+import { registerKeyset } from '../../i18n';
+import en from './en.json';
+import ru from './ru.json';
+export const i18n = registerKeyset('gpt', { en, ru });

package/build/esm/i18n/gpt/extension/ru.json

@@ -0,0 +1,6 @@
+{
+  "confirm-cancel": "Отменить",
+  "confirm-ok": "Закрыть",
+  "confirm-title": "Хотите закрыть помощника GPT?",
+  "help-with-text": "Помощь с текстом"
+}

package/build/esm/i18n/gpt/loading/en.json

@@ -0,0 +1,3 @@
+{
+  "loading-text": "GPT is generating a response..."
+}

package/build/esm/i18n/gpt/loading/index.d.ts

@@ -0,0 +1,6 @@
+export declare const i18n: <G extends "loading-text", S extends string>(key: G | (string extends S ? S : never), params?: {
+    [key: string]: any;
+} | undefined) => S extends G ? {
+    "loading-text": string;
+}[G] : string;
+export declare type I18nKey = Parameters<typeof i18n>[0];

package/build/esm/i18n/gpt/loading/index.js

@@ -0,0 +1,4 @@
+import { registerKeyset } from '../../i18n';
+import en from './en.json';
+import ru from './ru.json';
+export const i18n = registerKeyset('gpt-dialog-loading-screen', { en, ru });

package/build/esm/i18n/gpt/loading/ru.json

@@ -0,0 +1,3 @@
+{
+  "loading-text": "GPT генерирует ответ..."
+}

package/build/esm/i18n/menubar/en.json

@@ -19,6 +19,7 @@
   "file": "File",
   "folding-heading": "Collapsed section",
   "folding-heading_hint": "The text under the heading can be collapsed or expanded",
+  "gpt": "GPT widget",
   "heading": "Heading",
   "heading1": "Heading 1",
   "heading2": "Heading 2",

package/build/esm/i18n/menubar/index.d.ts

@@ -1,4 +1,4 @@
-export declare const i18n: <G extends "bold" | "code" | "link" | "italic" | "strike" | "underline" | "mark" | "quote" | "colorify" | "mono" | "text" | "html" | "cut" | "table" | "image" | "code_inline" | "heading" | "note" | "file" | "codeblock" | "checkbox" | "emoji" | "list" | "tabs" | "math" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "undo" | "redo" | "math_inline" | "math_block" | "colorify__color_blue" | "colorify__color_default" | "colorify__color_gray" | "colorify__color_green" | "colorify__color_orange" | "colorify__color_red" | "colorify__color_violet" | "colorify__color_yellow" | "colorify__group_text" | "folding-heading" | "folding-heading_hint" | "hrule" | "list__action_lift" | "list__action_sink" | "list_action_disabled" | "mermaid" | "more_action" | "olist" | "ulist", S extends string>(key: G | (string extends S ? S : never), params?: {
+export declare const i18n: <G extends "bold" | "code" | "link" | "italic" | "strike" | "underline" | "mark" | "quote" | "colorify" | "mono" | "text" | "html" | "cut" | "table" | "image" | "code_inline" | "heading" | "note" | "file" | "codeblock" | "checkbox" | "emoji" | "list" | "tabs" | "math" | "heading1" | "heading2" | "heading3" | "heading4" | "heading5" | "heading6" | "gpt" | "undo" | "redo" | "math_inline" | "math_block" | "colorify__color_blue" | "colorify__color_default" | "colorify__color_gray" | "colorify__color_green" | "colorify__color_orange" | "colorify__color_red" | "colorify__color_violet" | "colorify__color_yellow" | "colorify__group_text" | "folding-heading" | "folding-heading_hint" | "hrule" | "list__action_lift" | "list__action_sink" | "list_action_disabled" | "mermaid" | "more_action" | "olist" | "ulist", S extends string>(key: G | (string extends S ? S : never), params?: {
     [key: string]: any;
 } | undefined) => S extends G ? {
     bold: string;
@@ -21,6 +21,7 @@ export declare const i18n: <G extends "bold" | "code" | "link" | "italic" | "str
     file: string;
     "folding-heading": string;
     "folding-heading_hint": string;
+    gpt: string;
     heading: string;
     heading1: string;
     heading2: string;

package/build/esm/i18n/menubar/ru.json

@@ -19,6 +19,7 @@
   "file": "Файл",
   "folding-heading": "Свёрнутый раздел",
   "folding-heading_hint": "Текст под заголовком можно свернуть или раскрыть",
+  "gpt": "GPT-виджет",
   "heading": "Заголовок",
   "heading1": "Заголовок 1",
   "heading2": "Заголовок 2",

package/build/esm/icons/GPT.d.ts

@@ -0,0 +1,2 @@
+declare const GPTIcon: () => JSX.Element;
+export default GPTIcon;

package/build/esm/icons/GPT.js

@@ -0,0 +1,19 @@
+import React from 'react';
+import { useTheme } from '@gravity-ui/uikit';
+const GPTIcon = () => {
+    // It may be worth taking the hook outside the icon
+    const theme = useTheme();
+    const gradient = theme === 'dark' || theme === 'dark-hc' ? (React.createElement(React.Fragment, null,
+        React.createElement("stop", { stopColor: "#FF7233" }),
+        React.createElement("stop", { offset: "1", stopColor: "#D14DFF" }))) : (React.createElement(React.Fragment, null,
+        React.createElement("stop", { stopColor: "#FF5001" }),
+        React.createElement("stop", { offset: "1", stopColor: "#BD00FF" })));
+    return (React.createElement("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", xmlns: "http://www.w3.org/2000/svg" },
+        React.createElement("g", { clipPath: "url(#clip0_1608_24154)" },
+            React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M0 6C0 2.68629 2.68629 -4.3454e-07 6 0C9.31371 4.3454e-07 12 2.68629 12 6C12 9.31371 9.31371 12 6 12C2.68629 12 -6.0141e-07 9.31371 0 6ZM14 16C12.8954 16 12 15.1046 12 14C12 12.8954 12.8954 12 14 12C15.1046 12 16 12.8954 16 14C16 15.1046 15.1046 16 14 16Z", fill: "url(#paint0_linear_1608_24154)" })),
+        React.createElement("defs", null,
+            React.createElement("linearGradient", { id: "paint0_linear_1608_24154", x1: "17.5", y1: "-1", x2: "2.5", y2: "13.5", gradientUnits: "userSpaceOnUse" }, gradient),
+            React.createElement("clipPath", { id: "clip0_1608_24154" },
+                React.createElement("rect", { width: "16", height: "16", fill: "white" })))));
+};
+export default GPTIcon;

package/build/esm/icons/GPTLoading.d.ts

@@ -0,0 +1,2 @@
+declare const GPTLoading: () => JSX.Element;
+export default GPTLoading;

package/build/esm/icons/GPTLoading.js

@@ -0,0 +1,9 @@
+import React from 'react';
+const GPTLoading = () => (React.createElement("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20" },
+    React.createElement("circle", { cx: "8", cy: "8", r: "6", fill: "url(#paint0_linear_1608_24154)" },
+        React.createElement("animateMotion", { fill: "url(#paint0_linear_1608_24154)", begin: "0s", dur: "1150ms", path: "M 0 0 a 1 3 145 0 1 8 8 a 1 3 145 0 1 -8 -8", repeatCount: "indefinite" }),
+        React.createElement("animate", { attributeName: "r", dur: "1150ms", repeatCount: "indefinite", values: "6; 2; 6" })),
+    React.createElement("circle", { cx: "16", cy: "16", r: "2", fill: "url(#paint0_linear_1608_24154)" },
+        React.createElement("animateMotion", { fill: "url(#paint0_linear_1608_24154)", begin: "0s", dur: "1150ms", path: "M 0 0 a 1.2 2.7 157 0 1 -5 -6.7 a 1.2 2.7 157 0 1 5 6.7", repeatCount: "indefinite" }),
+        React.createElement("animate", { attributeName: "r", dur: "1150ms", repeatCount: "indefinite", values: "2; 6; 2" }))));
+export default GPTLoading;

package/build/esm/icons/index.d.ts

@@ -1,5 +1,7 @@
+import GPTIcon from './GPT';
+import GPTLoading from './GPTLoading';
 import MermaidIcon from './Mermaid';
 import MonoIcon from './Mono';
 import TabsIcon from './Tabs';
-export { MermaidIcon, MonoIcon, TabsIcon };
+export { MermaidIcon, MonoIcon, TabsIcon, GPTIcon, GPTLoading };
 export { ArrowUturnCcwLeft as UndoIcon, ArrowUturnCwRight as RedoIcon, Bold as BoldIcon, Italic as ItalicIcon, Underline as UnderlineIcon, Strikethrough as StrikethroughIcon, FontCursor as MarkIcon, Text as TextIcon, Heading as HeadingIcon, Heading1 as Heading1Icon, Heading2 as Heading2Icon, Heading3 as Heading3Icon, Heading4 as Heading4Icon, Heading5 as Heading5Icon, Heading6 as Heading6Icon, ListUl as ListBlIcon, ListOl as ListOlIcon, TextOutdent as LiftIcon, TextIndent as SinkIcon, Font as TextColorIcon, Link as LinkIcon, QuoteClose as QuoteIcon, Scissors as CutIcon, Sticker as NoteIcon, Paperclip as FileIcon, Minus as HRuleIcon, LayoutList as TableIcon, ChevronsExpandHorizontal as IframeIcon, SquareCheck as CheckListIcon, Picture as ImageIcon, Person as UserIcon, FaceSmile as EmojiIcon, Code as CodeInlineIcon, FileCode as CodeBlockIcon, Function as FunctionInlineIcon, CurlyBracketsFunction as FunctionBlockIcon, Hashtag as AnchorIcon, SquareDashedText as BlockIcon, LayoutColumns3 as LayoutIcon, Pencil as DrawIoIcon, FolderCode as HtmlBlockIcon, ArrowChevronRight as FoldingHeadingIcon, } from '@gravity-ui/icons';

package/build/esm/icons/index.js

@@ -1,7 +1,9 @@
+import GPTIcon from './GPT';
+import GPTLoading from './GPTLoading';
 import MermaidIcon from './Mermaid';
 import MonoIcon from './Mono';
 import TabsIcon from './Tabs';
-export { MermaidIcon, MonoIcon, TabsIcon };
+export { MermaidIcon, MonoIcon, TabsIcon, GPTIcon, GPTLoading };
 export { ArrowUturnCcwLeft as UndoIcon, ArrowUturnCwRight as RedoIcon, 
 //
 Bold as BoldIcon, Italic as ItalicIcon, Underline as UnderlineIcon, Strikethrough as StrikethroughIcon, FontCursor as MarkIcon, 

package/build/esm/react-utils/useAutoFocus.d.ts

@@ -1,2 +1,2 @@
 import { RefObject } from 'react';
-export declare const useAutoFocus: (nodeRef: RefObject<HTMLElement>) => void;
+export declare const useAutoFocus: (nodeRef: RefObject<HTMLElement>, dependencies?: unknown[]) => void;

package/build/esm/react-utils/useAutoFocus.js

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-export const useAutoFocus = (nodeRef) => {
+export const useAutoFocus = (nodeRef, dependencies = []) => {
     useEffect(() => {
         const { current: anchor } = nodeRef;
         const timeout = setTimeout(() => {
@@ -10,5 +10,5 @@ export const useAutoFocus = (nodeRef) => {
         };
         // https://github.com/facebook/react/issues/23392#issuecomment-1055610198
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [nodeRef.current]);
+    }, [nodeRef.current, ...dependencies]);
 };

package/build/esm/react-utils/useNodeResizing.js

@@ -47,9 +47,14 @@ export const useNodeResizing = ({ width, height, onResize, ref, delay = RESIZE_D
                     const newHeight = (startHeight / startWidth) * newWidth;
                     setCurrentWidth(newWidth);
                     setCurrentHeight(newHeight);
+                    // If neither width nor height are provided, the width is set automatically.
+                    const shouldSetWidth = !initialWidth &&
+                        initialWidth !== 0 &&
+                        !(initialWidth === null && initialHeight === null);
+                    const shouldSetHeight = !initialHeight && initialHeight !== 0;
                     onResize === null || onResize === void 0 ? void 0 : onResize({
-                        width: !initialWidth && initialWidth !== 0 ? undefined : newWidth,
-                        height: !initialHeight && initialHeight !== 0 ? undefined : newHeight,
+                        width: shouldSetWidth ? undefined : newWidth,
+                        height: shouldSetHeight ? undefined : newHeight,
                     });
                 }
             });

package/build/esm/table-utils/commands/appendColumn.js

@@ -1,48 +1,57 @@
-import { findChildren, findParentNodeClosestToPos } from 'prosemirror-utils';
-import { isTableNode, isTableRowNode } from '..';
-import { findChildIndex } from '../helpers';
-import { findChildTableCells, isTableBodyNode, isTableCellNode } from '../utils';
+import { findParentNodeClosestToPos } from 'prosemirror-utils';
+import { isTableNode } from '..';
+import { TableDesc } from '../table-desc';
 export const appendColumn = (state, dispatch, _, attrs) => {
-    var _a;
     if (!attrs)
         return false;
-    const { tablePos, columnNumber, direction } = attrs;
-    const parentTable = (_a = findParentNodeClosestToPos(state.doc.resolve(tablePos + 1), isTableNode)) === null || _a === void 0 ? void 0 : _a.node;
-    if (!parentTable)
+    const { tablePos, columnNumber, direction = 'after' } = attrs;
+    const res = findParentNodeClosestToPos(state.doc.resolve(tablePos + 1), isTableNode);
+    if (!res)
         return false;
-    let parentCell;
-    let parentRow;
-    const tableBody = findChildren(parentTable, isTableBodyNode, false).pop();
-    if (!tableBody)
+    const tableNode = res.node;
+    const tableDesc = TableDesc.create(tableNode);
+    if (!tableDesc)
         return false;
-    if (columnNumber !== undefined) {
-        parentCell = findChildTableCells(parentTable)[columnNumber];
-        parentRow = findParentNodeClosestToPos(state.doc.resolve(tablePos + parentCell.pos + 1), isTableRowNode);
-    }
-    else {
-        parentRow = findChildren(tableBody.node, isTableRowNode, false).pop();
-        if (!parentRow)
+    const columnIndex = columnNumber !== null && columnNumber !== void 0 ? columnNumber : tableDesc.cols - 1; // if columnNumber is not defined, that means last row
+    const isFirstColumn = columnIndex === 0;
+    const isLastColumn = columnIndex === tableDesc.cols - 1;
+    let pos = null;
+    if (isFirstColumn && direction === 'before')
+        pos = tableDesc.getRelativePosForColumn(0).map(fromOrClosest);
+    if (isLastColumn && direction === 'after')
+        pos = tableDesc.getRelativePosForColumn(tableDesc.cols - 1).map(toOrClosest);
+    if (!pos) {
+        if (tableDesc.cols <= columnIndex)
             return false;
-        parentCell = findChildren(parentRow.node, isTableCellNode, false).pop();
-    }
-    if (!parentCell || !parentRow || !parentTable) {
-        return false;
+        if (tableDesc.isSafeColumn(columnIndex)) {
+            const columnPos = tableDesc.getRelativePosForColumn(columnIndex);
+            if (direction === 'before')
+                pos = columnPos.map(fromOrClosest);
+            if (direction === 'after')
+                pos = columnPos.map(toOrClosest);
+        }
+        else {
+            if (direction === 'before' && tableDesc.isSafeColumn(columnIndex - 1))
+                pos = tableDesc.getRelativePosForColumn(columnIndex - 1).map(toOrClosest);
+            if (direction === 'after' && tableDesc.isSafeColumn(columnIndex + 1))
+                pos = tableDesc.getRelativePosForColumn(columnIndex + 1).map(fromOrClosest);
+        }
     }
-    const parentCellIndex = columnNumber || findChildIndex(parentRow.node, parentCell.node);
-    if (parentCellIndex < 0) {
+    if (!pos)
         return false;
-    }
     if (dispatch) {
-        const allRows = findChildren(tableBody.node, isTableRowNode, false);
-        let tr = state.tr;
-        for (const row of allRows) {
-            const rowCells = findChildren(row.node, isTableCellNode, false);
-            const cell = rowCells[parentCellIndex];
-            let position = tablePos + row.pos + cell.pos + 3;
-            position += direction === 'before' ? 0 : cell.node.nodeSize;
-            tr = tr.insert(tr.mapping.map(position), cell.node.type.createAndFill(cell.node.attrs));
+        const cellType = tableDesc.getCellNodeType();
+        const { tr } = state;
+        for (const p of pos) {
+            tr.insert(tr.mapping.map(res.pos + p), cellType.createAndFill());
         }
-        dispatch(tr.scrollIntoView());
+        dispatch(tr);
     }
     return true;
 };
+function fromOrClosest(pos) {
+    return pos.type === 'real' ? pos.from : pos.closestPos;
+}
+function toOrClosest(pos) {
+    return pos.type === 'real' ? pos.to : pos.closestPos;
+}

package/build/esm/table-utils/commands/appendRow.js

@@ -1,35 +1,53 @@
-import { Fragment } from 'prosemirror-model';
-import { findChildren, findParentNodeClosestToPos } from 'prosemirror-utils';
-import { findChildTableRows, isTableBodyNode, isTableNode, isTableRowNode } from '..';
+import { findParentNodeClosestToPos } from 'prosemirror-utils';
+import { isTableNode } from '..';
+import { TableDesc } from '../table-desc';
 export const appendRow = (state, dispatch, _, attrs) => {
-    var _a;
     if (!attrs)
         return false;
-    const { tablePos, rowNumber, direction } = attrs;
-    const tableNode = (_a = findParentNodeClosestToPos(state.doc.resolve(tablePos + 1), isTableNode)) === null || _a === void 0 ? void 0 : _a.node;
-    if (!tableNode)
+    const { tablePos, rowNumber, direction = 'after' } = attrs;
+    const res = findParentNodeClosestToPos(state.doc.resolve(tablePos + 1), isTableNode);
+    if (!res)
         return false;
-    const parentBody = findChildren(tableNode, isTableBodyNode, false).pop();
-    if (!parentBody)
+    const tableNode = res.node;
+    const tableDesc = TableDesc.create(tableNode);
+    if (!tableDesc)
         return false;
-    let parentRow;
-    if (rowNumber !== undefined) {
-        parentRow = findChildTableRows(tableNode)[rowNumber];
+    const rowIndex = rowNumber !== null && rowNumber !== void 0 ? rowNumber : tableDesc.rows - 1; // if rowNumber is not defined, that means last row
+    const isFirstRow = rowIndex === 0;
+    const isLastRow = rowIndex === tableDesc.rows - 1;
+    let pos = -1;
+    if (isFirstRow && direction === 'before')
+        pos = tableDesc.getRelativePosForRow(0).from;
+    if (isLastRow && direction === 'after')
+        pos = tableDesc.getRelativePosForRow(tableDesc.rows - 1).to;
+    if (pos === -1) {
+        if (tableDesc.rows <= rowIndex)
+            return false;
+        if (tableDesc.isSafeRow(rowIndex)) {
+            const rowPos = tableDesc.getRelativePosForRow(rowIndex);
+            if (direction === 'before')
+                pos = rowPos.from;
+            if (direction === 'after')
+                pos = rowPos.to;
+        }
+        else {
+            if (direction === 'before' && tableDesc.isSafeRow(rowIndex - 1))
+                pos = tableDesc.getRelativePosForRow(rowIndex - 1).to;
+            if (direction === 'after' && tableDesc.isSafeRow(rowIndex + 1))
+                pos = tableDesc.getRelativePosForRow(rowIndex + 1).from;
+        }
     }
-    else {
-        parentRow = findChildren(parentBody.node, isTableRowNode, false).pop();
-    }
-    if (!parentRow) {
+    if (pos === -1)
         return false;
-    }
     if (dispatch) {
-        const newCellNodes = [];
-        parentRow.node.forEach((node) => {
-            newCellNodes.push(node.type.createAndFill(node.attrs));
-        });
-        let position = tablePos + parentRow.pos;
-        position += direction === 'before' ? 1 : parentRow.node.nodeSize + 1;
-        dispatch(state.tr.insert(position, parentRow.node.copy(Fragment.from(newCellNodes))));
+        const cells = getNodes(tableDesc.getCellNodeType(), tableDesc.cols);
+        dispatch(state.tr.insert(res.pos + pos, tableDesc.getRowNodeType().create(null, cells)));
     }
     return true;
 };
+function getNodes(type, count) {
+    const nodes = [];
+    for (let i = 0; i < count; i++)
+        nodes.push(type.createAndFill());
+    return nodes;
+}

package/build/esm/table-utils/commands/removeColumn.js

@@ -1,5 +1,5 @@
-import { isTableNode } from '..';
-import { isTableBodyNode, isTableCellNode, isTableRowNode } from '../utils';
+import { TableDesc } from '../table-desc';
+import { isTableNode } from '../utils';
 export const removeColumn = (state, dispatch, _, attrs = {}) => {
     const { tablePos, columnNumber } = attrs;
     if (typeof tablePos !== 'number' || typeof columnNumber !== 'number')
@@ -11,28 +11,26 @@ export const removeColumn = (state, dispatch, _, attrs = {}) => {
     const tableNode = state.doc.nodeAt(tablePos);
     if (!tableNode || tableNode.nodeSize <= 2 || !isTableNode(tableNode))
         return false;
-    const tableBodyNode = tableNode.firstChild;
-    if (!tableBodyNode || tableBodyNode.nodeSize <= 2 || !isTableBodyNode(tableBodyNode))
+    const tableDesc = TableDesc.create(tableNode);
+    if (!tableDesc)
         return false;
-    // there is one column left
-    if (tableBodyNode.firstChild && tableBodyNode.firstChild.childCount < 2)
+    if (!tableDesc ||
+        // there is one column left
+        tableDesc.cols < 2 ||
+        tableDesc.cols <= columnNumber ||
+        !tableDesc.isSafeColumn(columnNumber))
         return false;
     if (dispatch) {
         const { tr } = state;
-        tableBodyNode.forEach((rowNode, rowOffset) => {
-            if (!isTableRowNode(rowNode))
-                return;
-            rowNode.forEach((cellNode, cellOffset, cellIndex) => {
-                if (!isTableCellNode(cellNode))
-                    return;
-                if (cellIndex === columnNumber) {
-                    // table -> tbody -> tr -> td
-                    const from = tablePos + 2 + rowOffset + 1 + cellOffset;
-                    const to = from + cellNode.nodeSize;
-                    tr.delete(tr.mapping.map(from), tr.mapping.map(to));
-                }
-            });
-        });
+        const pos = tableDesc.getRelativePosForColumn(columnNumber);
+        for (const item of pos) {
+            if (item.type === 'real') {
+                let { from, to } = item;
+                from += tablePos;
+                to += tablePos;
+                tr.delete(tr.mapping.map(from), tr.mapping.map(to));
+            }
+        }
         dispatch(tr);
     }
     return true;

package/build/esm/table-utils/commands/removeRow.js

@@ -1,8 +1,8 @@
 import { Fragment } from 'prosemirror-model';
-import { findChildren, findParentNodeClosestToPos } from 'prosemirror-utils';
-import { findChildTableBody, isTableNode, isTableRowNode } from '..';
+import { findParentNodeClosestToPos } from 'prosemirror-utils';
+import { isTableNode } from '..';
 import { trackTransactionMetrics } from '../../core';
-import { findChildTableRows } from '../utils';
+import { TableDesc } from '../table-desc';
 export const removeRow = (state, dispatch, _, attrs = {}) => {
     var _a;
     const { tablePos, rowNumber } = attrs;
@@ -11,16 +11,19 @@ export const removeRow = (state, dispatch, _, attrs = {}) => {
     const tableNode = (_a = findParentNodeClosestToPos(state.doc.resolve(tablePos + 1), isTableNode)) === null || _a === void 0 ? void 0 : _a.node;
     if (!tableNode)
         return false;
-    const parentRows = findChildren(tableNode, isTableRowNode);
-    const parentBody = findChildTableBody(tableNode)[0];
-    const parentRow = parentRows[rowNumber];
-    if (!parentRows.length || !parentBody) {
+    const tableDesc = TableDesc.create(tableNode);
+    if (!tableDesc || rowNumber >= tableDesc.rows)
         return false;
-    }
-    if (findChildTableRows(parentBody.node).length < 2) {
-        // there is one row left
+    if (!tableDesc.isSafeRow(rowNumber))
         return false;
+    if (dispatch) {
+        let { from, to } = tableDesc.getRelativePosForRow(rowNumber);
+        from += tablePos;
+        to += tablePos;
+        dispatch(trackTransactionMetrics(state.tr.replaceWith(from, to, Fragment.empty), 'removeRow', {
+            rows: tableDesc.rows,
+            cols: tableDesc.cols,
+        }));
     }
-    dispatch === null || dispatch === void 0 ? void 0 : dispatch(trackTransactionMetrics(state.tr.replaceWith(tablePos + parentRow.pos, tablePos + parentRow.pos + parentRow.node.nodeSize + 1, Fragment.empty), 'removeRow', { rows: parentRows.length, cols: parentRow.node.childCount }));
     return true;
 };

package/build/esm/table-utils/table-desc.d.ts

@@ -0,0 +1,53 @@
+import type { Node } from 'prosemirror-model';
+declare type TableCellRealDesc = {
+    type: 'real';
+    offset: number;
+    node: Node;
+    colspan?: number;
+    rowspan?: number;
+};
+declare type TableCellVirtualDesc = {
+    type: 'virtual';
+    /** Index of real cell, that prodeced this virtual cell */
+    colspan?: [number, number];
+    /** Index of real cell, that prodeced this virtual cell */
+    rowspan?: [number, number];
+};
+declare type Pos = {
+    from: number;
+    to: number;
+};
+export declare type CellPos = ({
+    type: 'real';
+} & Pos) | {
+    type: 'virtual';
+    closestPos: number;
+};
+declare type TableCellDesc = TableCellRealDesc | TableCellVirtualDesc;
+declare type TableRowDesc = {
+    node: Node;
+    cells: TableCellDesc[];
+    offset: number;
+    colspan?: boolean;
+    rowspan?: boolean;
+};
+export declare class TableDesc {
+    readonly rows: number;
+    readonly cols: number;
+    readonly rowsDesc: readonly TableRowDesc[];
+    readonly baseOffset: number;
+    private static __cache;
+    static create(table: Node): TableDesc | null;
+    private constructor();
+    rowHasVirtualCells(rowIndex: number): boolean;
+    columnHasVirtualCells(columnIndex: number): boolean;
+    isSafeColumn(columnIndex: number): boolean;
+    isSafeRow(rowIndex: number): boolean;
+    getOffsetForRow(rowIndex: number): number;
+    getRelativePosForRow(rowIndex: number): Pos;
+    getRelativePosForCell(rowIndex: number, columnIndex: number): CellPos;
+    getRelativePosForColumn(columnIndex: number): CellPos[];
+    getCellNodeType(): import("prosemirror-model").NodeType;
+    getRowNodeType(): import("prosemirror-model").NodeType;
+}
+export {};