fix(remove-scroll): resolve an issue where styles are not always rest…

…ored correctly
chakra-ui · Oct 28, 2024 · 85aa147 · 85aa147
1 parent fe17761
commit 85aa147
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.changeset/clever-rocks-shake.md b/.changeset/clever-rocks-shake.md
@@ -0,0 +1,5 @@
+---
+"@zag-js/remove-scroll": patch
+---
+
+Resolve an issue where styles are not always restored correctly
diff --git a/packages/utilities/remove-scroll/src/index.ts b/packages/utilities/remove-scroll/src/index.ts
@@ -4,10 +4,17 @@ const LOCK_CLASSNAME = "data-scroll-lock"
 
 function assignStyle(el: HTMLElement | null | undefined, style: Partial<CSSStyleDeclaration>) {
   if (!el) return
-  const previousStyle = el.style.cssText
+  const previousStyle = Object.keys(style).reduce(
+    (acc, key) => {
+      acc[key] = el.style.getPropertyValue(key)
+      return acc
+    },
+    {} as Record<string, string>,
+  )
+
   Object.assign(el.style, style)
   return () => {
-    el.style.cssText = previousStyle
+    Object.assign(el.style, previousStyle)
   }
 }