@pooder/kit 5.0.1 → 5.0.3

package/.test-dist/src/feature.js

@@ -16,6 +16,8 @@ class FeatureTool {
         this.workingFeatures = [];
         this.isUpdatingConfig = false;
         this.isToolActive = false;
+        this.isFeatureSessionActive = false;
+        this.sessionOriginalFeatures = null;
         this.hasWorkingChanges = false;
         this.handleMoving = null;
         this.handleModified = null;
@@ -23,6 +25,9 @@ class FeatureTool {
         this.currentGeometry = null;
         this.onToolActivated = (event) => {
             this.isToolActive = event.id === this.id;
+            if (!this.isToolActive) {
+                this.restoreSessionFeaturesToConfig();
+            }
             this.updateVisibility();
         };
         if (options) {
@@ -46,6 +51,8 @@ class FeatureTool {
                 if (this.isUpdatingConfig)
                     return;
                 if (e.key === "dieline.features") {
+                    if (this.isFeatureSessionActive)
+                        return;
                     const next = (e.value || []);
                     this.workingFeatures = this.cloneFeatures(next);
                     this.hasWorkingChanges = false;
@@ -62,6 +69,7 @@ class FeatureTool {
     }
     deactivate(context) {
         context.eventBus.off("tool:activated", this.onToolActivated);
+        this.restoreSessionFeaturesToConfig();
         this.dirtyTrackerDisposable?.dispose();
         this.dirtyTrackerDisposable = undefined;
         this.teardown();
@@ -95,9 +103,9 @@ class FeatureTool {
                     name: "Feature",
                     interaction: "session",
                     commands: {
-                        begin: "resetWorkingFeatures",
+                        begin: "beginFeatureSession",
                         commit: "completeFeatures",
-                        rollback: "resetWorkingFeatures",
+                        rollback: "rollbackFeatureSession",
                     },
                     session: {
                         autoBegin: false,
@@ -106,6 +114,25 @@ class FeatureTool {
                 },
             ],
             [core_1.ContributionPointIds.COMMANDS]: [
+                {
+                    command: "beginFeatureSession",
+                    title: "Begin Feature Session",
+                    handler: async () => {
+                        if (this.isFeatureSessionActive) {
+                            return { ok: true };
+                        }
+                        const original = this.getCommittedFeatures();
+                        this.sessionOriginalFeatures = this.cloneFeatures(original);
+                        this.isFeatureSessionActive = true;
+                        await this.refreshGeometry();
+                        this.setWorkingFeatures(this.cloneFeatures(original));
+                        this.hasWorkingChanges = false;
+                        this.redraw();
+                        this.emitWorkingChange();
+                        this.updateCommittedFeatures([]);
+                        return { ok: true };
+                    },
+                },
                 {
                     command: "addFeature",
                     title: "Add Edge Feature",
@@ -158,17 +185,25 @@ class FeatureTool {
                     },
                 },
                 {
-                    command: "resetWorkingFeatures",
-                    title: "Reset Working Features",
+                    command: "rollbackFeatureSession",
+                    title: "Rollback Feature Session",
                     handler: async () => {
-                        const configService = this.context?.services.get("ConfigurationService");
-                        const next = (configService?.get("dieline.features", []) ||
-                            []);
+                        const original = this.cloneFeatures(this.sessionOriginalFeatures || this.getCommittedFeatures());
                         await this.refreshGeometry();
-                        this.setWorkingFeatures(this.cloneFeatures(next));
+                        this.setWorkingFeatures(original);
                         this.hasWorkingChanges = false;
                         this.redraw();
                         this.emitWorkingChange();
+                        this.updateCommittedFeatures(original);
+                        this.clearFeatureSessionState();
+                        return { ok: true };
+                    },
+                },
+                {
+                    command: "resetWorkingFeatures",
+                    title: "Reset Working Features",
+                    handler: async () => {
+                        await this.resetWorkingFeaturesFromSource();
                         return { ok: true };
                     },
                 },
@@ -192,6 +227,38 @@ class FeatureTool {
     cloneFeatures(features) {
         return JSON.parse(JSON.stringify(features || []));
     }
+    getConfigService() {
+        return this.context?.services.get("ConfigurationService");
+    }
+    getCommittedFeatures() {
+        const configService = this.getConfigService();
+        const committed = (configService?.get("dieline.features", []) ||
+            []);
+        return this.cloneFeatures(committed);
+    }
+    updateCommittedFeatures(next) {
+        const configService = this.getConfigService();
+        if (!configService)
+            return;
+        this.isUpdatingConfig = true;
+        try {
+            configService.update("dieline.features", next);
+        }
+        finally {
+            this.isUpdatingConfig = false;
+        }
+    }
+    clearFeatureSessionState() {
+        this.isFeatureSessionActive = false;
+        this.sessionOriginalFeatures = null;
+    }
+    restoreSessionFeaturesToConfig() {
+        if (!this.isFeatureSessionActive)
+            return;
+        const original = this.cloneFeatures(this.sessionOriginalFeatures || this.getCommittedFeatures());
+        this.updateCommittedFeatures(original);
+        this.clearFeatureSessionState();
+    }
     emitWorkingChange() {
         this.context?.eventBus.emit("feature:working:change", {
             features: this.cloneFeatures(this.workingFeatures),
@@ -210,6 +277,16 @@ class FeatureTool {
         }
         catch (e) { }
     }
+    async resetWorkingFeaturesFromSource() {
+        const next = this.cloneFeatures(this.isFeatureSessionActive && this.sessionOriginalFeatures
+            ? this.sessionOriginalFeatures
+            : this.getCommittedFeatures());
+        await this.refreshGeometry();
+        this.setWorkingFeatures(next);
+        this.hasWorkingChanges = false;
+        this.redraw();
+        this.emitWorkingChange();
+    }
     setWorkingFeatures(next) {
         this.workingFeatures = next;
     }
@@ -265,13 +342,7 @@ class FeatureTool {
         const dielineWidth = sizeState.actualWidthMm;
         const dielineHeight = sizeState.actualHeightMm;
         const result = (0, featureComplete_1.completeFeaturesStrict)(this.workingFeatures, { dielineWidth, dielineHeight }, (next) => {
-            this.isUpdatingConfig = true;
-            try {
-                configService.update("dieline.features", next);
-            }
-            finally {
-                this.isUpdatingConfig = false;
-            }
+            this.updateCommittedFeatures(next);
             this.workingFeatures = this.cloneFeatures(next);
             this.emitWorkingChange();
         });
@@ -282,6 +353,7 @@ class FeatureTool {
             };
         }
         this.hasWorkingChanges = false;
+        this.clearFeatureSessionState();
         // Keep feature markers above dieline overlay after config-driven redraw.
         this.redraw();
         return { ok: true };

package/.test-dist/src/image.js

@@ -275,7 +275,7 @@ class ImageTool {
                     id: "image.frame.outerBackground",
                     type: "color",
                     label: "Image Frame Outer Background",
-                    default: "rgba(0,0,0,0.18)",
+                    default: "#f5f5f5",
                 },
             ],
             [core_1.ContributionPointIds.COMMANDS]: [
@@ -318,6 +318,7 @@ class ImageTool {
                         this.workingItems = this.cloneItems(this.items);
                         this.hasWorkingChanges = false;
                         this.updateImages();
+                        this.emitWorkingChange();
                     },
                 },
                 {
@@ -436,6 +437,12 @@ class ImageTool {
     cloneItems(items) {
         return this.normalizeItems((items || []).map((i) => ({ ...i })));
     }
+    emitWorkingChange(changedId = null) {
+        this.context?.eventBus.emit("image:working:change", {
+            changedId,
+            items: this.cloneItems(this.workingItems),
+        });
+    }
     generateId() {
         return Math.random().toString(36).substring(2, 9);
     }
@@ -509,6 +516,7 @@ class ImageTool {
             return;
         this.workingItems = this.cloneItems([...this.workingItems, item]);
         this.updateImages();
+        this.emitWorkingChange(item.id);
     }
     async updateImage(id, updates, options = {}) {
         this.syncToolActiveFromWorkbench();
@@ -681,7 +689,7 @@ class ImageTool {
             strokeStyle,
             dashLength: Number.isFinite(dashLength) ? Math.max(1, dashLength) : 8,
             innerBackground: this.getConfig("image.frame.innerBackground", "rgba(0,0,0,0)") || "rgba(0,0,0,0)",
-            outerBackground: this.getConfig("image.frame.outerBackground", "rgba(0,0,0,0.18)") || "rgba(0,0,0,0.18)",
+            outerBackground: "#f5f5f5",
         };
     }
     resolveRenderImageState(item) {
@@ -833,10 +841,15 @@ class ImageTool {
         const canvasW = this.canvasService.canvas.width || 0;
         const canvasH = this.canvasService.canvas.height || 0;
         const visual = this.getFrameVisualConfig();
-        const topH = Math.max(0, frame.top);
-        const bottomH = Math.max(0, canvasH - (frame.top + frame.height));
-        const leftW = Math.max(0, frame.left);
-        const rightW = Math.max(0, canvasW - (frame.left + frame.width));
+        const frameLeft = Math.max(0, Math.min(canvasW, frame.left));
+        const frameTop = Math.max(0, Math.min(canvasH, frame.top));
+        const frameRight = Math.max(frameLeft, Math.min(canvasW, frame.left + frame.width));
+        const frameBottom = Math.max(frameTop, Math.min(canvasH, frame.top + frame.height));
+        const visibleFrameH = Math.max(0, frameBottom - frameTop);
+        const topH = frameTop;
+        const bottomH = Math.max(0, canvasH - frameBottom);
+        const leftW = frameLeft;
+        const rightW = Math.max(0, canvasW - frameRight);
         const mask = [
             {
                 id: "image.cropMask.top",
@@ -860,7 +873,7 @@ class ImageTool {
                 data: { id: "image.cropMask.bottom", zIndex: 2 },
                 props: {
                     left: canvasW / 2,
-                    top: frame.top + frame.height + bottomH / 2,
+                    top: frameBottom + bottomH / 2,
                     width: canvasW,
                     height: bottomH,
                     originX: "center",
@@ -876,9 +889,9 @@ class ImageTool {
                 data: { id: "image.cropMask.left", zIndex: 3 },
                 props: {
                     left: leftW / 2,
-                    top: frame.top + frame.height / 2,
+                    top: frameTop + visibleFrameH / 2,
                     width: leftW,
-                    height: frame.height,
+                    height: visibleFrameH,
                     originX: "center",
                     originY: "center",
                     fill: visual.outerBackground,
@@ -891,10 +904,10 @@ class ImageTool {
                 type: "rect",
                 data: { id: "image.cropMask.right", zIndex: 4 },
                 props: {
-                    left: frame.left + frame.width + rightW / 2,
-                    top: frame.top + frame.height / 2,
+                    left: frameRight + rightW / 2,
+                    top: frameTop + visibleFrameH / 2,
                     width: rightW,
-                    height: frame.height,
+                    height: visibleFrameH,
                     originX: "center",
                     originY: "center",
                     fill: visual.outerBackground,
@@ -988,6 +1001,7 @@ class ImageTool {
         if (this.isToolActive) {
             this.updateImages();
         }
+        this.emitWorkingChange(id);
     }
     async updateImageInConfig(id, updates) {
         const index = this.items.findIndex((item) => item.id === id);
@@ -1073,6 +1087,7 @@ class ImageTool {
         this.isImageSelectionActive = true;
         this.focusedImageId = id;
         this.updateImages();
+        this.emitWorkingChange(id);
     }
     focusImageSelection(id) {
         if (!this.canvasService)
@@ -1162,6 +1177,7 @@ class ImageTool {
         this.hasWorkingChanges = false;
         this.workingItems = this.cloneItems(next);
         this.updateConfig(next);
+        this.emitWorkingChange(focusId);
         if (focusId) {
             this.focusedImageId = focusId;
             this.isImageSelectionActive = true;

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pooder/kit
 
+## 5.0.3
+
+### Patch Changes
+
+- bugfix
+
+## 5.0.2
+
+### Patch Changes
+
+- bugfix
+
 ## 5.0.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -178,6 +178,8 @@ declare class FeatureTool implements Extension {
     private context?;
     private isUpdatingConfig;
     private isToolActive;
+    private isFeatureSessionActive;
+    private sessionOriginalFeatures;
     private hasWorkingChanges;
     private dirtyTrackerDisposable?;
     private handleMoving;
@@ -209,8 +211,14 @@ declare class FeatureTool implements Extension {
         [ContributionPointIds.COMMANDS]: CommandContribution[];
     };
     private cloneFeatures;
+    private getConfigService;
+    private getCommittedFeatures;
+    private updateCommittedFeatures;
+    private clearFeatureSessionState;
+    private restoreSessionFeaturesToConfig;
     private emitWorkingChange;
     private refreshGeometry;
+    private resetWorkingFeaturesFromSource;
     private setWorkingFeatures;
     private updateWorkingGroupPosition;
     private completeFeatures;
@@ -286,6 +294,7 @@ declare class ImageTool implements Extension {
     private normalizeItem;
     private normalizeItems;
     private cloneItems;
+    private emitWorkingChange;
     private generateId;
     private getImageIdFromActiveObject;
     private resolveReplaceTargetId;

package/dist/index.d.ts

@@ -178,6 +178,8 @@ declare class FeatureTool implements Extension {
     private context?;
     private isUpdatingConfig;
     private isToolActive;
+    private isFeatureSessionActive;
+    private sessionOriginalFeatures;
     private hasWorkingChanges;
     private dirtyTrackerDisposable?;
     private handleMoving;
@@ -209,8 +211,14 @@ declare class FeatureTool implements Extension {
         [ContributionPointIds.COMMANDS]: CommandContribution[];
     };
     private cloneFeatures;
+    private getConfigService;
+    private getCommittedFeatures;
+    private updateCommittedFeatures;
+    private clearFeatureSessionState;
+    private restoreSessionFeaturesToConfig;
     private emitWorkingChange;
     private refreshGeometry;
+    private resetWorkingFeaturesFromSource;
     private setWorkingFeatures;
     private updateWorkingGroupPosition;
     private completeFeatures;
@@ -286,6 +294,7 @@ declare class ImageTool implements Extension {
     private normalizeItem;
     private normalizeItems;
     private cloneItems;
+    private emitWorkingChange;
     private generateId;
     private getImageIdFromActiveObject;
     private resolveReplaceTargetId;