@praxisjs/decorators 0.4.2 → 0.4.3

package/src/component/virtual.tsx

@@ -8,7 +8,7 @@ interface VirtualHost {
 
 export function Virtual(itemHeight: number, buffer = 3) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return function <T extends new (...args: any[]) => RootComponent>(
+  return function <T extends new (...args: any[]) => RootComponent<Record<string, any>>>(
     constructor: T,
     _context: ClassDecoratorContext,
   ): T {

package/src/functions/watch.ts

@@ -64,13 +64,16 @@ export function Watch<
       const instance = this as T & Record<string, unknown>;
       // eslint-disable-next-line @typescript-eslint/unbound-method
       const originalOnMount = instance.onMount;
+      // eslint-disable-next-line @typescript-eslint/unbound-method
+      const originalOnUnmount = instance.onUnmount;
+      let stopEffect: (() => void) | undefined;
 
       instance.onMount = function (this: T & Record<string, unknown>) {
         originalOnMount?.call(this);
 
         if (props.length === 1) {
           let oldVal = readValue(this, props[0]);
-          effect(() => {
+          stopEffect = effect(() => {
             const newVal = readValue(this, props[0]);
             if (!Object.is(newVal, oldVal)) {
               value.call(this as T, newVal, oldVal);
@@ -81,7 +84,7 @@ export function Watch<
           const read = () =>
             Object.fromEntries(props.map((p) => [p, readValue(this, p)]));
           let oldVals = read();
-          effect(() => {
+          stopEffect = effect(() => {
             const newVals = read();
             if (props.some((p) => !Object.is(newVals[p], oldVals[p]))) {
               value.call(this as T, newVals, oldVals);
@@ -90,6 +93,12 @@ export function Watch<
           });
         }
       };
+
+      instance.onUnmount = function (this: T) {
+        originalOnUnmount?.call(this);
+        stopEffect?.();
+        stopEffect = undefined;
+      };
     });
   };
 }