Fix errors in firefox extension when destructuring the window (#1038)

clauderic · Feb 19, 2023 · da888ee · da888ee
1 parent 880190f
commit da888ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.changeset/firefox-getcomputedstyle-fix.md b/.changeset/firefox-getcomputedstyle-fix.md
@@ -0,0 +1,5 @@
+---
+"@dnd-kit/core": patch
+---
+
+Fix errors with calls to `getComputedStyle` in Firefox when destructuring from the window object
diff --git a/packages/core/src/utilities/rect/getRect.ts b/packages/core/src/utilities/rect/getRect.ts
@@ -19,8 +19,8 @@ export function getClientRect(
   let rect: ClientRect = element.getBoundingClientRect();
 
   if (options.ignoreTransform) {
-    const {getComputedStyle} = getWindow(element);
-    const {transform, transformOrigin} = getComputedStyle(element);
+    const {transform, transformOrigin} =
+      getWindow(element).getComputedStyle(element);
 
     if (transform) {
       rect = inverseTransform(rect, transform, transformOrigin);

diff --git a/packages/core/src/utilities/scroll/getScrollableAncestors.ts b/packages/core/src/utilities/scroll/getScrollableAncestors.ts
@@ -41,8 +41,7 @@ export function getScrollableAncestors(
       return scrollParents;
     }
 
-    const {getComputedStyle} = getWindow(node);
-    const computedStyle = getComputedStyle(node);
+    const computedStyle = getWindow(element).getComputedStyle(node);
 
     if (node !== element) {
       if (isScrollable(node, computedStyle)) {