@pixldocs/canvas-renderer 0.5.270 → 0.5.272

package/dist/{index-CLq3CdA3.cjs → index-BYfp_ae9.cjs}

@@ -12722,7 +12722,9 @@ const PageCanvas = react.forwardRef(
               const selection = new fabric__namespace.ActiveSelection(members, { canvas: fc });
               restoreGroupSelectionVisualState(selection, groupId);
               fc.setActiveObject(selection);
-              selection.setCoords();
+              if (!selection.getObjects().every((obj) => !(obj instanceof fabric__namespace.Group))) {
+                selection.setCoords();
+              }
               fc.requestRenderAll();
             } finally {
               requestAnimationFrame(() => {
@@ -13906,7 +13908,7 @@ const PageCanvas = react.forwardRef(
       });
       let cropGroupSaveTimer = null;
       fabricCanvas.on("object:modified", (e) => {
-        var _a2, _b2, _c, _d, _e, _f, _g;
+        var _a2, _b2, _c, _d, _e, _f, _g, _h;
         try {
           dragStarted = false;
           setGuides([]);
@@ -14322,6 +14324,7 @@ const PageCanvas = react.forwardRef(
                 drilledGroupIdRef.current = null;
                 const groupSelectionId = (isActiveSelection && activeObj instanceof fabric__namespace.ActiveSelection ? activeObj.__pixldocsGroupSelection : void 0) ?? groupToMove.id;
                 const targetObjects = isActiveSelection && activeObj instanceof fabric__namespace.ActiveSelection ? activeObj.getObjects() : activeObjects;
+                let preservedGroupMemberIds = targetObjects.map((obj) => getObjectId(obj)).filter((id) => !!id && id !== "__background__");
                 if (groupSelectionId && activeObj instanceof fabric__namespace.ActiveSelection) {
                   try {
                     skipSelectionClearOnDiscardRef.current = true;
@@ -14334,15 +14337,35 @@ const PageCanvas = react.forwardRef(
                     }
                   } catch {
                   }
-                  const bakedSelection = targetObjects.length > 1 ? new fabric__namespace.ActiveSelection(targetObjects, { canvas: fabricCanvas }) : activeObj;
+                  const pageAfterMove = ((_g = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _g.children) ?? [];
+                  const groupAfterMove = findNodeById(pageAfterMove, groupToMove.id);
+                  const memberIdsAfterMove = groupAfterMove && isGroup(groupAfterMove) ? getAllElementIds(groupAfterMove.children ?? []) : targetObjects.map((obj) => getObjectId(obj)).filter((id) => !!id && id !== "__background__");
+                  preservedGroupMemberIds = memberIdsAfterMove;
+                  const reselectionObjects = memberIdsAfterMove.map((id) => targetObjects.find((obj) => getObjectId(obj) === id) ?? fabricCanvas.getObjects().find((obj) => getObjectId(obj) === id)).filter((obj) => !!obj);
+                  for (const obj of reselectionObjects) {
+                    const id = getObjectId(obj);
+                    const node = id ? findNodeById(pageAfterMove, id) : null;
+                    if (!node) continue;
+                    const abs = getAbsoluteBounds(node, pageAfterMove, pageBoundsOptions);
+                    const bounds = getNodeBounds(node, pageAfterMove, pageBoundsOptions);
+                    if (obj instanceof fabric__namespace.Group && obj.__cropGroup || obj instanceof fabric__namespace.FabricImage && (obj.originX === "center" || obj.originY === "center")) {
+                      obj.set({ left: abs.left + Math.max(1, bounds.width) / 2, top: abs.top + Math.max(1, bounds.height) / 2 });
+                    } else {
+                      obj.set({ left: abs.left, top: abs.top });
+                    }
+                    obj.setCoords();
+                  }
+                  const bakedSelection = reselectionObjects.length > 1 ? new fabric__namespace.ActiveSelection(reselectionObjects, { canvas: fabricCanvas }) : activeObj;
                   restoreGroupSelectionVisualState(bakedSelection, groupSelectionId);
                   fabricCanvas.setActiveObject(bakedSelection);
-                  bakedSelection.setCoords();
+                  if (!(bakedSelection instanceof fabric__namespace.ActiveSelection && bakedSelection.getObjects().every((obj) => !(obj instanceof fabric__namespace.Group)))) {
+                    bakedSelection.setCoords();
+                  }
                 }
                 selectElements([groupSelectionId], false, false);
                 fabricCanvas.requestRenderAll();
                 elementsRef.current = getCurrentElements();
-                for (const obj of targetObjects) {
+                for (const obj of targetObjects.length ? targetObjects : activeObjects) {
                   const objId = getObjectId(obj);
                   if (objId && objId !== "__background__") {
                     justModifiedIdsRef.current.add(objId);
@@ -14352,7 +14375,7 @@ const PageCanvas = react.forwardRef(
                 setTimeout(() => modifiedIdsThisRound.forEach((id) => justModifiedIdsRef.current.delete(id)), 150);
                 groupSelectionTransformStartRef.current = null;
                 restorePreservedGroupSelectionSoon({
-                  memberIds: targetObjects.map((obj) => getObjectId(obj)).filter((id) => !!id && id !== "__background__"),
+                  memberIds: preservedGroupMemberIds,
                   groupSelectionId
                 });
                 unlockEditsSoon();
@@ -14616,7 +14639,7 @@ const PageCanvas = react.forwardRef(
             updateElement(objId, elementUpdate, { recordHistory: false, skipLayoutRecalc: true });
             obj.setCoords();
           }
-          const pageChildrenForReflow = ((_g = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _g.children) ?? [];
+          const pageChildrenForReflow = ((_h = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _h.children) ?? [];
           const stackGroupsToReflow = /* @__PURE__ */ new Set();
           for (const id of modifiedIdsThisRound) {
             const parent = findParentGroup(pageChildrenForReflow, id);
@@ -15119,9 +15142,42 @@ const PageCanvas = react.forwardRef(
           };
           fc.add(sectionGroup);
         }
+        const getActiveSelectionContainingObject = (obj) => {
+          const active = fc.getActiveObject();
+          return active instanceof fabric__namespace.ActiveSelection && active.getObjects().includes(obj) ? active : null;
+        };
+        const shouldPreserveActiveSelectionMemberPosition = (obj) => {
+          if (syncTriggeredByPanelRef.current) return false;
+          const activeSelection = getActiveSelectionContainingObject(obj);
+          if (!activeSelection) return false;
+          const logicalActiveSelection = activeSelection;
+          const logicalGroupId = logicalActiveSelection.__pixldocsGroupSelection;
+          const logicalGroupIds = logicalActiveSelection.__pixldocsLogicalGroupIds;
+          if (logicalGroupId || Array.isArray(logicalGroupIds)) return true;
+          const id = getObjectId(obj);
+          const preserved = preserveActiveSelectionAfterTransformRef.current;
+          return !!(id && (preserved == null ? void 0 : preserved.memberIds.includes(id)) && (!preserved.expiresAt || preserved.expiresAt > Date.now()));
+        };
+        const getObjectSyncComparePosition = (obj) => {
+          const activeSelection = getActiveSelectionContainingObject(obj);
+          if (!activeSelection) return { left: obj.left ?? 0, top: obj.top ?? 0 };
+          const point = fabric__namespace.util.transformPoint({ x: obj.left ?? 0, y: obj.top ?? 0 }, activeSelection.calcTransformMatrix());
+          let left = point.x;
+          let top = point.y;
+          const cropObj = obj;
+          if (obj instanceof fabric__namespace.Group && cropObj.__cropGroup) {
+            const ct = cropObj.__cropData;
+            left -= ((ct == null ? void 0 : ct.frameW) ?? obj.width ?? 0) * Math.abs(obj.scaleX ?? 1) / 2;
+            top -= ((ct == null ? void 0 : ct.frameH) ?? obj.height ?? 0) * Math.abs(obj.scaleY ?? 1) / 2;
+          } else if (obj instanceof fabric__namespace.FabricImage && (obj.originX === "center" || obj.originY === "center")) {
+            left -= (obj.width ?? 0) * Math.abs(obj.scaleX ?? 1) / 2;
+            top -= (obj.height ?? 0) * Math.abs(obj.scaleY ?? 1) / 2;
+          }
+          return { left, top };
+        };
         for (const element of elementsToSync) {
           if (sectionDescendantIds.has(element.id)) continue;
-          let existingObj = currentFabricObjects.get(element.id);
+          const existingObj = currentFabricObjects.get(element.id);
           const isHidden = !element.visible;
           if (existingObj) {
             const isBeingTransformed = transformingIdsRef.current.has(element.id);
@@ -15415,7 +15471,9 @@ const PageCanvas = react.forwardRef(
                   const node = findNodeById(pageTree, element.id);
                   return node ? getAbsoluteBounds(node, pageTree) : { left: element.left ?? 0, top: element.top ?? 0 };
                 })() : { left: element.left ?? 0, top: element.top ?? 0 };
-                const positionChanged = Math.abs((existingObj.left ?? 0) - storePosForImg.left) > 0.1 || Math.abs((existingObj.top ?? 0) - storePosForImg.top) > 0.1;
+                const comparePosForImg = getObjectSyncComparePosition(existingObj);
+                const preserveSelectionMemberPosition = shouldPreserveActiveSelectionMemberPosition(existingObj);
+                const positionChanged = !preserveSelectionMemberPosition && (Math.abs(comparePosForImg.left - storePosForImg.left) > 0.1 || Math.abs(comparePosForImg.top - storePosForImg.top) > 0.1);
                 if (visibilityChanged && !positionChanged || visibilityUpdateInProgressRef.current) {
                   const isDynamicField = dynamicFieldIds.includes(element.id);
                   const canBeEvented = isEditorMode || isPreviewMode && isDynamicField;
@@ -15430,7 +15488,7 @@ const PageCanvas = react.forwardRef(
                   previousVisibilityRef.current.set(element.id, currentVisible);
                 } else {
                   if (!visibilityUpdateInProgressRef.current) {
-                    updateFabricObject(existingObj, element, wasJustModified);
+                    updateFabricObject(existingObj, element, wasJustModified || preserveSelectionMemberPosition);
                   }
                   const isDynamicField = dynamicFieldIds.includes(element.id);
                   const canBeEvented = isEditorMode || isPreviewMode && isDynamicField;
@@ -15452,8 +15510,9 @@ const PageCanvas = react.forwardRef(
               if (!isBeingTransformed && !isBeingTextEdited && !shouldSkipUpdates2) {
                 previousVisibilityRef.current.get(element.id) ?? true;
                 const currentVisible = element.visible !== false;
-                const fabricLeft = existingObj.left ?? 0;
-                const fabricTop = existingObj.top ?? 0;
+                const comparePos = getObjectSyncComparePosition(existingObj);
+                const fabricLeft = comparePos.left;
+                const fabricTop = comparePos.top;
                 const storePos = pageTree.length ? (() => {
                   const node = findNodeById(pageTree, element.id);
                   return node ? getAbsoluteBounds(node, pageTree) : { left: element.left ?? 0, top: element.top ?? 0 };
@@ -15462,7 +15521,8 @@ const PageCanvas = react.forwardRef(
                 const storeTop = storePos.top;
                 const deltaX = Math.abs(fabricLeft - storeLeft);
                 const deltaY = Math.abs(fabricTop - storeTop);
-                let positionChanged = deltaX > 0.1 || deltaY > 0.1;
+                const preserveSelectionMemberPosition = shouldPreserveActiveSelectionMemberPosition(existingObj);
+                let positionChanged = !preserveSelectionMemberPosition && (deltaX > 0.1 || deltaY > 0.1);
                 const activeObj = fc.getActiveObject();
                 const isInActiveSelection = activeObj && (activeObj instanceof fabric__namespace.ActiveSelection ? activeObj.getObjects().includes(existingObj) : activeObj === existingObj);
                 const isInSelectedIds = selectedIdsFromStore.has(element.id);
@@ -15514,7 +15574,7 @@ const PageCanvas = react.forwardRef(
                   });
                   previousVisibilityRef.current.set(element.id, currentVisible);
                 } else {
-                  const skipPositionBecauseSelection = isSelected && (deltaX > 0.1 || deltaY > 0.1) && (wasJustModified || isBeingTransformed);
+                  const skipPositionBecauseSelection = preserveSelectionMemberPosition || isSelected && (deltaX > 0.1 || deltaY > 0.1) && (wasJustModified || isBeingTransformed);
                   const anyChange = positionChanged || otherPropsChanged || forceApplyFromPanel;
                   if (!visibilityUpdateInProgressRef.current) {
                     if (anyChange && !skipPositionBecauseSelection) {
@@ -23696,9 +23756,9 @@ function captureFabricCanvasSvgForPdf(fabricInstance, canvasWidth, canvasHeight)
   }
   return svgString;
 }
-const resolvedPackageVersion = "0.5.270";
+const resolvedPackageVersion = "0.5.272";
 const PACKAGE_VERSION = resolvedPackageVersion;
-const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.270";
+const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.272";
 const roundParityValue = (value) => {
   if (typeof value !== "number") return value;
   return Number.isFinite(value) ? Number(value.toFixed(3)) : value;
@@ -24512,7 +24572,7 @@ class PixldocsRenderer {
         await this.waitForCanvasScene(container, cloned, i);
       }
       console.log(`[canvas-renderer][pdf-unified] mounted ${cloned.pages.length} page(s), handing off to client exportMultiPagePdf`);
-      const { exportMultiPagePdf, preparePagesForExport } = await Promise.resolve().then(() => require("./vectorPdfExport-BpHyRyQS.cjs"));
+      const { exportMultiPagePdf, preparePagesForExport } = await Promise.resolve().then(() => require("./vectorPdfExport-CdiLpR0-.cjs"));
       const prepared = preparePagesForExport(
         cloned.pages,
         canvasWidth,
@@ -26832,7 +26892,7 @@ async function prepareLiveCanvasSvgForPdf(rawSvg, pageWidth, pageHeight, pageKey
     if (options == null ? void 0 : options.stripPageBackground) stripRootPageBackgroundFromSvg(svgToDraw);
     sanitizeSvgTreeForPdf(svgToDraw);
     try {
-      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await Promise.resolve().then(() => require("./vectorPdfExport-BpHyRyQS.cjs"));
+      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await Promise.resolve().then(() => require("./vectorPdfExport-CdiLpR0-.cjs"));
       try {
         await logTextMeasurementDiagnostic(svgToDraw);
       } catch {
@@ -27229,4 +27289,4 @@ exports.setAutoShrinkDebug = setAutoShrinkDebug;
 exports.setBundledAssetPrefixes = setBundledAssetPrefixes;
 exports.warmResolvedTemplateForPreview = warmResolvedTemplateForPreview;
 exports.warmTemplateFromForm = warmTemplateFromForm;
-//# sourceMappingURL=index-CLq3CdA3.cjs.map
+//# sourceMappingURL=index-BYfp_ae9.cjs.map