@pixldocs/canvas-renderer 0.5.492 → 0.5.494

package/dist/{index-DHzIvJSN.js → index-dxfsI5E1.js}

@@ -2041,12 +2041,17 @@ const useEditorStore = create((set, get) => ({
   toggleElementLock: (id) => set((state) => {
     const currentPage = getCurrentPageFromCanvas(state.canvas);
     const node = findNodeById(currentPage.children, id);
-    if (!node || isGroup(node)) return {};
+    if (!node) return {};
+    const wasLocked = !!node.locked || node.selectable === false;
+    const nextLocked = !wasLocked;
     const nextCanvas = updateCurrentPageChildren(
       state.canvas,
       (children) => updateNodeInTree(children, id, {
-        selectable: !node.selectable,
-        evented: !node.evented
+        locked: nextLocked,
+        // Keep legacy selectable/evented in sync with the canonical flag so
+        // fabricObjectCreators (which also honors selectable === false)
+        // stays consistent for elements loaded from older configs.
+        ...isGroup(node) ? {} : { selectable: !nextLocked, evented: !nextLocked }
       })
     );
     const committed = commitFromState(state, nextCanvas);
@@ -12229,7 +12234,7 @@ const PageCanvas = forwardRef(
       var _a2;
       const fc = fabricRef.current;
       const groupId = snapshot == null ? void 0 : snapshot.groupSelectionId;
-      if (!fc || !groupId || snapshot.memberIds.length < 2 || editingTextIdRef.current) return;
+      if (!fc || !snapshot || 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;
       const activeBeforeRestore = fc.getActiveObject();
@@ -12238,7 +12243,7 @@ const PageCanvas = forwardRef(
         const sameMembers = activeMembers.length === members.length && members.every((member) => activeMembers.includes(member));
         const sameGroup = activeBeforeRestore.__pixldocsGroupSelection === groupId;
         const alreadyAligned = activeBeforeRestore.__pixldocsAlignedAngle != null;
-        if (sameMembers && sameGroup && alreadyAligned) {
+        if (sameMembers && (!groupId || sameGroup && alreadyAligned)) {
           ensureCanvaControlRenders(activeBeforeRestore);
           return;
         }
@@ -12247,7 +12252,7 @@ const PageCanvas = forwardRef(
       try {
         const active = activeBeforeRestore;
         const selection = active instanceof fabric.ActiveSelection && members.every((member) => active.getObjects().includes(member)) ? active : new fabric.ActiveSelection(members, { canvas: fc });
-        applyLogicalGroupSelectionVisualState(selection, groupId);
+        if (groupId) applyLogicalGroupSelectionVisualState(selection, groupId);
         ensureCanvaControlRenders(selection);
         fc.setActiveObject(selection);
         try {
@@ -12294,7 +12299,53 @@ const PageCanvas = forwardRef(
     }, [selectedIds]);
     useEffect(() => {
       const fc = fabricRef.current;
-      if (!fc || !isActive || !currentPage) return;
+      if (!fc || !isEditorMode || !currentPage) return;
+      const lockedIds = /* @__PURE__ */ new Set();
+      const walk = (nodes, parentLocked) => {
+        for (const n of nodes) {
+          const nodeLocked = !!n.locked || n.selectable === false;
+          const eff = parentLocked || nodeLocked;
+          if (eff) lockedIds.add(n.id);
+          if (isGroup(n)) walk(n.children ?? [], eff);
+        }
+      };
+      walk(currentPage.children ?? [], false);
+      fc.getObjects().forEach((o) => {
+        const id = getObjectId(o);
+        if (!id || id === "__background__") return;
+        const locked = lockedIds.has(id);
+        o.set({
+          lockMovementX: locked,
+          lockMovementY: locked,
+          lockScalingX: locked,
+          lockScalingY: locked,
+          lockRotation: locked,
+          lockSkewingX: locked,
+          lockSkewingY: locked,
+          hoverCursor: locked ? "not-allowed" : void 0
+        });
+      });
+      fc.requestRenderAll();
+    }, [currentPage == null ? void 0 : currentPage.children, isEditorMode, elements]);
+    useEffect(() => {
+      const fc = fabricRef.current;
+      if (!fc || !currentPage) return;
+      if (!isActive) {
+        try {
+          fc.__activeEditingGroupId = null;
+          drilledGroupIdRef.current = null;
+          setDrilledGroupBounds(null);
+          preserveActiveSelectionAfterTransformRef.current = null;
+          recentGroupSelectionRestoreRef.current = null;
+          if (fc.getActiveObject()) {
+            fc.discardActiveObject();
+          }
+          clearCanvasActiveVisuals(fc);
+          fc.requestRenderAll();
+        } catch {
+        }
+        return;
+      }
       const pageChildren2 = currentPage.children ?? [];
       const hasMissingSelection = selectedIds.some((id) => !findNodeById(pageChildren2, id));
       const activeEditingGroupId = fc.__activeEditingGroupId ?? null;
@@ -13741,7 +13792,7 @@ const PageCanvas = forwardRef(
           syncLockedRef.current = false;
         }
         const preservedGroupSelection = preserveActiveSelectionAfterTransformRef.current;
-        const shouldRestoreGroupSelection = !!((preservedGroupSelection == null ? void 0 : preservedGroupSelection.groupSelectionId) && (!preservedGroupSelection.expiresAt || preservedGroupSelection.expiresAt > Date.now()));
+        const shouldRestoreGroupSelection = !!(preservedGroupSelection && preservedGroupSelection.memberIds.length >= 2 && (!preservedGroupSelection.expiresAt || preservedGroupSelection.expiresAt > Date.now()));
         if (skipSelectionClearOnDiscardRef.current) {
           skipSelectionClearOnDiscardRef.current = false;
           return;
@@ -13995,9 +14046,13 @@ const PageCanvas = forwardRef(
         suppressBordersForObjects(memberObjects);
       };
       const restorePreservedGroupSelectionSoon = (snapshot = preserveActiveSelectionAfterTransformRef.current) => {
-        if (!(snapshot == null ? void 0 : snapshot.groupSelectionId) || snapshot.memberIds.length < 2) return;
+        if (!snapshot || snapshot.memberIds.length < 2) return;
         const groupId = snapshot.groupSelectionId;
-        selectElements([groupId], false, false);
+        if (groupId) {
+          selectElements([groupId], false, false);
+        } else {
+          selectElements(snapshot.memberIds, false, false);
+        }
         requestAnimationFrame(() => {
           setTimeout(() => {
             if (!isActiveRef.current) return;
@@ -14007,7 +14062,7 @@ const PageCanvas = forwardRef(
               const sameMembers = activeIds.length === snapshot.memberIds.length && snapshot.memberIds.every((id) => activeIds.includes(id));
               const sameGroup = active.__pixldocsGroupSelection === snapshot.groupSelectionId;
               const alreadyAligned = active.__pixldocsAlignedAngle != null;
-              if (sameMembers && sameGroup && alreadyAligned) {
+              if (sameMembers && (!groupId || sameGroup && alreadyAligned)) {
                 ensureCanvaControlRenders(active);
                 return;
               }
@@ -17120,6 +17175,10 @@ const PageCanvas = forwardRef(
           const innerImg = ct == null ? void 0 : ct._img;
           const innerSrc = ((_a2 = innerImg == null ? void 0 : innerImg.getSrc) == null ? void 0 : _a2.call(innerImg)) || ((_b2 = innerImg == null ? void 0 : innerImg._originalElement) == null ? void 0 : _b2.src) || (innerImg == null ? void 0 : innerImg.src) || "";
           const isPlaceholder = !innerSrc || innerSrc === EMPTY_IMAGE_PLACEHOLDER_DATA_URL;
+          const activatedAt = cropGroupActivatedAtRef.current.get(target) ?? 0;
+          if (Date.now() - activatedAt < 400) {
+            return;
+          }
           const targetId = getObjectId(target);
           const pageChildrenForCrop = ((_c2 = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId)) == null ? void 0 : _c2.children) ?? [];
           const parentForCrop = targetId ? findParentGroup(pageChildrenForCrop, targetId) : null;
@@ -17136,10 +17195,6 @@ const PageCanvas = forwardRef(
               }
               return;
             }
-            const activatedAt = cropGroupActivatedAtRef.current.get(target) ?? 0;
-            if (Date.now() - activatedAt < 400) {
-              return;
-            }
           }
           if (innerImg && !isPlaceholder && !isCropGroupInCropMode(target)) {
             enterCropMode(target);
@@ -17405,7 +17460,8 @@ const PageCanvas = forwardRef(
           }
           return memberIds.length > 0 ? { ...rawActiveSelectionSnapshot, memberIds, groupSelectionId } : null;
         })() : null;
-        if (syncTriggeredByPanelRef.current && !transformSelectionId && !shouldSkipUpdates2 && !isTransforming2) {
+        const hasFreshPreservedActiveSelection = !!(activeSelectionSnapshot && activeSelectionSnapshot.memberIds.length >= 2 && preserveActiveSelectionAfterTransformRef.current && (!preserveActiveSelectionAfterTransformRef.current.expiresAt || preserveActiveSelectionAfterTransformRef.current.expiresAt > Date.now()));
+        if (syncTriggeredByPanelRef.current && !transformSelectionId && !hasFreshPreservedActiveSelection && !shouldSkipUpdates2 && !isTransforming2) {
           const activeObj = fc.getActiveObject();
           const activeObjId = activeObj ? getObjectId(activeObj) : null;
           const isTextBeingEdited = activeObjId && editingTextIdRef.current === activeObjId;
@@ -17421,7 +17477,7 @@ const PageCanvas = forwardRef(
             currentFabricObjects.set(id, obj);
           }
         });
-        const skipRestoreSelection = syncTriggeredByPanelRef.current && !transformSelectionId;
+        const skipRestoreSelection = syncTriggeredByPanelRef.current && !transformSelectionId && !hasFreshPreservedActiveSelection;
         const activeId = transformSelectionId || (activeBeforeSync ? getObjectId(activeBeforeSync) : null);
         const activeStillOnCanvas = activeBeforeSync && fc.getObjects().includes(activeBeforeSync);
         const replacementById = !activeStillOnCanvas && activeId ? fc.getObjects().find((o) => getObjectId(o) === activeId) ?? null : null;
@@ -18264,6 +18320,11 @@ const PageCanvas = forwardRef(
         const recentGroupRestore = recentGroupSelectionRestoreRef.current;
         if ((recentGroupRestore == null ? void 0 : recentGroupRestore.groupSelectionId) && recentGroupRestore.expiresAt > Date.now()) {
           restoreGroupSelectionSnapshot(recentGroupRestore);
+        } else {
+          const preservedActiveSelectionRestore = preserveActiveSelectionAfterTransformRef.current;
+          if (preservedActiveSelectionRestore && preservedActiveSelectionRestore.memberIds.length >= 2 && (!preservedActiveSelectionRestore.expiresAt || preservedActiveSelectionRestore.expiresAt > Date.now())) {
+            restoreGroupSelectionSnapshot(preservedActiveSelectionRestore);
+          }
         }
         preserveSelectionAfterTransformIdRef.current = null;
         preserveActiveSelectionAfterTransformRef.current = null;
@@ -26502,9 +26563,9 @@ function captureFabricCanvasSvgForPdf(fabricInstance, canvasWidth, canvasHeight)
   }
   return svgString;
 }
-const resolvedPackageVersion = "0.5.492";
+const resolvedPackageVersion = "0.5.494";
 const PACKAGE_VERSION = resolvedPackageVersion;
-const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.492";
+const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.494";
 const roundParityValue = (value) => {
   if (typeof value !== "number") return value;
   return Number.isFinite(value) ? Number(value.toFixed(3)) : value;
@@ -27318,7 +27379,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 import("./vectorPdfExport-rz4LyyuM.js");
+      const { exportMultiPagePdf, preparePagesForExport } = await import("./vectorPdfExport-Bazeq3bN.js");
       const prepared = preparePagesForExport(
         cloned.pages,
         canvasWidth,
@@ -29638,7 +29699,7 @@ async function prepareLiveCanvasSvgForPdf(rawSvg, pageWidth, pageHeight, pageKey
     if (options == null ? void 0 : options.stripPageBackground) stripRootPageBackgroundFromSvg(svgToDraw);
     sanitizeSvgTreeForPdf(svgToDraw);
     try {
-      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await import("./vectorPdfExport-rz4LyyuM.js");
+      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await import("./vectorPdfExport-Bazeq3bN.js");
       try {
         await logTextMeasurementDiagnostic(svgToDraw);
       } catch {
@@ -29955,4 +30016,4 @@ export {
   buildTeaserBlurFlatKeys as y,
   collectFontDescriptorsFromConfig as z
 };
-//# sourceMappingURL=index-DHzIvJSN.js.map
+//# sourceMappingURL=index-dxfsI5E1.js.map