Skip to content

Zoom to fit #181

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

Open
philn wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Zoom to fit #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c97e913
Add zoomToFit feature
ystreibel Nov 13, 2019
b133efb
Fix zoomToFit feature
philn Mar 24, 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 index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ declare module "panzoom" {
scale: number;
};
showRectangle: (rect: ClientRect) => void;
zoomToFit: (ui: any) => void;
pause: () => void;
resume: () => void;
isPaused: () => boolean;
Expand Down
66 changes: 43 additions & 23 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ function createPanZoom(domElement, options) {
smoothZoom: smoothZoom,
smoothZoomAbs: smoothZoomAbs,
showRectangle: showRectangle,
zoomToFit: zoomToFit,

pause: pause,
resume: resume,
Expand Down Expand Up @@ -418,43 +419,62 @@ function createPanZoom(domElement, options) {
zoomByRatio(clientX, clientY, ratio);
}

function centerOn(ui) {
var parent = ui.ownerSVGElement;
if (!parent)
throw new Error('ui element is required to be within the scene');

function centerOn(smooth) {
Copy link
Owner

@anvaka anvaka Mar 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original idea of this method was for SVG elements, that would allow clients to center on a specific element of the scene.

As the library grew this become a bit obsolete in the context of WebGL/DOM scenes (which are also supported by the library).

May I propose to keep the API, but delegate the center inference to the controller? For example, svgController API could have a method that takes the UI element and returns cx/cy, while domController does the same for the DOM nodes?

I interpret this change as a desire to zoom into the center of the actual container, right?

Copy link

@ystreibel ystreibel Oct 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, right.

// TODO: should i use controller's screen CTM?
var clientRect = ui.getBoundingClientRect();
var clientRect = owner.getBoundingClientRect();
var cx = clientRect.left + clientRect.width / 2;
var cy = clientRect.top + clientRect.height / 2;

var parent = owner.parentElement.parentElement;
var container = parent.getBoundingClientRect();
var dx = container.width / 2 - cx;
var dy = container.height / 2 - cy;

internalMoveBy(dx, dy, true);
internalMoveBy(dx, dy, smooth);
}

function internalMoveBy(dx, dy, smooth) {
if (!smooth) {
return moveBy(dx, dy);
}
function zoomToFit(smooth) {
// TODO: should i use controller's screen CTM?
var clientRect = owner.getBoundingClientRect();
var cx = clientRect.left + clientRect.width/2;
var cy = clientRect.top + clientRect.height/2;

if (moveByAnimation) moveByAnimation.cancel();
var parent = owner.parentElement.parentElement;
Copy link
Owner

@anvaka anvaka Mar 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not following this. Why are we fetching parentElement.parentElement? Any way to avoid it?

Same applies to the use in the centerOn() method

var container = parent.getBoundingClientRect();
var dx = container.width/2 - cx;
var dy = container.height/2 - cy;

var from = { x: 0, y: 0 };
var to = { x: dx, y: dy };
var lastX = 0;
var lastY = 0;
var wx = window.innerWidth / 2;
var wy = window.innerHeight / 2;
Comment on lines +447 to +448
Copy link
Owner

@anvaka anvaka Mar 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem right for the cases when container is smaller than the window


moveByAnimation = animate(from, to, {
step: function (v) {
moveBy(v.x - lastX, v.y - lastY);
var fitRatio = Math.min(wx / (clientRect.width / 2), wy / (clientRect.height / 2));

lastX = v.x;
lastY = v.y;
}
});
internalMoveBy(dx, dy, smooth, () => {smoothZoom(wx , wy, fitRatio);});
}

function internalMoveBy(dx, dy, smooth, done) {
if (!smooth) {
moveBy(dx, dy);
if (done !== undefined)
done();
} else {
if (moveByAnimation) moveByAnimation.cancel();

var from = { x: 0, y: 0 };
var to = { x: dx, y : dy };
var lastX = 0;
var lastY = 0;

moveByAnimation = animate(from, to, {
step: function(v) {
moveBy(v.x - lastX, v.y - lastY);

lastX = v.x;
lastY = v.y;
},
done: done
});
}
}

function scroll(x, y) {
Expand Down