Skip to content

5291: recalculation of dynamic CSS transforms on hover #5302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 27, 2020
Merged

5291: recalculation of dynamic CSS transforms on hover #5302

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fe912ae
5291: recalculation of transforms on hover
alexhartstone Nov 25, 2020
cfd8e36
5291: make transform update func in fullLayout
alexhartstone Nov 26, 2020
2217f7c
5291: add transform recalc to prep funcs for various plots
alexhartstone Nov 26, 2020
0403aa7
5291: simplify recalculate fn name
alexhartstone Nov 26, 2020
3b9071f
5291: fixed syntax
alexhartstone Nov 27, 2020
8796f1b
5291: changed tests to do dynamic transforms
alexhartstone Nov 27, 2020
648c3c9
5291: fix syntax errors
alexhartstone Nov 27, 2020
fbaf868
fixup jasmine tests
archmoj Nov 27, 2020
3a5ca3a
ensure gd
archmoj Nov 27, 2020
0b2397a
fixup calcInverseTransform function and rename domRectsAreEqual
archmoj Nov 27, 2020
fe5ee9b
use shorter inverse keys for css transforms in gd._fullLayout
archmoj Nov 27, 2020
b97895f
remove unnecessary call at the end of makePlotFramework and call reca…
archmoj Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/fx/hover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ function _hover(gd, evt, subplot, noHoverEvent) {
xpx = evt.clientX - dbb.left;
ypx = evt.clientY - dbb.top;

fullLayout._calcInverseTransform(gd);
var transformedCoords = Lib.apply3DTransform(fullLayout._inverseTransform)(xpx, ypx);

xpx = transformedCoords[0];
Expand Down
13 changes: 13 additions & 0 deletions src/lib/dom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,18 @@ function isTransformableElement(element) {
return element && (element instanceof Element || element instanceof HTMLElement);
}

function domRectsAreEqual(a, b) {
return (
a && b &&
a.left === b.left &&
a.top === b.top &&
a.right === b.right &&
a.bottom === b.bottom &&
a.x === b.x &&
a.y === b.y
);
}

module.exports = {
getGraphDiv: getGraphDiv,
isPlotDiv: isPlotDiv,
Expand All @@ -160,4 +172,5 @@ module.exports = {
getFullTransformMatrix: getFullTransformMatrix,
getElementTransformMatrix: getElementTransformMatrix,
getElementAndAncestors: getElementAndAncestors,
domRectsAreEqual: domRectsAreEqual
};
1 change: 1 addition & 0 deletions src/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ lib.deleteRelatedStyleRule = domModule.deleteRelatedStyleRule;
lib.getFullTransformMatrix = domModule.getFullTransformMatrix;
lib.getElementTransformMatrix = domModule.getElementTransformMatrix;
lib.getElementAndAncestors = domModule.getElementAndAncestors;
lib.domRectsAreEqual = domModule.domRectsAreEqual;

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

Expand Down
1 change: 1 addition & 0 deletions src/lib/svg_text_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,7 @@ function alignHTMLWith(_base, container, options) {
var x0 = getLeft() - cRect.left;
var y0 = getTop() - cRect.top;
var gd = options.gd || {};
gd._fullLayout._calcInverseTransform(gd);
var transformedCoords = Lib.apply3DTransform(gd._fullLayout._inverseTransform)(x0, y0);
x0 = transformedCoords[0];
y0 = transformedCoords[1];
Expand Down
24 changes: 19 additions & 5 deletions src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3706,17 +3706,29 @@ function purge(gd) {
return gd;
}

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

if(Lib.domRectsAreEqual(newBBox, fullLayout._lastBBox)) return;

var m = fullLayout._inverseTransform = Lib.inverseTransformMatrix(Lib.getFullTransformMatrix(gd));
fullLayout._inverseScaleX = Math.sqrt(m[0][0] * m[0][0] + m[0][1] * m[0][1] + m[0][2] * m[0][2]);
fullLayout._inverseScaleY = Math.sqrt(m[1][0] * m[1][0] + m[1][1] * m[1][1] + m[1][2] * m[1][2]);
fullLayout._lastBBox = gd.getBoundingClientRect();
}

// -------------------------------------------------------
// makePlotFramework: Create the plot container and axes
// -------------------------------------------------------
function makePlotFramework(gd) {
var gd3 = d3.select(gd);
var fullLayout = gd._fullLayout;
if(fullLayout._inverseTransform === undefined) {
var m = fullLayout._inverseTransform = Lib.inverseTransformMatrix(Lib.getFullTransformMatrix(gd));
fullLayout._inverseScaleX = Math.sqrt(m[0][0] * m[0][0] + m[0][1] * m[0][1] + m[0][2] * m[0][2]);
fullLayout._inverseScaleY = Math.sqrt(m[1][0] * m[1][0] + m[1][1] * m[1][1] + m[1][2] * m[1][2]);
}

fullLayout._calcInverseTransform = calcInverseTransform;
fullLayout._calcInverseTransform(gd);

// Plot container
fullLayout._container = gd3.selectAll('.plot-container').data([0]);
Expand Down Expand Up @@ -3856,6 +3868,8 @@ function makePlotFramework(gd) {
.style('top', '0px')
.style('right', '0px');

fullLayout._lastBBox = gd.getBoundingClientRect();

gd.emit('plotly_framework');
}

Expand Down
1 change: 1 addition & 0 deletions src/plots/cartesian/dragbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
x0 = startX - dragBBox.left;
y0 = startY - dragBBox.top;

gd._fullLayout._calcInverseTransform(gd);
var transformedCoords = Lib.apply3DTransform(gd._fullLayout._inverseTransform)(x0, y0);
x0 = transformedCoords[0];
y0 = transformedCoords[1];
Expand Down
1 change: 1 addition & 0 deletions src/plots/cartesian/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ function prepSelect(e, startX, startY, dragOptions, mode) {
var x0 = startX - dragBBox.left;
var y0 = startY - dragBBox.top;

fullLayout._calcInverseTransform(gd);
var transformedCoords = Lib.apply3DTransform(fullLayout._inverseTransform)(x0, y0);
x0 = transformedCoords[0];
y0 = transformedCoords[1];
Expand Down
8 changes: 6 additions & 2 deletions src/plots/polar/polar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,8 @@ proto.updateMainDrag = function(fullLayout) {
var chw = constants.cornerHalfWidth;
var chl = constants.cornerLen / 2;

var scaleX = gd._fullLayout._inverseScaleX;
var scaleY = gd._fullLayout._inverseScaleY;
var scaleX;
var scaleY;

var mainDrag = dragBox.makeDragger(layers, 'path', 'maindrag', 'crosshair');

Expand Down Expand Up @@ -943,7 +943,10 @@ proto.updateMainDrag = function(fullLayout) {
var dragModeNow = gd._fullLayout.dragmode;

var bbox = mainDrag.getBoundingClientRect();
gd._fullLayout._calcInverseTransform(gd);
var inverse = gd._fullLayout._inverseTransform;
scaleX = gd._fullLayout._inverseScaleX;
scaleY = gd._fullLayout._inverseScaleY;
var transformedCoords = Lib.apply3DTransform(inverse)(startX - bbox.left, startY - bbox.top);
x0 = transformedCoords[0];
y0 = transformedCoords[1];
Expand Down Expand Up @@ -1293,6 +1296,7 @@ proto.updateAngularDrag = function(fullLayout) {
x0 = startX - bbox.left;
y0 = startY - bbox.top;

gd._fullLayout._calcInverseTransform(gd);
var transformedCoords = Lib.apply3DTransform(fullLayout._inverseTransform)(x0, y0);
x0 = transformedCoords[0];
y0 = transformedCoords[1];
Expand Down
1 change: 1 addition & 0 deletions src/plots/ternary/ternary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@ proto.initInteractions = function() {
var inverse = gd._fullLayout._inverseTransform;
x0 = startX - dragBBox.left;
y0 = startY - dragBBox.top;
gd._fullLayout._calcInverseTransform(gd);
var transformedCoords = Lib.apply3DTransform(inverse)(x0, y0);
x0 = transformedCoords[0];
y0 = transformedCoords[1];
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/cartesian_interact_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2519,8 +2519,8 @@ describe('Cartesian plots with css transforms', function() {
var start = [50, 50];
var end = [150, 150];

transformPlot(gd, transform);
Plotly.newPlot(gd, Lib.extendDeep({}, mock))
.then(function() { transformPlot(gd, transform); })
.then(function() {_drag(start, end); })
.then(function() {
_assertTransformedZoombox(start, end);
Expand Down
13 changes: 8 additions & 5 deletions test/jasmine/tests/choropleth_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,6 @@ describe('Test choropleth hover:', function() {
function run(hasCssTransform, pos, fig, content, style) {
gd = createGraphDiv();
var scale = 1;
if(hasCssTransform) {
scale = 0.5;
transformPlot(gd, 'translate(-25%, -25%) scale(0.5)');
}

style = style || {
bgcolor: 'rgb(68, 68, 68)',
Expand All @@ -180,7 +176,14 @@ describe('Test choropleth hover:', function() {
fontFamily: 'Arial'
};

return Plotly.plot(gd, fig).then(function() {
return Plotly.plot(gd, fig)
.then(function() {
if(hasCssTransform) {
scale = 0.5;
transformPlot(gd, 'translate(-25%, -25%) scale(0.5)');
}
})
.then(function() {
mouseEvent('mousemove', scale * pos[0], scale * pos[1]);
assertHoverLabelContent({
nums: content[0],
Expand Down
Loading