From d7a3be326871838aff89520da7df7e74c0abece3 Mon Sep 17 00:00:00 2001
From: Gavin Joyce <gavinjoyce@gmail.com>
Date: Mon, 30 Jul 2018 14:06:13 +0100
Subject: [PATCH] [WIP] scale bounding client rect

---
 addon/-private/sprite.js | 44 ++++++++++++++++++++++++++++++++++------
 addon/motions/resize.js  | 12 +++++------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/addon/-private/sprite.js b/addon/-private/sprite.js
index f8bde1f7e..b765135ed 100644
--- a/addon/-private/sprite.js
+++ b/addon/-private/sprite.js
@@ -435,14 +435,14 @@ export default class Sprite {
     }
     this._inInitialPosition = true;
     if (this._offsetSprite) {
-      this._initialBounds = relativeBounds(this.element.getBoundingClientRect(), this._offsetSprite.initialBounds);
+      this._initialBounds = relativeBounds(this._getScaledBoundingClientRect(), this._offsetSprite.initialBounds);
     } else {
-      this._initialBounds = this.element.getBoundingClientRect();
+      this._initialBounds = this._getScaledBoundingClientRect();
     }
     this._initialComputedStyle = copyComputedStyle(this.element);
     this._initialPosition = this._getCurrentPosition();
     this._originalInitialBounds = this._initialBounds;
-    this._initialCumulativeTransform = cumulativeTransform(this.element);
+    this._initialCumulativeTransform = this.cumulativeTransform;
   }
 
   measureFinalBounds() {
@@ -451,14 +451,46 @@ export default class Sprite {
     }
     this._inInitialPosition = false;
     if (this._offsetSprite) {
-      this._finalBounds = relativeBounds(this.element.getBoundingClientRect(), this._offsetSprite.finalBounds);
+      this._finalBounds = relativeBounds(this._getScaledBoundingClientRect(), this._offsetSprite.finalBounds);
     } else {
-      this._finalBounds = this.element.getBoundingClientRect();
+      this._finalBounds = this._getScaledBoundingClientRect();
     }
     this._finalComputedStyle = copyComputedStyle(this.element);
     this._finalPosition = this._getCurrentPosition();
     this._originalFinalBounds = this._finalBounds;
-    this._finalCumulativeTransform = cumulativeTransform(this.element);
+    this._finalCumulativeTransform = this.cumulativeTransform;
+  }
+
+  _getScaledBoundingClientRect() {
+    const rect = this.element.getBoundingClientRect();
+
+    let xScale = this.cumulativeTransform.a;
+    let yScale = this.cumulativeTransform.d;
+
+    if (xScale === 1 && yScale === 1) {
+      return rect;
+    }
+
+    let scaled = {};
+    for (let key in rect) {
+      if (key === 'left') {
+        scaled[key] = rect[key] * (1 / xScale);
+      } else if (key === 'right') {
+        scaled[key] = rect[key] * (1 / xScale);
+      } else if (key === 'width') {
+        scaled[key] = rect[key] * (1 / xScale);
+      } else if (key === 'top') {
+        scaled[key] = rect[key] * (1 / yScale);
+      } else if (key === 'bottom') {
+        scaled[key] = rect[key] * (1 / yScale);
+      } else if (key === 'height') {
+        scaled[key] = rect[key] * (1 / yScale);
+      } else {
+        scaled[key] = rect[key];
+      }
+    }
+
+    return scaled;
   }
 
   /**
diff --git a/addon/motions/resize.js b/addon/motions/resize.js
index 68b24f703..2f6d055a6 100644
--- a/addon/motions/resize.js
+++ b/addon/motions/resize.js
@@ -22,22 +22,22 @@ export class Resize extends Motion {
 
     if (!this.prior) {
       this.widthTween = new Tween(
-        sprite.initialBounds.width / sprite.initialCumulativeTransform.a,
-        sprite.finalBounds.width / sprite.finalCumulativeTransform.a, duration
+        sprite.initialBounds.width,
+        sprite.finalBounds.width, duration
       );
       this.heightTween = new Tween(
-        sprite.initialBounds.height / sprite.initialCumulativeTransform.d,
-        sprite.finalBounds.height / sprite.finalCumulativeTransform.d, duration
+        sprite.initialBounds.height,
+        sprite.finalBounds.height, duration
       );
     } else {
       this.widthTween = new Tween(
         0,
-        sprite.finalBounds.width / sprite.finalCumulativeTransform.a - this.prior.sprite.finalBounds.width,
+        sprite.finalBounds.width - this.prior.sprite.finalBounds.width,
         duration
       ).plus(this.prior.widthTween);
       this.heightTween = new Tween(
         0,
-        sprite.finalBounds.height / sprite.finalCumulativeTransform.d - this.prior.sprite.finalBounds.height,
+        sprite.finalBounds.height - this.prior.sprite.finalBounds.height,
         duration
       ).plus(this.prior.heightTween);
     }