fix previous

svecosystem · May 11, 2024 · c6b1453 · abdel-17 · May 11, 2024 · c6b1453
1 parent 36b6405
commit c6b1453
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/runed/src/lib/utilities/Previous/Previous.svelte.ts b/packages/runed/src/lib/utilities/Previous/Previous.svelte.ts
@@ -1,4 +1,5 @@
-import { type PreviousValue, watch } from "../index.js";
+import { untrack } from "svelte";
+import { watch } from "../index.js";
 import type { Getter } from "$lib/internal/types.js";
 
 /**
@@ -7,17 +8,17 @@ import type { Getter } from "$lib/internal/types.js";
  * @see {@link https://runed.dev/docs/utilities/use-previous}
  */
 export class Previous<T> {
-	#previous = $state<PreviousValue<T> | undefined>();
+	#previous = $state<T | undefined>(undefined);
+	#curr = $state<T | undefined>(undefined);
 
 	constructor(getter: Getter<T>) {
-		// eslint-disable-next-line ts/no-explicit-any
-		this.#previous = (Array.isArray(getter()) ? [] : undefined) as any;
-		watch(getter, (_, prev) => {
-			this.#previous = prev;
+		$effect(() => {
+			this.#previous = untrack(() => this.#curr);
+			this.#curr = getter();
 		});
 	}
 
 	get current() {
 		return this.#previous;
 	}
-}
+}
diff --git a/packages/runed/src/lib/utilities/watch/watch.svelte.ts b/packages/runed/src/lib/utilities/watch/watch.svelte.ts
@@ -31,7 +31,7 @@ export type WatchOptions = {
 	once?: boolean;
 };
 
-export type PreviousValue<T> = T extends Array<infer U> ? Array<U | undefined> : T | undefined;
+type PreviousValue<T> = T extends Array<infer U> ? Array<U | undefined> : T | undefined;
 
 function runWatcher<T>(
 	source: Getter<T>,