@pooder/kit 5.3.0 → 5.4.0

package/src/extensions/sceneLayoutModel.ts

@@ -2,6 +2,13 @@ import type { ConfigurationService } from "@pooder/core";
 import type { CanvasService } from "../services";
 import { Coordinate, Unit } from "../coordinate";
 import { parseLengthToMm } from "../units";
+import {
+  DEFAULT_DIELINE_SHAPE,
+  DEFAULT_DIELINE_SHAPE_STYLE,
+  normalizeShapeStyle,
+  normalizeDielineShape,
+} from "./dielineShape";
+import type { DielineShape, DielineShapeStyle } from "./dielineShape";
 
 export type SizeConstraintMode = "free" | "lockAspect" | "equal";
 export type CutMode = "trim" | "outset" | "inset";
@@ -45,9 +52,9 @@ export interface SceneLayoutSnapshot {
 }
 
 export interface SceneGeometrySnapshot {
-  shape: "rect" | "circle" | "ellipse" | "custom";
-  unit: "mm";
-  displayUnit: Unit;
+  shape: DielineShape;
+  shapeStyle: DielineShapeStyle;
+  unit: "px";
   x: number;
   y: number;
   width: number;
@@ -56,6 +63,8 @@ export interface SceneGeometrySnapshot {
   offset: number;
   scale: number;
   pathData?: string;
+  customSourceWidthPx?: number;
+  customSourceHeightPx?: number;
 }
 
 const DEFAULT_SIZE_STATE: SizeState = {
@@ -325,11 +334,20 @@ export function buildSceneGeometry(
     "mm",
   );
   const offset = (layout.cutRect.width - layout.trimRect.width) / 2;
+  const sourceWidth = Number(configService.get("dieline.customSourceWidthPx", 0));
+  const sourceHeight = Number(
+    configService.get("dieline.customSourceHeightPx", 0),
+  );
+  const shapeStyle = normalizeShapeStyle(
+    configService.get("dieline.shapeStyle", DEFAULT_DIELINE_SHAPE_STYLE),
+  );
 
   return {
-    shape: configService.get("dieline.shape", "rect"),
-    unit: "mm",
-    displayUnit: normalizeUnit(configService.get("size.unit", "mm")),
+    shape: normalizeDielineShape(
+      configService.get("dieline.shape", DEFAULT_DIELINE_SHAPE),
+    ),
+    shapeStyle,
+    unit: "px",
     x: layout.trimRect.centerX,
     y: layout.trimRect.centerY,
     width: layout.trimRect.width,
@@ -338,5 +356,9 @@ export function buildSceneGeometry(
     offset,
     scale: layout.scale,
     pathData: configService.get("dieline.pathData"),
+    customSourceWidthPx:
+      Number.isFinite(sourceWidth) && sourceWidth > 0 ? sourceWidth : undefined,
+    customSourceHeightPx:
+      Number.isFinite(sourceHeight) && sourceHeight > 0 ? sourceHeight : undefined,
   };
 }

package/src/extensions/sceneVisibility.ts

@@ -53,18 +53,11 @@ export class SceneVisibilityService implements Service {
     const dielineLayer = this.canvasService.getLayer("dieline-overlay");
     if (dielineLayer) {
       const visible = !HIDDEN_DIELINE_TOOLS.has(this.activeToolId || "");
-      if (dielineLayer.visible !== visible) {
-        dielineLayer.set({ visible });
-      }
+      this.canvasService.setLayerVisibility("dieline-overlay", visible);
     }
 
-    const rulerLayer = this.canvasService.getLayer("ruler-overlay");
-    if (rulerLayer) {
-      const visible = !HIDDEN_RULER_TOOLS.has(this.activeToolId || "");
-      if (rulerLayer.visible !== visible) {
-        rulerLayer.set({ visible });
-      }
-    }
+    const rulerVisible = !HIDDEN_RULER_TOOLS.has(this.activeToolId || "");
+    this.canvasService.setLayerVisibility("ruler-overlay", rulerVisible);
 
     this.canvasService.requestRenderAll();
   }