fix: nested scroll prevention issue

huntabyte · Nov 9, 2024 · 3a49a24 · 3a49a24
1 parent f593851
commit 3a49a24
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/packages/bits-ui/src/lib/internal/use-body-scroll-lock.svelte.ts b/packages/bits-ui/src/lib/internal/use-body-scroll-lock.svelte.ts
@@ -120,13 +120,14 @@ export function useBodyScrollLock(
 	$effect(() => {
 		return () => {
 			countState.map.delete(id);
-
-			if (!isAnyLocked(countState.map)) {
-				if (_restoreScrollDelay === null) {
-					requestAnimationFrame(() => countState.resetBodyStyle());
-				} else {
-					afterSleep(_restoreScrollDelay, () => countState.resetBodyStyle());
-				}
+			// if any locks are still active, we don't reset the body style
+			if (isAnyLocked(countState.map)) return;
+
+			// if no locks are active (meaning this was the last lock), we reset the body style
+			if (_restoreScrollDelay === null) {
+				requestAnimationFrame(() => countState.resetBodyStyle());
+			} else {
+				afterSleep(_restoreScrollDelay, () => countState.resetBodyStyle());
 			}
 		};
 	});