@pixldocs/canvas-renderer 0.5.284 → 0.5.286

package/dist/{index-n9HBI3ow.cjs → index-4L9uZ78v.cjs}

@@ -10494,10 +10494,6 @@ const SELECTION_PRIMARY = "hsl(217, 91%, 60%)";
 const SELECTION_BORDER_SCALE = 2;
 let ensureCanvaControlRenders = () => {
 };
-const shouldLogGroupMove = () => {
-  if (typeof window === "undefined") return false;
-  return window.__pixldocsDebugGroupMove === true;
-};
 try {
   const InteractiveBase = fabric__namespace.InteractiveFabricObject ?? fabric__namespace.Object;
   if ((InteractiveBase == null ? void 0 : InteractiveBase.prototype) && !InteractiveBase.prototype.__pixldocsCenteredSelectionBorder) {
@@ -10947,31 +10943,20 @@ try {
       } catch (e) {
       }
     };
-    const tryPatchFactory = (target, key, bindTarget = target) => {
-      try {
-        if (!target || typeof target[key] !== "function") return;
-        const descriptor = Object.getOwnPropertyDescriptor(target, key);
-        if (descriptor && descriptor.writable === false && !descriptor.set) return;
-        const original = target[key].bind(bindTarget);
-        target[key] = () => installPillRenders(original());
-      } catch {
-      }
-    };
-    tryPatchFactory(cu, "createObjectDefaultControls");
-    tryPatchFactory(cu, "createTextboxDefaultControls");
+    const origObj = cu.createObjectDefaultControls.bind(cu);
+    cu.createObjectDefaultControls = () => installPillRenders(origObj());
+    if (typeof cu.createTextboxDefaultControls === "function") {
+      const origTb = cu.createTextboxDefaultControls.bind(cu);
+      cu.createTextboxDefaultControls = () => installPillRenders(origTb());
+    }
     const wrapClassCreateControls = (Klass) => {
-      try {
-        if (!Klass || typeof Klass.createControls !== "function") return;
-        const descriptor = Object.getOwnPropertyDescriptor(Klass, "createControls");
-        if (descriptor && descriptor.writable === false && !descriptor.set) return;
-        const orig = Klass.createControls.bind(Klass);
-        Klass.createControls = () => {
-          const res = orig();
-          if (res && res.controls) installPillRenders(res.controls);
-          return res;
-        };
-      } catch {
-      }
+      if (!Klass || typeof Klass.createControls !== "function") return;
+      const orig = Klass.createControls.bind(Klass);
+      Klass.createControls = () => {
+        const res = orig();
+        if (res && res.controls) installPillRenders(res.controls);
+        return res;
+      };
     };
     wrapClassCreateControls(fabric__namespace.InteractiveFabricObject);
     wrapClassCreateControls(fabric__namespace.FabricObject);
@@ -10994,7 +10979,8 @@ try {
       };
     }
   }
-} catch {
+} catch (e) {
+  console.warn("[PageCanvas] Failed to install Canva-style control handles:", e);
 }
 const scaleTextPathConfig = (textPath, sx, sy, uniform) => {
   if (!textPath || typeof textPath !== "object") return textPath;
@@ -11027,9 +11013,9 @@ const scaleUpdateNumber = (updates, source, key, factor) => {
   const value = Number(source == null ? void 0 : source[key]);
   if (Number.isFinite(value)) updates[key] = value * factor;
 };
-const bakeTextboxScaleIntoTypography = (obj, sourceElement, scaleOverride) => {
-  const sx = Math.abs((scaleOverride == null ? void 0 : scaleOverride.scaleX) ?? obj.scaleX ?? 1) || 1;
-  const sy = Math.abs((scaleOverride == null ? void 0 : scaleOverride.scaleY) ?? obj.scaleY ?? 1) || 1;
+const bakeTextboxScaleIntoTypography = (obj, sourceElement) => {
+  const sx = Math.abs(obj.scaleX ?? 1) || 1;
+  const sy = Math.abs(obj.scaleY ?? 1) || 1;
   if (Math.abs(sx - 1) < 1e-3 && Math.abs(sy - 1) < 1e-3) return null;
   const isUniform = Math.abs(sx - sy) < 0.01;
   const fontScale = isUniform ? (sx + sy) / 2 : Math.abs(sy - 1) > 1e-3 ? sy : 1;
@@ -11225,6 +11211,7 @@ const PageCanvas = react.forwardRef(
     const skipActiveSelectionBakeOnClearRef = react.useRef(false);
     const preserveEditingScopeOnSelectionClearRef = react.useRef(false);
     const preserveActiveSelectionAfterTransformRef = react.useRef(null);
+    const recentGroupSelectionRestoreRef = react.useRef(null);
     const pendingGroupPromotionRef = react.useRef(null);
     const pendingGroupDrillInRef = react.useRef(null);
     const imageReloadRequestSeqRef = react.useRef(/* @__PURE__ */ new Map());
@@ -11245,7 +11232,6 @@ const PageCanvas = react.forwardRef(
     react.useRef(null);
     const lastTextEditDimensionsRef = react.useRef(null);
     const lastResizeScaleTargetRef = react.useRef(null);
-    const lastResizeScaleCornerRef = react.useRef(null);
     const preserveSelectionAfterTransformIdRef = react.useRef(null);
     const groupSelectionTransformStartRef = react.useRef(null);
     const activeSelectionMoveStartRef = react.useRef(null);
@@ -11262,6 +11248,26 @@ const PageCanvas = react.forwardRef(
       hoveredGroupId
     } = useEditorStore();
     const storeSelectedIds = canvas.selectedIds ?? [];
+    const restoreGroupSelectionSnapshot = react.useCallback((snapshot) => {
+      const fc = fabricRef.current;
+      const groupId = snapshot == null ? void 0 : snapshot.groupSelectionId;
+      if (!fc || !groupId || snapshot.memberIds.length < 2 || editingTextIdRef.current) return;
+      const members = snapshot.memberIds.map((id) => fc.getObjects().find((o) => getObjectId(o) === id)).filter((o) => !!o);
+      if (members.length < 2) return;
+      isSyncingSelectionToFabricRef.current = true;
+      try {
+        const active = fc.getActiveObject();
+        const selection = active instanceof fabric__namespace.ActiveSelection && members.every((member) => active.getObjects().includes(member)) ? active : new fabric__namespace.ActiveSelection(members, { canvas: fc });
+        applyLogicalGroupSelectionVisualState(selection, groupId);
+        fc.setActiveObject(selection);
+        selection.setCoords();
+        fc.requestRenderAll();
+      } finally {
+        requestAnimationFrame(() => {
+          isSyncingSelectionToFabricRef.current = false;
+        });
+      }
+    }, [applyLogicalGroupSelectionVisualState]);
     const currentPage = react.useMemo(() => (canvas.pages ?? []).find((p) => p.id === pageId), [canvas.pages, pageId]);
     react.useMemo(() => {
       const ids = storeSelectedIds ?? [];
@@ -11573,7 +11579,6 @@ const PageCanvas = react.forwardRef(
         fc.__isUserTransforming = true;
         didTransformRef.current = true;
         lastResizeScaleTargetRef.current = target;
-        lastResizeScaleCornerRef.current = corner;
         const targetId = getObjectId(target);
         if (targetId && targetId !== "__background__") {
           preserveSelectionAfterTransformIdRef.current = targetId;
@@ -12057,9 +12062,6 @@ const PageCanvas = react.forwardRef(
             selectionLeft: rect.left,
             selectionTop: rect.top
           };
-          if (active.__pixldocsGroupSelection) {
-            prepareGroupSelectionTransformStart(active);
-          }
         }
         if (fabricCanvas._currentTransform) {
           fabricCanvas.__isUserTransforming = true;
@@ -12500,8 +12502,11 @@ const PageCanvas = react.forwardRef(
           if (shouldRestoreGroupSelection) restorePreservedGroupSelectionSoon(preservedGroupSelection);
           return;
         }
-        if (editLockRef.current || syncLockedRef.current || didTransformRef.current || preserveSelectionAfterTransformIdRef.current || shouldRestoreGroupSelection) {
+        const recentGroupSelectionRestore = recentGroupSelectionRestoreRef.current;
+        const shouldReassertRecentGroupSelection = !!((recentGroupSelectionRestore == null ? void 0 : recentGroupSelectionRestore.groupSelectionId) && recentGroupSelectionRestore.expiresAt > Date.now());
+        if (editLockRef.current || syncLockedRef.current || didTransformRef.current || preserveSelectionAfterTransformIdRef.current || shouldRestoreGroupSelection || shouldReassertRecentGroupSelection) {
           if (shouldRestoreGroupSelection) restorePreservedGroupSelectionSoon(preservedGroupSelection);
+          else if (shouldReassertRecentGroupSelection) restorePreservedGroupSelectionSoon(recentGroupSelectionRestore);
           return;
         }
         restoreSuppressedGroupBorders();
@@ -12717,34 +12722,11 @@ const PageCanvas = react.forwardRef(
       const restorePreservedGroupSelectionSoon = (snapshot = preserveActiveSelectionAfterTransformRef.current) => {
         if (!(snapshot == null ? void 0 : snapshot.groupSelectionId) || snapshot.memberIds.length < 2) return;
         const groupId = snapshot.groupSelectionId;
-        const memberIds = [...snapshot.memberIds];
         selectElements([groupId], false, false);
         requestAnimationFrame(() => {
           setTimeout(() => {
-            const fc = fabricRef.current;
-            if (!fc || !isActiveRef.current || editingTextIdRef.current) return;
-            const active = fc.getActiveObject();
-            if (active instanceof fabric__namespace.ActiveSelection && active.__pixldocsGroupSelection === groupId) {
-              restoreGroupSelectionVisualState(active, groupId);
-              fc.requestRenderAll();
-              return;
-            }
-            const members = memberIds.map((id) => fc.getObjects().find((o) => getObjectId(o) === id)).filter((o) => !!o);
-            if (members.length < 2) return;
-            isSyncingSelectionToFabricRef.current = true;
-            try {
-              const selection = new fabric__namespace.ActiveSelection(members, { canvas: fc });
-              restoreGroupSelectionVisualState(selection, groupId);
-              fc.setActiveObject(selection);
-              if (!selection.getObjects().every((obj) => !(obj instanceof fabric__namespace.Group))) {
-                selection.setCoords();
-              }
-              fc.requestRenderAll();
-            } finally {
-              requestAnimationFrame(() => {
-                isSyncingSelectionToFabricRef.current = false;
-              });
-            }
+            if (!isActiveRef.current) return;
+            restoreGroupSelectionSnapshot(snapshot);
           }, 0);
         });
       };
@@ -12927,9 +12909,6 @@ const PageCanvas = react.forwardRef(
       fabricCanvas.on("mouse:down:before", (opt) => {
         var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
         const activeBeforeMouseDown = fabricCanvas.getActiveObject();
-        if (activeBeforeMouseDown instanceof fabric__namespace.ActiveSelection && activeBeforeMouseDown.__pixldocsGroupSelection) {
-          prepareGroupSelectionTransformStart(activeBeforeMouseDown);
-        }
         if (editLockRef.current) {
           const active = fabricCanvas.getActiveObject();
           if (active && (((_a2 = active._ct) == null ? void 0 : _a2.isCropGroup) || active.__cropGroup)) {
@@ -13044,14 +13023,7 @@ const PageCanvas = react.forwardRef(
             pendingGroupDrillInRef.current = null;
           } else if (drillGroup && !drillGroup.backgroundColor && !targetIsInCrop && alreadyThisGroup && !isMultiSelectKey && effectiveTarget !== activeNow) {
             pendingGroupPromotionRef.current = null;
-            const pointer = fabricCanvas.getPointer(opt.e);
-            pendingGroupDrillInRef.current = {
-              groupId: drillGroup.id,
-              childId: effectiveTargetId,
-              target: effectiveTarget,
-              startX: pointer.x,
-              startY: pointer.y
-            };
+            pendingGroupDrillInRef.current = { groupId: drillGroup.id, childId: effectiveTargetId, target: effectiveTarget };
             if (effectiveTarget instanceof fabric__namespace.Textbox) {
               suppressTextEditForClick(effectiveTarget);
             }
@@ -13198,7 +13170,7 @@ const PageCanvas = react.forwardRef(
         o.__lockScaleDuringCrop = false;
       });
       fabricCanvas.on("mouse:up", (e) => {
-        var _a2, _b2, _c, _d;
+        var _a2, _b2, _c;
         clearTransforming();
         setGuides([]);
         setRotationLabel(null);
@@ -13208,21 +13180,7 @@ const PageCanvas = react.forwardRef(
         dragStarted = false;
         const pendingDrillIn = pendingGroupDrillInRef.current;
         pendingGroupDrillInRef.current = null;
-        let movedPendingDrillPointer = false;
-        if (pendingDrillIn && pendingDrillIn.startX !== void 0 && pendingDrillIn.startY !== void 0) {
-          try {
-            const pointer = fabricCanvas.getPointer(e == null ? void 0 : e.e);
-            const zoom3 = ((_a2 = fabricCanvas.getZoom) == null ? void 0 : _a2.call(fabricCanvas)) || 1;
-            const dragThreshold = Math.max(2, 4 / zoom3);
-            movedPendingDrillPointer = Math.hypot(pointer.x - pendingDrillIn.startX, pointer.y - pendingDrillIn.startY) > dragThreshold;
-          } catch {
-            movedPendingDrillPointer = false;
-          }
-        }
-        if (movedPendingDrillPointer) {
-          didTransformRef.current = true;
-        }
-        if (pendingDrillIn && (didTransformRef.current || movedPendingDrillPointer)) {
+        if (pendingDrillIn && didTransformRef.current) {
           const activeNow = fabricCanvas.getActiveObject();
           fabricCanvas.__activeEditingGroupId = null;
           setDrilledGroupBounds(null);
@@ -13238,7 +13196,8 @@ const PageCanvas = react.forwardRef(
           if (memberIds.length > 1) {
             restorePreservedGroupSelectionSoon({
               memberIds,
-              groupSelectionId: pendingDrillIn.groupId
+              groupSelectionId: pendingDrillIn.groupId,
+              expiresAt: Date.now() + 1200
             });
           } else {
             selectElements([pendingDrillIn.groupId], false, false);
@@ -13252,7 +13211,7 @@ const PageCanvas = react.forwardRef(
               fabricCanvas.__activeEditingGroupId = pendingDrillIn.groupId;
               delete pendingDrillIn.target.__pixldocsGroupSelection;
               delete pendingDrillIn.target.__pixldocsLogicalGroupIds;
-              (_c = (_b2 = pendingDrillIn.target).set) == null ? void 0 : _c.call(_b2, { selectable: true, evented: true, hasBorders: true, hasControls: true });
+              (_b2 = (_a2 = pendingDrillIn.target).set) == null ? void 0 : _b2.call(_a2, { selectable: true, evented: true, hasBorders: true, hasControls: true });
               fabricCanvas.setActiveObject(pendingDrillIn.target);
               pendingDrillIn.target.setCoords();
               if (pendingDrillIn.target instanceof fabric__namespace.Textbox) {
@@ -13305,7 +13264,7 @@ const PageCanvas = react.forwardRef(
           }
         }
         const activeObj = fabricCanvas.getActiveObject();
-        if (activeObj && (activeObj.__cropGroup || ((_d = activeObj._ct) == null ? void 0 : _d.isCropGroup))) {
+        if (activeObj && (activeObj.__cropGroup || ((_c = activeObj._ct) == null ? void 0 : _c.isCropGroup))) {
           activeObj.__lockScaleDuringCrop = false;
           if (activeObj.__cropDrag) {
             delete activeObj.__cropDrag;
@@ -13323,9 +13282,7 @@ const PageCanvas = react.forwardRef(
             syncLockedRef.current = false;
           }, 50);
         }
-        requestAnimationFrame(() => {
-          didTransformRef.current = false;
-        });
+        didTransformRef.current = false;
         setTimeout(() => {
           if (!fabricCanvas._currentTransform) {
             editLockRef.current = false;
@@ -13403,11 +13360,10 @@ const PageCanvas = react.forwardRef(
       fabricCanvas.on("selection:cleared", () => {
       });
       fabricCanvas.on("object:scaling", (e) => {
-        var _a2, _b2;
+        var _a2;
         if (!isActiveRef.current) return;
         const t = e.target;
         if (t) lastResizeScaleTargetRef.current = t;
-        lastResizeScaleCornerRef.current = ((_a2 = e.transform) == null ? void 0 : _a2.corner) ?? null;
         prepareGroupSelectionTransformStart(t);
         markTransforming(t);
         didTransformRef.current = true;
@@ -13725,17 +13681,16 @@ const PageCanvas = react.forwardRef(
         setGuides(gridGuidesForScale.length ? [...scaleGuides, ...gridGuidesForScale] : scaleGuides);
         if (drilledGroupIdRef.current) {
           try {
-            (_b2 = fabricCanvas.__updateDrilledGroupOutline) == null ? void 0 : _b2.call(fabricCanvas);
+            (_a2 = fabricCanvas.__updateDrilledGroupOutline) == null ? void 0 : _a2.call(fabricCanvas);
           } catch {
           }
         }
       });
       fabricCanvas.on("object:resizing", (e) => {
-        var _a2, _b2;
+        var _a2;
         if (!isActiveRef.current) return;
         const t = e.target;
         if (t) lastResizeScaleTargetRef.current = t;
-        lastResizeScaleCornerRef.current = ((_a2 = e.transform) == null ? void 0 : _a2.corner) ?? null;
         markTransforming(t);
         didTransformRef.current = true;
         const transformTargetId = t ? getObjectId(t) : null;
@@ -13811,7 +13766,7 @@ const PageCanvas = react.forwardRef(
         setGuides(gridGuidesForTextResize.length ? [...scaleGuides, ...gridGuidesForTextResize] : scaleGuides);
         if (drilledGroupIdRef.current) {
           try {
-            (_b2 = fabricCanvas.__updateDrilledGroupOutline) == null ? void 0 : _b2.call(fabricCanvas);
+            (_a2 = fabricCanvas.__updateDrilledGroupOutline) == null ? void 0 : _a2.call(fabricCanvas);
           } catch {
           }
         }
@@ -13855,26 +13810,19 @@ const PageCanvas = react.forwardRef(
         const activeDuringMove = fabricCanvas.getActiveObject();
         const movingLogicalGroupId = activeDuringMove instanceof fabric__namespace.ActiveSelection ? activeDuringMove.__pixldocsGroupSelection : void 0;
         const pendingMoveDrill = pendingGroupDrillInRef.current;
-        const groupIdToKeep = movingLogicalGroupId ?? (pendingMoveDrill == null ? void 0 : pendingMoveDrill.groupId);
         if (movingLogicalGroupId || pendingMoveDrill) {
+          const groupIdToKeep = movingLogicalGroupId ?? (pendingMoveDrill == null ? void 0 : pendingMoveDrill.groupId);
           pendingGroupDrillInRef.current = null;
           fabricCanvas.__activeEditingGroupId = null;
           setDrilledGroupBounds(null);
           drilledGroupIdRef.current = null;
           if (activeDuringMove instanceof fabric__namespace.ActiveSelection && groupIdToKeep) {
             restoreGroupSelectionVisualState(activeDuringMove, groupIdToKeep);
-            const memberIds = activeDuringMove.getObjects().map((obj2) => getObjectId(obj2)).filter((id) => !!id && id !== "__background__");
-            if (memberIds.length > 1) {
-              preserveActiveSelectionAfterTransformRef.current = { memberIds, groupSelectionId: groupIdToKeep, expiresAt: Date.now() + 1200 };
-            }
-            preserveSelectionAfterTransformIdRef.current = groupIdToKeep;
           }
         }
         if (e.target) e.target.__pixldocsDragMoved = true;
         const moveTargetId = e.target ? getObjectId(e.target) : null;
-        if (groupIdToKeep) {
-          preserveSelectionAfterTransformIdRef.current = groupIdToKeep;
-        } else if (moveTargetId && moveTargetId !== "__background__") {
+        if (moveTargetId && moveTargetId !== "__background__") {
           preserveSelectionAfterTransformIdRef.current = moveTargetId;
         }
         if (!dragStarted) {
@@ -13921,34 +13869,10 @@ const PageCanvas = react.forwardRef(
         }
       });
       let cropGroupSaveTimer = null;
-      let objectModifiedInFlight = false;
       fabricCanvas.on("object:modified", (e) => {
-        var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j;
-        if (objectModifiedInFlight) {
-          if (shouldLogGroupMove()) {
-            console.log("[GRP-MOVE] object:modified re-entry skipped", {
-              targetType: (_b2 = (_a2 = e.target) == null ? void 0 : _a2.constructor) == null ? void 0 : _b2.name
-            });
-          }
-          return;
-        }
-        objectModifiedInFlight = true;
+        var _a2, _b2, _c, _d, _e, _f, _g;
         try {
           dragStarted = false;
-          if (shouldLogGroupMove()) {
-            const t = e.target;
-            console.log("[GRP-MOVE] object:modified fired", {
-              targetType: (_c = t == null ? void 0 : t.constructor) == null ? void 0 : _c.name,
-              isActiveSelection: t instanceof fabric__namespace.ActiveSelection,
-              groupSelectionId: t ? t.__pixldocsGroupSelection : null,
-              memberIds: t instanceof fabric__namespace.ActiveSelection ? t.getObjects().map((o) => getObjectId(o)) : [getObjectId(t)],
-              targetLeft: t == null ? void 0 : t.left,
-              targetTop: t == null ? void 0 : t.top,
-              scaleX: t == null ? void 0 : t.scaleX,
-              scaleY: t == null ? void 0 : t.scaleY,
-              angle: t == null ? void 0 : t.angle
-            });
-          }
           setGuides([]);
           setGroupOverlayLiveBoundsRef.current(null);
           objectResizeActiveSnapRef.current = null;
@@ -13990,7 +13914,7 @@ const PageCanvas = react.forwardRef(
           const active = fabricCanvas.getActiveObject();
           const activeId = active ? getObjectId(active) : null;
           if (active && activeId && activeId !== "__background__" && !(active instanceof fabric__namespace.Group)) {
-            const pageChildrenForParent = ((_d = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _d.children) ?? [];
+            const pageChildrenForParent = ((_a2 = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _a2.children) ?? [];
             const parentGroup = findParentGroup(pageChildrenForParent, activeId);
             if (parentGroup && isGroup(parentGroup) && parentGroup.backgroundColor) {
               let fabricSectionGroup = active.group && active.group instanceof fabric__namespace.Group ? active.group : null;
@@ -14072,7 +13996,7 @@ const PageCanvas = react.forwardRef(
                   useEditorStore.getState().reflowStackGroupInPage(pageId, groupId);
                 }
                 const stateAfter = useEditorStore.getState();
-                const pageAfter = ((_e = stateAfter.canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _e.children) ?? [];
+                const pageAfter = ((_b2 = stateAfter.canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _b2.children) ?? [];
                 const groupNodeAfter = findNodeById(pageAfter, groupId);
                 if (groupNodeAfter) {
                   const abs = getAbsoluteBounds(groupNodeAfter, pageAfter);
@@ -14134,7 +14058,7 @@ const PageCanvas = react.forwardRef(
           }
           if (active && active instanceof fabric__namespace.Group && active.__docuforgeSectionGroup && getObjectId(active)) {
             const groupId = getObjectId(active);
-            const pageChildrenSec = ((_f = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _f.children) ?? [];
+            const pageChildrenSec = ((_c = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _c.children) ?? [];
             const modifiedTarget2 = e == null ? void 0 : e.target;
             const resizeScaleTarget = lastResizeScaleTargetRef.current;
             lastResizeScaleTargetRef.current = null;
@@ -14165,7 +14089,7 @@ const PageCanvas = react.forwardRef(
             const node = findNodeById(pageChildrenSec, groupId);
             if (isChildModified && node && !groupMoved) {
               const stateAfter = useEditorStore.getState();
-              const pageAfter = ((_g = stateAfter.canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _g.children) ?? [];
+              const pageAfter = ((_d = stateAfter.canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _d.children) ?? [];
               const groupNodeAfter = findNodeById(pageAfter, groupId);
               if (groupNodeAfter) {
                 const abs = getAbsoluteBounds(groupNodeAfter, pageAfter);
@@ -14181,7 +14105,7 @@ const PageCanvas = react.forwardRef(
           }
           if (active && active instanceof fabric__namespace.Group && !(active instanceof fabric__namespace.ActiveSelection) && getObjectId(active)) {
             const groupId = getObjectId(active);
-            const pageChildren3 = ((_h = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _h.children) ?? [];
+            const pageChildren3 = ((_e = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _e.children) ?? [];
             const w = (active.width ?? 0) * (active.scaleX ?? 1);
             const h = (active.height ?? 0) * (active.scaleY ?? 1);
             const centerX = active.left ?? 0;
@@ -14203,7 +14127,7 @@ const PageCanvas = react.forwardRef(
           }
           const activeObj = fabricCanvas.getActiveObject();
           let activeObjects = fabricCanvas.getActiveObjects();
-          const activeSelectionMoveStart = activeObj instanceof fabric__namespace.ActiveSelection && ((_i = activeSelectionMoveStartRef.current) == null ? void 0 : _i.selection) === activeObj ? activeSelectionMoveStartRef.current : null;
+          const activeSelectionMoveStart = activeObj instanceof fabric__namespace.ActiveSelection && ((_f = activeSelectionMoveStartRef.current) == null ? void 0 : _f.selection) === activeObj ? activeSelectionMoveStartRef.current : null;
           const activeSelectionDelta = activeObj instanceof fabric__namespace.ActiveSelection && activeSelectionMoveStart ? (() => {
             const rect = activeObj.getBoundingRect();
             return {
@@ -14294,22 +14218,6 @@ const PageCanvas = react.forwardRef(
               return memberIds.every((mid) => selectedSet.has(mid));
             })();
             const groupToMove = candidateIsStack || allMembersSelected ? candidateGroup : null;
-            if (shouldLogGroupMove()) {
-              console.log("[GRP-MOVE] entry", {
-                selectedElementIds,
-                isActiveSelection,
-                activeSelectionGroupId: activeObj instanceof fabric__namespace.ActiveSelection ? activeObj.__pixldocsGroupSelection : null,
-                parentGroupIds: parentGroups.map((g) => g.id),
-                sameDirectParent,
-                commonAncestorId: commonAncestor == null ? void 0 : commonAncestor.id,
-                candidateGroupId: candidateGroup == null ? void 0 : candidateGroup.id,
-                candidateIsStack,
-                allMembersSelected,
-                groupToMoveId: (groupToMove == null ? void 0 : groupToMove.id) ?? null,
-                activeSelectionHadTransform,
-                selectedLogicalGroupIds
-              });
-            }
             if (groupToMove) {
               const activeGroupSelectionId = activeObj instanceof fabric__namespace.ActiveSelection ? activeObj.__pixldocsGroupSelection : void 0;
               const transformStart = activeGroupSelectionId === groupToMove.id ? groupSelectionTransformStartRef.current : null;
@@ -14367,18 +14275,6 @@ const PageCanvas = react.forwardRef(
                 const { updateNode: updateNodeStore, commitHistory: commitHistoryStore, getCurrentElements } = useEditorStore.getState();
                 const newLeft = (groupToMove.left ?? 0) + deltaX;
                 const newTop = (groupToMove.top ?? 0) + deltaY;
-                const __dbg = shouldLogGroupMove();
-                if (__dbg) {
-                  console.log("[GRP-MOVE] commit", {
-                    groupId: groupToMove.id,
-                    groupAbs,
-                    movedGroup: { left: movedGroupLeft, top: movedGroupTop },
-                    delta: { x: deltaX, y: deltaY },
-                    newStored: { left: newLeft, top: newTop },
-                    activeSelectionAngle: isActiveSelection && activeObj ? activeObj.angle : null,
-                    hasGroupSelectionId: !!(isActiveSelection && activeObj instanceof fabric__namespace.ActiveSelection && activeObj.__pixldocsGroupSelection)
-                  });
-                }
                 updateNodeStore(groupToMove.id, { left: newLeft, top: newTop }, { recordHistory: false, skipLayoutRecalc: true });
                 commitHistoryStore();
                 pendingGroupDrillInRef.current = null;
@@ -14404,11 +14300,13 @@ const PageCanvas = react.forwardRef(
                 }
                 setTimeout(() => modifiedIdsThisRound.forEach((id) => justModifiedIdsRef.current.delete(id)), 150);
                 groupSelectionTransformStartRef.current = null;
-                activeSelectionMoveStartRef.current = null;
-                restorePreservedGroupSelectionSoon({
+                const restoreSnapshot = {
                   memberIds: targetObjects.map((obj) => getObjectId(obj)).filter((id) => !!id && id !== "__background__"),
-                  groupSelectionId
-                });
+                  groupSelectionId,
+                  expiresAt: Date.now() + 1200
+                };
+                recentGroupSelectionRestoreRef.current = restoreSnapshot;
+                restorePreservedGroupSelectionSoon(restoreSnapshot);
                 unlockEditsSoon();
                 return;
               }
@@ -14576,8 +14474,6 @@ const PageCanvas = react.forwardRef(
             } else if (obj instanceof fabric__namespace.Textbox && isActiveSelection && (Math.abs((decomposed.scaleX ?? 1) - 1) > 1e-3 || Math.abs((decomposed.scaleY ?? 1) - 1) > 1e-3)) {
               const sx = Math.abs(decomposed.scaleX || 1);
               const sy = Math.abs(decomposed.scaleY || 1);
-              const lastCorner = lastResizeScaleCornerRef.current ?? "";
-              const isCornerGroupScale = lastCorner === "tl" || lastCorner === "tr" || lastCorner === "bl" || lastCorner === "br";
               const bakedWidth = Math.max(20, intrinsicWidth * sx);
               const bakedHeight = Math.max(1, intrinsicHeight * sy);
               finalWidth = bakedWidth;
@@ -14585,13 +14481,8 @@ const PageCanvas = react.forwardRef(
               finalScaleX = 1;
               finalScaleY = 1;
               try {
-                if (isCornerGroupScale) {
-                  bakeTextboxScaleIntoTypography(obj, sourceElement, { scaleX: sx, scaleY: sy });
-                } else {
-                  obj.set({ width: bakedWidth, scaleX: 1, scaleY: 1 });
-                  obj.minBoxHeight = bakedHeight;
-                  obj.initDimensions();
-                }
+                obj.set({ width: bakedWidth, scaleX: 1, scaleY: 1 });
+                obj.initDimensions();
                 obj.setCoords();
               } catch {
               }
@@ -14670,7 +14561,7 @@ const PageCanvas = react.forwardRef(
             updateElement(objId, elementUpdate, { recordHistory: false, skipLayoutRecalc: true });
             obj.setCoords();
           }
-          const pageChildrenForReflow = ((_j = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _j.children) ?? [];
+          const pageChildrenForReflow = ((_g = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _g.children) ?? [];
           const stackGroupsToReflow = /* @__PURE__ */ new Set();
           for (const id of modifiedIdsThisRound) {
             const parent = findParentGroup(pageChildrenForReflow, id);
@@ -14732,15 +14623,11 @@ const PageCanvas = react.forwardRef(
           }
           groupSelectionTransformStartRef.current = null;
           activeSelectionMoveStartRef.current = null;
-          lastResizeScaleCornerRef.current = null;
           setTimeout(() => modifiedIdsThisRound.forEach((id) => justModifiedIdsRef.current.delete(id)), 150);
           commitHistory();
           unlockEditsSoon();
         } catch (e2) {
-          lastResizeScaleCornerRef.current = null;
           unlockEditsSoon();
-        } finally {
-          objectModifiedInFlight = false;
         }
       });
       fabricCanvas.on("before:selection:cleared", (e) => {
@@ -14998,14 +14885,13 @@ const PageCanvas = react.forwardRef(
         visibilityUpdateInProgressRef.current = false;
       }
       doSyncRef.current = () => {
-        var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
+        var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j;
         const shouldSkipUpdates2 = syncLockedRef.current || editLockRef.current;
         const state = useEditorStore.getState();
-        const storePage = state.canvas.pages.find((p) => p.id === pageId);
-        const pageTree = isPreviewMode && (pageChildren == null ? void 0 : pageChildren.length) ? pageChildren ?? [] : (storePage == null ? void 0 : storePage.children) ?? [];
-        const elementsToSync = isPreviewMode ? elements : pageTree.length ? flattenChildren(pageTree) : elements;
+        const elementsToSync = elements;
         elementsRef.current = elementsToSync;
-        const selectedIdsFromStore = new Set(((_a2 = state.canvas) == null ? void 0 : _a2.selectedIds) ?? []);
+        const pageTree = isPreviewMode && (pageChildren == null ? void 0 : pageChildren.length) ? pageChildren ?? [] : ((_a2 = state.canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _a2.children) ?? [];
+        const selectedIdsFromStore = new Set(((_b2 = state.canvas) == null ? void 0 : _b2.selectedIds) ?? []);
         isRebuildingRef.current = true;
         const allElementIds = new Set(elementsToSync.map((el) => el.id));
         const sectionGroups = pageTree.filter(
@@ -15033,7 +14919,7 @@ const PageCanvas = react.forwardRef(
           const activeObjId = activeObj ? getObjectId(activeObj) : null;
           const isTextBeingEdited = activeObjId && editingTextIdRef.current === activeObjId;
           const isMultiSelect = activeObj instanceof fabric__namespace.ActiveSelection;
-          if (activeObj && isMultiSelect && !(((_b2 = activeObj._ct) == null ? void 0 : _b2.isCropGroup) || activeObj.__cropGroup) && !isTextBeingEdited) {
+          if (activeObj && isMultiSelect && !(((_c = activeObj._ct) == null ? void 0 : _c.isCropGroup) || activeObj.__cropGroup) && !isTextBeingEdited) {
             fc.discardActiveObject();
           }
         }
@@ -15070,7 +14956,7 @@ const PageCanvas = react.forwardRef(
             fc.requestRenderAll();
           }
         } else if (!skipRestoreSelection && restoreTarget && !isActiveTextBeingEdited) {
-          const isCropGroup2 = ((_c = restoreTarget._ct) == null ? void 0 : _c.isCropGroup) || restoreTarget.__cropGroup;
+          const isCropGroup2 = ((_d = restoreTarget._ct) == null ? void 0 : _d.isCropGroup) || restoreTarget.__cropGroup;
           const isSectionGroup = activeId && sectionGroupIds.has(activeId);
           if ((isCropGroup2 || !shouldSkipUpdates2) && !isSectionGroup) {
             fc.setActiveObject(restoreTarget);
@@ -15175,42 +15061,9 @@ 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;
-          const existingObj = currentFabricObjects.get(element.id);
+          let existingObj = currentFabricObjects.get(element.id);
           const isHidden = !element.visible;
           if (existingObj) {
             const isBeingTransformed = transformingIdsRef.current.has(element.id);
@@ -15231,7 +15084,7 @@ const PageCanvas = react.forwardRef(
               const sourceUrlChanged = currentUrlNormalized !== storedUrlNormalized;
               const newFadeKey = edgeFadeKey(element);
               const oldFadeKey = isCropGroup2 ? existingObj.__edgeFadeInputKey || "" : existingObj.__edgeFadeKey || "";
-              const innerImg = (_d = existingObj == null ? void 0 : existingObj.__cropData) == null ? void 0 : _d._img;
+              const innerImg = (_e = existingObj == null ? void 0 : existingObj.__cropData) == null ? void 0 : _e._img;
               const innerOldKey = isCropGroup2 ? oldFadeKey : innerImg ? innerImg.__edgeFadeKey || "" : oldFadeKey;
               const cropFadeRendererMissing = isCropGroup2 && Boolean(newFadeKey) && !existingObj.__edgeFadeRenderConfig;
               const fadeKeyChanged = newFadeKey !== oldFadeKey || newFadeKey !== innerOldKey || cropFadeRendererMissing;
@@ -15239,14 +15092,14 @@ const PageCanvas = react.forwardRef(
               const needsCropGroupFadeUpdate = isCropGroup2 && fadeKeyChanged;
               const hadUrlBefore = storedImageUrl && String(storedImageUrl).trim() !== "";
               if (!hasUrl && hadUrlBefore) {
-                const resolvedSizeImg = pageTree.length ? getNodeBounds(element, pageTree) : { width: typeof element.width === "number" ? element.width : 200, height: typeof element.height === "number" ? element.height : 50 };
+                const resolvedSizeImg = (pageChildren == null ? void 0 : pageChildren.length) ? getNodeBounds(element, pageChildren) : { width: typeof element.width === "number" ? element.width : 200, height: typeof element.height === "number" ? element.height : 50 };
                 const hasExplicitSize = typeof element.width === "number" && Number.isFinite(element.width) && element.width > 0 && typeof element.height === "number" && Number.isFinite(element.height) && element.height > 0;
                 const minVisiblePlaceholder = hasExplicitSize ? 1 : 20;
                 const nextWidth = Math.max(minVisiblePlaceholder, Number(resolvedSizeImg.width) || 200);
                 const nextHeight = Math.max(minVisiblePlaceholder, Number(resolvedSizeImg.height) || 50);
-                const storePosImg = pageTree.length ? (() => {
-                  const node = findNodeById(pageTree, element.id);
-                  return node ? getAbsoluteBounds(node, pageTree) : { left: element.left ?? 0, top: element.top ?? 0 };
+                const storePosImg = pageChildren ? (() => {
+                  const node = findNodeById(pageChildren, element.id);
+                  return node ? getAbsoluteBounds(node, pageChildren) : { left: element.left ?? 0, top: element.top ?? 0 };
                 })() : { left: element.left ?? 0, top: element.top ?? 0 };
                 const elementForPlaceholder = { ...element, width: nextWidth, height: nextHeight };
                 const placeholder = isCropGroup2 ? createImagePlaceholderForGroup(elementForPlaceholder) : createImagePlaceholder(elementForPlaceholder);
@@ -15269,8 +15122,8 @@ const PageCanvas = react.forwardRef(
                 fc.requestRenderAll();
                 continue;
               }
-              const imageFitForReplace = element.imageFit || ((_e = element.style) == null ? void 0 : _e.imageFit) || "cover";
-              const clipShapeForReplace = element.clipShape ?? ((_f = element.style) == null ? void 0 : _f.imageFrameShape) ?? (isPreviewMode ? "rectangle" : "none");
+              const imageFitForReplace = element.imageFit || ((_f = element.style) == null ? void 0 : _f.imageFit) || "cover";
+              const clipShapeForReplace = element.clipShape ?? ((_g = element.style) == null ? void 0 : _g.imageFrameShape) ?? (isPreviewMode ? "rectangle" : "none");
               const needCropGroupForElement = imageFitForReplace !== "fill" || clipShapeForReplace && clipShapeForReplace !== "none";
               const plainImageNeedsCropGroup = hasUrl && !isCropGroup2 && existingObj instanceof fabric__namespace.FabricImage && needCropGroupForElement;
               if (hasUrl && (needsReload || isPlaceholder || plainImageNeedsCropGroup || needsCropGroupFadeUpdate)) {
@@ -15307,9 +15160,9 @@ const PageCanvas = react.forwardRef(
                       }
                       ct.rx = rxRatio;
                     }
-                    const cropPos = pageTree.length ? (() => {
-                      const node = findNodeById(pageTree, element.id);
-                      return node ? getAbsoluteBounds(node, pageTree) : { left: element.left ?? 0, top: element.top ?? 0 };
+                    const cropPos = pageChildren ? (() => {
+                      const node = findNodeById(pageChildren, element.id);
+                      return node ? getAbsoluteBounds(node, pageChildren) : { left: element.left ?? 0, top: element.top ?? 0 };
                     })() : { left: element.left ?? 0, top: element.top ?? 0 };
                     const cropCenterX = cropPos.left + (ct.frameW ?? 0) / 2;
                     const cropCenterY = cropPos.top + (ct.frameH ?? 0) / 2;
@@ -15406,7 +15259,7 @@ const PageCanvas = react.forwardRef(
                   continue;
                 }
               } else if (!hasUrl && !isPlaceholder) {
-                const resolvedSizeImg = pageTree.length ? getNodeBounds(element, pageTree) : { width: typeof element.width === "number" ? element.width : 200, height: typeof element.height === "number" ? element.height : 50 };
+                const resolvedSizeImg = (pageChildren == null ? void 0 : pageChildren.length) ? getNodeBounds(element, pageChildren) : { width: typeof element.width === "number" ? element.width : 200, height: typeof element.height === "number" ? element.height : 50 };
                 const hasExplicitSize = typeof element.width === "number" && Number.isFinite(element.width) && element.width > 0 && typeof element.height === "number" && Number.isFinite(element.height) && element.height > 0;
                 const minVisiblePlaceholder = hasExplicitSize ? 1 : 20;
                 const elementForPlaceholder = {
@@ -15436,11 +15289,11 @@ const PageCanvas = react.forwardRef(
                 placeholder.__imageSrc = void 0;
               } else if (!isBeingTransformed && !isBeingTextEdited && !shouldSkipUpdates2) {
                 if (isPlaceholderGroup) {
-                  const storePosImg = pageTree.length ? (() => {
-                    const node = findNodeById(pageTree, element.id);
-                    return node ? getAbsoluteBounds(node, pageTree) : { left: element.left ?? 0, top: element.top ?? 0 };
+                  const storePosImg = pageChildren ? (() => {
+                    const node = findNodeById(pageChildren, element.id);
+                    return node ? getAbsoluteBounds(node, pageChildren) : { left: element.left ?? 0, top: element.top ?? 0 };
                   })() : { left: element.left ?? 0, top: element.top ?? 0 };
-                  const resolvedSizeImg = pageTree.length ? getNodeBounds(element, pageTree) : { width: typeof element.width === "number" ? element.width : 200, height: typeof element.height === "number" ? element.height : 50 };
+                  const resolvedSizeImg = (pageChildren == null ? void 0 : pageChildren.length) ? getNodeBounds(element, pageChildren) : { width: typeof element.width === "number" ? element.width : 200, height: typeof element.height === "number" ? element.height : 50 };
                   const hasExplicitSize = typeof element.width === "number" && Number.isFinite(element.width) && element.width > 0 && typeof element.height === "number" && Number.isFinite(element.height) && element.height > 0;
                   const minVisiblePlaceholder = hasExplicitSize ? 1 : 20;
                   const nextWidth = Math.max(minVisiblePlaceholder, Number(resolvedSizeImg.width) || 200);
@@ -15500,13 +15353,11 @@ const PageCanvas = react.forwardRef(
                 const previousVisible = previousVisibilityRef.current.get(element.id) ?? true;
                 const currentVisible = element.visible !== false;
                 const visibilityChanged = previousVisible !== currentVisible;
-                const storePosForImg = pageTree.length ? (() => {
-                  const node = findNodeById(pageTree, element.id);
-                  return node ? getAbsoluteBounds(node, pageTree) : { left: element.left ?? 0, top: element.top ?? 0 };
+                const storePosForImg = pageChildren ? (() => {
+                  const node = findNodeById(pageChildren, element.id);
+                  return node ? getAbsoluteBounds(node, pageChildren) : { left: element.left ?? 0, top: element.top ?? 0 };
                 })() : { left: element.left ?? 0, top: element.top ?? 0 };
-                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);
+                const positionChanged = Math.abs((existingObj.left ?? 0) - storePosForImg.left) > 0.1 || Math.abs((existingObj.top ?? 0) - storePosForImg.top) > 0.1;
                 if (visibilityChanged && !positionChanged || visibilityUpdateInProgressRef.current) {
                   const isDynamicField = dynamicFieldIds.includes(element.id);
                   const canBeEvented = isEditorMode || isPreviewMode && isDynamicField;
@@ -15521,7 +15372,7 @@ const PageCanvas = react.forwardRef(
                   previousVisibilityRef.current.set(element.id, currentVisible);
                 } else {
                   if (!visibilityUpdateInProgressRef.current) {
-                    updateFabricObject(existingObj, element, wasJustModified || preserveSelectionMemberPosition);
+                    updateFabricObject(existingObj, element, wasJustModified);
                   }
                   const isDynamicField = dynamicFieldIds.includes(element.id);
                   const canBeEvented = isEditorMode || isPreviewMode && isDynamicField;
@@ -15543,19 +15394,17 @@ const PageCanvas = react.forwardRef(
               if (!isBeingTransformed && !isBeingTextEdited && !shouldSkipUpdates2) {
                 previousVisibilityRef.current.get(element.id) ?? true;
                 const currentVisible = element.visible !== false;
-                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 };
+                const fabricLeft = existingObj.left ?? 0;
+                const fabricTop = existingObj.top ?? 0;
+                const storePos = pageChildren ? (() => {
+                  const node = findNodeById(pageChildren, element.id);
+                  return node ? getAbsoluteBounds(node, pageChildren) : { left: element.left ?? 0, top: element.top ?? 0 };
                 })() : { left: element.left ?? 0, top: element.top ?? 0 };
                 const storeLeft = storePos.left;
                 const storeTop = storePos.top;
                 const deltaX = Math.abs(fabricLeft - storeLeft);
                 const deltaY = Math.abs(fabricTop - storeTop);
-                const preserveSelectionMemberPosition = shouldPreserveActiveSelectionMemberPosition(existingObj);
-                let positionChanged = !preserveSelectionMemberPosition && (deltaX > 0.1 || deltaY > 0.1);
+                let positionChanged = 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);
@@ -15563,7 +15412,7 @@ const PageCanvas = react.forwardRef(
                 if (positionChanged && isSelected && (wasJustModified || isBeingTransformed)) {
                   positionChanged = false;
                 }
-                const resolvedSizeForCompare = pageTree.length ? getNodeBounds(element, pageTree) : { width: typeof element.width === "number" ? element.width : 0, height: typeof element.height === "number" ? element.height : 0 };
+                const resolvedSizeForCompare = (pageChildren == null ? void 0 : pageChildren.length) ? getNodeBounds(element, pageChildren) : { width: typeof element.width === "number" ? element.width : 0, height: typeof element.height === "number" ? element.height : 0 };
                 const fabricText = existingObj.text ?? "";
                 const storeText = element.text ?? "";
                 const otherPropsChanged = Math.abs((existingObj.width ?? 0) - resolvedSizeForCompare.width) > 0.1 || Math.abs((existingObj.height ?? 0) - resolvedSizeForCompare.height) > 0.1 || Math.abs((existingObj.angle ?? 0) - (element.angle ?? 0)) > 0.1 || Math.abs((existingObj.scaleX ?? 1) - (element.scaleX ?? 1)) > 0.01 || Math.abs((existingObj.scaleY ?? 1) - (element.scaleY ?? 1)) > 0.01 || (existingObj.flipX ?? false) !== (element.flipX ?? false) || (existingObj.flipY ?? false) !== (element.flipY ?? false) || fabricText !== storeText || existingObj.fill !== (element.fill ?? "") || existingObj.stroke !== (element.stroke ?? "") || Math.abs((existingObj.strokeWidth ?? 0) - (element.strokeWidth ?? 0)) > 0.01 || Math.abs((existingObj.opacity ?? 1) - (element.opacity ?? 1)) > 0.01 || (existingObj.fontSize ?? 0) !== (element.fontSize ?? 0) || (existingObj.fontFamily ?? "") !== (element.fontFamily ?? "") || // Vertical alignment & min box height: panel-driven changes must trigger a re-apply
@@ -15607,28 +15456,8 @@ const PageCanvas = react.forwardRef(
                   });
                   previousVisibilityRef.current.set(element.id, currentVisible);
                 } else {
-                  const skipPositionBecauseSelection = preserveSelectionMemberPosition || isSelected && (deltaX > 0.1 || deltaY > 0.1) && (wasJustModified || isBeingTransformed);
+                  const skipPositionBecauseSelection = isSelected && (deltaX > 0.1 || deltaY > 0.1) && (wasJustModified || isBeingTransformed);
                   const anyChange = positionChanged || otherPropsChanged || forceApplyFromPanel;
-                  if (shouldLogGroupMove() && (preserveSelectionMemberPosition || (deltaX > 0.1 || deltaY > 0.1))) {
-                    console.log("[GRP-MOVE] doSync-member", {
-                      id: element.id,
-                      type: element.type,
-                      fabric: { left: fabricLeft, top: fabricTop },
-                      store: { left: storeLeft, top: storeTop },
-                      delta: { x: deltaX, y: deltaY },
-                      flags: {
-                        preserveSelectionMemberPosition,
-                        isSelected,
-                        wasJustModified,
-                        isBeingTransformed,
-                        positionChanged,
-                        otherPropsChanged,
-                        skipPositionBecauseSelection,
-                        anyChange,
-                        syncTriggeredByPanel: syncTriggeredByPanelRef.current
-                      }
-                    });
-                  }
                   if (!visibilityUpdateInProgressRef.current) {
                     if (anyChange && !skipPositionBecauseSelection) {
                       updateFabricObject(existingObj, element, wasJustModified);
@@ -15724,7 +15553,7 @@ const PageCanvas = react.forwardRef(
               fc.add(placeholder);
               fc.bringObjectToFront(placeholder);
               const activeObj = fc.getActiveObject();
-              if (activeObj && (((_g = activeObj._ct) == null ? void 0 : _g.isCropGroup) || activeObj.__cropGroup)) {
+              if (activeObj && (((_h = activeObj._ct) == null ? void 0 : _h.isCropGroup) || activeObj.__cropGroup)) {
                 fc.setActiveObject(activeObj);
               }
               placeholder.dirty = true;
@@ -15764,7 +15593,7 @@ const PageCanvas = react.forwardRef(
                 fc.add(obj);
                 fc.bringObjectToFront(obj);
                 const activeObj = fc.getActiveObject();
-                if (activeObj && (((_h = activeObj._ct) == null ? void 0 : _h.isCropGroup) || activeObj.__cropGroup)) {
+                if (activeObj && (((_i = activeObj._ct) == null ? void 0 : _i.isCropGroup) || activeObj.__cropGroup)) {
                   fc.setActiveObject(activeObj);
                 }
                 obj.dirty = true;
@@ -15794,20 +15623,10 @@ const PageCanvas = react.forwardRef(
           });
           allFabricObjects.forEach((obj) => fc.bringObjectToFront(obj));
         }
-        const activeAfterObjectSync = fc.getActiveObject();
-        if (activeAfterObjectSync instanceof fabric__namespace.ActiveSelection) {
-          const groupSelectionId = activeAfterObjectSync.__pixldocsGroupSelection;
-          if (groupSelectionId) {
-            applyLogicalGroupSelectionVisualState(activeAfterObjectSync, groupSelectionId);
-            if (!activeAfterObjectSync.getObjects().every((obj) => !(obj instanceof fabric__namespace.Group))) {
-              activeAfterObjectSync.setCoords();
-            }
-          }
-        }
         isRebuildingRef.current = false;
         fc.requestRenderAll();
         if (activeBeforeSync && fc.getObjects().includes(activeBeforeSync)) {
-          const isCropGroup2 = ((_i = activeBeforeSync._ct) == null ? void 0 : _i.isCropGroup) || activeBeforeSync.__cropGroup;
+          const isCropGroup2 = ((_j = activeBeforeSync._ct) == null ? void 0 : _j.isCropGroup) || activeBeforeSync.__cropGroup;
           if (isCropGroup2) {
             fc.setActiveObject(activeBeforeSync);
             fc.requestRenderAll();
@@ -15860,9 +15679,7 @@ const PageCanvas = react.forwardRef(
                   applyLogicalGroupSelectionVisualState(newSel, activeSelectionSnapshot.groupSelectionId);
                 }
                 fc.setActiveObject(newSel);
-                if (!(activeSelectionSnapshot.groupSelectionId && newSel.getObjects().every((obj) => !(obj instanceof fabric__namespace.Group)))) {
-                  newSel.setCoords();
-                }
+                newSel.setCoords();
                 fc.requestRenderAll();
               } finally {
                 isSyncingSelectionToFabricRef.current = false;
@@ -15890,6 +15707,10 @@ const PageCanvas = react.forwardRef(
             }
           }
         }
+        const recentGroupRestore = recentGroupSelectionRestoreRef.current;
+        if ((recentGroupRestore == null ? void 0 : recentGroupRestore.groupSelectionId) && recentGroupRestore.expiresAt > Date.now()) {
+          restoreGroupSelectionSnapshot(recentGroupRestore);
+        }
         preserveSelectionAfterTransformIdRef.current = null;
         preserveActiveSelectionAfterTransformRef.current = null;
         syncTriggeredByPanelRef.current = false;
@@ -16166,6 +15987,7 @@ const PageCanvas = react.forwardRef(
             });
             if (isPureSingleGroupSelection) {
               active.hasBorders = true;
+              active.setCoords();
               applyWarpAwareSelectionBorders(active);
             }
           }
@@ -16234,7 +16056,7 @@ const PageCanvas = react.forwardRef(
       if (fc && isTransforming(fc)) {
         return;
       }
-      const currentPageTree = (isPreviewMode && (pageChildren == null ? void 0 : pageChildren.length) ? pageChildren : (_a2 = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _a2.children) ?? [];
+      const currentPageTree = ((pageChildren == null ? void 0 : pageChildren.length) ? pageChildren : (_a2 = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _a2.children) ?? [];
       const fabricPos = currentPageTree.length > 0 ? (() => {
         const node = findNodeById(currentPageTree, element.id);
         return node ? getAbsoluteBounds(node, currentPageTree) : { left: element.left ?? 0, top: element.top ?? 0 };
@@ -17302,7 +17124,7 @@ const PageCanvas = react.forwardRef(
           if (imageFit === "fill" && !needCropGroup2) {
             const finalScaleX = baseScaleX * (element.scaleX ?? 1);
             const finalScaleY = baseScaleY * (element.scaleY ?? 1);
-            const pageTreeForCreate = ((isPreviewMode || isExportMode) && (pageChildren == null ? void 0 : pageChildren.length) ? pageChildren : (_f = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _f.children) ?? [];
+            const pageTreeForCreate = ((pageChildren == null ? void 0 : pageChildren.length) ? pageChildren : (_f = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _f.children) ?? [];
             const createPos = pageTreeForCreate.length > 0 ? (() => {
               const node = findNodeById(pageTreeForCreate, element.id);
               return node ? getAbsoluteBounds(node, pageTreeForCreate) : { left: element.left ?? 0, top: element.top ?? 0 };
@@ -17352,7 +17174,7 @@ const PageCanvas = react.forwardRef(
         const needCropGroup = imageFitFinal !== "fill" || clipShapeFinal && clipShapeFinal !== "none";
         let finalObject = img;
         if (needCropGroup) {
-          const pageTreeForCropResolve = ((isPreviewMode || isExportMode) && (pageChildren == null ? void 0 : pageChildren.length) ? pageChildren : (_i = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _i.children) ?? [];
+          const pageTreeForCropResolve = ((pageChildren == null ? void 0 : pageChildren.length) ? pageChildren : (_i = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _i.children) ?? [];
           const nodeForSize = pageTreeForCropResolve.length ? findNodeById(pageTreeForCropResolve, element.id) : null;
           const w = nodeForSize && isElement(nodeForSize) ? nodeForSize.width : element.width;
           const h = nodeForSize && isElement(nodeForSize) ? nodeForSize.height : element.height;
@@ -17396,7 +17218,7 @@ const PageCanvas = react.forwardRef(
           }
           const isDynamicField = dynamicFieldIds.includes(element.id);
           const canBeEvented = isEditorMode || isPreviewMode && isDynamicField;
-          const pageTreeForCrop = ((isPreviewMode || isExportMode) && (pageChildren == null ? void 0 : pageChildren.length) ? pageChildren : (_n = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _n.children) ?? [];
+          const pageTreeForCrop = ((pageChildren == null ? void 0 : pageChildren.length) ? pageChildren : (_n = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _n.children) ?? [];
           const createPosForCrop = pageTreeForCrop.length > 0 ? (() => {
             const node = findNodeById(pageTreeForCrop, element.id);
             return node ? getAbsoluteBounds(node, pageTreeForCrop) : { left: element.left ?? 0, top: element.top ?? 0 };
@@ -23812,9 +23634,9 @@ function captureFabricCanvasSvgForPdf(fabricInstance, canvasWidth, canvasHeight)
   }
   return svgString;
 }
-const resolvedPackageVersion = "0.5.284";
+const resolvedPackageVersion = "0.5.286";
 const PACKAGE_VERSION = resolvedPackageVersion;
-const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.284";
+const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.286";
 const roundParityValue = (value) => {
   if (typeof value !== "number") return value;
   return Number.isFinite(value) ? Number(value.toFixed(3)) : value;
@@ -24628,7 +24450,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-C28yMJ_a.cjs"));
+      const { exportMultiPagePdf, preparePagesForExport } = await Promise.resolve().then(() => require("./vectorPdfExport-DqdRBbl_.cjs"));
       const prepared = preparePagesForExport(
         cloned.pages,
         canvasWidth,
@@ -26948,7 +26770,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-C28yMJ_a.cjs"));
+      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await Promise.resolve().then(() => require("./vectorPdfExport-DqdRBbl_.cjs"));
       try {
         await logTextMeasurementDiagnostic(svgToDraw);
       } catch {
@@ -27345,4 +27167,4 @@ exports.setAutoShrinkDebug = setAutoShrinkDebug;
 exports.setBundledAssetPrefixes = setBundledAssetPrefixes;
 exports.warmResolvedTemplateForPreview = warmResolvedTemplateForPreview;
 exports.warmTemplateFromForm = warmTemplateFromForm;
-//# sourceMappingURL=index-n9HBI3ow.cjs.map
+//# sourceMappingURL=index-4L9uZ78v.cjs.map