@lumir-company/editor 0.4.17 → 0.4.18

package/README.md

@@ -1478,6 +1478,13 @@ const url = await uploader(imageFile);
 
 ## 변경 로그
 
+### v0.4.18
+
+- **표 열 삭제 버그 수정 (병합 셀 포함)**
+  - 그립 메뉴로 첫 열/행 삭제 시, 그립 클릭으로 ProseMirror 선택이 표 밖으로 빠져 삭제가 무시되던 문제 수정(삭제 대상 표를 포커스 표 기준으로 결정적으로 탐색)
+  - **세로 병합(rowspan) 인접 열**이 있을 때 첫 열이 삭제되지 않던 문제 수정 — 코어 prosemirror-tables가 행의 유일 셀을 지울 때 빈 셀을 남겨(`tableRow+` 스키마) `fixTables`가 원복하던 케이스. 열 삭제를 표 재구성 방식으로 변경해 colspan/rowspan 병합을 안전하게 처리
+  - 병합 셀이 행 축소로 collapse될 때 **행 높이를 보존**(원래 차지하던 행 높이 합을 유지)
+
 ### v0.4.17
 
 - **표 행 높이(세로) 리사이즈**

package/dist/index.js

@@ -4858,6 +4858,9 @@ function LumirTableHandlesController() {
   const frozenRef = (0, import_react36.useRef)(false);
   const menuOpenRef = (0, import_react36.useRef)(false);
   const draggingRef = (0, import_react36.useRef)(false);
+  (0, import_react36.useEffect)(() => {
+    editor.__lumirActiveTableId = focused?.block?.id ?? null;
+  }, [editor, focused]);
   const recompute = (0, import_react36.useCallback)(() => {
     if (frozenRef.current) {
       return;
@@ -5400,6 +5403,140 @@ function liftFontSize(blocks) {
   return mapPreservingRef(blocks, (b) => mapBlock(b, "lift"));
 }
 
+// src/utils/table-delete.ts
+var import_prosemirror_tables2 = require("prosemirror-tables");
+function measureRowHeights(view, tablePos) {
+  try {
+    const at = view?.domAtPos?.(tablePos + 1);
+    let el = at?.node;
+    if (el && el.nodeType === 3) el = el.parentElement;
+    const tableEl = el?.closest?.("table") ?? null;
+    const body = tableEl?.tBodies?.[0];
+    if (!body) return null;
+    return Array.from(body.rows).map(
+      (tr) => Math.round(tr.getBoundingClientRect().height)
+    );
+  } catch {
+    return null;
+  }
+}
+function buildDeleteColumnTr(state, tablePos, col, rowPx) {
+  const table = state.doc.nodeAt(tablePos);
+  if (!table || table.type.name !== "table") return null;
+  const map = import_prosemirror_tables2.TableMap.get(table);
+  const W = map.width;
+  const H = map.height;
+  if (col < 0 || col >= W || W <= 1) return null;
+  const cells = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (let r = 0; r < H; r++) {
+    for (let c = 0; c < W; c++) {
+      const pos = map.map[r * W + c];
+      if (seen.has(pos)) continue;
+      seen.add(pos);
+      const node = table.nodeAt(pos);
+      if (!node) continue;
+      cells.push({
+        node,
+        top: r,
+        left: c,
+        rowspan: node.attrs.rowspan ?? 1,
+        colspan: node.attrs.colspan ?? 1
+      });
+    }
+  }
+  const spansCol = (c) => c.left <= col && col < c.left + c.colspan;
+  const isDropped = (c) => spansCol(c) && c.colspan === 1;
+  const survivingByRow = new Array(H).fill(0);
+  for (const c of cells) if (!isDropped(c)) survivingByRow[c.top]++;
+  const rowDies = survivingByRow.map((n) => n === 0);
+  const newRowIndex = [];
+  let ni = 0;
+  for (let r = 0; r < H; r++) newRowIndex[r] = rowDies[r] ? -1 : ni++;
+  const newH = ni;
+  if (newH === 0) return null;
+  const newRows = Array.from({ length: newH }, () => []);
+  for (const c of cells) {
+    if (isDropped(c)) continue;
+    const newColspan = c.colspan - (spansCol(c) ? 1 : 0);
+    let dyingWithin = 0;
+    for (let r = c.top; r < c.top + c.rowspan; r++) if (rowDies[r]) dyingWithin++;
+    const newRowspan = Math.max(1, c.rowspan - dyingWithin);
+    const attrs = { ...c.node.attrs, colspan: newColspan, rowspan: newRowspan };
+    if (spansCol(c) && Array.isArray(attrs.colwidth) && attrs.colwidth.length) {
+      const cw = attrs.colwidth.slice();
+      cw.splice(col - c.left, 1);
+      attrs.colwidth = cw.some((w) => w > 0) ? cw : null;
+    }
+    if (dyingWithin > 0 && rowPx) {
+      let sum = 0;
+      let ok = true;
+      for (let r = c.top; r < c.top + c.rowspan; r++) {
+        if (typeof rowPx[r] !== "number") {
+          ok = false;
+          break;
+        }
+        sum += rowPx[r];
+      }
+      if (ok && sum > 0) attrs.rowHeight = Math.round(sum);
+    }
+    const target = newRowIndex[c.top];
+    if (target >= 0) newRows[target].push(c.node.type.create(attrs, c.node.content));
+  }
+  const rowType = table.child(0)?.type;
+  if (!rowType) return null;
+  const rowNodes = newRows.map((rowCells) => rowType.create(null, rowCells));
+  const newTable = table.type.create(table.attrs, rowNodes);
+  const tr = state.tr;
+  tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
+  return tr.docChanged ? tr : null;
+}
+function removeFocusedRowOrColumn(editor, index, direction) {
+  const tiptap = editor?._tiptapEditor;
+  if (!tiptap) return false;
+  const { state } = tiptap;
+  let tablePos = -1;
+  const activeId = editor?.__lumirActiveTableId;
+  if (activeId) {
+    const p = findTableNodePos(tiptap, activeId);
+    if (p >= 0 && state.doc.nodeAt(p)?.type.name === "table") tablePos = p;
+  }
+  if (tablePos < 0) {
+    const $from = state.selection.$from;
+    for (let d = $from.depth; d > 0; d--) {
+      if ($from.node(d).type.name === "table") {
+        tablePos = $from.before(d);
+        break;
+      }
+    }
+  }
+  if (tablePos < 0) {
+    const vp = editor?.tableHandles?.view?.tablePos;
+    if (typeof vp === "number" && state.doc.nodeAt(vp)?.type.name === "table") {
+      tablePos = vp;
+    }
+  }
+  if (tablePos < 0) return false;
+  try {
+    if (direction === "column") {
+      const rowPx = measureRowHeights(tiptap.view, tablePos);
+      const tr = buildDeleteColumnTr(state, tablePos, index, rowPx);
+      if (!tr) return false;
+      tiptap.view.dispatch(tr);
+      return true;
+    }
+    const tableInside = state.doc.resolve(tablePos + 1);
+    const rowStart = state.doc.resolve(tableInside.posAtIndex(index) + 1);
+    const cellPos = state.doc.resolve(rowStart.posAtIndex(0));
+    const selState = state.apply(
+      state.tr.setSelection(new import_prosemirror_tables2.CellSelection(cellPos))
+    );
+    return (0, import_prosemirror_tables2.deleteRow)(selState, (tr) => tiptap.view.dispatch(tr));
+  } catch {
+    return false;
+  }
+}
+
 // src/utils/excel-paste.ts
 var NAMED_COLORS = {
   black: "#000000",
@@ -6253,6 +6390,18 @@ function LumirEditor({
       editor.isEditable = editable;
     }
   }, [editor, editable]);
+  (0, import_react37.useEffect)(() => {
+    if (!editor) return;
+    const th = editor.tableHandles;
+    if (!th || th.__lumirColDelPatched || typeof th.removeRowOrColumn !== "function")
+      return;
+    const orig = th.removeRowOrColumn.bind(th);
+    th.removeRowOrColumn = (index, dir) => {
+      if (removeFocusedRowOrColumn(editor, index, dir)) return;
+      return orig(index, dir);
+    };
+    th.__lumirColDelPatched = true;
+  }, [editor]);
   (0, import_react37.useEffect)(() => {
     if (!editor || !floatingMenu) return;
     const ft = editor.formattingToolbar;