archive-gh-me/react-viewer
1
0
Fork 0
mirror of https://github.com/infeng/react-viewer.git synced 2025-12-08 17:36:40 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
infeng 2016-10-22 14:07:16 +08:00
parent 457c7f5abc
commit 1e90c401b0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ViewerCore.tsx
View File

@ -89,7 +89,7 @@ export default class ViewerCore extends React.Component<ViewerProps, ViewerCoreS
this.props.onClose();
}
startVisible() {
startVisible(activeIndex: number) {
this.setState({
visibleStart: true,
});
@ -99,13 +99,13 @@ export default class ViewerCore extends React.Component<ViewerProps, ViewerCoreS
});
setTimeout(() => {
this.bindEvent();
this.loadImg(this.state.activeIndex, true);
this.loadImg(activeIndex, true);
}, 300);
}, 10);
}
componentDidMount() {
this.startVisible();
this.startVisible(this.state.activeIndex);
}
getImgWidthHeight(imgWidth, imgHeight) {
@ -113,10 +113,10 @@ export default class ViewerCore extends React.Component<ViewerProps, ViewerCoreS
let height = 0;
let aspectRatio = imgWidth / imgHeight;
if (aspectRatio > 1) {
width = Math.min(this.containerWidth * .9, imgWidth);
width = Math.min(this.containerWidth * .8, imgWidth);
height = (width / imgWidth) * imgHeight;
}else {
height = Math.min((this.containerWidth - this.footerHeight) * .8, imgHeight);
height = Math.min((this.containerHeight - this.footerHeight) * .8, imgHeight);
width = (height / imgHeight) * imgWidth;
}
return [width, height];
@ -364,7 +364,7 @@ export default class ViewerCore extends React.Component<ViewerProps, ViewerCoreS
componentWillReceiveProps(nextProps: ViewerProps) {
if (!this.props.visible && nextProps.visible) {
this.startVisible();
this.startVisible(nextProps.activeIndex);
return;
}
if (this.props.visible && !nextProps.visible) {