chore: release v2.0.0-beta.36

RSamaium · RSamaium · commit 5980edfee142 · 2025-12-05T14:24:22.000+01:00
diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@canvasengine/compiler",
-  "version": "2.0.0-beta.35",
+  "version": "2.0.0-beta.36",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canvasengine",
-  "version": "2.0.0-beta.35",
+  "version": "2.0.0-beta.36",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/core/src/directives/Flash.ts b/packages/core/src/directives/Flash.ts
@@ -120,10 +120,20 @@ export class Flash extends Directive {
             return;
         }
 
-        // Store original values
-        this.originalAlpha = flashProps.originalAlpha ?? instance.alpha ?? 1;
+        // Store original values once at mount time
+        // Only set if not already stored (to preserve values from first mount)
+        if (this.originalAlpha === 1 && !flashProps.originalAlpha) {
+            this.originalAlpha = instance.alpha ?? 1;
+        } else if (flashProps.originalAlpha !== undefined) {
+            this.originalAlpha = flashProps.originalAlpha;
+        }
+        
         const currentTint = (instance as any).tint;
-        this.originalTint = flashProps.originalTint ?? (isSignal(currentTint) ? currentTint() : currentTint) ?? 0xffffff;
+        if (this.originalTint === 0xffffff && !flashProps.originalTint) {
+            this.originalTint = (isSignal(currentTint) ? currentTint() : currentTint) ?? 0xffffff;
+        } else if (flashProps.originalTint !== undefined) {
+            this.originalTint = flashProps.originalTint;
+        }
 
         // Listen to trigger activation
         this.flashSubscription = on(flashProps.trigger, async (data) => {
@@ -157,18 +167,20 @@ export class Flash extends Directive {
         const flashProps = this.flashProps;
         
         // Use data from trigger to override defaults if provided
-        const type = data?.type ?? flashProps.type();
-        const duration = data?.duration ?? flashProps.duration();
-        const cycles = data?.cycles ?? flashProps.cycles();
-        const flashAlpha = data?.alpha ?? flashProps.alpha();
-        const flashTint = data?.tint ?? flashProps.tint();
+        const type = data?.type ?? (typeof flashProps.type === 'function' ? flashProps.type() : flashProps.type);
+        const duration = data?.duration ?? (typeof flashProps.duration === 'function' ? flashProps.duration() : flashProps.duration);
+        const cycles = data?.cycles ?? (typeof flashProps.cycles === 'function' ? flashProps.cycles() : flashProps.cycles);
+        const flashAlpha = data?.alpha ?? (typeof flashProps.alpha === 'function' ? flashProps.alpha() : flashProps.alpha);
+        const flashTint = data?.tint ?? (typeof flashProps.tint === 'function' ? flashProps.tint() : flashProps.tint);
 
-        // Store original values if not already stored
-        this.originalAlpha = flashProps.originalAlpha ?? instance.alpha ?? 1;
-        const currentTint = (instance as any).tint;
-        this.originalTint = flashProps.originalTint ?? (isSignal(currentTint) ? currentTint() : currentTint) ?? 0xffffff;
+        // Stop any existing animation first
+        if (this.progressSignal) {
+            // Stop the animation immediately
+            this.progressSignal.set(0, { duration: 0 });
+        }
 
-        // Stop any existing animation and clean up
+        // Clean up effects BEFORE restoring values
+        // This prevents effects from continuing to update values after we restore
         if (this.alphaEffect) {
             this.alphaEffect.unsubscribe();
             this.alphaEffect = null;
@@ -178,12 +190,20 @@ export class Flash extends Directive {
             this.tintEffect = null;
         }
 
-        // Restore original values before starting new flash
+        // Always restore to original values immediately after stopping effects
+        // This ensures that if a new flash starts before the previous one completes,
+        // we restore to the true original values, not the intermediate animation values
         instance.alpha = this.originalAlpha;
-        if ((instance as any).tint !== undefined) {
+        const currentTint = (instance as any).tint;
+        if (currentTint !== undefined) {
             // Ensure originalTint is a primitive value, not a signal
             const tintValue = typeof this.originalTint === 'number' ? this.originalTint : 0xffffff;
-            (instance as any).tint = tintValue;
+            // Handle both signal and primitive tint
+            if (isSignal(currentTint)) {
+                currentTint.set(tintValue);
+            } else {
+                (instance as any).tint = tintValue;
+            }
         }
 
         // Call onStart callback
@@ -199,17 +219,17 @@ export class Flash extends Directive {
         };
 
         // Create or recreate progress signal for flash animation
-        if (this.progressSignal) {
-            // Reset to 0 immediately without animation
-            this.progressSignal.set(0, { duration: 0 });
-            // Wait a bit to ensure the reset is complete
-            await new Promise(resolve => setTimeout(resolve, 0));
-        } else {
+        // Note: We already stopped the previous animation above, so we can reuse the signal
+        if (!this.progressSignal) {
             this.progressSignal = animatedSignal(0, {
                 duration: duration,
                 ease: (t) => t, // Linear ease
             });
         }
+        // Reset to 0 immediately without animation to start fresh
+        this.progressSignal.set(0, { duration: 0 });
+        // Wait a bit to ensure the reset is complete before starting new animation
+        await new Promise(resolve => setTimeout(resolve, 0));
 
         // Create effect to update alpha based on progress
         if (type === 'alpha' || type === 'both') {
@@ -239,8 +259,14 @@ export class Flash extends Directive {
         if (type === 'tint' || type === 'both') {
             this.tintEffect = effect(() => {
                 if (!instance || !this.progressSignal || !this.currentFlashConfig) return;
-                if ((instance as any).tint === undefined) return;
-
+                
+                // Get current tint value - handle both signal and primitive
+                const currentTint = (instance as any).tint;
+                if (currentTint === undefined) return;
+                
+                // Check if tint is a signal
+                const tintIsSignal = isSignal(currentTint);
+                
                 const progress = this.progressSignal();
                 const config = this.currentFlashConfig;
                 
@@ -266,7 +292,14 @@ export class Flash extends Directive {
                 const g = Math.round(g1 + (g2 - g1) * flashPhase);
                 const b = Math.round(b1 + (b2 - b1) * flashPhase);
                 
-                (instance as any).tint = (r << 16) | (g << 8) | b;
+                const newTintValue = (r << 16) | (g << 8) | b;
+                
+                // Handle both signal and primitive tint
+                if (tintIsSignal) {
+                    currentTint.set(newTintValue);
+                } else {
+                    (instance as any).tint = newTintValue;
+                }
             }).subscription;
         }
 
@@ -279,10 +312,16 @@ export class Flash extends Directive {
         // Restore original values
         if (instance) {
             instance.alpha = this.originalAlpha;
-            if ((instance as any).tint !== undefined) {
+            const currentTint = (instance as any).tint;
+            if (currentTint !== undefined) {
                 // Ensure originalTint is a primitive value, not a signal
                 const tintValue = typeof this.originalTint === 'number' ? this.originalTint : 0xffffff;
-                (instance as any).tint = tintValue;
+                // Handle both signal and primitive tint
+                if (isSignal(currentTint)) {
+                    currentTint.set(tintValue);
+                } else {
+                    (instance as any).tint = tintValue;
+                }
             }
         }
         
@@ -344,10 +383,16 @@ export class Flash extends Directive {
         if (this.elementRef?.componentInstance) {
             const instance = this.elementRef.componentInstance;
             instance.alpha = this.originalAlpha;
-            if ((instance as any).tint !== undefined) {
+            const currentTint = (instance as any).tint;
+            if (currentTint !== undefined) {
                 // Ensure originalTint is a primitive value, not a signal
                 const tintValue = typeof this.originalTint === 'number' ? this.originalTint : 0xffffff;
-                (instance as any).tint = tintValue;
+                // Handle both signal and primitive tint
+                if (isSignal(currentTint)) {
+                    currentTint.set(tintValue);
+                } else {
+                    (instance as any).tint = tintValue;
+                }
             }
         }
 
diff --git a/packages/core/src/engine/trigger.ts b/packages/core/src/engine/trigger.ts
@@ -1,6 +1,6 @@
 import { effect, signal } from "@signe/reactive";
 
-interface Listen<T = any> {
+export interface Listen<T = any> {
   config: T | undefined;
   seed: {
     config: T | undefined;
@@ -9,7 +9,7 @@ interface Listen<T = any> {
   };
 }
 
-interface Trigger<T = any> {
+export interface Trigger<T = any> {
   start: () => Promise<void>;
   listen: () => Listen<T> | undefined;
 }
diff --git a/packages/presets/package.json b/packages/presets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@canvasengine/presets",
-  "version": "2.0.0-beta.35",
+  "version": "2.0.0-beta.36",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/tiled/package.json b/packages/tiled/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@canvasengine/tiled",
-  "version": "2.0.0-beta.35",
+  "version": "2.0.0-beta.36",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/sample/src/flash.ce b/sample/src/flash.ce
@@ -76,8 +76,8 @@
         <Text text="Sprite Flash" x={0} y={-30} color="#ecf0f1" size="14" fontFamily="Arial" />
         <Sprite 
             image="exp.png"
-            width={80}
-            height={80}
+            width={800}
+            height={800}
             flash={spriteFlashConfig}
             click={() => spriteFlashTrigger.start()}
         />
@@ -180,7 +180,7 @@
     const spriteFlashConfig = {
         trigger: spriteFlashTrigger,
         type: 'tint',
-        tint: 0xffff00,  // Yellow flash
+        tint: 0xff0000,  // Yellow flash
         duration: 250
     };
 
diff --git a/sample/src/shake.ce b/sample/src/shake.ce
@@ -8,10 +8,10 @@
     <!-- Basic shake example -->
     <Container x={100} y={100}>
         <Text text="Basic Shake" x={0} y={-30} color="#ecf0f1" size="14" fontFamily="Arial" />
-        <Rect 
-            color="#e74c3c" 
-            width={80} 
-            height={80} 
+        <Sprite 
+            image="exp.png"
+            width={200}
+            height={200}
             borderRadius={8} 
             shake={shakeConfig}
             click={() => shakeTrigger.start()}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@canvasengine/compiler",`
`3`		`- "version": "2.0.0-beta.35",`
	`3`	`+ "version": "2.0.0-beta.36",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "canvasengine",`
`3`		`- "version": "2.0.0-beta.35",`
	`3`	`+ "version": "2.0.0-beta.36",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { effect, signal } from "@signe/reactive";`
`2`	`2`
`3`		`-interface Listen<T = any> {`
	`3`	`+export interface Listen<T = any> {`
`4`	`4`	`config: T \| undefined;`
`5`	`5`	`seed: {`
`6`	`6`	`config: T \| undefined;`
`@@ -9,7 +9,7 @@ interface Listen<T = any> {`
`9`	`9`	`};`
`10`	`10`	`}`
`11`	`11`
`12`		`-interface Trigger<T = any> {`
	`12`	`+export interface Trigger<T = any> {`
`13`	`13`	`start: () => Promise<void>;`
`14`	`14`	`listen: () => Listen<T> \| undefined;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@canvasengine/presets",`
`3`		`- "version": "2.0.0-beta.35",`
	`3`	`+ "version": "2.0.0-beta.36",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@canvasengine/tiled",`
`3`		`- "version": "2.0.0-beta.35",`
	`3`	`+ "version": "2.0.0-beta.36",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`