@jvs-milkdown/components 1.2.3 → 1.2.5

package/lib/table-block/index.js

@@ -2,7 +2,7 @@ import { $ctx, $view } from '@jvs-milkdown/utils';
 import { selectColCommand, moveColCommand, selectRowCommand, moveRowCommand, mergeCellsCommand, setAlignCommand, deleteSelectedCellsCommand, addRowWithAlignment, tableSchema } from '@jvs-milkdown/preset-gfm';
 import { h, defineComponent, ref, onMounted, watch, onBeforeUnmount, shallowRef, createApp, triggerRef } from 'vue';
 import { computePosition, offset } from '@floating-ui/dom';
-import { findTable, CellSelection, selectedRect, splitCellWithType, TableMap, addColumn, mergeCells, splitCell } from '@jvs-milkdown/prose/tables';
+import { findTable, CellSelection, selectedRect, splitCellWithType, TableMap, removeColumn, removeRow, addColumn, mergeCells, splitCell } from '@jvs-milkdown/prose/tables';
 import clsx from 'clsx';
 import DOMPurify from 'dompurify';
 import { editorViewCtx, commandsCtx } from '@jvs-milkdown/core';
@@ -577,6 +577,56 @@ function useOperation(refs, ctx, getPos) {
       ctx.get(editorViewCtx).focus();
     });
   };
+  const deleteRowByIndex = (index) => {
+    if (!ctx || !ctx.get(editorViewCtx).editable) return;
+    const view = ctx.get(editorViewCtx);
+    const tablePos = getPos == null ? void 0 : getPos();
+    if (tablePos == null) return;
+    const table = view.state.doc.nodeAt(tablePos);
+    if (!table) return;
+    const tableStart = tablePos + 1;
+    const map = TableMap.get(table);
+    const tr = view.state.tr;
+    const rect = {
+      map,
+      tableStart,
+      table,
+      left: 0,
+      right: map.width,
+      top: 0,
+      bottom: map.height
+    };
+    removeRow(tr, rect, index);
+    view.dispatch(tr);
+    requestAnimationFrame(() => {
+      ctx.get(editorViewCtx).focus();
+    });
+  };
+  const deleteColByIndex = (index) => {
+    if (!ctx || !ctx.get(editorViewCtx).editable) return;
+    const view = ctx.get(editorViewCtx);
+    const tablePos = getPos == null ? void 0 : getPos();
+    if (tablePos == null) return;
+    const table = view.state.doc.nodeAt(tablePos);
+    if (!table) return;
+    const tableStart = tablePos + 1;
+    const map = TableMap.get(table);
+    const tr = view.state.tr;
+    const rect = {
+      map,
+      tableStart,
+      table,
+      left: 0,
+      right: map.width,
+      top: 0,
+      bottom: map.height
+    };
+    removeColumn(tr, rect, index);
+    view.dispatch(tr);
+    requestAnimationFrame(() => {
+      ctx.get(editorViewCtx).focus();
+    });
+  };
   const onAlign = (direction) => (e) => {
     if (!ctx) return;
     if (!ctx.get(editorViewCtx).editable) return;
@@ -656,6 +706,8 @@ function useOperation(refs, ctx, getPos) {
     selectCol,
     selectRow,
     deleteSelected,
+    deleteRowByIndex,
+    deleteColByIndex,
     onAlign,
     onMergeCells,
     onSplitCell
@@ -830,7 +882,8 @@ const TableBlock = defineComponent({
       addColByIndex,
       selectCol,
       selectRow,
-      deleteSelected,
+      deleteRowByIndex,
+      deleteColByIndex,
       onAlign,
       onMergeCells,
       onSplitCell
@@ -980,14 +1033,19 @@ const TableBlock = defineComponent({
         const isCellSelection = (sel) => sel && typeof sel.isColSelection === "function" && typeof sel.forEachCell === "function";
         if (isCellSelection(selection)) {
           const selAny = selection;
+          const rect = selectedRect(view.state);
           if (selAny.isColSelection()) {
-            const $headCell = selAny.$headCell;
-            activeColIndex.value = $headCell ? $headCell.index($headCell.depth) : -1;
+            if (activeColIndex.value >= rect.left && activeColIndex.value < rect.right) ; else {
+              const $headCell = selAny.$headCell;
+              activeColIndex.value = $headCell ? $headCell.index($headCell.depth) : -1;
+            }
             activeRowIndex.value = -1;
           } else if (selAny.isRowSelection()) {
-            const $headCell = selAny.$headCell;
+            if (activeRowIndex.value >= rect.top && activeRowIndex.value < rect.bottom) ; else {
+              const $headCell = selAny.$headCell;
+              activeRowIndex.value = $headCell ? $headCell.index($headCell.depth - 1) : -1;
+            }
             activeColIndex.value = -1;
-            activeRowIndex.value = $headCell ? $headCell.index($headCell.depth - 1) : -1;
           } else {
             activeColIndex.value = -1;
             activeRowIndex.value = -1;
@@ -1168,9 +1226,9 @@ const TableBlock = defineComponent({
               "button",
               {
                 type: "button",
-                onPointerdown: (e) => {
+                onPointerdown: () => {
                   hoverIndex.value = [0, i];
-                  deleteSelected(e);
+                  deleteColByIndex(i);
                 }
               },
               /* @__PURE__ */ h(Icon, { icon: config.renderButton("delete_col") })
@@ -1235,9 +1293,9 @@ const TableBlock = defineComponent({
               "button",
               {
                 type: "button",
-                onPointerdown: (e) => {
+                onPointerdown: () => {
                   hoverIndex.value = [i, 0];
-                  deleteSelected(e);
+                  deleteRowByIndex(i);
                 }
               },
               /* @__PURE__ */ h(Icon, { icon: config.renderButton("delete_row") })