From c506ff39e98566f33e60fb4501ac75a04af3467e Mon Sep 17 00:00:00 2001
From: infeng <fzhihao@outlook.com>
Date: Wed, 12 Dec 2018 10:19:10 +0800
Subject: [PATCH] refactor: resize behavior

---
 src/ViewerCore.tsx | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/ViewerCore.tsx b/src/ViewerCore.tsx
index 64ae271..cc1e10c 100644
--- a/src/ViewerCore.tsx
+++ b/src/ViewerCore.tsx
@@ -138,6 +138,10 @@ export default class ViewerCore extends React.Component<ViewerProps, ViewerCoreS
       height = maxHeight;
       width = height / imgHeight * imgWidth;
     }
+    if (this.props.noLimitInitializationSize) {
+      width = imgWidth;
+      height = imgHeight;
+    }
     return [width, height];
   }
 
@@ -152,16 +156,7 @@ export default class ViewerCore extends React.Component<ViewerProps, ViewerCoreS
       realImgWidth = activeImage.defaultSize.width;
       realImgHeight = activeImage.defaultSize.height;
     }
-    let width = null;
-    let height = null;
-    if (this.props.noLimitInitializationSize) {
-      width = realImgWidth;
-      height = realImgHeight;
-    } else {
-      const imgSize = this.getImgWidthHeight(realImgWidth, realImgHeight);
-      width = imgSize[0];
-      height = imgSize[1];
-    }
+    let [ width, height ] = this.getImgWidthHeight(realImgWidth, realImgHeight);
     width *= this.props.defaultScale;
     height *= this.props.defaultScale;
     let left = (this.containerWidth - width) / 2;
@@ -384,17 +379,11 @@ export default class ViewerCore extends React.Component<ViewerProps, ViewerCoreS
   handleResize = () => {
     this.setContainerWidthHeight();
     if (this.props.visible) {
-      const [width, height] = this.getImgWidthHeight(this.state.imageWidth, this.state.imageHeight);
-      let left = (this.containerWidth - width) / 2;
-      let top = (this.containerHeight - height - this.footerHeight) / 2;
+      let left = (this.containerWidth - this.state.width) / 2;
+      let top = (this.containerHeight - this.state.height - this.footerHeight) / 2;
       this.setState({
-        width: width,
-        height: height,
         left: left,
         top: top,
-        rotate: 0,
-        scaleX: 1,
-        scaleY: 1,
       });
     }
   }