@pixldocs/canvas-renderer 0.5.242 → 0.5.244

package/dist/{index-BQ5V2uT8.js → index-xJBNIfjT.js}

@@ -11176,6 +11176,7 @@ const PageCanvas = forwardRef(
     const preserveEditingScopeOnSelectionClearRef = useRef(false);
     const preserveActiveSelectionAfterTransformRef = useRef(null);
     const pendingGroupPromotionRef = useRef(null);
+    const pendingGroupDrillInRef = useRef(null);
     const imageReloadRequestSeqRef = useRef(/* @__PURE__ */ new Map());
     useRef(null);
     const groupBoundsResizingRef = useRef(false);
@@ -12246,7 +12247,7 @@ const PageCanvas = forwardRef(
         const active = fabricCanvas.getActiveObject();
         let hitChild = null;
         if (active instanceof fabric.ActiveSelection) {
-          const pointer = fabricCanvas.getViewportPoint(opt.e);
+          const pointer = fabricCanvas.getPointer(opt.e);
           const objs = active.getObjects();
           for (let i = objs.length - 1; i >= 0; i--) {
             const o = objs[i];
@@ -12467,10 +12468,36 @@ const PageCanvas = forwardRef(
         }
       };
       const isMultiSelectModifier = (event) => !!((event == null ? void 0 : event.shiftKey) || (event == null ? void 0 : event.metaKey) || (event == null ? void 0 : event.ctrlKey));
+      const pickChildInActiveSelectionAtPointer = (selection, event) => {
+        var _a2, _b2, _c, _d, _e;
+        try {
+          const pointer = fabricCanvas.getPointer(event);
+          const viewportPointer = (_a2 = fabricCanvas.getViewportPoint) == null ? void 0 : _a2.call(fabricCanvas, event);
+          const zoom3 = ((_b2 = fabricCanvas.getZoom) == null ? void 0 : _b2.call(fabricCanvas)) || 1;
+          const tolerance = Math.max(3, 6 / zoom3);
+          const members = selection.getObjects();
+          for (let i = members.length - 1; i >= 0; i--) {
+            const obj = members[i];
+            const id = getObjectId(obj);
+            if (!id || id === "__background__" || obj.visible === false) continue;
+            (_c = obj.setCoords) == null ? void 0 : _c.call(obj);
+            const containsScene = typeof obj.containsPoint === "function" && obj.containsPoint(pointer);
+            const containsViewport = !!(viewportPointer && typeof obj.containsPoint === "function" && obj.containsPoint(viewportPointer));
+            if (containsScene || containsViewport) return obj;
+            const br = ((_d = obj.getBoundingRect) == null ? void 0 : _d.call(obj, true, true)) ?? ((_e = obj.getBoundingRect) == null ? void 0 : _e.call(obj));
+            if (br && pointer.x >= br.left - tolerance && pointer.x <= br.left + br.width + tolerance && pointer.y >= br.top - tolerance && pointer.y <= br.top + br.height + tolerance) {
+              return obj;
+            }
+          }
+        } catch {
+          return null;
+        }
+        return null;
+      };
       const pickSelectableObjectAtPointer = (event) => {
         var _a2;
         try {
-          const pointer = fabricCanvas.getViewportPoint(event);
+          const pointer = fabricCanvas.getPointer(event);
           const objects = fabricCanvas.getObjects();
           for (let i = objects.length - 1; i >= 0; i--) {
             const obj = objects[i];
@@ -12734,8 +12761,16 @@ const PageCanvas = forwardRef(
           syncLockedRef.current = true;
           lockEdits();
         }
-        const target = opt.target;
-        const targetId = target ? getObjectId(target) : null;
+        let target = opt.target;
+        let targetId = target ? getObjectId(target) : null;
+        if (target instanceof fabric.ActiveSelection && target.__pixldocsGroupSelection && target === fabricCanvas.getActiveObject()) {
+          const child = pickChildInActiveSelectionAtPointer(target, opt.e);
+          const childId = child ? getObjectId(child) : null;
+          if (child && childId) {
+            target = child;
+            targetId = childId;
+          }
+        }
         const activeEditingGroupId = fabricCanvas.__activeEditingGroupId ?? null;
         const pageNow = useEditorStore.getState().canvas.pages.find((p) => p.id === pageId);
         const childrenNow = (pageNow == null ? void 0 : pageNow.children) ?? [];
@@ -12752,6 +12787,7 @@ const PageCanvas = forwardRef(
               activeObjects: fabricCanvas.getActiveObjects().slice()
             };
             pendingGroupPromotionRef.current = null;
+            pendingGroupDrillInRef.current = null;
             return;
           }
         }
@@ -12774,28 +12810,21 @@ const PageCanvas = forwardRef(
           const activeNowEarly = fabricCanvas.getActiveObject();
           const asGroupId = target instanceof fabric.ActiveSelection ? target.__pixldocsGroupSelection : void 0;
           if (target instanceof fabric.ActiveSelection && asGroupId && target === activeNowEarly) {
-            try {
-              const pointer = fabricCanvas.getViewportPoint(opt.e);
-              const members = target.getObjects();
-              for (let i = members.length - 1; i >= 0; i--) {
-                const m = members[i];
-                if (m.visible === false) continue;
-                if (typeof m.containsPoint === "function" && m.containsPoint(pointer)) {
-                  const mid = getObjectId(m);
-                  if (mid) {
-                    effectiveTarget = m;
-                    effectiveTargetId = mid;
-                  }
-                  break;
-                }
-              }
-            } catch {
+            const child = pickChildInActiveSelectionAtPointer(target, opt.e);
+            const childId = child ? getObjectId(child) : null;
+            if (child && childId) {
+              effectiveTarget = child;
+              effectiveTargetId = childId;
             }
           }
           const parent = findTopmostPromotableGroup(effectiveTargetId);
           const targetIsInCrop = !!(effectiveTarget instanceof fabric.Group && isCropGroupInCropMode(effectiveTarget) || (effectiveTarget == null ? void 0 : effectiveTarget.group) instanceof fabric.Group && isCropGroupInCropMode(effectiveTarget.group));
           const activeNow = fabricCanvas.getActiveObject();
-          const alreadyThisGroup = activeNow instanceof fabric.ActiveSelection && activeNow.__pixldocsGroupSelection === (parent == null ? void 0 : parent.id);
+          const activeGroupSelectionId = activeNow instanceof fabric.ActiveSelection ? activeNow.__pixldocsGroupSelection : void 0;
+          const activeGroupNode = activeGroupSelectionId ? findNodeById(childrenNow, activeGroupSelectionId) : null;
+          const activeGroupContainsTarget = !!(activeGroupNode && isGroup(activeGroupNode) && getAllElementIds(activeGroupNode.children ?? []).includes(effectiveTargetId));
+          const alreadyThisGroup = !!(activeGroupSelectionId && activeGroupContainsTarget);
+          const drillGroup = alreadyThisGroup && activeGroupNode && isGroup(activeGroupNode) ? activeGroupNode : parent;
           const isMultiSelectKey = !!(((_f = opt.e) == null ? void 0 : _f.shiftKey) || ((_g = opt.e) == null ? void 0 : _g.metaKey) || ((_h = opt.e) == null ? void 0 : _h.ctrlKey));
           const isDeepSelectKey = !!((_i = opt.e) == null ? void 0 : _i.altKey);
           if (isDeepSelectKey) {
@@ -12825,7 +12854,8 @@ const PageCanvas = forwardRef(
               opt.target = only;
               pendingGroupPromotionRef.current = { groupId: parent.id, selection: only };
             }
-          } else if (parent && !parent.backgroundColor && !targetIsInCrop && alreadyThisGroup && !isMultiSelectKey && effectiveTarget !== activeNow) {
+            pendingGroupDrillInRef.current = null;
+          } else if (drillGroup && !drillGroup.backgroundColor && !targetIsInCrop && alreadyThisGroup && !isMultiSelectKey && effectiveTarget !== activeNow) {
             try {
               skipSelectionClearOnDiscardRef.current = true;
               preserveEditingScopeOnSelectionClearRef.current = true;
@@ -12835,7 +12865,7 @@ const PageCanvas = forwardRef(
               skipSelectionClearOnDiscardRef.current = false;
               preserveEditingScopeOnSelectionClearRef.current = false;
             }
-            fabricCanvas.__activeEditingGroupId = parent.id;
+            fabricCanvas.__activeEditingGroupId = drillGroup.id;
             delete effectiveTarget.__pixldocsGroupSelection;
             delete effectiveTarget.__pixldocsLogicalGroupIds;
             try {
@@ -12847,6 +12877,9 @@ const PageCanvas = forwardRef(
             fabricCanvas._target = effectiveTarget;
             opt.target = effectiveTarget;
             pendingGroupPromotionRef.current = null;
+            pendingGroupDrillInRef.current = { groupId: drillGroup.id, childId: effectiveTargetId, target: effectiveTarget };
+            selectElements([effectiveTargetId], false, false);
+            fabricCanvas.requestRenderAll();
           }
         } else if (!target || targetId === "__background__") {
           const isMultiSelectKey = !!(((_k = opt.e) == null ? void 0 : _k.shiftKey) || ((_l = opt.e) == null ? void 0 : _l.metaKey) || ((_m = opt.e) == null ? void 0 : _m.ctrlKey));
@@ -12873,6 +12906,7 @@ const PageCanvas = forwardRef(
                   fabricCanvas._target = selection;
                   opt.target = selection;
                   pendingGroupPromotionRef.current = { groupId: parent.id, selection };
+                  pendingGroupDrillInRef.current = null;
                 } else if (memberObjs.length === 1) {
                   const only = memberObjs[0];
                   only.__pixldocsGroupSelection = parent.id;
@@ -12880,6 +12914,7 @@ const PageCanvas = forwardRef(
                   fabricCanvas._target = only;
                   opt.target = only;
                   pendingGroupPromotionRef.current = { groupId: parent.id, selection: only };
+                  pendingGroupDrillInRef.current = null;
                 }
               }
             }
@@ -12989,7 +13024,7 @@ const PageCanvas = forwardRef(
         o.__lockScaleDuringCrop = false;
       });
       fabricCanvas.on("mouse:up", (e) => {
-        var _a2;
+        var _a2, _b2, _c;
         clearTransforming();
         setGuides([]);
         setRotationLabel(null);
@@ -12997,6 +13032,29 @@ const PageCanvas = forwardRef(
         objectResizeActiveSnapRef.current = null;
         groupResizeActiveSnapRef.current = null;
         dragStarted = false;
+        const pendingDrillIn = pendingGroupDrillInRef.current;
+        pendingGroupDrillInRef.current = null;
+        if (pendingDrillIn && !didTransformRef.current) {
+          const activeNow = fabricCanvas.getActiveObject();
+          if (activeNow !== pendingDrillIn.target) {
+            isSyncingSelectionToFabricRef.current = true;
+            try {
+              restoreSuppressedGroupBorders();
+              fabricCanvas.__activeEditingGroupId = pendingDrillIn.groupId;
+              delete pendingDrillIn.target.__pixldocsGroupSelection;
+              delete pendingDrillIn.target.__pixldocsLogicalGroupIds;
+              (_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();
+              fabricCanvas.requestRenderAll();
+            } finally {
+              requestAnimationFrame(() => {
+                isSyncingSelectionToFabricRef.current = false;
+              });
+            }
+            selectElements([pendingDrillIn.childId], false, false);
+          }
+        }
         const pendingPromotion = pendingGroupPromotionRef.current;
         pendingGroupPromotionRef.current = null;
         if (pendingPromotion && !didTransformRef.current) {
@@ -13030,7 +13088,7 @@ const PageCanvas = forwardRef(
           }
         }
         const activeObj = fabricCanvas.getActiveObject();
-        if (activeObj && (activeObj.__cropGroup || ((_a2 = activeObj._ct) == null ? void 0 : _a2.isCropGroup))) {
+        if (activeObj && (activeObj.__cropGroup || ((_c = activeObj._ct) == null ? void 0 : _c.isCropGroup))) {
           activeObj.__lockScaleDuringCrop = false;
           if (activeObj.__cropDrag) {
             delete activeObj.__cropDrag;
@@ -23234,9 +23292,9 @@ function captureFabricCanvasSvgForPdf(fabricInstance, canvasWidth, canvasHeight)
   }
   return svgString;
 }
-const resolvedPackageVersion = "0.5.242";
+const resolvedPackageVersion = "0.5.244";
 const PACKAGE_VERSION = resolvedPackageVersion;
-const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.242";
+const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.244";
 const roundParityValue = (value) => {
   if (typeof value !== "number") return value;
   return Number.isFinite(value) ? Number(value.toFixed(3)) : value;
@@ -24050,7 +24108,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-CsrQStE8.js");
+      const { exportMultiPagePdf, preparePagesForExport } = await import("./vectorPdfExport-BWQ8fyXp.js");
       const prepared = preparePagesForExport(
         cloned.pages,
         canvasWidth,
@@ -26370,7 +26428,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-CsrQStE8.js");
+      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await import("./vectorPdfExport-BWQ8fyXp.js");
       try {
         await logTextMeasurementDiagnostic(svgToDraw);
       } catch {
@@ -26770,4 +26828,4 @@ export {
   buildTeaserBlurFlatKeys as y,
   collectFontDescriptorsFromConfig as z
 };
-//# sourceMappingURL=index-BQ5V2uT8.js.map
+//# sourceMappingURL=index-xJBNIfjT.js.map