@pixldocs/canvas-renderer 0.5.397 → 0.5.399

package/dist/{index-BgYo0VtS.cjs → index-BJ-DTm0r.cjs}

@@ -125,7 +125,6 @@ const createDefaultGroup = (partial) => ({
   locked: false,
   left: 0,
   top: 0,
-  angle: 0,
   ...partial
 });
 const PAGE_BACKGROUND_ELEMENT_ID = "__pageBackground__";
@@ -848,17 +847,9 @@ function getNodeBounds(node, pageChildren, options) {
   let width;
   let height;
   if (isGroup(node) && (pageChildren == null ? void 0 : pageChildren.length) !== void 0) {
-    const group = node;
-    const storedWidth = Number(group.width);
-    const storedHeight = Number(group.height);
-    if (!isStackLayoutMode(group.layoutMode) && storedWidth > 0 && storedHeight > 0) {
-      width = storedWidth;
-      height = storedHeight;
-    } else {
-      const size = groupBoundsFromChildren(group, pageChildren ?? []);
-      width = size.width;
-      height = size.height;
-    }
+    const size = groupBoundsFromChildren(node, pageChildren ?? []);
+    width = size.width;
+    height = size.height;
   } else {
     width = simpleWidth(node);
     height = simpleHeight(node);
@@ -10529,119 +10520,6 @@ function bakeEdgeFade(source, fade) {
 }
 const SELECTION_PRIMARY = "hsl(217, 91%, 60%)";
 const SELECTION_BORDER_SCALE = 2;
-const normalizeAngle180 = (angle) => {
-  const n = (angle % 360 + 360) % 360;
-  return n > 180 ? n - 360 : n;
-};
-const isValidLogicalGroupFrame = (frame) => !!frame && Number.isFinite(frame.left) && Number.isFinite(frame.top) && Number.isFinite(frame.width) && frame.width > 0 && Number.isFinite(frame.height) && frame.height > 0;
-const frameFromStoredGroupNode = (group, pageChildren, options) => {
-  const width = Number(group.width);
-  const height = Number(group.height);
-  if (!Number.isFinite(width) || width <= 0 || !Number.isFinite(height) || height <= 0) return null;
-  try {
-    const abs = getAbsoluteBounds(group, pageChildren, options);
-    return { left: abs.left, top: abs.top, width, height };
-  } catch {
-    return null;
-  }
-};
-const orientedFrameFromWorldPoints = (points, angle) => {
-  if (points.length === 0 || !Number.isFinite(angle)) return null;
-  const rad = -angle * Math.PI / 180;
-  const cos = Math.cos(rad);
-  const sin = Math.sin(rad);
-  let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
-  for (const p of points) {
-    const xr = p.x * cos - p.y * sin;
-    const yr = p.x * sin + p.y * cos;
-    minX = Math.min(minX, xr);
-    minY = Math.min(minY, yr);
-    maxX = Math.max(maxX, xr);
-    maxY = Math.max(maxY, yr);
-  }
-  if (![minX, minY, maxX, maxY].every(Number.isFinite)) return null;
-  const width = Math.max(1, maxX - minX);
-  const height = Math.max(1, maxY - minY);
-  const centerXRot = minX + width / 2;
-  const centerYRot = minY + height / 2;
-  const back = angle * Math.PI / 180;
-  const c = Math.cos(back);
-  const s = Math.sin(back);
-  const centerX = centerXRot * c - centerYRot * s;
-  const centerY = centerXRot * s + centerYRot * c;
-  return { left: centerX - width / 2, top: centerY - height / 2, width, height };
-};
-const collectFabricObjectWorldPoints = (objects) => {
-  const points = [];
-  for (const obj of objects) {
-    try {
-      obj.setCoords();
-    } catch {
-    }
-    const coords = typeof obj.getCoords === "function" ? obj.getCoords() : null;
-    if (Array.isArray(coords) && coords.length) {
-      points.push(...coords.map((p) => ({ x: p.x, y: p.y })));
-      continue;
-    }
-    const aC = obj.aCoords;
-    if (!aC) continue;
-    for (const key of ["tl", "tr", "br", "bl"]) {
-      const p = aC[key];
-      if (p) points.push({ x: p.x, y: p.y });
-    }
-  }
-  return points;
-};
-const collectFabricObjectWorldCenters = (objects) => {
-  var _a2;
-  const centers = [];
-  for (const obj of objects) {
-    try {
-      obj.setCoords();
-    } catch {
-    }
-    const coords = typeof obj.getCoords === "function" ? obj.getCoords() : null;
-    if (Array.isArray(coords) && coords.length >= 4) {
-      const pts = coords.slice(0, 4).map((p) => ({ x: Number(p.x), y: Number(p.y) })).filter((p) => Number.isFinite(p.x) && Number.isFinite(p.y));
-      if (pts.length) centers.push({ x: pts.reduce((sum, p) => sum + p.x, 0) / pts.length, y: pts.reduce((sum, p) => sum + p.y, 0) / pts.length });
-      continue;
-    }
-    try {
-      const center = (_a2 = obj.getCenterPoint) == null ? void 0 : _a2.call(obj);
-      if (center && Number.isFinite(center.x) && Number.isFinite(center.y)) centers.push({ x: center.x, y: center.y });
-    } catch {
-    }
-  }
-  return centers;
-};
-const logicalFrameContainsWorldCenters = (frame, angle, centers) => {
-  if (!isValidLogicalGroupFrame(frame) || centers.length === 0) return true;
-  const a = typeof angle === "number" && Number.isFinite(angle) ? normalizeAngle180(angle) : 0;
-  const cx = frame.left + frame.width / 2;
-  const cy = frame.top + frame.height / 2;
-  const rad = -a * Math.PI / 180;
-  const c = Math.cos(rad);
-  const s = Math.sin(rad);
-  const tolerance = Math.max(8, Math.min(frame.width, frame.height) * 0.08);
-  return centers.every((p) => {
-    const dx = p.x - cx;
-    const dy = p.y - cy;
-    const localX = cx + dx * c - dy * s;
-    const localY = cy + dx * s + dy * c;
-    return localX >= frame.left - tolerance && localX <= frame.left + frame.width + tolerance && localY >= frame.top - tolerance && localY <= frame.top + frame.height + tolerance;
-  });
-};
-const shouldRepairUnrotatedLogicalGroupFrame = (storedFrame, contentFrame, angle) => {
-  if (!isValidLogicalGroupFrame(storedFrame) || !isValidLogicalGroupFrame(contentFrame)) return false;
-  if (Math.abs(normalizeAngle180(typeof angle === "number" && Number.isFinite(angle) ? angle : 0)) > 0.5) return false;
-  const storedArea = storedFrame.width * storedFrame.height;
-  const contentArea = contentFrame.width * contentFrame.height;
-  const areaRatio = storedArea / Math.max(1, contentArea);
-  const dx = Math.abs(storedFrame.left + storedFrame.width / 2 - (contentFrame.left + contentFrame.width / 2));
-  const dy = Math.abs(storedFrame.top + storedFrame.height / 2 - (contentFrame.top + contentFrame.height / 2));
-  const driftTolerance = Math.max(12, Math.min(storedFrame.width, storedFrame.height) * 0.08);
-  return areaRatio > 1.35 || dx > driftTolerance || dy > driftTolerance;
-};
 let ensureCanvaControlRenders = () => {
 };
 try {
@@ -11572,7 +11450,7 @@ const bakeTextboxScaleIntoTypography = (obj, sourceElement) => {
   };
   return updates;
 };
-function applyWarpAwareSelectionBorders(selection, preferredGroupAngle, preferredGroupFrame) {
+function applyWarpAwareSelectionBorders(selection) {
   var _a2;
   if (selection.__pixldocsOrigASHasBorders !== void 0) {
     selection.hasBorders = selection.__pixldocsOrigASHasBorders;
@@ -11584,13 +11462,17 @@ function applyWarpAwareSelectionBorders(selection, preferredGroupAngle, preferre
     if (selection.__pixldocsAlignedAngle == null) {
       const kids = selection.getObjects();
       if (kids.length >= 1) {
-        const angleDelta = (a, b) => Math.abs(normalizeAngle180(a - b));
+        const norm = (a) => {
+          const n = (a % 360 + 360) % 360;
+          return n > 180 ? n - 360 : n;
+        };
+        const angleDelta = (a, b) => Math.abs(norm(a - b));
         const selectionMatrix = selection.calcTransformMatrix();
         const worldMatrices = kids.map((k) => fabric__namespace.util.multiplyTransformMatrices(
           selectionMatrix,
           k.calcOwnMatrix()
         ));
-        const worldAngles = worldMatrices.map((m) => normalizeAngle180(fabric__namespace.util.qrDecompose(m).angle ?? 0));
+        const worldAngles = worldMatrices.map((m) => norm(fabric__namespace.util.qrDecompose(m).angle ?? 0));
         const worldPoints = [];
         for (const k of kids) {
           try {
@@ -11635,40 +11517,15 @@ function applyWarpAwareSelectionBorders(selection, preferredGroupAngle, preferre
         for (const b of buckets) b.area = orientedAreaForAngle(b.angle);
         buckets.sort((a, b) => b.count - a.count || a.area - b.area || Math.abs(b.angle) - Math.abs(a.angle));
         const dominant = buckets[0];
-        let effectivePreferredGroupAngle = preferredGroupAngle;
-        let effectivePreferredGroupFrame = preferredGroupFrame;
-        const logicalGroupId = selection.__pixldocsGroupSelection;
-        if (logicalGroupId && (!(typeof effectivePreferredGroupAngle === "number" && Number.isFinite(effectivePreferredGroupAngle)) || !isValidLogicalGroupFrame(effectivePreferredGroupFrame))) {
-          try {
-            const stateNow = useEditorStore.getState();
-            const pageNow = stateNow.canvas.pages.find((p) => p.id === stateNow.canvas.currentPageId);
-            const groupNode = pageNow ? findNodeById(pageNow.children ?? [], logicalGroupId) : null;
-            if (groupNode && isGroup(groupNode)) {
-              if (!(typeof effectivePreferredGroupAngle === "number" && Number.isFinite(effectivePreferredGroupAngle)) && typeof groupNode.angle === "number") {
-                effectivePreferredGroupAngle = groupNode.angle;
-              }
-              if (!isValidLogicalGroupFrame(effectivePreferredGroupFrame)) {
-                effectivePreferredGroupFrame = frameFromStoredGroupNode(groupNode, (pageNow == null ? void 0 : pageNow.children) ?? []);
-              }
-            }
-          } catch {
-          }
+        let targetAngle = null;
+        const isLogicalGroupSelection = !!selection.__pixldocsGroupSelection;
+        const frozenGroupAngle = selection.__pixldocsFrozenGroupAngle;
+        if (isLogicalGroupSelection && typeof frozenGroupAngle === "number" && Math.abs(frozenGroupAngle) > 0.5) {
+          targetAngle = frozenGroupAngle;
         }
-        const rawPreferredGroupAngle = typeof effectivePreferredGroupAngle === "number" && Number.isFinite(effectivePreferredGroupAngle) ? effectivePreferredGroupAngle : typeof selection.__pixldocsGroupAngle === "number" && Number.isFinite(selection.__pixldocsGroupAngle) ? selection.__pixldocsGroupAngle : null;
-        const preferredAngle = rawPreferredGroupAngle != null ? normalizeAngle180(rawPreferredGroupAngle) : null;
-        let targetAngle = preferredAngle;
-        const isLogicalGroupSelection = !!logicalGroupId;
         if (targetAngle == null && dominant && Math.abs(dominant.angle) > 0.5 && (isLogicalGroupSelection || kids.length === 1 || dominant.count >= 2 || dominant.count === kids.length)) {
           targetAngle = dominant.angle;
         }
-        if (isLogicalGroupSelection && isValidLogicalGroupFrame(effectivePreferredGroupFrame) && targetAngle != null) {
-          const contentFrame = orientedFrameFromWorldPoints(worldPoints, targetAngle);
-          if (shouldRepairUnrotatedLogicalGroupFrame(effectivePreferredGroupFrame, contentFrame, targetAngle)) {
-            effectivePreferredGroupFrame = contentFrame;
-          } else if (!logicalFrameContainsWorldCenters(effectivePreferredGroupFrame, targetAngle, collectFabricObjectWorldCenters(kids))) {
-            effectivePreferredGroupFrame = null;
-          }
-        }
         if (targetAngle != null) {
           const restoreKidsFromWorld = () => {
             const invSelection = fabric__namespace.util.invertTransform(
@@ -11707,30 +11564,11 @@ function applyWarpAwareSelectionBorders(selection, preferredGroupAngle, preferre
             targetAngle,
             worldAngles
           });
-          const fixedFrame = effectivePreferredGroupFrame && Number.isFinite(effectivePreferredGroupFrame.left) && Number.isFinite(effectivePreferredGroupFrame.top) && Number.isFinite(effectivePreferredGroupFrame.width) && effectivePreferredGroupFrame.width > 0 && Number.isFinite(effectivePreferredGroupFrame.height) && effectivePreferredGroupFrame.height > 0 ? effectivePreferredGroupFrame : null;
           selection.set({ angle: targetAngle, scaleX: 1, scaleY: 1, skewX: 0, skewY: 0 });
-          if (fixedFrame) {
-            selection.set({ width: fixedFrame.width, height: fixedFrame.height, originX: "center", originY: "center" });
-            selection.setPositionByOrigin(
-              new fabric__namespace.Point(fixedFrame.left + fixedFrame.width / 2, fixedFrame.top + fixedFrame.height / 2),
-              "center",
-              "center"
-            );
-          }
           restoreKidsFromWorld();
-          if (!fixedFrame) {
-            try {
-              (_a2 = selection.triggerLayout) == null ? void 0 : _a2.call(selection);
-            } catch {
-            }
-          }
-          if (fixedFrame) {
-            selection.set({ width: fixedFrame.width, height: fixedFrame.height, originX: "center", originY: "center" });
-            selection.setPositionByOrigin(
-              new fabric__namespace.Point(fixedFrame.left + fixedFrame.width / 2, fixedFrame.top + fixedFrame.height / 2),
-              "center",
-              "center"
-            );
+          try {
+            (_a2 = selection.triggerLayout) == null ? void 0 : _a2.call(selection);
+          } catch {
           }
           restoreKidsFromWorld();
           selection.setCoords();
@@ -11819,93 +11657,22 @@ const PageCanvas = react.forwardRef(
     const [ready, setReady] = react.useState(false);
     const [unlockRequestId, setUnlockRequestId] = react.useState(0);
     const applyLogicalGroupSelectionVisualState = react.useCallback((selection, groupId) => {
-      var _a2, _b2;
+      var _a2;
       selection.__pixldocsGroupSelection = groupId;
       delete selection.__pixldocsLogicalGroupIds;
-      const pageNow = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId);
-      const groupNode = pageNow ? findNodeById(pageNow.children ?? [], groupId) : null;
-      let groupAngle = groupNode && isGroup(groupNode) && typeof groupNode.angle === "number" ? groupNode.angle : void 0;
-      const members = selection.getObjects();
-      if (groupAngle === void 0 && groupNode && isGroup(groupNode)) {
-        const storedW = Number(groupNode.width);
-        const storedH = Number(groupNode.height);
-        if (storedW > 0 && storedH > 0) {
-          groupAngle = 0;
-        }
-      }
-      if (groupAngle === void 0 && groupNode && isGroup(groupNode)) {
-        try {
-          const selectionMatrix = selection.calcTransformMatrix();
-          const worldAngles = members.map((kid) => normalizeAngle180(fabric__namespace.util.qrDecompose(
-            fabric__namespace.util.multiplyTransformMatrices(
-              selectionMatrix,
-              kid.calcOwnMatrix()
-            )
-          ).angle ?? 0));
-          const buckets = [];
-          for (const angle of worldAngles) {
-            const bucket = buckets.find((candidate) => Math.abs(normalizeAngle180(candidate.angle - angle)) <= 2);
-            if (bucket) bucket.count += 1;
-            else buckets.push({ angle, count: 1 });
-          }
-          buckets.sort((a, b) => b.count - a.count || Math.abs(b.angle) - Math.abs(a.angle));
-          const inferredAngle = (_a2 = buckets[0]) == null ? void 0 : _a2.angle;
-          if (typeof inferredAngle === "number" && Number.isFinite(inferredAngle) && Math.abs(inferredAngle) > 0.01) {
-            groupAngle = inferredAngle;
-          }
-        } catch {
-        }
-      }
-      let groupFrame = groupNode && isGroup(groupNode) ? frameFromStoredGroupNode(groupNode, (pageNow == null ? void 0 : pageNow.children) ?? []) : null;
-      let groupFrameWasInferred = false;
-      const memberWorldPoints = collectFabricObjectWorldPoints(members);
-      const memberWorldCenters = collectFabricObjectWorldCenters(members);
-      const contentFrame = typeof groupAngle === "number" && Number.isFinite(groupAngle) ? orientedFrameFromWorldPoints(memberWorldPoints, normalizeAngle180(groupAngle)) : null;
-      if (shouldRepairUnrotatedLogicalGroupFrame(groupFrame, contentFrame, groupAngle)) {
-        groupFrame = contentFrame;
-        groupFrameWasInferred = true;
-      } else if (groupFrame && !logicalFrameContainsWorldCenters(groupFrame, groupAngle, memberWorldCenters)) {
-        groupFrame = null;
-      }
-      if (!groupFrame && groupNode && isGroup(groupNode) && typeof groupAngle === "number" && Number.isFinite(groupAngle)) {
-        groupFrame = contentFrame ?? orientedFrameFromWorldPoints(memberWorldPoints, normalizeAngle180(groupAngle));
-        groupFrameWasInferred = isValidLogicalGroupFrame(groupFrame);
-      }
-      if (groupNode && isGroup(groupNode)) {
-        const updates = {};
-        if (typeof groupAngle === "number" && Number.isFinite(groupAngle)) {
-          const prevAngle = typeof groupNode.angle === "number" ? groupNode.angle : void 0;
-          if (prevAngle === void 0 || Math.abs(normalizeAngle180(prevAngle - groupAngle)) > 0.01) {
-            updates.angle = normalizeAngle180(groupAngle);
-          }
-        }
-        if (isValidLogicalGroupFrame(groupFrame)) {
-          const prevW = Number(groupNode.width);
-          const prevH = Number(groupNode.height);
-          if (!Number.isFinite(prevW) || Math.abs(prevW - groupFrame.width) > 0.5) updates.width = groupFrame.width;
-          if (!Number.isFinite(prevH) || Math.abs(prevH - groupFrame.height) > 0.5) updates.height = groupFrame.height;
-          if (groupFrameWasInferred) {
-            const storePos = absoluteToStorePosition(groupFrame.left, groupFrame.top, groupId, (pageNow == null ? void 0 : pageNow.children) ?? []);
-            const prevLeft = Number(groupNode.left ?? 0);
-            const prevTop = Number(groupNode.top ?? 0);
-            if (!Number.isFinite(prevLeft) || Math.abs(prevLeft - storePos.left) > 0.5) updates.left = storePos.left;
-            if (!Number.isFinite(prevTop) || Math.abs(prevTop - storePos.top) > 0.5) updates.top = storePos.top;
-          }
-        }
-        if (Object.keys(updates).length > 0) {
-          useEditorStore.getState().updateNode(groupId, updates, { recordHistory: false, skipLayoutRecalc: true });
-        }
-      }
-      if (groupAngle !== void 0) {
-        selection.__pixldocsGroupAngle = groupAngle;
-        const aligned = selection.__pixldocsAlignedAngle;
-        if (typeof aligned === "number" && Math.abs(normalizeAngle180(aligned - groupAngle)) > 0.01) {
-          delete selection.__pixldocsAlignedAngle;
+      selection.hasBorders = true;
+      try {
+        const pageNow = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId);
+        const node = pageNow ? findNodeById(pageNow.children ?? [], groupId) : null;
+        const ang = node && isGroup(node) ? node.angle ?? 0 : 0;
+        if (Math.abs(ang) > 0.01) {
+          selection.__pixldocsFrozenGroupAngle = ang;
+        } else {
+          delete selection.__pixldocsFrozenGroupAngle;
         }
-      } else {
-        delete selection.__pixldocsGroupAngle;
+      } catch {
       }
-      selection.hasBorders = true;
+      const members = selection.getObjects();
       for (const prev of suppressGroupMemberBordersRef.current) {
         if (members.includes(prev)) continue;
         const origBorders = prev.__pixldocsOrigHasBorders;
@@ -11928,7 +11695,7 @@ const PageCanvas = react.forwardRef(
         if (m.__pixldocsOrigHasControls === void 0) m.__pixldocsOrigHasControls = m.hasControls;
         m.hasBorders = false;
         m.hasControls = false;
-        if (m.__cropGroup || ((_b2 = m._ct) == null ? void 0 : _b2.isCropGroup)) {
+        if (m.__cropGroup || ((_a2 = m._ct) == null ? void 0 : _a2.isCropGroup)) {
           if (m.__pixldocsOrigLockScalingX === void 0) {
             m.__pixldocsOrigLockScalingX = m.lockScalingX;
             m.__pixldocsOrigLockScalingY = m.lockScalingY;
@@ -11937,8 +11704,8 @@ const PageCanvas = react.forwardRef(
           m.lockScalingY = false;
         }
       }
-      applyWarpAwareSelectionBorders(selection, groupAngle, groupFrame);
-    }, [pageId]);
+      applyWarpAwareSelectionBorders(selection);
+    }, []);
     const pageBoundsOptions = react.useMemo(
       () => ({ pageContentWidth: canvasWidth, pageContentHeight: canvasHeight }),
       [canvasWidth, canvasHeight]
@@ -12040,11 +11807,7 @@ const PageCanvas = react.forwardRef(
         const activeMembers = activeBeforeRestore.getObjects();
         const sameMembers = activeMembers.length === members.length && members.every((member) => activeMembers.includes(member));
         const sameGroup = activeBeforeRestore.__pixldocsGroupSelection === groupId;
-        const pageNow = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId);
-        const groupNode = pageNow ? findNodeById(pageNow.children ?? [], groupId) : null;
-        const savedAngle = groupNode && isGroup(groupNode) && typeof groupNode.angle === "number" ? groupNode.angle : null;
-        const alignedAngle = activeBeforeRestore.__pixldocsAlignedAngle;
-        const alreadyAligned = typeof alignedAngle === "number" && (savedAngle == null || Math.abs(normalizeAngle180(alignedAngle - savedAngle)) <= 0.01);
+        const alreadyAligned = activeBeforeRestore.__pixldocsAlignedAngle != null;
         if (sameMembers && sameGroup && alreadyAligned) {
           ensureCanvaControlRenders(activeBeforeRestore);
           return;
@@ -12061,11 +11824,9 @@ const PageCanvas = react.forwardRef(
           members.forEach((m) => m.setCoords());
         } catch {
         }
-        if (!selection.__pixldocsGroupSelection) {
-          try {
-            (_a2 = selection.triggerLayout) == null ? void 0 : _a2.call(selection);
-          } catch {
-          }
+        try {
+          (_a2 = selection.triggerLayout) == null ? void 0 : _a2.call(selection);
+        } catch {
         }
         selection.setCoords();
         fc.requestRenderAll();
@@ -13505,18 +13266,14 @@ const PageCanvas = react.forwardRef(
         const groupNode = findNodeById(pageChildren2, groupId);
         if (!groupNode) return;
         const groupAbs = getAbsoluteBounds(groupNode, pageChildren2);
-        const storedGroupFrame = groupNode && isGroup(groupNode) ? frameFromStoredGroupNode(groupNode, pageChildren2, pageBoundsOptions) : null;
-        const groupFrame = storedGroupFrame ?? groupAbs;
         const rect = active.getBoundingRect();
         groupSelectionTransformStartRef.current = {
           groupId,
           selection: active,
           selectionLeft: rect.left,
           selectionTop: rect.top,
-          groupLeft: groupFrame.left,
-          groupTop: groupFrame.top,
-          groupWidth: groupFrame.width,
-          groupHeight: groupFrame.height,
+          groupLeft: groupAbs.left,
+          groupTop: groupAbs.top,
           selectionAngle: ((active.angle ?? 0) % 360 + 360) % 360
         };
         logRotDriftSelectionSnapshot("transform-start", active, {
@@ -13684,11 +13441,7 @@ const PageCanvas = react.forwardRef(
               const activeIds = active.getObjects().map((obj) => getObjectId(obj)).filter((id) => !!id && id !== "__background__");
               const sameMembers = activeIds.length === snapshot.memberIds.length && snapshot.memberIds.every((id) => activeIds.includes(id));
               const sameGroup = active.__pixldocsGroupSelection === snapshot.groupSelectionId;
-              const pageNow = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId);
-              const groupNode = pageNow ? findNodeById(pageNow.children ?? [], snapshot.groupSelectionId) : null;
-              const savedAngle = groupNode && isGroup(groupNode) && typeof groupNode.angle === "number" ? groupNode.angle : null;
-              const alignedAngle = active.__pixldocsAlignedAngle;
-              const alreadyAligned = typeof alignedAngle === "number" && (savedAngle == null || Math.abs(normalizeAngle180(alignedAngle - savedAngle)) <= 0.01);
+              const alreadyAligned = active.__pixldocsAlignedAngle != null;
               if (sameMembers && sameGroup && alreadyAligned) {
                 ensureCanvaControlRenders(active);
                 return;
@@ -13844,32 +13597,15 @@ const PageCanvas = react.forwardRef(
           if (oid && memberIds.has(oid)) members.push(o);
         }
         if (members.length === 0) return null;
-        const savedGroupAngle = typeof g.angle === "number" && Number.isFinite(g.angle) ? normalizeAngle180(g.angle) : null;
-        const savedGroupWidth = Number(g.width);
-        const savedGroupHeight = Number(g.height);
-        if (savedGroupAngle != null && savedGroupWidth > 0 && savedGroupHeight > 0) {
-          const pageNow = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId);
-          const pageChildrenNow = (pageNow == null ? void 0 : pageNow.children) ?? [];
-          const abs = getAbsoluteBounds(g, pageChildrenNow);
-          const cx = abs.left + savedGroupWidth / 2;
-          const cy = abs.top + savedGroupHeight / 2;
-          const rad2 = savedGroupAngle * Math.PI / 180;
-          const c = Math.cos(rad2), s = Math.sin(rad2);
-          const rotate = (x, y) => {
-            const dx = x - cx;
-            const dy = y - cy;
-            return { x: cx + dx * c - dy * s, y: cy + dx * s + dy * c };
-          };
-          return {
-            corners: [
-              rotate(abs.left, abs.top),
-              rotate(abs.left + savedGroupWidth, abs.top),
-              rotate(abs.left + savedGroupWidth, abs.top + savedGroupHeight),
-              rotate(abs.left, abs.top + savedGroupHeight)
-            ],
-            angle: savedGroupAngle
-          };
-        }
+        const TOL = 2;
+        const norm = (a) => {
+          const n = (a % 360 + 360) % 360;
+          return n > 180 ? n - 360 : n;
+        };
+        const angleDelta = (a, b) => {
+          const d = Math.abs(norm(a) - norm(b));
+          return Math.min(d, 360 - d);
+        };
         const worldPoints = [];
         for (const m of members) {
           (_a2 = m.setCoords) == null ? void 0 : _a2.call(m);
@@ -13880,35 +13616,37 @@ const PageCanvas = react.forwardRef(
             if (p) worldPoints.push({ x: p.x, y: p.y });
           }
         }
-        const getLegacyDominantAngle = () => {
-          var _a3;
-          const areaFor = (angle) => {
-            if (worldPoints.length === 0) return Number.POSITIVE_INFINITY;
-            const r = -angle * Math.PI / 180;
-            const c = Math.cos(r), s = Math.sin(r);
-            let nX = Infinity, nY = Infinity, xX = -Infinity, xY = -Infinity;
-            for (const p of worldPoints) {
-              const xr = p.x * c - p.y * s;
-              const yr = p.x * s + p.y * c;
-              if (xr < nX) nX = xr;
-              if (yr < nY) nY = yr;
-              if (xr > xX) xX = xr;
-              if (yr > xY) xY = yr;
-            }
-            return Math.max(1, (xX - nX) * (xY - nY));
-          };
+        const orientedAreaForAngle = (angle) => {
+          if (worldPoints.length === 0) return Number.POSITIVE_INFINITY;
+          const r = -angle * Math.PI / 180;
+          const c = Math.cos(r), s = Math.sin(r);
+          let nX = Infinity, nY = Infinity, xX = -Infinity, xY = -Infinity;
+          for (const p of worldPoints) {
+            const xr = p.x * c - p.y * s;
+            const yr = p.x * s + p.y * c;
+            if (xr < nX) nX = xr;
+            if (yr < nY) nY = yr;
+            if (xr > xX) xX = xr;
+            if (yr > xY) xY = yr;
+          }
+          return Math.max(1, (xX - nX) * (xY - nY));
+        };
+        let a0;
+        const savedGroupAngle = norm(g.angle ?? 0);
+        if (Math.abs(savedGroupAngle) > 0.01) {
+          a0 = savedGroupAngle;
+        } else {
           const buckets = [];
           for (const m of members) {
-            const a = normalizeAngle180(m.angle ?? 0);
-            const b = buckets.find((x) => Math.abs(normalizeAngle180(x.angle - a)) <= 2);
+            const a = norm(m.angle ?? 0);
+            const b = buckets.find((x) => angleDelta(x.angle, a) <= TOL);
             if (b) b.count++;
             else buckets.push({ angle: a, count: 1, area: Number.POSITIVE_INFINITY });
           }
-          for (const b of buckets) b.area = areaFor(b.angle);
+          for (const b of buckets) b.area = orientedAreaForAngle(b.angle);
           buckets.sort((a, b) => b.count - a.count || a.area - b.area || Math.abs(b.angle) - Math.abs(a.angle));
-          return ((_a3 = buckets[0]) == null ? void 0 : _a3.angle) ?? 0;
-        };
-        const a0 = savedGroupAngle ?? getLegacyDominantAngle();
+          a0 = buckets[0].angle;
+        }
         const rad = -a0 * Math.PI / 180;
         const cos = Math.cos(rad), sin = Math.sin(rad);
         let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
@@ -15109,7 +14847,6 @@ const PageCanvas = react.forwardRef(
       fabricCanvas.on("object:rotating", (e) => {
         var _a2, _b2;
         markSimpleTransform(e);
-        prepareGroupSelectionTransformStart(e.target);
         didTransformRef.current = true;
         const tr = e.target;
         if (shouldLogRotDriftLiveTick(tr, "rotating")) {
@@ -15246,6 +14983,29 @@ const PageCanvas = react.forwardRef(
           } catch {
           }
           groupShiftReflowSnapshotRef.current = null;
+          try {
+            const t = e.target;
+            if (t instanceof fabric__namespace.ActiveSelection) {
+              const gid = t.__pixldocsGroupSelection;
+              const delta = ((t.angle ?? 0) + 360) % 360;
+              const deltaSigned = delta > 180 ? delta - 360 : delta;
+              if (gid && Math.abs(deltaSigned) > 0.01) {
+                const pageNow = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId);
+                const node = pageNow ? findNodeById(pageNow.children ?? [], gid) : null;
+                if (node && isGroup(node)) {
+                  const prev = node.angle ?? 0;
+                  const next = ((prev + deltaSigned) % 360 + 360) % 360;
+                  const nextSigned = next > 180 ? next - 360 : next;
+                  useEditorStore.getState().updateNode(
+                    gid,
+                    { angle: nextSigned },
+                    { recordHistory: false, skipLayoutRecalc: true }
+                  );
+                }
+              }
+            }
+          } catch {
+          }
           lockEdits();
           const modifiedTarget = e.target;
           const modifiedTargetId = modifiedTarget ? getObjectId(modifiedTarget) : null;
@@ -15299,7 +15059,7 @@ const PageCanvas = react.forwardRef(
                     const groupLeft = fabricCenterX - w / 2;
                     const groupTop = fabricCenterY - h / 2;
                     const storePosGroup = absoluteToStorePosition(groupLeft, groupTop, movedGroupId, pageChildrenSec);
-                    useEditorStore.getState().updateNode(movedGroupId, { left: storePosGroup.left, top: storePosGroup.top, angle: fabricSectionGroup.angle ?? 0 }, { recordHistory: false, skipLayoutRecalc: true });
+                    useEditorStore.getState().updateNode(movedGroupId, { left: storePosGroup.left, top: storePosGroup.top }, { recordHistory: false, skipLayoutRecalc: true });
                   }
                   commitHistory();
                   unlockEditsSoon();
@@ -15442,7 +15202,7 @@ const PageCanvas = react.forwardRef(
               const groupLeft = centerX - w / 2;
               const groupTop = centerY - h / 2;
               const storePosGroup = absoluteToStorePosition(groupLeft, groupTop, groupId, pageChildrenSec);
-              useEditorStore.getState().updateNode(groupId, { left: storePosGroup.left, top: storePosGroup.top, angle: active.angle ?? 0 }, { recordHistory: false, skipLayoutRecalc: true });
+              useEditorStore.getState().updateNode(groupId, { left: storePosGroup.left, top: storePosGroup.top }, { recordHistory: false, skipLayoutRecalc: true });
             }
             const node = findNodeById(pageChildrenSec, groupId);
             if (isChildModified && node && !groupMoved) {
@@ -15471,7 +15231,7 @@ const PageCanvas = react.forwardRef(
             const groupLeft = active.originX === "center" ? centerX - w / 2 : centerX;
             const groupTop = active.originY === "center" ? centerY - h / 2 : centerY;
             const storePos = absoluteToStorePosition(groupLeft, groupTop, groupId, pageChildren3);
-            useEditorStore.getState().updateNode(groupId, { left: storePos.left, top: storePos.top, angle: active.angle ?? 0 }, { recordHistory: false, skipLayoutRecalc: true });
+            useEditorStore.getState().updateNode(groupId, { left: storePos.left, top: storePos.top }, { recordHistory: false, skipLayoutRecalc: true });
             commitHistory();
             unlockEditsSoon();
             return;
@@ -15653,38 +15413,6 @@ const PageCanvas = react.forwardRef(
                 360 - Math.abs(currentSelAngle - startSelAngle)
               );
               const hadRotation = isActiveSelection && activeObj && angleDelta > 0.01;
-              if ((hadScale || hadRotation) && activeObj instanceof fabric__namespace.ActiveSelection && activeGroupSelectionId === groupToMove.id) {
-                const groupTransformUpdates = {};
-                if (hadRotation) {
-                  groupTransformUpdates.angle = normalizeAngle180(currentSelAngle);
-                  activeObj.__pixldocsGroupAngle = groupTransformUpdates.angle;
-                }
-                if (hadScale && (transformStart == null ? void 0 : transformStart.groupId) === groupToMove.id) {
-                  const center = activeObj.getCenterPoint();
-                  const nextWidth = Math.max(1, transformStart.groupWidth * Math.abs(activeObj.scaleX ?? 1));
-                  const nextHeight = Math.max(1, transformStart.groupHeight * Math.abs(activeObj.scaleY ?? 1));
-                  const storePos = absoluteToStorePosition(
-                    center.x - nextWidth / 2,
-                    center.y - nextHeight / 2,
-                    groupToMove.id,
-                    pageChildren2
-                  );
-                  groupTransformUpdates.left = storePos.left;
-                  groupTransformUpdates.top = storePos.top;
-                  groupTransformUpdates.width = nextWidth;
-                  groupTransformUpdates.height = nextHeight;
-                } else if (!Number.isFinite(Number(groupToMove.width)) || !Number.isFinite(Number(groupToMove.height))) {
-                  groupTransformUpdates.width = (transformStart == null ? void 0 : transformStart.groupWidth) ?? groupAbs.width;
-                  groupTransformUpdates.height = (transformStart == null ? void 0 : transformStart.groupHeight) ?? groupAbs.height;
-                }
-                if (Object.keys(groupTransformUpdates).length > 0) {
-                  useEditorStore.getState().updateNode(
-                    groupToMove.id,
-                    groupTransformUpdates,
-                    { recordHistory: false, skipLayoutRecalc: true }
-                  );
-                }
-              }
               if (!hadScale && !hadRotation && (Math.abs(deltaX) > 0.1 || Math.abs(deltaY) > 0.1)) {
                 const { updateNode: updateNodeStore, commitHistory: commitHistoryStore, getCurrentElements } = useEditorStore.getState();
                 const newLeft = (groupToMove.left ?? 0) + deltaX;
@@ -16320,11 +16048,9 @@ const PageCanvas = react.forwardRef(
               } catch {
               }
               fabricCanvas.setActiveObject(newSel);
-              if (!wasGroupSel) {
-                try {
-                  (_j = newSel.triggerLayout) == null ? void 0 : _j.call(newSel);
-                } catch {
-                }
+              try {
+                (_j = newSel.triggerLayout) == null ? void 0 : _j.call(newSel);
+              } catch {
               }
               try {
                 for (const member of membersToReselect) member.setCoords();
@@ -16701,12 +16427,7 @@ const PageCanvas = react.forwardRef(
               const prevAS = activeBeforeSync instanceof fabric__namespace.ActiveSelection ? activeBeforeSync : null;
               const prevMembers = prevAS ? prevAS.getObjects() : [];
               const sameMembers = !!prevAS && prevMembers.length === freshMembers.length && prevMembers.every((m) => freshMembers.includes(m));
-              const savedSnapshotAngle = activeSelectionSnapshot.groupSelectionId ? (() => {
-                const groupNode = findNodeById(pageTree, activeSelectionSnapshot.groupSelectionId);
-                return groupNode && isGroup(groupNode) && typeof groupNode.angle === "number" ? groupNode.angle : null;
-              })() : null;
-              const prevAlignedAngle = sameMembers ? prevAS.__pixldocsAlignedAngle : null;
-              const alreadyAligned = sameMembers && typeof prevAlignedAngle === "number" && (savedSnapshotAngle == null || Math.abs(normalizeAngle180(prevAlignedAngle - savedSnapshotAngle)) <= 0.01);
+              const alreadyAligned = sameMembers && prevAS.__pixldocsAlignedAngle != null;
               if (sameMembers && alreadyAligned) {
                 try {
                   ensureCanvaControlRenders(prevAS);
@@ -17748,10 +17469,11 @@ const PageCanvas = react.forwardRef(
         if (sameSelection && (isFlatGroupSelection || isPureSingleGroupSelection)) {
           if (selectedGroupSelectionId && active instanceof fabric__namespace.ActiveSelection) {
             if (isPureSingleGroupSelection) {
-              applyLogicalGroupSelectionVisualState(active, selectedGroupSelectionId);
+              active.__pixldocsGroupSelection = selectedGroupSelectionId;
+              delete active.__pixldocsLogicalGroupIds;
+              suppressGroupMemberBordersRef.current = active.getObjects();
             } else {
               delete active.__pixldocsGroupSelection;
-              delete active.__pixldocsGroupAngle;
               active.__pixldocsLogicalGroupIds = selectedGroupIds;
               active.hasBorders = true;
               suppressGroupMemberBordersRef.current = active.getObjects().filter((m) => {
@@ -17791,10 +17513,10 @@ const PageCanvas = react.forwardRef(
           const selection = new fabric__namespace.ActiveSelection(toSelect, { canvas: fc });
           if (selectedGroupSelectionId) {
             if (isPureSingleGroupSelection) {
-              applyLogicalGroupSelectionVisualState(selection, selectedGroupSelectionId);
+              selection.__pixldocsGroupSelection = selectedGroupSelectionId;
+              suppressGroupMemberBordersRef.current = toSelect;
             } else {
               selection.__pixldocsLogicalGroupIds = selectedGroupIds;
-              delete selection.__pixldocsGroupAngle;
               selection.hasBorders = true;
               suppressGroupMemberBordersRef.current = toSelect.filter((m) => {
                 const id = getObjectId(m);
@@ -25437,9 +25159,9 @@ function captureFabricCanvasSvgForPdf(fabricInstance, canvasWidth, canvasHeight)
   }
   return svgString;
 }
-const resolvedPackageVersion = "0.5.397";
+const resolvedPackageVersion = "0.5.399";
 const PACKAGE_VERSION = resolvedPackageVersion;
-const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.397";
+const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.399";
 const roundParityValue = (value) => {
   if (typeof value !== "number") return value;
   return Number.isFinite(value) ? Number(value.toFixed(3)) : value;
@@ -26253,7 +25975,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-o6mqay90.cjs"));
+      const { exportMultiPagePdf, preparePagesForExport } = await Promise.resolve().then(() => require("./vectorPdfExport-Bvm0vPj2.cjs"));
       const prepared = preparePagesForExport(
         cloned.pages,
         canvasWidth,
@@ -28573,7 +28295,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-o6mqay90.cjs"));
+      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await Promise.resolve().then(() => require("./vectorPdfExport-Bvm0vPj2.cjs"));
       try {
         await logTextMeasurementDiagnostic(svgToDraw);
       } catch {
@@ -28970,4 +28692,4 @@ exports.setAutoShrinkDebug = setAutoShrinkDebug;
 exports.setBundledAssetPrefixes = setBundledAssetPrefixes;
 exports.warmResolvedTemplateForPreview = warmResolvedTemplateForPreview;
 exports.warmTemplateFromForm = warmTemplateFromForm;
-//# sourceMappingURL=index-BgYo0VtS.cjs.map
+//# sourceMappingURL=index-BJ-DTm0r.cjs.map