Skip to content

Commit 0b2397a

Browse files
committed
fixup calcInverseTransform function and rename domRectsAreEqual
1 parent 3a5ca3a commit 0b2397a

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

src/lib/dom.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,15 @@ function isTransformableElement(element) {
150150
return element && (element instanceof Element || element instanceof HTMLElement);
151151
}
152152

153-
function domRectsAreEqual(a, b) {
153+
function equalDomRects(a, b) {
154154
return (
155155
a && b &&
156-
a.left === b.left &&
156+
a.x === b.x &&
157+
a.y === b.y &&
157158
a.top === b.top &&
159+
a.left === b.left &&
158160
a.right === b.right &&
159-
a.bottom === b.bottom &&
160-
a.x === b.x &&
161-
a.y === b.y
161+
a.bottom === b.bottom
162162
);
163163
}
164164

@@ -172,5 +172,5 @@ module.exports = {
172172
getFullTransformMatrix: getFullTransformMatrix,
173173
getElementTransformMatrix: getElementTransformMatrix,
174174
getElementAndAncestors: getElementAndAncestors,
175-
domRectsAreEqual: domRectsAreEqual
175+
equalDomRects: equalDomRects
176176
};

src/lib/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ lib.deleteRelatedStyleRule = domModule.deleteRelatedStyleRule;
151151
lib.getFullTransformMatrix = domModule.getFullTransformMatrix;
152152
lib.getElementTransformMatrix = domModule.getElementTransformMatrix;
153153
lib.getElementAndAncestors = domModule.getElementAndAncestors;
154-
lib.domRectsAreEqual = domModule.domRectsAreEqual;
154+
lib.equalDomRects = domModule.equalDomRects;
155155

156156
lib.clearResponsive = require('./clear_responsive');
157157

src/plot_api/plot_api.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3707,17 +3707,16 @@ function purge(gd) {
37073707
}
37083708

37093709
// determines if the graph div requires a recalculation of its inverse matrix transforms by comparing old + new bounding boxes.
3710-
function calcInverseTransform(gd, newBBox) {
3711-
gd = Lib.getGraphDiv(gd);
3710+
function calcInverseTransform(gd) {
37123711
var fullLayout = gd._fullLayout;
3713-
if(!newBBox) newBBox = gd.getBoundingClientRect();
37143712

3715-
if(Lib.domRectsAreEqual(newBBox, fullLayout._lastBBox)) return;
3713+
var newBBox = gd.getBoundingClientRect();
3714+
if(Lib.equalDomRects(newBBox, fullLayout._lastBBox)) return;
37163715

37173716
var m = fullLayout._inverseTransform = Lib.inverseTransformMatrix(Lib.getFullTransformMatrix(gd));
37183717
fullLayout._inverseScaleX = Math.sqrt(m[0][0] * m[0][0] + m[0][1] * m[0][1] + m[0][2] * m[0][2]);
37193718
fullLayout._inverseScaleY = Math.sqrt(m[1][0] * m[1][0] + m[1][1] * m[1][1] + m[1][2] * m[1][2]);
3720-
fullLayout._lastBBox = gd.getBoundingClientRect();
3719+
fullLayout._lastBBox = newBBox;
37213720
}
37223721

37233722
// -------------------------------------------------------

0 commit comments

Comments
 (0)