Skip to content
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

Make ImageView zoom scale dynamic with window size #6599

Closed
wants to merge 3 commits into from
Closed

Make ImageView zoom scale dynamic with window size #6599

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e4b393
Get rid of unnecessary ternary
roryabraham Dec 6, 2021
7d85a38
Re-measure image region when window resizes
roryabraham Dec 6, 2021
2e8df19
Use early return
roryabraham Dec 6, 2021
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
23 changes: 16 additions & 7 deletions src/components/ImageView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,21 @@ class ImageView extends PureComponent {
return;
}
Image.getSize(this.props.url, (width, height) => {
this.setImageRegion(width, height);
this.imageWidth = width;
this.imageHeight = height;
this.setImageRegion(this.imageWidth, this.imageHeight);
});
document.addEventListener('mousemove', this.trackMovement.bind(this));
}

componentDidUpdate(prevProps) {
if (prevProps.widthWidth === this.props.windowWidth && prevProps.windowHeight === this.props.windowHeight) {
return;
}

this.setImageRegion(this.imageWidth, this.imageHeight);
}

componentWillUnmount() {
if (this.canUseTouchScreen) {
return;
Expand All @@ -59,8 +69,8 @@ class ImageView extends PureComponent {

/**
* When open image, set image left/right/top/bottom point and width, height
* @param {Boolean} width image width
* @param {Boolean} height image height
* @param {Number} width image width
* @param {Number} height image height
*/
setImageRegion(width, height) {
let imgLeft = (this.props.windowWidth - width) / 2;
Expand All @@ -86,10 +96,9 @@ class ImageView extends PureComponent {
imgRight = imgLeft + (fitRate * width);
}

const newZoomScale = Math.min(this.state.containerWidth / width, this.state.containerHeight / height);
this.setState(prevState => ({
imgWidth: width,
zoomScale: prevState.zoomScale === 0 ? newZoomScale : prevState.zoomScale,
zoomScale: Math.min(prevState.containerWidth / width, prevState.containerHeight / height),
imgHeight: height,
imageLeft: imgLeft,
imageTop: imgTop,
Expand All @@ -100,8 +109,8 @@ class ImageView extends PureComponent {

/**
* Convert touch point to zoomed point
* @param {Boolean} x x point when click zoom
* @param {Boolean} y y point when click zoom
* @param {Number} x x point when click zoom
* @param {Number} y y point when click zoom
* @returns {Object} converted touch point
*/
getScrollOffset(x, y) {
Expand Down