Merge pull request #2562 from didi/fix/rn-svg-image-extra-render

Fix/rn svg image extra render

Author: hiyuki

packages/webpack-plugin/lib/runtime/components/react/mpx-image.tsx

@@ -272,6 +272,24 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
     }
   }
 
+  function updateImageSize (width: number, height: number) {
+    state.current.imageWidth = width
+    state.current.imageHeight = height
+    state.current.ratio = !width ? 0 : height / width
+
+    if (isWidthFixMode
+      ? state.current.viewWidth
+      : isHeightFixMode
+        ? state.current.viewHeight
+        : state.current.viewWidth && state.current.viewHeight) {
+      setRatio(state.current.ratio)
+      setImageWidth(width)
+      setImageHeight(height)
+      setViewSize(state.current.viewWidth!, state.current.viewHeight!, state.current.ratio)
+      setLoaded(true)
+    }
+  }
+
   const modeStyle: ImageStyle = useMemo(() => {
     if (noMeetCalcRule(isSvg, mode, viewWidth, viewHeight, ratio)) return {}
     switch (mode) {
@@ -370,21 +388,7 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
 
   const onSvgLoad = (evt: LayoutChangeEvent) => {
     const { width, height } = evt.nativeEvent.layout
-    state.current.imageHeight = height
-    setImageHeight(height)
-    state.current.ratio = !width ? 0 : height / width
-
-    if (isWidthFixMode
-      ? state.current.viewWidth
-      : isHeightFixMode
-        ? state.current.viewHeight
-        : state.current.viewWidth && state.current.viewHeight) {
-      setRatio(state.current.ratio)
-      setImageWidth(width)
-      setImageHeight(height)
-      setViewSize(state.current.viewWidth!, state.current.viewHeight!, state.current.ratio)
-      setLoaded(true)
-    }
+    updateImageSize(width, height)
 
     bindload && bindload(
       getCustomEvent(
@@ -455,22 +459,7 @@ const Image = forwardRef<HandlerRef<RNImage, ImageProps>, ImageProps>((props, re
       getImageSize(
         src,
         (width: number, height: number) => {
-          state.current.imageWidth = width
-          state.current.imageHeight = height
-          state.current.ratio = !width ? 0 : height / width
-
-          if (isWidthFixMode
-            ? state.current.viewWidth
-            : isHeightFixMode
-              ? state.current.viewHeight
-              : state.current.viewWidth && state.current.viewHeight) {
-            setRatio(state.current.ratio)
-            setImageWidth(width)
-            setImageHeight(height)
-            setViewSize(state.current.viewWidth!, state.current.viewHeight!, state.current.ratio!)
-
-            setLoaded(true)
-          }
+          updateImageSize(width, height)
         },
         () => {
           setLoaded(true)