next: fix untrack cleanups (#746)

huntabyte · Oct 8, 2024 · 6e14ca6 · 6e14ca6
1 parent bd3e9b8
commit 6e14ca6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/.changeset/moody-islands-chew.md b/.changeset/moody-islands-chew.md
@@ -0,0 +1,5 @@
+---
+"bits-ui": patch
+---
+
+fix: cleanup a few untracks that were left unhandled
diff --git a/packages/bits-ui/src/lib/bits/command/command.svelte.ts b/packages/bits-ui/src/lib/bits/command/command.svelte.ts
@@ -836,7 +836,7 @@ class CommandItemState {
 			this.id.current;
 			this.#group?.id.current;
 			if (!this.#forceMount.current) {
-				untrack(() => {
+				return untrack(() => {
 					return this.root.registerItem(this.id.current, this.#group?.id.current);
 				});
 			}

diff --git a/packages/bits-ui/src/lib/bits/pin-input/pin-input.svelte.ts b/packages/bits-ui/src/lib/bits/pin-input/pin-input.svelte.ts
@@ -115,7 +115,7 @@ class PinInputRootState {
 
 		$effect(() => {
 			let unsub = noop;
-			untrack(() => {
+			return untrack(() => {
 				const input = this.#inputRef.current;
 				const container = this.#ref.current;
 

diff --git a/packages/bits-ui/src/lib/bits/select/select.svelte.ts b/packages/bits-ui/src/lib/bits/select/select.svelte.ts
@@ -379,7 +379,7 @@ export class SelectContentState {
 
 		$effect(() => {
 			this.root.open.current;
-			untrack(() => {
+			return untrack(() => {
 				let cleanup = [noop];
 
 				afterTick(() => {

diff --git a/packages/bits-ui/src/lib/bits/tabs/tabs.svelte.ts b/packages/bits-ui/src/lib/bits/tabs/tabs.svelte.ts
@@ -183,7 +183,7 @@ class TabsTriggerState {
 			const id = this.#id.current;
 			const value = this.#value.current;
 
-			untrack(() => {
+			return untrack(() => {
 				const deregister = this.#root.registerTrigger(id, value);
 				return () => {
 					deregister();

diff --git a/packages/bits-ui/src/lib/bits/utilities/focus-scope/useFocusScope.svelte.ts b/packages/bits-ui/src/lib/bits/utilities/focus-scope/useFocusScope.svelte.ts
@@ -172,16 +172,10 @@ export function useFocusScope({
 
 		return () => {
 			if (!container) return;
-			container.removeEventListener(
-				AUTOFOCUS_ON_MOUNT,
-				untrack(() => onOpenAutoFocus.current)
-			);
+			container.removeEventListener(AUTOFOCUS_ON_MOUNT, onOpenAutoFocus.current);
 
 			const destroyEvent = new CustomEvent(AUTOFOCUS_ON_DESTROY, EVENT_OPTIONS);
-			container.addEventListener(
-				AUTOFOCUS_ON_DESTROY,
-				untrack(() => onCloseAutoFocus.current)
-			);
+			container.addEventListener(AUTOFOCUS_ON_DESTROY, onCloseAutoFocus.current);
 			container.dispatchEvent(destroyEvent);
 
 			setTimeout(() => {