Merge pull request #680 from mkszepp/fix-position-fixed-for-v0-35

Backport to v0.35: fix offset calculation for position fixed elements
ember-animation · Jun 21, 2023 · 13490ed · 13490ed
2 parents 53d6596 + f9701de
commit 13490ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/addon/transitions/explode.js b/addon/transitions/explode.js
@@ -139,7 +139,7 @@ function _explodePart(context, field, childContext, selector, seen) {
 }
 
 function getOffset(ele) {
-  const rect = ele.getBoundingClientRect();
+  const rect = ele?.getBoundingClientRect() ?? { top: 0, left: 0 };
   return {
     top: rect.top + window.scrollY,
     left: rect.left + window.scrollX,

diff --git a/addon/transitions/fly-to.js b/addon/transitions/fly-to.js
@@ -35,7 +35,7 @@ export default function flyTo(opts = {}) {
 }
 
 function getOffset(ele) {
-  const rect = ele.getBoundingClientRect();
+  const rect = ele?.getBoundingClientRect() ?? { top: 0, left: 0 };
   return {
     top: rect.top + window.scrollY,
     left: rect.left + window.scrollX,

diff --git a/tests/integration/transitions/explode-test.js b/tests/integration/transitions/explode-test.js
@@ -603,7 +603,7 @@ module('Integration: explode transition', function (hooks) {
   });
 
   function getOffset(ele) {
-    const rect = ele.getBoundingClientRect();
+    const rect = ele?.getBoundingClientRect() ?? { top: 0, left: 0 };
     return {
       top: rect.top + window.scrollY,
       left: rect.left + window.scrollX,

diff --git a/tests/integration/transitions/fly-to-test.js b/tests/integration/transitions/fly-to-test.js
@@ -145,7 +145,7 @@ module('Integration: fly-to transition', function (hooks) {
   });
 
   function getOffset(ele) {
-    const rect = ele.getBoundingClientRect();
+    const rect = ele?.getBoundingClientRect() ?? { top: 0, left: 0 };
     return {
       top: rect.top + window.scrollY,
       left: rect.left + window.scrollX,