@douyinfe/semi-foundation 2.50.0-beta.0 → 2.50.0

package/image/previewImageFoundation.ts

@@ -86,7 +86,9 @@ export default class PreviewImageFoundation<P = Record<string, any>, S = Record<
             this.setState({
                 loading: false,
             } as any);
-            this.handleResizeImage();
+            // 图片初次加载，计算 zoom，zoom 改变不需要通过回调透出
+            // When the image is loaded for the first time, zoom is calculated, and zoom changes do not need to be exposed through callbacks.
+            this.handleResizeImage(false);
         }
         const { src, onLoad } = this.getProps();
         onLoad && onLoad(src);
@@ -100,7 +102,7 @@ export default class PreviewImageFoundation<P = Record<string, any>, S = Record<
         onError && onError(src);
     }
 
-    handleResizeImage = () => {
+    handleResizeImage = (notify: boolean = true) => {
         const horizontal = !this._isImageVertical();
         const { currZoom } = this.getStates();
         const imgWidth = horizontal ? this.originImageWidth : this.originImageHeight;
@@ -120,7 +122,7 @@ export default class PreviewImageFoundation<P = Record<string, any>, S = Record<
             if (currZoom === _zoom) {
                 this.calculatePreviewImage(_zoom, null);
             } else {
-                onZoom(_zoom);
+                onZoom(_zoom, notify);
             }
         }
     }

package/image/previewInnerFoundation.ts

@@ -166,7 +166,6 @@ export default class PreviewInnerFoundation<P = Record<string, any>, S = Record<
             direction,
             rotation: 0,
         } as any);
-        this._adapter.notifyRotateChange(0);
     }
 
     handleDownload = () => {
@@ -199,10 +198,10 @@ export default class PreviewInnerFoundation<P = Record<string, any>, S = Record<
         this._adapter.notifyRotateChange(newRotation);
     }
 
-    handleZoomImage = (newZoom: number) => {
+    handleZoomImage = (newZoom: number, notify: boolean = true) => {
         const { zoom } = this.getStates();
         if (zoom !== newZoom) {
-            this._adapter.notifyZoom(newZoom, newZoom > zoom);
+            notify && this._adapter.notifyZoom(newZoom, newZoom > zoom);
             this.setState({
                 zoom: newZoom,
             } as any);

package/lib/cjs/image/previewImageFoundation.d.ts

@@ -33,7 +33,7 @@ export default class PreviewImageFoundation<P = Record<string, any>, S = Record<
     handleWindowResize: () => void;
     handleLoad: (e: any) => void;
     handleError: (e: any) => void;
-    handleResizeImage: () => void;
+    handleResizeImage: (notify?: boolean) => void;
     handleRatioChange: () => void;
     handleRightClickImage: (e: any) => boolean;
     calcCanDragDirection: () => DragDirection;

package/lib/cjs/image/previewImageFoundation.js

@@ -19,7 +19,9 @@ const DefaultDOMRect = {
 };
 class PreviewImageFoundation extends _foundation.default {
   constructor(adapter) {
+    var _this;
     super(Object.assign({}, adapter));
+    _this = this;
     this.startMouseOffset = {
       x: 0,
       y: 0
@@ -70,7 +72,9 @@ class PreviewImageFoundation extends _foundation.default {
         this.setState({
           loading: false
         });
-        this.handleResizeImage();
+        // 图片初次加载，计算 zoom，zoom 改变不需要通过回调透出
+        // When the image is loaded for the first time, zoom is calculated, and zoom changes do not need to be exposed through callbacks.
+        this.handleResizeImage(false);
       }
       const {
         src,
@@ -88,24 +92,25 @@ class PreviewImageFoundation extends _foundation.default {
       });
       onError && onError(src);
     };
-    this.handleResizeImage = () => {
-      const horizontal = !this._isImageVertical();
+    this.handleResizeImage = function () {
+      let notify = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      const horizontal = !_this._isImageVertical();
       const {
         currZoom
-      } = this.getStates();
-      const imgWidth = horizontal ? this.originImageWidth : this.originImageHeight;
-      const imgHeight = horizontal ? this.originImageHeight : this.originImageWidth;
+      } = _this.getStates();
+      const imgWidth = horizontal ? _this.originImageWidth : _this.originImageHeight;
+      const imgHeight = horizontal ? _this.originImageHeight : _this.originImageWidth;
       const {
         onZoom,
         setRatio,
         ratio
-      } = this.getProps();
-      const containerDOM = this._adapter.getContainer();
+      } = _this.getProps();
+      const containerDOM = _this._adapter.getContainer();
       if (containerDOM) {
         const {
           width: containerWidth,
           height: containerHeight
-        } = this._getContainerBounds();
+        } = _this._getContainerBounds();
         const reservedWidth = containerWidth - 80;
         const reservedHeight = containerHeight - 80;
         let _zoom = 1;
@@ -113,9 +118,9 @@ class PreviewImageFoundation extends _foundation.default {
           _zoom = Number(Math.min(reservedWidth / imgWidth, reservedHeight / imgHeight).toFixed(2));
         }
         if (currZoom === _zoom) {
-          this.calculatePreviewImage(_zoom, null);
+          _this.calculatePreviewImage(_zoom, null);
         } else {
-          onZoom(_zoom);
+          onZoom(_zoom, notify);
         }
       }
     };

package/lib/cjs/image/previewInnerFoundation.d.ts

@@ -41,7 +41,7 @@ export default class PreviewInnerFoundation<P = Record<string, any>, S = Record<
     handlePreviewClose: () => void;
     handleAdjustRatio: (type: RatioType) => void;
     handleRotateImage: (direction: string) => void;
-    handleZoomImage: (newZoom: number) => void;
+    handleZoomImage: (newZoom: number, notify?: boolean) => void;
     preloadGapImage: () => void;
     preloadSingleImage: () => void;
     setLoadSuccessStatus: (src: string) => void;

package/lib/cjs/image/previewInnerFoundation.js

@@ -15,7 +15,9 @@ const NOT_CLOSE_TARGETS = ["icon", "footer"];
 const STOP_CLOSE_TARGET = ["icon", "footer", "header"];
 class PreviewInnerFoundation extends _foundation.default {
   constructor(adapter) {
+    var _this;
     super(Object.assign({}, adapter));
+    _this = this;
     this._timer = null;
     this._startMouseDown = {
       x: 0,
@@ -162,7 +164,6 @@ class PreviewInnerFoundation extends _foundation.default {
         direction,
         rotation: 0
       });
-      this._adapter.notifyRotateChange(0);
     };
     this.handleDownload = () => {
       const {
@@ -195,13 +196,14 @@ class PreviewInnerFoundation extends _foundation.default {
       });
       this._adapter.notifyRotateChange(newRotation);
     };
-    this.handleZoomImage = newZoom => {
+    this.handleZoomImage = function (newZoom) {
+      let notify = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       const {
         zoom
-      } = this.getStates();
+      } = _this.getStates();
       if (zoom !== newZoom) {
-        this._adapter.notifyZoom(newZoom, newZoom > zoom);
-        this.setState({
+        notify && _this._adapter.notifyZoom(newZoom, newZoom > zoom);
+        _this.setState({
           zoom: newZoom
         });
       }

package/lib/es/image/previewImageFoundation.d.ts

@@ -33,7 +33,7 @@ export default class PreviewImageFoundation<P = Record<string, any>, S = Record<
     handleWindowResize: () => void;
     handleLoad: (e: any) => void;
     handleError: (e: any) => void;
-    handleResizeImage: () => void;
+    handleResizeImage: (notify?: boolean) => void;
     handleRatioChange: () => void;
     handleRightClickImage: (e: any) => boolean;
     calcCanDragDirection: () => DragDirection;

package/lib/es/image/previewImageFoundation.js

@@ -12,7 +12,9 @@ const DefaultDOMRect = {
 };
 export default class PreviewImageFoundation extends BaseFoundation {
   constructor(adapter) {
+    var _this;
     super(Object.assign({}, adapter));
+    _this = this;
     this.startMouseOffset = {
       x: 0,
       y: 0
@@ -63,7 +65,9 @@ export default class PreviewImageFoundation extends BaseFoundation {
         this.setState({
           loading: false
         });
-        this.handleResizeImage();
+        // 图片初次加载，计算 zoom，zoom 改变不需要通过回调透出
+        // When the image is loaded for the first time, zoom is calculated, and zoom changes do not need to be exposed through callbacks.
+        this.handleResizeImage(false);
       }
       const {
         src,
@@ -81,24 +85,25 @@ export default class PreviewImageFoundation extends BaseFoundation {
       });
       onError && onError(src);
     };
-    this.handleResizeImage = () => {
-      const horizontal = !this._isImageVertical();
+    this.handleResizeImage = function () {
+      let notify = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      const horizontal = !_this._isImageVertical();
       const {
         currZoom
-      } = this.getStates();
-      const imgWidth = horizontal ? this.originImageWidth : this.originImageHeight;
-      const imgHeight = horizontal ? this.originImageHeight : this.originImageWidth;
+      } = _this.getStates();
+      const imgWidth = horizontal ? _this.originImageWidth : _this.originImageHeight;
+      const imgHeight = horizontal ? _this.originImageHeight : _this.originImageWidth;
       const {
         onZoom,
         setRatio,
         ratio
-      } = this.getProps();
-      const containerDOM = this._adapter.getContainer();
+      } = _this.getProps();
+      const containerDOM = _this._adapter.getContainer();
       if (containerDOM) {
         const {
           width: containerWidth,
           height: containerHeight
-        } = this._getContainerBounds();
+        } = _this._getContainerBounds();
         const reservedWidth = containerWidth - 80;
         const reservedHeight = containerHeight - 80;
         let _zoom = 1;
@@ -106,9 +111,9 @@ export default class PreviewImageFoundation extends BaseFoundation {
           _zoom = Number(Math.min(reservedWidth / imgWidth, reservedHeight / imgHeight).toFixed(2));
         }
         if (currZoom === _zoom) {
-          this.calculatePreviewImage(_zoom, null);
+          _this.calculatePreviewImage(_zoom, null);
         } else {
-          onZoom(_zoom);
+          onZoom(_zoom, notify);
         }
       }
     };

package/lib/es/image/previewInnerFoundation.d.ts

@@ -41,7 +41,7 @@ export default class PreviewInnerFoundation<P = Record<string, any>, S = Record<
     handlePreviewClose: () => void;
     handleAdjustRatio: (type: RatioType) => void;
     handleRotateImage: (direction: string) => void;
-    handleZoomImage: (newZoom: number) => void;
+    handleZoomImage: (newZoom: number, notify?: boolean) => void;
     preloadGapImage: () => void;
     preloadSingleImage: () => void;
     setLoadSuccessStatus: (src: string) => void;

package/lib/es/image/previewInnerFoundation.js

@@ -8,7 +8,9 @@ const NOT_CLOSE_TARGETS = ["icon", "footer"];
 const STOP_CLOSE_TARGET = ["icon", "footer", "header"];
 export default class PreviewInnerFoundation extends BaseFoundation {
   constructor(adapter) {
+    var _this;
     super(Object.assign({}, adapter));
+    _this = this;
     this._timer = null;
     this._startMouseDown = {
       x: 0,
@@ -155,7 +157,6 @@ export default class PreviewInnerFoundation extends BaseFoundation {
         direction,
         rotation: 0
       });
-      this._adapter.notifyRotateChange(0);
     };
     this.handleDownload = () => {
       const {
@@ -188,13 +189,14 @@ export default class PreviewInnerFoundation extends BaseFoundation {
       });
       this._adapter.notifyRotateChange(newRotation);
     };
-    this.handleZoomImage = newZoom => {
+    this.handleZoomImage = function (newZoom) {
+      let notify = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       const {
         zoom
-      } = this.getStates();
+      } = _this.getStates();
       if (zoom !== newZoom) {
-        this._adapter.notifyZoom(newZoom, newZoom > zoom);
-        this.setState({
+        notify && _this._adapter.notifyZoom(newZoom, newZoom > zoom);
+        _this.setState({
           zoom: newZoom
         });
       }

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.50.0-beta.0",
+    "version": "2.50.0",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.50.0-beta.0",
+        "@douyinfe/semi-animation": "2.50.0",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.29.3",
@@ -23,7 +23,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "d40aee69f15db9a5dc64cc6bc04ad39bfffc1621",
+    "gitHead": "4f5ca71f4a992aaadf6c637d8a798ba18c0af740",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",