@underverse-ui/underverse 2.0.27 → 2.0.28

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   extractImageSrcsFromHtml,
   normalizeImageUrl,
   prepareUEditorContentForSave
-} from "./chunk-5ODK33CL.js";
+} from "./chunk-QYFXYDBK.js";
 import {
   EmojiPicker_default
 } from "./chunk-F7MX3XXK.js";
@@ -16,7 +16,7 @@ import {
 import "./chunk-4TYW5K4J.js";
 import {
   Modal_default
-} from "./chunk-HVJ3R6LP.js";
+} from "./chunk-Y4X6CAZY.js";
 import {
   DropdownMenuItem,
   DropdownMenuSeparator,
@@ -31,7 +31,7 @@ import {
   shadcnAnimationStyles,
   useShadCNAnimations,
   useUnderverseUIConfig
-} from "./chunk-BDRCOIYR.js";
+} from "./chunk-KTOXCD6J.js";
 import {
   ForceInternalTranslationsProvider,
   NextIntlAdapter,

package/dist/{menu-bar-GKJEVLQU.js → menu-bar-CFIWMBAA.js}

@@ -1,7 +1,7 @@
 "use client";
 import {
   Modal_default
-} from "./chunk-HVJ3R6LP.js";
+} from "./chunk-Y4X6CAZY.js";
 import {
   DEFAULT_TABLE_ROW_HEIGHT,
   DEFAULT_UEDITOR_IMAGE_MAX_FILE_SIZE,
@@ -21,7 +21,7 @@ import {
   sanitizeUEditorUrl,
   useDropdownMenuClose,
   useSharedEditorUiRenderState
-} from "./chunk-BDRCOIYR.js";
+} from "./chunk-KTOXCD6J.js";
 import {
   cn,
   useSmartTranslations
@@ -945,4 +945,4 @@ var MenuBar = ({
 export {
   MenuBar
 };
-//# sourceMappingURL=menu-bar-GKJEVLQU.js.map
+//# sourceMappingURL=menu-bar-CFIWMBAA.js.map

package/dist/ueditor.cjs

@@ -5326,24 +5326,28 @@ function isRowResizeHotspot(cell, clientX, clientY) {
 }
 function getRelativeBoundaryMetrics(surface, table, row, cell) {
   const surfaceRect = surface.getBoundingClientRect();
+  const originLeft = surfaceRect.left + surface.clientLeft;
+  const originTop = surfaceRect.top + surface.clientTop;
   const tableRect = table.getBoundingClientRect();
   const rowRect = row.getBoundingClientRect();
   const cellRect = cell.getBoundingClientRect();
   return {
-    left: tableRect.left - surfaceRect.left + surface.scrollLeft,
-    top: tableRect.top - surfaceRect.top + surface.scrollTop,
+    left: tableRect.left - originLeft + surface.scrollLeft,
+    top: tableRect.top - originTop + surface.scrollTop,
     width: tableRect.width,
     height: tableRect.height,
-    rowBottom: rowRect.bottom - surfaceRect.top + surface.scrollTop,
-    columnRight: cellRect.right - surfaceRect.left + surface.scrollLeft
+    rowBottom: rowRect.bottom - originTop + surface.scrollTop,
+    columnRight: cellRect.right - originLeft + surface.scrollLeft
   };
 }
 function getRelativeCellMetrics(surface, cell) {
   const surfaceRect = surface.getBoundingClientRect();
+  const originLeft = surfaceRect.left + surface.clientLeft;
+  const originTop = surfaceRect.top + surface.clientTop;
   const cellRect = cell.getBoundingClientRect();
   return {
-    left: cellRect.left - surfaceRect.left + surface.scrollLeft,
-    top: cellRect.top - surfaceRect.top + surface.scrollTop,
+    left: cellRect.left - originLeft + surface.scrollLeft,
+    top: cellRect.top - originTop + surface.scrollTop,
     width: cellRect.width,
     height: cellRect.height
   };
@@ -5356,6 +5360,8 @@ function getRelativeSelectedCellsMetrics(surface) {
     return null;
   }
   const surfaceRect = surface.getBoundingClientRect();
+  const originLeft = surfaceRect.left + surface.clientLeft;
+  const originTop = surfaceRect.top + surface.clientTop;
   let left = Number.POSITIVE_INFINITY;
   let top = Number.POSITIVE_INFINITY;
   let right = Number.NEGATIVE_INFINITY;
@@ -5368,8 +5374,8 @@ function getRelativeSelectedCellsMetrics(surface) {
     bottom = Math.max(bottom, rect.bottom);
   });
   return {
-    left: left - surfaceRect.left + surface.scrollLeft,
-    top: top - surfaceRect.top + surface.scrollTop,
+    left: left - originLeft + surface.scrollLeft,
+    top: top - originTop + surface.scrollTop,
     width: right - left,
     height: bottom - top
   };
@@ -21054,7 +21060,7 @@ function buildLogicalColumnMetrics({
       if (relativeCellPos == null) continue;
       const cellMapRect = map.findCell(relativeCellPos);
       const cellRect = tableCell.getBoundingClientRect();
-      const cellStart = cellRect.width > 0 ? cellRect.left - surfaceRect.left + surface.scrollLeft : tableLeft + cellMapRect.left * fallbackWidth;
+      const cellStart = cellRect.width > 0 ? cellRect.left - surfaceRect.left - surface.clientLeft + surface.scrollLeft : tableLeft + cellMapRect.left * fallbackWidth;
       const size = metricOrFallback(cellRect.width, fallbackWidth * Math.max(1, cellMapRect.right - cellMapRect.left));
       visualColumns.push({
         index: cellMapRect.left,
@@ -21109,7 +21115,7 @@ function buildLogicalRowMetrics({
     const tableCell = isTableCellElement(cellCandidate) ? cellCandidate : null;
     if (tableCell) {
       const cellRect = tableCell.getBoundingClientRect();
-      const start = cellRect.height > 0 ? cellRect.top - surfaceRect.top + surface.scrollTop : tableTop + cellMapRect.top * fallbackHeight;
+      const start = cellRect.height > 0 ? cellRect.top - surfaceRect.top - surface.clientTop + surface.scrollTop : tableTop + cellMapRect.top * fallbackHeight;
       const size = metricOrFallback(cellRect.height, fallbackHeight * Math.max(1, cellMapRect.bottom - cellMapRect.top));
       visualRows.push({
         index: cellMapRect.top,
@@ -21126,7 +21132,7 @@ function buildLogicalRowMetrics({
   return rows.map((tableRow, index) => {
     const rowRect = tableRow.getBoundingClientRect();
     const anchorCell = tableRow.cells.item(0) ?? cornerCell;
-    const start = rowRect.height > 0 ? rowRect.top - surfaceRect.top + surface.scrollTop : tableTop + index * fallbackHeight;
+    const start = rowRect.height > 0 ? rowRect.top - surfaceRect.top - surface.clientTop + surface.scrollTop : tableTop + index * fallbackHeight;
     const size = metricOrFallback(rowRect.height, fallbackHeight);
     return {
       index,
@@ -21168,6 +21174,8 @@ function buildTableControlLayout(editor, surface, cell) {
   }
   const map = TableMap4.get(tableInfo.node);
   const surfaceRect = surface.getBoundingClientRect();
+  const surfaceOriginLeft = surfaceRect.left + surface.clientLeft;
+  const surfaceOriginTop = surfaceRect.top + surface.clientTop;
   const tableRect = table.getBoundingClientRect();
   const explicitColumnWidths = Array.from(table.querySelectorAll("colgroup > col")).slice(0, map.width).map((column) => parsePixelMetric(column.style.width));
   const explicitTableWidth = parsePixelMetric(table.style.width) ?? (explicitColumnWidths.length === map.width && explicitColumnWidths.every((width) => width !== null) ? explicitColumnWidths.reduce((sum, width) => sum + width, 0) : null);
@@ -21176,14 +21184,14 @@ function buildTableControlLayout(editor, surface, cell) {
   const wrapperElement = table.closest(".tableWrapper");
   const wrapper = isHTMLElement(wrapperElement) ? wrapperElement : null;
   const wrapperRect = wrapper?.getBoundingClientRect() ?? tableRect;
-  const tableLeft = tableRect.left - surfaceRect.left + surface.scrollLeft;
-  const tableTop = tableRect.top - surfaceRect.top + surface.scrollTop;
+  const tableLeft = tableRect.left - surfaceOriginLeft + surface.scrollLeft;
+  const tableTop = tableRect.top - surfaceOriginTop + surface.scrollTop;
   const tableWidth = metricOrFallback(tableRect.width, explicitTableWidth ?? FALLBACK_TABLE_COLUMN_WIDTH * map.width);
   const tableHeight = metricOrFallback(tableRect.height, explicitTableHeight ?? FALLBACK_TABLE_ROW_HEIGHT * rows.length);
   const avgRowHeight = metricOrFallback(tableHeight / rows.length, FALLBACK_TABLE_ROW_HEIGHT);
   const avgColumnWidth = metricOrFallback(tableWidth / map.width, FALLBACK_TABLE_COLUMN_WIDTH);
-  const wrapperLeft = wrapperRect.left - surfaceRect.left + surface.scrollLeft;
-  const wrapperTop = wrapperRect.top - surfaceRect.top + surface.scrollTop;
+  const wrapperLeft = wrapperRect.left - surfaceOriginLeft + surface.scrollLeft;
+  const wrapperTop = wrapperRect.top - surfaceOriginTop + surface.scrollTop;
   const wrapperWidth = metricOrFallback(wrapperRect.width, tableWidth);
   const wrapperHeight = metricOrFallback(wrapperRect.height, tableHeight);
   const viewportWidth = metricOrFallback(wrapper?.clientWidth ?? wrapperRect.width, tableWidth);
@@ -21265,8 +21273,8 @@ function buildTableHoverState({
     return DEFAULT_TABLE_HOVER_STATE;
   }
   const surfaceRect = surface.getBoundingClientRect();
-  const relativeX = event.clientX - surfaceRect.left + surface.scrollLeft;
-  const relativeY = event.clientY - surfaceRect.top + surface.scrollTop;
+  const relativeX = event.clientX - surfaceRect.left - surface.clientLeft + surface.scrollLeft;
+  const relativeY = event.clientY - surfaceRect.top - surface.clientTop + surface.scrollTop;
   const targetElement = resolveEventElement(event.target);
   const directRowHandle = targetElement?.closest?.("[data-row-handle-index]");
   const directColumnHandle = targetElement?.closest?.("[data-column-handle-index]");
@@ -22174,6 +22182,7 @@ function TableControls({ editor, containerRef, showCellInspector = true }) {
     surface.addEventListener(UEDITOR_TABLE_LAYOUT_CHANGE_EVENT, scheduleCurrentLayoutRefresh);
     if (!editorWindow) return void 0;
     const unsubscribeResize = subscribeSharedGlobalEvent(editorWindow, "resize", scheduleCurrentLayoutRefresh);
+    const unsubscribeWindowScroll = subscribeSharedGlobalEvent(editorWindow, "scroll", scheduleCurrentLayoutRefresh, { passive: true });
     editor.on("selectionUpdate", scheduleSyncFromSelection);
     editor.on("update", scheduleCurrentLayoutRefresh);
     syncFromSelection();
@@ -22189,6 +22198,7 @@ function TableControls({ editor, containerRef, showCellInspector = true }) {
       surface.removeEventListener("scroll", scheduleCurrentLayoutRefresh, scrollListenerOptions);
       surface.removeEventListener(UEDITOR_TABLE_LAYOUT_CHANGE_EVENT, scheduleCurrentLayoutRefresh);
       unsubscribeResize();
+      unsubscribeWindowScroll();
       editor.off("selectionUpdate", scheduleSyncFromSelection);
       editor.off("update", scheduleCurrentLayoutRefresh);
     };