@umbraco-cms/backoffice 17.2.2 → 17.3.0-rc2

package/dist-cms/packages/tiptap/extensions/table/plugins/table-handle.js

@@ -0,0 +1,376 @@
+import { CellSelection, TableMap } from '@tiptap/pm/tables';
+import { Plugin } from '@tiptap/pm/state';
+let nextPopoverId = 0;
+/**
+ * Plugin view that manages table grips and shared popover menu.
+ * Consolidates grip management from header/cell plugins into a single location.
+ */
+class TableHandlePluginView {
+    #editor;
+    #view;
+    #state;
+    #rowGrip = null;
+    #colGrip = null;
+    #rowPopover = null;
+    #colPopover = null;
+    #rowMenu = null;
+    #colMenu = null;
+    #currentControlsContainer = null;
+    constructor(editor, view) {
+        this.#editor = editor;
+        this.#view = view;
+        // Setup event listeners
+        this.#view.dom.addEventListener('mousemove', this.#handleMouseMove);
+        this.#view.dom.addEventListener('mouseleave', this.#handleMouseLeave);
+    }
+    #handleMouseMove = (event) => {
+        if (!this.#editor.isEditable) {
+            this.#hideGrips();
+            return;
+        }
+        const target = event.target;
+        if (!target)
+            return;
+        // Don't update state if hovering over grips or popover - keep them visible
+        if (this.#isOverGripOrPopover(target)) {
+            return;
+        }
+        // Only process if inside the editor
+        if (!this.#view.dom.contains(target))
+            return;
+        this.#updateStateFromMousePosition(event);
+    };
+    #handleMouseLeave = () => {
+        this.#hideGrips();
+    };
+    #isOverGripOrPopover(target) {
+        // Check if target is a grip or inside a grip
+        if (target.closest('.grip-row') || target.closest('.grip-column')) {
+            return true;
+        }
+        // Check if target is inside the table-controls container (grip area)
+        if (target.closest('.table-controls')) {
+            return true;
+        }
+        // Check if target is a popover or inside a popover
+        if (target.closest('uui-popover-container')) {
+            return true;
+        }
+        return false;
+    }
+    #updateStateFromMousePosition(event) {
+        // Find the cell element under the mouse
+        const cellElement = this.#findCellFromEvent(event);
+        if (!cellElement) {
+            this.#hideGrips();
+            return;
+        }
+        // Find the table and its position
+        const tableInfo = this.#findTableFromCell(cellElement);
+        if (!tableInfo) {
+            this.#hideGrips();
+            return;
+        }
+        // Get the controls container from the UmbTableView
+        const tableWrapper = cellElement.closest('.tableWrapper');
+        const controlsContainer = tableWrapper?.querySelector('.table-controls');
+        if (!controlsContainer) {
+            this.#hideGrips();
+            return;
+        }
+        // Get cell indices using TableMap for correct handling of merged cells
+        const cellIndices = this.#getCellIndices(cellElement, tableInfo);
+        if (!cellIndices) {
+            this.#hideGrips();
+            return;
+        }
+        const tableBody = cellElement.closest('tbody') || cellElement.closest('table');
+        const tableRect = tableBody?.getBoundingClientRect();
+        const cellRect = cellElement.getBoundingClientRect();
+        this.#state = {
+            rowIndex: cellIndices.rowIndex,
+            colIndex: cellIndices.colIndex,
+            referencePosCell: cellRect,
+            referencePosTable: tableRect,
+            tableNode: tableInfo.node,
+            tablePos: tableInfo.pos,
+            controlsContainer: controlsContainer,
+        };
+        this.#updateGrips(controlsContainer);
+    }
+    #findCellFromEvent(event) {
+        const target = event.target;
+        const cell = target.closest('td, th');
+        return cell;
+    }
+    #findTableFromCell(cell) {
+        const tableElement = cell.closest('table');
+        if (!tableElement)
+            return null;
+        // Find the table wrapper which is the nodeDOM for the table
+        const tableWrapper = tableElement.closest('.tableWrapper');
+        if (!tableWrapper)
+            return null;
+        // Get the block container (our enhanced UmbTableView's dom)
+        const blockContainer = tableWrapper.parentElement;
+        if (!blockContainer?.classList.contains('umb-tiptap-table'))
+            return null;
+        // Find the position in the document
+        const pos = this.#view.posAtDOM(tableElement, 0);
+        if (pos === undefined)
+            return null;
+        try {
+            const $pos = this.#view.state.doc.resolve(pos);
+            for (let d = $pos.depth; d >= 0; d--) {
+                const node = $pos.node(d);
+                if (node.type.name === 'table') {
+                    return { node, pos: d === 0 ? 0 : $pos.before(d) };
+                }
+            }
+        }
+        catch {
+            return null;
+        }
+        return null;
+    }
+    #getCellIndices(cell, tableInfo) {
+        try {
+            const pos = this.#view.posAtDOM(cell, 0);
+            const $pos = this.#view.state.doc.resolve(pos);
+            const tableStart = tableInfo.pos + 1;
+            const map = TableMap.get(tableInfo.node);
+            // Walk up from the resolved position to find the cell node
+            for (let d = $pos.depth; d >= 0; d--) {
+                const name = $pos.node(d).type.name;
+                if (name === 'tableCell' || name === 'tableHeader') {
+                    const rect = map.findCell($pos.before(d) - tableStart);
+                    return { rowIndex: rect.top, colIndex: rect.left };
+                }
+            }
+        }
+        catch {
+            // Position resolution or cell lookup failed
+        }
+        return null;
+    }
+    #hideGrips() {
+        if (this.#rowGrip) {
+            this.#rowGrip.style.display = 'none';
+        }
+        if (this.#colGrip) {
+            this.#colGrip.style.display = 'none';
+        }
+        this.#state = undefined;
+    }
+    #updateGrips(container) {
+        // Create grips and popover if they don't exist or if container changed
+        if (this.#currentControlsContainer !== container) {
+            this.#cleanupGrips();
+            this.#createGrips(container);
+            this.#currentControlsContainer = container;
+        }
+        this.#positionGrips();
+    }
+    #createGrips(container) {
+        // Generate unique IDs for each popover
+        const id = nextPopoverId++;
+        const rowPopoverId = `table-row-menu-${id}`;
+        const colPopoverId = `table-col-menu-${id}`;
+        // Create row grip as button
+        const rowGrip = document.createElement('button');
+        rowGrip.type = 'button';
+        rowGrip.className = 'grip-row';
+        rowGrip.appendChild(document.createElement('uui-symbol-more'));
+        rowGrip.setAttribute('popovertarget', rowPopoverId);
+        rowGrip.addEventListener('click', () => {
+            this.#handleGripClick('row');
+        });
+        this.#rowGrip = rowGrip;
+        // Create column grip as button
+        const colGrip = document.createElement('button');
+        colGrip.type = 'button';
+        colGrip.className = 'grip-column';
+        colGrip.appendChild(document.createElement('uui-symbol-more'));
+        colGrip.setAttribute('popovertarget', colPopoverId);
+        colGrip.addEventListener('click', () => {
+            this.#handleGripClick('column');
+        });
+        this.#colGrip = colGrip;
+        // Create row popover
+        this.#rowPopover = document.createElement('uui-popover-container');
+        this.#rowPopover.id = rowPopoverId;
+        this.#rowPopover.setAttribute('popover', 'auto');
+        this.#rowPopover.placement = 'left';
+        // Create row menu element
+        this.#rowMenu = document.createElement('umb-tiptap-menu');
+        this.#rowMenu.menuAlias = 'Umb.Menu.Tiptap.TableRow';
+        this.#rowPopover.appendChild(this.#rowMenu);
+        // Create column popover
+        this.#colPopover = document.createElement('uui-popover-container');
+        this.#colPopover.id = colPopoverId;
+        this.#colPopover.setAttribute('popover', 'auto');
+        this.#colPopover.placement = 'top';
+        // Create column menu element
+        this.#colMenu = document.createElement('umb-tiptap-menu');
+        this.#colMenu.menuAlias = 'Umb.Menu.Tiptap.TableColumn';
+        this.#colPopover.appendChild(this.#colMenu);
+        container.append(this.#rowGrip, this.#colGrip, this.#rowPopover, this.#colPopover);
+    }
+    #handleGripClick(context) {
+        if (!this.#state || !this.#editor.isEditable)
+            return;
+        const index = context === 'row' ? this.#state.rowIndex : this.#state.colIndex;
+        if (index === undefined)
+            return;
+        // Select the row or column
+        const tr = this.#editor.state.tr;
+        const selectFn = context === 'row' ? selectRow : selectColumn;
+        const tableStart = this.#state.tablePos + 1; // start = pos + 1 (position of first child)
+        this.#editor.view.dispatch(selectFn(index)(tr, this.#state.tableNode, tableStart));
+        // Update grip selection state
+        this.#updateGripSelectionState(context);
+    }
+    #updateGripSelectionState(selectedContext) {
+        if (this.#rowGrip) {
+            this.#rowGrip.classList.toggle('selected', selectedContext === 'row');
+        }
+        if (this.#colGrip) {
+            this.#colGrip.classList.toggle('selected', selectedContext === 'column');
+        }
+    }
+    #positionGrips() {
+        if (!this.#state?.referencePosCell || !this.#state?.referencePosTable || !this.#state?.controlsContainer)
+            return;
+        const { referencePosCell, referencePosTable, controlsContainer } = this.#state;
+        // Compute the offset dynamically from the controls container's position
+        const controlsRect = controlsContainer.getBoundingClientRect();
+        const containerOffsetTop = referencePosTable.top - controlsRect.top;
+        const containerOffsetLeft = referencePosTable.left - controlsRect.left;
+        // Position row grip (left side of cell)
+        if (this.#rowGrip) {
+            this.#rowGrip.style.display = 'flex';
+            this.#rowGrip.style.top = `${referencePosCell.top - referencePosTable.top + containerOffsetTop}px`;
+            this.#rowGrip.style.height = `${referencePosCell.height}px`;
+        }
+        // Position column grip (top of cell)
+        if (this.#colGrip) {
+            this.#colGrip.style.display = 'flex';
+            this.#colGrip.style.left = `${referencePosCell.left - referencePosTable.left + containerOffsetLeft}px`;
+            this.#colGrip.style.width = `${referencePosCell.width}px`;
+        }
+    }
+    #cleanupGrips() {
+        this.#rowGrip?.remove();
+        this.#colGrip?.remove();
+        this.#rowPopover?.remove();
+        this.#colPopover?.remove();
+        this.#rowGrip = null;
+        this.#colGrip = null;
+        this.#rowPopover = null;
+        this.#colPopover = null;
+        this.#rowMenu = null;
+        this.#colMenu = null;
+    }
+    update(view) {
+        this.#view = view;
+        // Update grip selection state based on current selection
+        const { selection } = view.state;
+        if (isCellSelection(selection) && this.#state) {
+            const rowSelected = this.#state.rowIndex !== undefined && isRowSelected(this.#state.rowIndex)(selection);
+            const colSelected = this.#state.colIndex !== undefined && isColumnSelected(this.#state.colIndex)(selection);
+            if (this.#rowGrip) {
+                this.#rowGrip.classList.toggle('selected', rowSelected);
+            }
+            if (this.#colGrip) {
+                this.#colGrip.classList.toggle('selected', colSelected);
+            }
+        }
+    }
+    destroy() {
+        this.#view.dom.removeEventListener('mousemove', this.#handleMouseMove);
+        this.#view.dom.removeEventListener('mouseleave', this.#handleMouseLeave);
+        this.#cleanupGrips();
+    }
+}
+/**
+ * Creates the TableHandlePlugin for managing table grips and context menus.
+ * @param {Editor} editor The Tiptap editor instance to which the plugin will be attached.
+ * @returns {Plugin} Returns a ProseMirror plugin instance that manages table grips and context menus.
+ */
+export const TableHandlePlugin = (editor) => {
+    return new Plugin({
+        view(editorView) {
+            return new TableHandlePluginView(editor, editorView);
+        },
+    });
+};
+const select = (type) => (index) => (tr, tableNode, tableStart) => {
+    const isRowSelection = type === 'row';
+    const map = TableMap.get(tableNode);
+    // Check if the index is valid
+    if (index >= 0 && index < (isRowSelection ? map.height : map.width)) {
+        const left = isRowSelection ? 0 : index;
+        const top = isRowSelection ? index : 0;
+        const right = isRowSelection ? map.width : index + 1;
+        const bottom = isRowSelection ? index + 1 : map.height;
+        const cellsInFirstRow = map.cellsInRect({
+            left,
+            top,
+            right: isRowSelection ? right : left + 1,
+            bottom: isRowSelection ? top + 1 : bottom,
+        });
+        const cellsInLastRow = bottom - top === 1
+            ? cellsInFirstRow
+            : map.cellsInRect({
+                left: isRowSelection ? left : right - 1,
+                top: isRowSelection ? bottom - 1 : top,
+                right,
+                bottom,
+            });
+        const head = tableStart + cellsInFirstRow[0];
+        const anchor = tableStart + cellsInLastRow[cellsInLastRow.length - 1];
+        const $head = tr.doc.resolve(head);
+        const $anchor = tr.doc.resolve(anchor);
+        return tr.setSelection(new CellSelection($anchor, $head));
+    }
+    return tr;
+};
+const isRectSelected = (rect) => (selection) => {
+    const map = TableMap.get(selection.$anchorCell.node(-1));
+    const start = selection.$anchorCell.start(-1);
+    const cells = map.cellsInRect(rect);
+    const selectedCells = map.cellsInRect(map.rectBetween(selection.$anchorCell.pos - start, selection.$headCell.pos - start));
+    for (let i = 0, count = cells.length; i < count; i += 1) {
+        if (selectedCells.indexOf(cells[i]) === -1) {
+            return false;
+        }
+    }
+    return true;
+};
+const isCellSelection = (selection) => selection instanceof CellSelection;
+const isColumnSelected = (columnIndex) => (selection) => {
+    if (isCellSelection(selection)) {
+        const map = TableMap.get(selection.$anchorCell.node(-1));
+        return isRectSelected({
+            left: columnIndex,
+            right: columnIndex + 1,
+            top: 0,
+            bottom: map.height,
+        })(selection);
+    }
+    return false;
+};
+const isRowSelected = (rowIndex) => (selection) => {
+    if (isCellSelection(selection)) {
+        const map = TableMap.get(selection.$anchorCell.node(-1));
+        return isRectSelected({
+            left: 0,
+            right: map.width,
+            top: rowIndex,
+            bottom: rowIndex + 1,
+        })(selection);
+    }
+    return false;
+};
+const selectColumn = select('column');
+const selectRow = select('row');

package/dist-cms/packages/tiptap/extensions/table/plugins/table-view.d.ts

@@ -0,0 +1,9 @@
+import type { ProseMirrorNode } from '../../../externals.js';
+import { TableView } from '@tiptap/pm/tables';
+import type { ViewMutationRecord } from '@tiptap/pm/view';
+export declare class UmbTableView extends TableView {
+    #private;
+    constructor(node: ProseMirrorNode, cellMinWidth: number, containerAttributes: Record<string, string>);
+    ignoreMutation(mutation: ViewMutationRecord): boolean;
+    update(node: ProseMirrorNode): boolean;
+}

package/dist-cms/packages/tiptap/extensions/table/plugins/table-view.js

@@ -0,0 +1,76 @@
+import { TableView } from '@tiptap/pm/tables';
+export class UmbTableView extends TableView {
+    #containerAttributes;
+    #blockContainer;
+    #innerTableContainer;
+    #controlsContainer;
+    constructor(node, cellMinWidth, containerAttributes) {
+        super(node, cellMinWidth);
+        this.#containerAttributes = containerAttributes ?? {};
+        this.#blockContainer = this.#createBlockContainer();
+        this.#innerTableContainer = this.#createInnerTableContainer();
+        this.#controlsContainer = this.#createControlsContainer();
+        this.#setupDOMStructure();
+        this.#updateTableStyle(node);
+    }
+    #createBlockContainer() {
+        const container = document.createElement('div');
+        container.className = 'umb-tiptap-table';
+        Object.entries(this.#containerAttributes).forEach(([key, value]) => {
+            if (key === 'class') {
+                container.className += ' ' + value;
+            }
+            else {
+                container.setAttribute(key, value);
+            }
+        });
+        return container;
+    }
+    #createInnerTableContainer() {
+        const container = document.createElement('div');
+        container.className = 'table-container';
+        return container;
+    }
+    #createControlsContainer() {
+        const container = document.createElement('div');
+        container.className = 'table-controls';
+        return container;
+    }
+    #setupDOMStructure() {
+        // The parent TableView creates: <div class="tableWrapper"><table>...</table></div>
+        // We restructure to: blockContainer > tableWrapper > innerTableContainer + controlsContainer
+        const tableWrapper = this.dom;
+        const tableElement = tableWrapper.firstChild;
+        if (!tableElement)
+            return;
+        // Move table into inner container
+        this.#innerTableContainer.appendChild(tableElement);
+        // Build the new structure
+        tableWrapper.appendChild(this.#innerTableContainer);
+        tableWrapper.appendChild(this.#controlsContainer);
+        this.#blockContainer.appendChild(tableWrapper);
+        // Update the DOM reference
+        this.dom = this.#blockContainer;
+    }
+    ignoreMutation(mutation) {
+        // Only track mutations inside the table-container (the actual table content)
+        // Ignore mutations in controls and overlay containers
+        const target = mutation.target;
+        const isInsideTable = target.closest('.table-container');
+        return !isInsideTable || super.ignoreMutation(mutation);
+    }
+    update(node) {
+        if (!super.update(node))
+            return false;
+        this.#updateTableStyle(node);
+        return true;
+    }
+    #updateTableStyle(node) {
+        if (node.attrs.style) {
+            // NOTE: The `min-width` inline style is handled by the Tiptap TableView, so we need to preserve it. [LK]
+            const minWidth = this.table.style.minWidth;
+            const styles = node.attrs.style;
+            this.table.style.cssText = `${styles}; min-width: ${minWidth};`;
+        }
+    }
+}

package/dist-cms/packages/tiptap/extensions/table/table.tiptap-api.js

@@ -7,84 +7,107 @@ export default class UmbTiptapTableExtensionApi extends UmbTiptapExtensionApiBas
         super(...arguments);
         this.getTiptapExtensions = () => [UmbTable, UmbTableHeader, UmbTableRow, UmbTableCell];
         this.getStyles = () => css `
-		.tableWrapper {
-			margin: 1.5rem 0;
-
-			table {
-				border-color: rgba(0, 0, 0, 0.1);
-				border-radius: 0.25rem;
-				border-spacing: 0;
-				box-sizing: border-box;
+		/* Block container (outer wrapper from UmbTableView) */
+		.umb-tiptap-table {
+			margin-block: 1.25rem;
+
+			/* Table wrapper - needs position relative for grip positioning */
+			.tableWrapper {
+				position: relative;
+			}
+
+			/* Inner table container */
+			.table-container {
 				max-width: 100%;
 
-				td,
-				th {
+				/* Table styles */
+				table {
+					border-color: rgba(0, 0, 0, 0.1);
+					border-radius: 0.25rem;
+					border-spacing: 0;
 					box-sizing: border-box;
-					position: relative;
-					min-width: 50px;
-					border: 1px solid var(--uui-color-border);
-					padding: 0.5rem;
-					text-align: left;
-					vertical-align: top;
-
-					&:first-of-type:not(a),
-					&:first-of-type:not(a) {
-						margin-top: 0;
+					max-width: 100%;
+					overflow-wrap: break-word;
+
+					td,
+					th {
+						box-sizing: border-box;
+						position: relative;
+						min-width: 50px;
+						border: 1px solid var(--uui-color-border);
+						padding: 0.5rem;
+						text-align: left;
+						vertical-align: top;
+
+						&:first-of-type:not(a) {
+							margin-top: 0;
+						}
+
+						p {
+							margin: 0;
+						}
+
+						p + p {
+							margin-top: 0.75rem;
+						}
 					}
 
-					p {
-						margin: 0;
+					th {
+						background-color: var(--uui-color-surface-emphasis);
+						font-weight: bold;
 					}
 
-					p + p {
-						margin-top: 0.75rem;
+					.column-resize-handle {
+						position: absolute;
+						top: 0;
+						right: 0;
+						width: 4px;
+						height: 100%;
+						margin-inline-start: -1px;
+						margin-top: -1px;
+						height: calc(100% + 2px);
+						background: var(--uui-color-divider-emphasis);
+						cursor: col-resize;
+						z-index: 1;
+						pointer-events: auto;
 					}
-				}
-
-				th {
-					font-weight: bold;
-				}
 
-				.column-resize-handle {
-					cursor: ew-resize;
-					cursor: col-resize;
-					display: flex;
-					position: absolute;
-					top: 0;
-					bottom: -2px;
-					right: -0.25rem;
-					width: 0.5rem;
-				}
-
-				.column-resize-handle:before {
-					margin-left: 0.5rem;
-					height: 100%;
-					width: 1px;
-				}
-
-				.column-resize-handle:before {
-					content: '';
-				}
-
-				.selectedCell {
-					background-color: color-mix(in srgb, var(--uui-color-surface-emphasis) 50%, transparent);
-					border-color: var(--uui-color-selected);
+					.selectedCell {
+						background-color: color-mix(in srgb, var(--uui-color-surface-emphasis) 50%, transparent);
+						border-color: var(--uui-color-selected);
+					}
 				}
+			}
 
+			/* Controls container for grips and popovers - positioned to include grip areas */
+			.table-controls {
+				position: absolute;
+				top: -1rem;
+				left: -1rem;
+				right: -1rem;
+				bottom: -1rem;
+				pointer-events: none; /* Allow clicks to pass through to table */
+				z-index: 10;
+
+				/* Grips in the controls container (button elements) */
 				.grip-column,
 				.grip-row {
+					/* Reset button styles */
+					appearance: none;
+					border: none;
+					padding: 0;
+					margin: 0;
+					font: inherit;
+
 					position: absolute;
 					z-index: 10;
-					display: flex;
+					display: none; /* Hidden by default, shown via JS */
 					cursor: pointer;
 					align-items: center;
 					justify-content: center;
 					background-color: rgba(0, 0, 0, 0.05);
 					border-color: rgba(0, 0, 0, 0.2);
-
-					uui-symbol-more {
-						visibility: hidden;
-					}
+					pointer-events: auto; /* Grips are clickable */
 
 					&:hover {
 						background-color: rgba(0, 0, 0, 0.1);
@@ -98,35 +121,33 @@ export default class UmbTiptapTableExtensionApi extends UmbTiptapExtensionApiBas
 							0 0 #0000,
 							0 0 rgba(0, 0, 0, 0.05);
 					}
-
-					&:hover uui-symbol-more,
-					&.selected uui-symbol-more {
-						visibility: visible;
-					}
 				}
 
 				.grip-column {
 					border-left-width: 1px;
-					top: -0.75rem;
-					left: 0;
+					/* Container is offset by -1rem, so 0.25rem here = -0.75rem relative to table */
+					top: 0.25rem;
 					height: 0.75rem;
-					width: calc(100% + 1px);
-					margin-left: -1px;
+					/* left and width are set dynamically via JS */
 				}
 
 				.grip-row {
 					border-top-width: 1px;
 					flex-direction: column;
-					top: 0;
-					left: -0.75rem;
-					height: calc(100% + 1px);
+					/* Container is offset by -1rem, so 0.25rem here = -0.75rem relative to table */
+					left: 0.25rem;
 					width: 0.75rem;
-					margin-top: -1px;
+					/* top and height are set dynamically via JS */
 
 					uui-symbol-more {
 						transform: rotate(90deg);
 					}
 				}
+
+				/* Popover menu in controls container */
+				uui-popover-container {
+					pointer-events: auto;
+				}
 			}
 		}
 	`;

package/dist-cms/packages/tiptap/extensions/table/table.tiptap-extension.d.ts

@@ -1,11 +1,6 @@
-import { TableView } from '@tiptap/pm/tables';
-import type { Node as ProseMirrorNode } from '@tiptap/pm/model';
-export declare class UmbTableView extends TableView {
-    #private;
-    constructor(node: ProseMirrorNode, cellMinWidth: number);
-    update(node: ProseMirrorNode): boolean;
-}
+import { UmbTableView } from './plugins/table-view.js';
 export declare const UmbTable: import("@tiptap/core").Node<import("@tiptap/extension-table").TableOptions, any>;
 export declare const UmbTableRow: import("@tiptap/core").Node<import("@tiptap/extension-table").TableRowOptions, any>;
 export declare const UmbTableHeader: import("@tiptap/core").Node<import("@tiptap/extension-table").TableHeaderOptions, any>;
 export declare const UmbTableCell: import("@tiptap/core").Node<import("@tiptap/extension-table").TableCellOptions, any>;
+export { UmbTableView };