@openleaf-editor/plugins-table 0.1.0-beta.3 → 0.1.0-beta.5

package/dist/resize.js

@@ -0,0 +1,162 @@
+/**
+ * Nested-table column-resize hit-testing.
+ *
+ * `columnResizing()` is installed once for the document. Its own
+ * `domCellAround` walks to the innermost `TD`/`TH`, so a pointer over a nested
+ * table can never grab an outer column — even when it is sitting on that
+ * column's border. Nested tables are legal (`table_cell` is `block+`; Insert
+ * table inside a cell is tested), and that hit-test is inside the third-party
+ * plugin, not behind an option.
+ *
+ * Forking the plugin would mean owning `handleMouseMove` / `edgeCell` /
+ * `handleDecorations` for every upstream change. The wrapping plugin below is
+ * the smaller seam: it shares `columnResizingPluginKey` and the same handle
+ * width, and on `mousemove` it looks at every ancestor cell. An outer border
+ * within the handle width wins; otherwise it returns false and the upstream
+ * plugin handles the innermost table as before.
+ *
+ * Plugin order is load-bearing. `EditorView.someProp` walks from the start of
+ * the plugin list and stops at the first `handleDOMEvents` handler that returns
+ * true, so this plugin must sit *before* `columnResizing`. Returning true after
+ * setting the outer handle is what stops the innermost walk from overwriting it.
+ * `mousedown` is deliberately not claimed: once `activeHandle` points at the
+ * outer cell, the upstream drag logic is the right one to run.
+ */
+import { Plugin, PluginKey } from 'prosemirror-state';
+import { columnResizingPluginKey, pointsAtCell, TableMap, } from 'prosemirror-tables';
+/** Matches `columnResizing`'s default. Keep the two in lockstep in `index.ts`. */
+export const COLUMN_RESIZE_HANDLE_WIDTH = 5;
+const nestedColumnResizeKey = new PluginKey('openleaf-nested-column-resize');
+export function nestedColumnResizePlugin(handleWidth = COLUMN_RESIZE_HANDLE_WIDTH) {
+    return new Plugin({
+        key: nestedColumnResizeKey,
+        props: {
+            handleDOMEvents: {
+                mousemove: (view, event) => {
+                    if (!view.editable)
+                        return false;
+                    if (!(event instanceof MouseEvent))
+                        return false;
+                    const pluginState = columnResizingPluginKey.getState(view.state);
+                    if (!pluginState || pluginState.dragging)
+                        return false;
+                    const cell = nestedHandleCell(view, event, handleWidth);
+                    if (cell == null)
+                        return false;
+                    if (cell !== pluginState.activeHandle) {
+                        view.dispatch(view.state.tr.setMeta(columnResizingPluginKey, { setHandle: cell }));
+                    }
+                    return true;
+                },
+            },
+        },
+    });
+}
+/**
+ * The cell whose column should be resized, or `null` to leave the decision to
+ * `columnResizing`.
+ *
+ * `null` covers "no nesting", "pointer is not on an outer edge", and "the only
+ * matching edge is the innermost one". Those are all cases the upstream plugin
+ * already handles, and intercepting them would mean reimplementing it.
+ */
+function nestedHandleCell(view, event, handleWidth) {
+    const cells = ancestorCells(event.target);
+    if (cells.length < 2)
+        return null;
+    for (let i = cells.length - 1; i >= 0; i -= 1) {
+        const td = cells[i];
+        const { left, right } = td.getBoundingClientRect();
+        let side = null;
+        if (event.clientX - left <= handleWidth)
+            side = 'left';
+        else if (right - event.clientX <= handleWidth)
+            side = 'right';
+        if (!side)
+            continue;
+        const cellPos = cellPosFromDOM(view, td);
+        if (cellPos == null)
+            continue;
+        const handle = handleCellForSide(view, cellPos, side);
+        if (handle < 0)
+            continue;
+        if (!pointsAtCell(view.state.doc.resolve(handle)))
+            continue;
+        // Innermost match: `columnResizing` will pick the same cell.
+        if (i === 0)
+            return null;
+        return handle;
+    }
+    return null;
+}
+/** Innermost first, walking out through nested tables to the editor root. */
+function ancestorCells(target) {
+    const cells = [];
+    let node = target instanceof Node ? target : null;
+    while (node) {
+        if (node instanceof HTMLElement) {
+            if (node.nodeName === 'TD' || node.nodeName === 'TH')
+                cells.push(node);
+            if (node.classList.contains('ProseMirror'))
+                break;
+        }
+        node = node.parentNode;
+    }
+    return cells;
+}
+function cellPosFromDOM(view, td) {
+    let pos;
+    try {
+        pos = view.posAtDOM(td, 0);
+    }
+    catch {
+        return null;
+    }
+    const $pos = view.state.doc.resolve(pos);
+    for (let depth = $pos.depth; depth > 0; depth -= 1) {
+        const role = $pos.node(depth).type.spec['tableRole'];
+        if (role !== 'cell' && role !== 'header_cell')
+            continue;
+        const cellPos = $pos.before(depth);
+        const dom = view.nodeDOM(cellPos);
+        if (!dom)
+            continue;
+        if (dom === td)
+            return cellPos;
+        if (td.contains(dom))
+            return cellPos;
+        if (dom instanceof Node && dom.contains(td))
+            return cellPos;
+    }
+    return null;
+}
+/**
+ * Same mapping as upstream `edgeCell`: the right edge resizes this cell's
+ * column, the left edge resizes the previous one, and the first column's left
+ * edge is not a handle.
+ *
+ * `edgeCell` itself cannot be reused. It calls `posAtCoords` and then
+ * `cellAround`, both of which resolve to the innermost cell under the pointer
+ * — the original bug.
+ */
+function handleCellForSide(view, cellPos, side) {
+    const $cell = view.state.doc.resolve(cellPos);
+    const role = $cell.nodeAfter?.type.spec['tableRole'];
+    if (role !== 'cell' && role !== 'header_cell')
+        return -1;
+    if (side === 'right')
+        return $cell.pos;
+    const table = $cell.node(-1);
+    if (table.type.spec['tableRole'] !== 'table')
+        return -1;
+    const map = TableMap.get(table);
+    const start = $cell.start(-1);
+    const index = map.map.indexOf($cell.pos - start);
+    if (index < 0)
+        return -1;
+    if (index % map.width === 0)
+        return -1;
+    const prev = map.map[index - 1];
+    return prev == null ? -1 : start + prev;
+}
+//# sourceMappingURL=resize.js.map

package/dist/resize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resize.js","sourceRoot":"","sources":["../src/resize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EACL,uBAAuB,EACvB,YAAY,EACZ,QAAQ,GACT,MAAM,oBAAoB,CAAA;AAG3B,kFAAkF;AAClF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAA;AAE3C,MAAM,qBAAqB,GAAG,IAAI,SAAS,CAAC,+BAA+B,CAAC,CAAA;AAE5E,MAAM,UAAU,wBAAwB,CACtC,WAAW,GAAG,0BAA0B;IAExC,OAAO,IAAI,MAAM,CAAC;QAChB,GAAG,EAAE,qBAAqB;QAC1B,KAAK,EAAE;YACL,eAAe,EAAE;gBACf,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;oBACzB,IAAI,CAAC,IAAI,CAAC,QAAQ;wBAAE,OAAO,KAAK,CAAA;oBAChC,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC;wBAAE,OAAO,KAAK,CAAA;oBAChD,MAAM,WAAW,GAAG,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;oBAChE,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,QAAQ;wBAAE,OAAO,KAAK,CAAA;oBAEtD,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;oBACvD,IAAI,IAAI,IAAI,IAAI;wBAAE,OAAO,KAAK,CAAA;oBAC9B,IAAI,IAAI,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;wBACtC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;oBACpF,CAAC;oBACD,OAAO,IAAI,CAAA;gBACb,CAAC;aACF;SACF;KACF,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,gBAAgB,CAAC,IAAgB,EAAE,KAAiB,EAAE,WAAmB;IAChF,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACzC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAA;IAEjC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9C,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAE,CAAA;QACpB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAA;QAClD,IAAI,IAAI,GAA4B,IAAI,CAAA;QACxC,IAAI,KAAK,CAAC,OAAO,GAAG,IAAI,IAAI,WAAW;YAAE,IAAI,GAAG,MAAM,CAAA;aACjD,IAAI,KAAK,GAAG,KAAK,CAAC,OAAO,IAAI,WAAW;YAAE,IAAI,GAAG,OAAO,CAAA;QAC7D,IAAI,CAAC,IAAI;YAAE,SAAQ;QAEnB,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACxC,IAAI,OAAO,IAAI,IAAI;YAAE,SAAQ;QAC7B,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QACrD,IAAI,MAAM,GAAG,CAAC;YAAE,SAAQ;QACxB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAAE,SAAQ;QAE3D,6DAA6D;QAC7D,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;QACxB,OAAO,MAAM,CAAA;IACf,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,6EAA6E;AAC7E,SAAS,aAAa,CAAC,MAA0B;IAC/C,MAAM,KAAK,GAAkB,EAAE,CAAA;IAC/B,IAAI,IAAI,GAAgB,MAAM,YAAY,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAA;IAC9D,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI;gBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACtE,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAAE,MAAK;QACnD,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,cAAc,CAAC,IAAgB,EAAE,EAAe;IACvD,IAAI,GAAW,CAAA;IACf,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACxC,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAuB,CAAA;QAC1E,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,aAAa;YAAE,SAAQ;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAClC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACjC,IAAI,CAAC,GAAG;YAAE,SAAQ;QAClB,IAAI,GAAG,KAAK,EAAE;YAAE,OAAO,OAAO,CAAA;QAC9B,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,OAAO,CAAA;QACpC,IAAI,GAAG,YAAY,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAAE,OAAO,OAAO,CAAA;IAC7D,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,iBAAiB,CAAC,IAAgB,EAAE,OAAe,EAAE,IAAsB;IAClF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAuB,CAAA;IAC1E,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,aAAa;QAAE,OAAO,CAAC,CAAC,CAAA;IACxD,IAAI,IAAI,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC,GAAG,CAAA;IAEtC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,OAAO;QAAE,OAAO,CAAC,CAAC,CAAA;IACvD,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7B,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA;IAChD,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC,CAAA;IACxB,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,CAAA;IACtC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC/B,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAA;AACzC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openleaf-editor/plugins-table",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.5",
   "description": "Opt-in table editing for OpenLeaf: cell selection, column resizing, property dialogs, captions, insert grid, context menu, and row/column commands. The table schema itself lives in @openleaf-editor/core so every deployment reads tables faithfully.",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -34,16 +34,16 @@
   "peerDependencies": {
     "prosemirror-state": "^1.4.3",
     "prosemirror-tables": "^1.6.4",
-    "@openleaf-editor/ui": "^0.1.0-beta.3",
-    "@openleaf-editor/core": "^0.1.0-beta.3"
+    "@openleaf-editor/ui": "^0.1.0-beta.5",
+    "@openleaf-editor/core": "^0.1.0-beta.5"
   },
   "devDependencies": {
     "prosemirror-model": "^1.24.1",
     "prosemirror-state": "^1.4.3",
     "prosemirror-tables": "^1.6.4",
     "prosemirror-view": "^1.37.0",
-    "@openleaf-editor/ui": "0.1.0-beta.3",
-    "@openleaf-editor/core": "0.1.0-beta.3"
+    "@openleaf-editor/ui": "0.1.0-beta.5",
+    "@openleaf-editor/core": "0.1.0-beta.5"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json"