@mpxjs/webpack-plugin 2.10.14-beta.10 → 2.10.14-beta.12

package/lib/runtime/components/react/dist/mpx-input.jsx

@@ -158,12 +158,12 @@ const Input = forwardRef((props, ref) => {
         if (!keyboardAvoid?.current) {
             setKeyboardAvoidContext();
         }
-        if (bindfocus && keyboardAvoid?.current) {
+        if (keyboardAvoid?.current) {
             const focusAction = () => {
-                bindfocus(getCustomEvent('focus', evt, {
+                bindfocus?.(getCustomEvent('focus', evt, {
                     detail: {
                         value: tmpValue.current || '',
-                        height: keyboardAvoid.current?.keyboardHeight,
+                        height: keyboardAvoid.current?.keyboardHeight
                     },
                     layoutRef
                 }, props));

package/lib/runtime/components/react/dist/mpx-keyboard-avoiding-view.jsx

@@ -32,7 +32,9 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
                 // 修复 Android 点击键盘收起按钮时当前 input 没触发失焦的问题
                 inputRef.blur();
             }
-            keyboardAvoid.current = null;
+            if (!keyboardAvoid.current.onKeyboardShow) {
+                keyboardAvoid.current = null;
+            }
         }
         cancelAnimation(offset);
         offset.value = withTiming(0, { duration, easing });

package/lib/runtime/components/react/dist/mpx-view.jsx

@@ -203,7 +203,7 @@ function backgroundSize(imageProps, preImageInfo, imageSize, layoutInfo) {
         else { // 数值类型      ImageStyle
             // 数值类型设置为 stretch
             imageProps.resizeMode = 'stretch';
-            if (type === 'linear' && (!layoutWidth || !layoutHeight)) {
+            if (type === 'linear' && (!layoutWidth || !layoutHeight) && isNeedLayout(preImageInfo)) {
                 // ios 上 linear 组件只要重新触发渲染，在渲染过程中外层容器 width 或者 height 被设置为 0，通过设置 % 的方式会渲染不出来，即使后面再更新为正常宽高也渲染不出来
                 // 所以 hack 手动先将 linear 宽高也设置为 0，后面再更新为正确的数值或 %。
                 dimensions = {
@@ -212,6 +212,7 @@ function backgroundSize(imageProps, preImageInfo, imageSize, layoutInfo) {
                 };
             }
             else {
+                // background-size 手动设置具体值，不会触发 onLayout，需要走这里的逻辑
                 dimensions = {
                     width: isPercent(width) ? width : +width,
                     height: isPercent(height) ? height : +height

package/lib/runtime/components/react/mpx-input.tsx

@@ -301,16 +301,16 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
       setKeyboardAvoidContext()
     }
 
-    if (bindfocus && keyboardAvoid?.current) {
+    if (keyboardAvoid?.current) {
       const focusAction = () => {
-        bindfocus(
+        bindfocus?.(
           getCustomEvent(
             'focus',
             evt,
             {
               detail: {
                 value: tmpValue.current || '',
-                height: keyboardAvoid.current?.keyboardHeight,
+                height: keyboardAvoid.current?.keyboardHeight
               },
               layoutRef
             },

package/lib/runtime/components/react/mpx-keyboard-avoiding-view.tsx

@@ -45,7 +45,9 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }: Keyboa
         // 修复 Android 点击键盘收起按钮时当前 input 没触发失焦的问题
         inputRef.blur()
       }
-      keyboardAvoid.current = null
+      if (!keyboardAvoid.current.onKeyboardShow) {
+        keyboardAvoid.current = null
+      }
     }
 
     cancelAnimation(offset)

package/lib/runtime/components/react/mpx-view.tsx

@@ -287,7 +287,7 @@ function backgroundSize (imageProps: ImageProps, preImageInfo: PreImageInfo, ima
     } else { // 数值类型      ImageStyle
       // 数值类型设置为 stretch
       imageProps.resizeMode = 'stretch'
-      if (type === 'linear' && (!layoutWidth || !layoutHeight)) {
+      if (type === 'linear' && (!layoutWidth || !layoutHeight) && isNeedLayout(preImageInfo)) {
         // ios 上 linear 组件只要重新触发渲染，在渲染过程中外层容器 width 或者 height 被设置为 0，通过设置 % 的方式会渲染不出来，即使后面再更新为正常宽高也渲染不出来
         // 所以 hack 手动先将 linear 宽高也设置为 0，后面再更新为正确的数值或 %。
         dimensions = {
@@ -295,6 +295,7 @@ function backgroundSize (imageProps: ImageProps, preImageInfo: PreImageInfo, ima
           height: 0
         } as { width: NumberVal, height: NumberVal }
       } else {
+        // background-size 手动设置具体值，不会触发 onLayout，需要走这里的逻辑
         dimensions = {
           width: isPercent(width) ? width : +width,
           height: isPercent(height) ? height : +height

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.14-beta.10",
+  "version": "2.10.14-beta.12",
   "description": "mpx compile core",
   "keywords": [
     "mpx"