wordinweb 0.1.16 → 0.1.17

package/dist/index.js

@@ -20716,7 +20716,7 @@ function resizeTableRow(doc, tblEl, rowIdx, newHeightPx) {
   doc.refresh();
   return true;
 }
-function moveTableTo(doc, tblEl, xPx, yPx, preservePageStart = false) {
+function moveTableTo(doc, tblEl, xPx, yPx, preservePageStart = false, pageDelta = 0) {
   if (localName(tblEl.name) !== "tbl") return false;
   const w = prefixOf5(tblEl);
   let tblPr = child(tblEl, "tblPr");
@@ -20725,31 +20725,54 @@ function moveTableTo(doc, tblEl, xPx, yPx, preservePageStart = false) {
     tblEl.children.unshift(tblPr);
   }
   let position = child(tblPr, "tblpPr");
+  const wasInline = !position;
   if (!position) {
-    if (preservePageStart) {
-      const parent = doc.findParentOf(tblEl);
-      const tableIndex = parent?.children.indexOf(tblEl) ?? -1;
-      const previous = parent && tableIndex > 0 ? parent.children[tableIndex - 1] : void 0;
-      const breakRun = {
+    position = { name: `${w}tblpPr`, attrs: {}, children: [], text: "" };
+    const styleIdx = tblPr.children.findIndex((c) => localName(c.name) === "tblStyle");
+    tblPr.children.splice(styleIdx + 1, 0, position);
+  }
+  let pageBreakAdjustment = pageDelta + (wasInline && preservePageStart ? 1 : 0);
+  const parent = doc.findParentOf(tblEl);
+  if (parent && pageBreakAdjustment > 0) {
+    const tableIndex = parent.children.indexOf(tblEl);
+    let previous = tableIndex > 0 ? parent.children[tableIndex - 1] : void 0;
+    if (!previous || localName(previous.name) !== "p") {
+      previous = { name: `${w}p`, attrs: {}, children: [], text: "" };
+      parent.children.splice(tableIndex, 0, previous);
+    }
+    while (pageBreakAdjustment-- > 0) {
+      previous.children.push({
         name: `${w}r`,
         attrs: {},
         children: [{ name: `${w}br`, attrs: { [`${w}type`]: "page" }, children: [], text: "" }],
         text: ""
-      };
-      if (previous && localName(previous.name) === "p") {
-        previous.children.push(breakRun);
-      } else if (parent && tableIndex >= 0) {
-        parent.children.splice(tableIndex, 0, {
-          name: `${w}p`,
-          attrs: {},
-          children: [breakRun],
-          text: ""
-        });
+      });
+    }
+  } else if (parent && pageBreakAdjustment < 0) {
+    while (pageBreakAdjustment++ < 0) {
+      const tableIndex = parent.children.indexOf(tblEl);
+      const previous = tableIndex > 0 ? parent.children[tableIndex - 1] : void 0;
+      if (!previous || localName(previous.name) !== "p") break;
+      let removed = false;
+      for (let runIndex = previous.children.length - 1; runIndex >= 0 && !removed; runIndex--) {
+        const run = previous.children[runIndex];
+        if (localName(run.name) !== "r") continue;
+        for (let childIndex = run.children.length - 1; childIndex >= 0; childIndex--) {
+          const runChild = run.children[childIndex];
+          if (localName(runChild.name) !== "br" || attr(runChild, "type") !== "page") continue;
+          run.children.splice(childIndex, 1);
+          if (!run.children.some((childEl) => localName(childEl.name) !== "rPr")) {
+            previous.children.splice(runIndex, 1);
+          }
+          removed = true;
+          break;
+        }
+      }
+      if (!removed) break;
+      if (!previous.children.some((childEl) => localName(childEl.name) !== "pPr")) {
+        parent.children.splice(parent.children.indexOf(previous), 1);
       }
     }
-    position = { name: `${w}tblpPr`, attrs: {}, children: [], text: "" };
-    const styleIdx = tblPr.children.findIndex((c) => localName(c.name) === "tblStyle");
-    tblPr.children.splice(styleIdx + 1, 0, position);
   }
   const keyOf = (name) => Object.keys(position.attrs).find((key) => localName(key) === name);
   const set = (name, value) => {
@@ -23595,39 +23618,102 @@ var _DocxEditor = class _DocxEditor {
       const zoom = this.host.zoom ?? 1;
       const startX = e.clientX;
       const startY = e.clientY;
+      const pages = Array.from(handle?.root.querySelectorAll(".dxw-page") ?? []);
+      const sourcePage = surface.parentElement;
+      const sourcePageIndex = sourcePage ? pages.indexOf(sourcePage) : -1;
+      const sourceRect = surface.getBoundingClientRect();
+      const pointerOffsetX = (startX - sourceRect.left) / zoom - grip.item.x;
+      const pointerOffsetY = (startY - sourceRect.top) / zoom - grip.item.y1;
       let dx = 0;
       let dy = 0;
-      const onMove = (me) => {
-        dx = (me.clientX - startX) / zoom;
-        dy = (me.clientY - startY) / zoom;
+      let targetPageIndex = sourcePageIndex;
+      let targetX = grip.item.x;
+      let targetY = grip.item.y1;
+      let pointerX = startX;
+      let pointerY = startY;
+      let scrollParent = surface.parentElement;
+      while (scrollParent) {
+        const style = getComputedStyle(scrollParent);
+        if (/(auto|scroll)/.test(style.overflowY) && scrollParent.scrollHeight > scrollParent.clientHeight) break;
+        scrollParent = scrollParent.parentElement;
+      }
+      scrollParent ?? (scrollParent = document.scrollingElement);
+      const updateMove = (clientX, clientY) => {
+        dx = (clientX - startX) / zoom;
+        dy = (clientY - startY) / zoom;
         if (isMove) {
           const width = (grip.item.x2 ?? grip.item.x) - grip.item.x;
           const height = grip.item.y2 - grip.item.y1;
-          const maxX = Math.max(0, parseFloat(surface.style.width) - width);
-          const maxY = Math.max(0, parseFloat(surface.style.height) - height);
-          dx = Math.max(-grip.item.x, Math.min(dx, maxX - grip.item.x));
-          dy = Math.max(-grip.item.y1, Math.min(dy, maxY - grip.item.y1));
-          guide.style.left = `${grip.item.x + dx}px`;
-          guide.style.top = `${grip.item.y1 + dy}px`;
+          let targetSurface = surface;
+          let bestDistance = Infinity;
+          for (let pageIndex = 0; pageIndex < pages.length; pageIndex++) {
+            const candidate = pages[pageIndex].firstElementChild;
+            if (!candidate) continue;
+            const rect = candidate.getBoundingClientRect();
+            const distX = clientX < rect.left ? rect.left - clientX : clientX > rect.right ? clientX - rect.right : 0;
+            const distY = clientY < rect.top ? rect.top - clientY : clientY > rect.bottom ? clientY - rect.bottom : 0;
+            const distance = distX * distX + distY * distY;
+            if (distance >= bestDistance) continue;
+            bestDistance = distance;
+            targetSurface = candidate;
+            targetPageIndex = pageIndex;
+          }
+          const targetRect = targetSurface.getBoundingClientRect();
+          const maxX = Math.max(0, targetRect.width / zoom - width);
+          const maxY = Math.max(0, targetRect.height / zoom - height);
+          targetX = Math.max(0, Math.min((clientX - targetRect.left) / zoom - pointerOffsetX, maxX));
+          targetY = Math.max(0, Math.min((clientY - targetRect.top) / zoom - pointerOffsetY, maxY));
+          dx = targetX - grip.item.x;
+          dy = targetY - grip.item.y1;
+          if (guide.parentElement !== targetSurface) targetSurface.appendChild(guide);
+          guide.style.left = `${targetX}px`;
+          guide.style.top = `${targetY}px`;
         } else if (isCol) {
           guide.style.left = `${grip.item.x + dx}px`;
         } else {
           guide.style.top = `${grip.item.y1 + dy}px`;
         }
       };
+      const onMove = (me) => {
+        pointerX = me.clientX;
+        pointerY = me.clientY;
+        updateMove(pointerX, pointerY);
+      };
+      let autoScrollFrame;
+      const autoScroll = () => {
+        if (isMove && scrollParent) {
+          const isDocumentScroll = scrollParent === document.documentElement || scrollParent === document.body;
+          const rect = isDocumentScroll ? { top: 0, bottom: window.innerHeight } : scrollParent.getBoundingClientRect();
+          const margin = 48;
+          const amount = pointerY < rect.top + margin ? -Math.min(28, Math.ceil(rect.top + margin - pointerY)) : pointerY > rect.bottom - margin ? Math.min(28, Math.ceil(pointerY - (rect.bottom - margin))) : 0;
+          if (amount !== 0) {
+            const before = scrollParent.scrollTop;
+            scrollParent.scrollTop += amount;
+            if (scrollParent.scrollTop !== before) updateMove(pointerX, pointerY);
+          }
+        }
+        autoScrollFrame = requestAnimationFrame(autoScroll);
+      };
+      autoScrollFrame = requestAnimationFrame(autoScroll);
       const onUp = () => {
         document.removeEventListener("mousemove", onMove);
         document.removeEventListener("mouseup", onUp);
+        if (autoScrollFrame !== void 0) cancelAnimationFrame(autoScrollFrame);
         guide.remove();
         this.suppressNextMouseUp = false;
         const delta = isCol ? dx : dy;
-        if ((isMove ? Math.hypot(dx, dy) : Math.abs(delta)) >= 1) {
+        if (isMove ? targetPageIndex !== sourcePageIndex || Math.hypot(dx, dy) >= 1 : Math.abs(delta) >= 1) {
           this.host.history?.checkpoint();
-          const page = surface.parentElement;
-          const pages = Array.from(this.host.getHandle()?.root.querySelectorAll(".dxw-page") ?? []);
-          const bodyTop = parseFloat(page?.dataset.bodyTop ?? "");
-          const preservePageStart = isMove && page !== null && pages.indexOf(page) > 0 && Number.isFinite(bodyTop) && Math.abs(grip.item.y1 - bodyTop) <= 1;
-          const ok = isMove ? moveTableTo(this.host.doc, grip.item.tbl, grip.item.x + dx, grip.item.y1 + dy, preservePageStart) : isCol ? resizeTableColumn(this.host.doc, grip.item.tbl, grip.item.boundary, dx, grip.item.renderedWidths) : resizeTableRow(this.host.doc, grip.item.tbl, grip.item.boundary, (grip.item.rowHeightPx ?? 0) + dy);
+          const bodyTop = parseFloat(sourcePage?.dataset.bodyTop ?? "");
+          const preservePageStart = isMove && sourcePage !== null && sourcePageIndex > 0 && Number.isFinite(bodyTop) && Math.abs(grip.item.y1 - bodyTop) <= 1;
+          const ok = isMove ? moveTableTo(
+            this.host.doc,
+            grip.item.tbl,
+            targetX,
+            targetY,
+            preservePageStart,
+            targetPageIndex - sourcePageIndex
+          ) : isCol ? resizeTableColumn(this.host.doc, grip.item.tbl, grip.item.boundary, dx, grip.item.renderedWidths) : resizeTableRow(this.host.doc, grip.item.tbl, grip.item.boundary, (grip.item.rowHeightPx ?? 0) + dy);
           if (ok) {
             this.host.rerender(void 0, isMove ? "global" : "local");
             this.positionCaret();