@mpxjs/webpack-plugin 2.10.17-beta.11 → 2.10.17-beta.12

package/lib/global.d.ts

@@ -11,6 +11,20 @@ declare module 'webpack' {
 }
 
 declare global {
+    interface MpxWebpackPluginOptions {
+    style: {
+      cssCondition?: {
+        before?: boolean
+        after?: boolean
+        beforeExclude?: (string | RegExp)[]
+        afterExclude?: (string | RegExp)[]
+        legacy?: boolean
+        afterLegacy?: boolean
+        beforeLegacy?: boolean
+      }
+    }
+  }
+
   type MpxLoaderContext<T> = webpack.LoaderContext<T> & {
     getMpx(): MpxContext
   }

package/lib/index.js

@@ -1,6 +1,5 @@
 'use strict'
 
-require('./init')
 const path = require('path')
 const { ConcatSource, RawSource } = require('webpack').sources
 const ResolveDependency = require('./dependencies/ResolveDependency')
@@ -59,6 +58,7 @@ const wxssLoaderPath = normalize.lib('wxss/index')
 const wxmlLoaderPath = normalize.lib('wxml/loader')
 const wxsLoaderPath = normalize.lib('wxs/loader')
 const styleCompilerPath = normalize.lib('style-compiler/index')
+const styleStripConditionalPath = normalize.lib('style-compiler/strip-conditional-loader')
 const templateCompilerPath = normalize.lib('template-compiler/index')
 const jsonCompilerPath = normalize.lib('json-compiler/index')
 const jsonThemeCompilerPath = normalize.lib('json-compiler/theme')
@@ -79,7 +79,8 @@ const LoadAsyncChunkModule = require('./react/LoadAsyncChunkModule')
 const ExternalModule = require('webpack/lib/ExternalModule')
 const { RetryRuntimeModule, RetryRuntimeGlobal } = require('./dependencies/RetryRuntimeModule')
 const checkVersionCompatibility = require('./utils/check-core-version-match')
-const { startFSStripForCss, registerStripCompilation } = require('./style-compiler/strip-conditional')
+const { rewriteFSForCss, startFSStripForCss } = require('./style-compiler/strip-conditional-loader')
+rewriteFSForCss()
 checkVersionCompatibility()
 
 const isProductionLikeMode = options => {
@@ -716,7 +717,6 @@ class MpxWebpackPlugin {
     })
 
     compiler.hooks.thisCompilation.tap('MpxWebpackPlugin', (compilation, { normalModuleFactory }) => {
-      registerStripCompilation(compilation)
       compilation.warnings.push(...warnings)
       compilation.errors.push(...errors)
       const moduleGraph = compilation.moduleGraph
@@ -1934,9 +1934,42 @@ try {
       normalModuleFactory.hooks.afterResolve.tap('MpxWebpackPlugin', ({ createData }) => {
         const { queryObj } = parseRequest(createData.request)
         const loaders = createData.loaders
+
+        // 样式 loader 类型检测和条件编译 loader 插入的工具函数
+        const STYLE_LOADER_TYPES = ['stylus-loader', 'sass-loader', 'less-loader', 'css-loader', wxssLoaderPath]
+        const injectStyleStripLoader = (loaders) => {
+          // 检查是否已经存在 stripLoader
+          const hasStripLoader = loaders.some(loader => {
+            const loaderPath = toPosix(loader.loader)
+            return loaderPath.includes('style-compiler/strip-conditional-loader')
+          })
+          if (hasStripLoader) {
+            return
+          }
+          const loaderTypes = new Map(STYLE_LOADER_TYPES.map(type => [`node_modules/${type}`, -1]))
+          loaders.forEach((loader, index) => {
+            const currentLoader = toPosix(loader.loader)
+            for (const [key] of loaderTypes) {
+              if (currentLoader.includes(key)) {
+                loaderTypes.set(key, index)
+                break
+              }
+            }
+          })
+          const targetIndex = STYLE_LOADER_TYPES
+            .map(type => loaderTypes.get(`node_modules/${type}`))
+            .find(index => index !== -1)
+
+          if (targetIndex !== undefined) {
+            loaders.splice(targetIndex + 1, 0, { loader: styleStripConditionalPath })
+          }
+        }
         if (queryObj.mpx && queryObj.mpx !== MPX_PROCESSED_FLAG) {
           const type = queryObj.type
           const extract = queryObj.extract
+          if (type === 'styles') {
+            injectStyleStripLoader(loaders)
+          }
 
           switch (type) {
             case 'styles':
@@ -1989,6 +2022,7 @@ try {
         }
         // mpxStyleOptions 为 mpx style 文件的标识，避免 Vue 文件插入 styleCompiler 后导致 vue scoped 样式隔离失效
         if (isWeb(mpx.mode) && queryObj.mpxStyleOptions) {
+          injectStyleStripLoader(loaders)
           const firstLoader = loaders[0] ? toPosix(loaders[0].loader) : ''
           const isPitcherRequest = firstLoader.includes('node_modules/vue-loader/lib/loaders/pitcher')
           let cssLoaderIndex = -1

package/lib/platform/style/wx/index.js

@@ -1,7 +1,7 @@
 const { hump2dash } = require('../../../utils/hump-dash')
 const { parseValues } = require('../../../utils/string')
 
-module.exports = function getSpec({ warn, error }) {
+module.exports = function getSpec ({ warn, error }) {
   // React Native 双端都不支持的 CSS property
   const unsupportedPropExp = /^(white-space|text-overflow|animation|font-variant-caps|font-variant-numeric|font-variant-east-asian|font-variant-alternates|font-variant-ligatures|background-position|caret-color)$/
   const unsupportedPropMode = {
@@ -33,8 +33,7 @@ module.exports = function getSpec({ warn, error }) {
   }
   // 值类型
   const ValueType = {
-    integer: 'integer',
-    length: 'length',
+    number: 'number',
     color: 'color',
     enum: 'enum'
   }
@@ -64,27 +63,26 @@ module.exports = function getSpec({ warn, error }) {
     'align-items': ['flex-start', 'flex-end', 'center', 'stretch', 'baseline'],
     'align-self': ['auto', 'flex-start', 'flex-end', 'center', 'stretch', 'baseline'],
     'justify-content': ['flex-start', 'flex-end', 'center', 'space-between', 'space-around', 'space-evenly'],
-    'background-size': ['contain', 'cover', 'auto', ValueType.length],
-    'background-position': ['left', 'right', 'top', 'bottom', 'center', ValueType.length],
+    'background-size': ['contain', 'cover', 'auto', ValueType.number],
+    'background-position': ['left', 'right', 'top', 'bottom', 'center', ValueType.number],
     'background-repeat': ['no-repeat'],
-    width: ['auto', ValueType.length],
-    height: ['auto', ValueType.length],
-    'flex-basis': ['auto', ValueType.length],
-    margin: ['auto', ValueType.length],
-    'margin-top': ['auto', ValueType.length],
-    'margin-left': ['auto', ValueType.length],
-    'margin-bottom': ['auto', ValueType.length],
-    'margin-right': ['auto', ValueType.length],
-    'margin-horizontal': ['auto', ValueType.length],
-    'margin-vertical': ['auto', ValueType.length]
+    width: ['auto', ValueType.number],
+    height: ['auto', ValueType.number],
+    'flex-basis': ['auto', ValueType.number],
+    margin: ['auto', ValueType.number],
+    'margin-top': ['auto', ValueType.number],
+    'margin-left': ['auto', ValueType.number],
+    'margin-bottom': ['auto', ValueType.number],
+    'margin-right': ['auto', ValueType.number],
+    'margin-horizontal': ['auto', ValueType.number],
+    'margin-vertical': ['auto', ValueType.number]
   }
   // 获取值类型
   const getValueType = (prop) => {
     const propValueTypeRules = [
       // 重要！！优先判断是不是枚举类型
       [ValueType.enum, new RegExp('^(' + Object.keys(SUPPORTED_PROP_VAL_ARR).join('|') + ')$')],
-      [ValueType.length, /^((gap|left|right|top|bottom)|(.+-(width|height|left|right|top|bottom|radius|spacing|size|gap|offset)))$/],
-      [ValueType.integer, /^((opacity|flex-grow|flex-shrink|z-index)|(.+-(index|opacity)))$/],
+      [ValueType.number, /^((opacity|flex-grow|flex-shrink|gap|left|right|top|bottom)|(.+-(width|height|left|right|top|bottom|radius|spacing|size|gap|index|offset|opacity)))$/],
       [ValueType.color, /^(color|(.+-color))$/]
     ]
     for (const rule of propValueTypeRules) {
@@ -104,86 +102,66 @@ module.exports = function getSpec({ warn, error }) {
 
     const newVal = parseValues((str.match(totalVarExp)?.[1] || ''), ',')
     if (newVal.length <= 1) return null // 没有 fallback
-    // fallback 可能本身包含逗号（如多 font-family 兜底、渐变等），这里取第2段及之后并 join 回去
-    const fallback = newVal.slice(1).join(',').trim()
+    const fallback = newVal[1].trim()
     // 如果 fallback 也是 var()，递归提取
     if (totalVarExp.test(fallback)) return getDefaultValueFromVar(fallback, visited)
     return fallback
   }
 
-  // 属性值校验
-  // 返回值：
-  // - 通过：返回 true
-  // - 失败：返回 false
   const verifyValues = ({ prop, value, selector }, isError = true) => {
     prop = prop.trim()
-    const rawValue = value.trim()
+    value = value.trim()
     const tips = isError ? error : warn
 
-    // CSS 自定义属性（--xxx）是变量定义，不属于 RN 样式属性：
-    // 不能按 `-height/-color` 等后缀推断类型去校验，否则会把变量定义错误过滤，导致运行时 var() 取值失败
-    if (/^--/.test(prop)) return true
-
-    // 校验阶段允许使用 fallback 作为最坏情况（避免 RN crash），但输出必须保留 rawValue
-    let valueForVerify = rawValue
-
-    if (cssVariableExp.test(valueForVerify)) {
-      const fallback = getDefaultValueFromVar(valueForVerify)
+    // 对于包含 CSS 变量的值，提取 fallback 值进行验证
+    if (cssVariableExp.test(value)) {
+      const fallback = getDefaultValueFromVar(value)
       // undefined 表示检测到循环引用
       if (fallback === undefined) {
-        tips(`CSS variable circular reference in fallback chain detected in ${selector} for property ${prop}, value: ${rawValue}`)
+        tips(`CSS variable circular reference in fallback chain detected in ${selector} for property ${prop}, value: ${value}`)
         return false
       }
       // null 表示没有 fallback，CSS 变量本身是合法的（运行时会解析）
       if (fallback === null) {
         return true
       }
-      // 有 fallback 值：使用 fallback 继续做值校验
-      valueForVerify = fallback.trim()
+      // 有 fallback 值，将 fallback 作为新的 value 继续后续验证流程
+      value = fallback
     }
 
-    // calc() / env() 跳过值校验，但保留 rawValue 输出
-    if (calcExp.test(valueForVerify) || envExp.test(valueForVerify)) return true
+    // calc() 和 env() 跳过验证
+    if (calcExp.test(value) || envExp.test(value)) return true
     const namedColor = ['transparent', 'aliceblue', 'antiquewhite', 'aqua', 'aquamarine', 'azure', 'beige', 'bisque', 'black', 'blanchedalmond', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue', 'chartreuse', 'chocolate', 'coral', 'cornflowerblue', 'cornsilk', 'crimson', 'cyan', 'darkblue', 'darkcyan', 'darkgoldenrod', 'darkgray', 'darkgreen', 'darkgrey', 'darkkhaki', 'darkmagenta', 'darkolivegreen', 'darkorange', 'darkorchid', 'darkred', 'darksalmon', 'darkseagreen', 'darkslateblue', 'darkslategrey', 'darkturquoise', 'darkviolet', 'deeppink', 'deepskyblue', 'dimgray', 'dimgrey', 'dodgerblue', 'firebrick', 'floralwhite', 'forestgreen', 'fuchsia', 'gainsboro', 'ghostwhite', 'gold', 'goldenrod', 'gray', 'green', 'greenyellow', 'grey', 'honeydew', 'hotpink', 'indianred', 'indigo', 'ivory', 'khaki', 'lavender', 'lavenderblush', 'lawngreen', 'lemonchiffon', 'lightblue', 'lightcoral', 'lightcyan', 'lightgoldenrodyellow', 'lightgray', 'lightgreen', 'lightgrey', 'lightpink', 'lightsalmon', 'lightseagreen', 'lightskyblue', 'lightslategrey', 'lightsteelblue', 'lightyellow', 'lime', 'limegreen', 'linen', 'magenta', 'maroon', 'mediumaquamarine', 'mediumblue', 'mediumorchid', 'mediumpurple', 'mediumseagreen', 'mediumslateblue', 'mediumspringgreen', 'mediumturquoise', 'mediumvioletred', 'midnightblue', 'mintcream', 'mistyrose', 'moccasin', 'navajowhite', 'navy', 'oldlace', 'olive', 'olivedrab', 'orange', 'orangered', 'orchid', 'palegoldenrod', 'palegreen', 'paleturquoise', 'palevioletred', 'papayawhip', 'peachpuff', 'peru', 'pink', 'plum', 'powderblue', 'purple', 'rebeccapurple', 'red', 'rosybrown', 'royalblue', 'saddlebrown', 'salmon', 'sandybrown', 'seagreen', 'seashell', 'sienna', 'silver', 'skyblue', 'slateblue', 'slategray', 'snow', 'springgreen', 'steelblue', 'tan', 'teal', 'thistle', 'tomato', 'turquoise', 'violet', 'wheat', 'white', 'whitesmoke', 'yellow', 'yellowgreen']
     const valueExp = {
-      integer: /^(-?(\d+(\.\d+)?|\.\d+))$/,
-      length: /^((-?(\d+(\.\d+)?|\.\d+))(rpx|px|%|vw|vh)?|hairlineWidth)$/,
+      number: /^((-?(\d+(\.\d+)?|\.\d+))(rpx|px|%|vw|vh)?|hairlineWidth)$/,
       color: new RegExp(('^(' + namedColor.join('|') + ')$') + '|(^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$)|^(rgb|rgba|hsl|hsla|hwb)\\(.+\\)$')
     }
     const type = getValueType(prop)
     const tipsType = (type) => {
       const info = {
-        [ValueType.length]: '2rpx,10%,30rpx',
         [ValueType.color]: 'rgb,rgba,hsl,hsla,hwb,named color,#000000',
         [ValueType.enum]: `${SUPPORTED_PROP_VAL_ARR[prop]?.join(',')}`
       }
-      tips(`Value of ${prop} in ${selector} should be ${type}${info[type] ? `, eg ${info[type]}` : ''}, received [${rawValue}], please check again!`)
+      tips(`Value of ${prop} in ${selector} should be ${type}${info[type] ? `, eg ${info[type]}` : ''}, received [${value}], please check again!`)
     }
     switch (type) {
-      case ValueType.length: {
-        if (!valueExp.length.test(valueForVerify)) {
-          tipsType(type)
-          return false
-        }
-        return true
-      }
-      case ValueType.integer: {
-        if (!valueExp.integer.test(valueForVerify)) {
+      case ValueType.number: {
+        if (!valueExp.number.test(value)) {
           tipsType(type)
           return false
         }
         return true
       }
       case ValueType.color: {
-        if (!valueExp.color.test(valueForVerify)) {
+        if (!valueExp.color.test(value)) {
           tipsType(type)
           return false
         }
         return true
       }
       case ValueType.enum: {
-        const isIn = SUPPORTED_PROP_VAL_ARR[prop].includes(valueForVerify)
-        const isType = Object.keys(valueExp).some(item => valueExp[item].test(valueForVerify) && SUPPORTED_PROP_VAL_ARR[prop].includes(ValueType[item]))
+        const isIn = SUPPORTED_PROP_VAL_ARR[prop].includes(value)
+        const isType = Object.keys(valueExp).some(item => valueExp[item].test(value) && SUPPORTED_PROP_VAL_ARR[prop].includes(ValueType[item]))
         if (!isIn && !isType) {
           tipsType(type)
           return false
@@ -454,23 +432,23 @@ module.exports = function getSpec({ warn, error }) {
           case 'skew':
           case 'translate3d': // x y 支持 z不支持
           case 'scale3d': // x y 支持 z不支持
-            {
-              // 2 个以上的值处理
-              key = key.replace('3d', '')
-              const vals = parseValues(val, ',').splice(0, 3)
-              // scale(.5) === scaleX(.5) scaleY(.5)
-              if (vals.length === 1 && key === 'scale') {
-                vals.push(vals[0])
-              }
-              const xyz = ['X', 'Y', 'Z']
-              transform.push(...vals.map((v, index) => {
-                if (key !== 'rotate' && index > 1) {
-                  unsupportedPropError({ prop: `${key}Z`, value, selector }, { mode })
-                }
-                return { [`${key}${xyz[index] || ''}`]: v.trim() }
-              }))
-              break
+          {
+            // 2 个以上的值处理
+            key = key.replace('3d', '')
+            const vals = parseValues(val, ',').splice(0, 3)
+            // scale(.5) === scaleX(.5) scaleY(.5)
+            if (vals.length === 1 && key === 'scale') {
+              vals.push(vals[0])
             }
+            const xyz = ['X', 'Y', 'Z']
+            transform.push(...vals.map((v, index) => {
+              if (key !== 'rotate' && index > 1) {
+                unsupportedPropError({ prop: `${key}Z`, value, selector }, { mode })
+              }
+              return { [`${key}${xyz[index] || ''}`]: v.trim() }
+            }))
+            break
+          }
           case 'translateZ':
           case 'scaleZ':
           case 'rotate3d': // x y z angle

package/lib/runtime/components/react/context.ts

@@ -1,5 +1,5 @@
 import { createContext, Dispatch, MutableRefObject, SetStateAction } from 'react'
-import type { NativeSyntheticEvent, Animated, ScaledSize } from 'react-native'
+import { NativeSyntheticEvent, Animated, ScaledSize } from 'react-native'
 import { noop } from '@mpxjs/utils'
 
 export type LabelContextValue = MutableRefObject<{
@@ -12,10 +12,7 @@ export type KeyboardAvoidContextValue = MutableRefObject<{
   adjustPosition: boolean
   holdKeyboard?: boolean
   keyboardHeight?: number
-  /** @internal bindfocus 异步延迟上报方法 */
   onKeyboardShow?: () => void
-  /** @internal 多个 Input 切换聚焦场景标记位 */
-  readyToShow?: boolean
 } | null>
 
 export interface GroupValue {
@@ -52,7 +49,7 @@ export interface PortalContextValue {
 
 export interface ScrollViewContextValue {
   gestureRef: React.RefObject<any> | null
-  scrollOffset: Animated.Value | null
+  scrollOffset: Animated.Value
 }
 
 export interface RouteContextValue {
@@ -92,7 +89,7 @@ export const SwiperContext = createContext({})
 
 export const KeyboardAvoidContext = createContext<KeyboardAvoidContextValue | null>(null)
 
-export const ScrollViewContext = createContext<ScrollViewContextValue>({ gestureRef: null, scrollOffset: null })
+export const ScrollViewContext = createContext<ScrollViewContextValue>({ gestureRef: null, scrollOffset: new Animated.Value(0) })
 
 export const PortalContext = createContext<PortalContextValue>(null as any)
 

package/lib/runtime/components/react/dist/context.d.ts

@@ -1,5 +1,5 @@
 import { Dispatch, MutableRefObject, SetStateAction } from 'react';
-import type { NativeSyntheticEvent, Animated, ScaledSize } from 'react-native';
+import { NativeSyntheticEvent, Animated, ScaledSize } from 'react-native';
 export type LabelContextValue = MutableRefObject<{
     triggerChange: (evt: NativeSyntheticEvent<TouchEvent>) => void;
 }>;
@@ -9,10 +9,7 @@ export type KeyboardAvoidContextValue = MutableRefObject<{
     adjustPosition: boolean;
     holdKeyboard?: boolean;
     keyboardHeight?: number;
-    /** @internal bindfocus 异步延迟上报方法 */
     onKeyboardShow?: () => void;
-    /** @internal 多个 Input 切换聚焦场景标记位 */
-    readyToShow?: boolean;
 } | null>;
 export interface GroupValue {
     [key: string]: {
@@ -48,7 +45,7 @@ export interface PortalContextValue {
 }
 export interface ScrollViewContextValue {
     gestureRef: React.RefObject<any> | null;
-    scrollOffset: Animated.Value | null;
+    scrollOffset: Animated.Value;
 }
 export interface RouteContextValue {
     pageId: number;

package/lib/runtime/components/react/dist/context.js

@@ -1,4 +1,5 @@
 import { createContext } from 'react';
+import { Animated } from 'react-native';
 import { noop } from '@mpxjs/utils';
 export const MovableAreaContext = createContext({ width: 0, height: 0 });
 export const FormContext = createContext(null);
@@ -11,7 +12,7 @@ export const IntersectionObserverContext = createContext(null);
 export const RouteContext = createContext(null);
 export const SwiperContext = createContext({});
 export const KeyboardAvoidContext = createContext(null);
-export const ScrollViewContext = createContext({ gestureRef: null, scrollOffset: null });
+export const ScrollViewContext = createContext({ gestureRef: null, scrollOffset: new Animated.Value(0) });
 export const PortalContext = createContext(null);
 export const StickyContext = createContext({ registerStickyHeader: noop, unregisterStickyHeader: noop });
 export const ProviderContext = createContext(null);

package/lib/runtime/components/react/dist/mpx-async-suspense.jsx

@@ -1,5 +1,6 @@
 import { useState, useEffect, useCallback, useRef, createElement } from 'react';
 import { View, Image, StyleSheet, Text, TouchableOpacity } from 'react-native';
+import FastImage from '@d11/react-native-fast-image';
 const asyncChunkMap = new Map();
 const styles = StyleSheet.create({
     container: {
@@ -62,8 +63,6 @@ const DefaultFallback = ({ onReload }) => {
     </View>);
 };
 const DefaultLoading = () => {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const FastImage = require('@d11/react-native-fast-image').default;
     return (<View style={styles.container}>
       <FastImage style={styles.loadingImage} source={{
             uri: 'https://dpubstatic.udache.com/static/dpubimg/439jiCVOtNOnEv9F2LaDs_loading.gif'

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

@@ -104,7 +104,7 @@ const Image = forwardRef((props, ref) => {
             setLoaded(true);
         }
     };
-    const { hasPositionFixed, hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, transformRadiusPercent: isAndroid && !isSvg && !isLayoutMode, externalVarContext, parentFontSize, parentWidth, parentHeight });
+    const { hasPositionFixed, hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, isTransformBorderRadiusPercent: isAndroid && !isSvg && !isLayoutMode, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const { layoutRef, layoutStyle, layoutProps } = useLayout({
         props,
         hasSelfPercent,

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

@@ -74,14 +74,15 @@ const Input = forwardRef((props, ref) => {
     };
     const defaultValue = parseValue(value);
     const textAlignVertical = multiline ? 'top' : 'auto';
-    const isAutoFocus = !!autoFocus || !!focus;
     const tmpValue = useRef(defaultValue);
     const cursorIndex = useRef(0);
     const lineCount = useRef(0);
     const [inputValue, setInputValue] = useState(defaultValue);
     const [contentHeight, setContentHeight] = useState(0);
     const [selection, setSelection] = useState({ start: -1, end: tmpValue.current.length });
-    const styleObj = extendObject({ padding: 0, backgroundColor: '#fff' }, style, multiline && autoHeight ? { height: 'auto' } : {});
+    const styleObj = extendObject({ padding: 0, backgroundColor: '#fff' }, style, multiline && autoHeight
+        ? { height: 'auto', minHeight: Math.max(style?.minHeight || 35, contentHeight) }
+        : {});
     const { hasPositionFixed, hasSelfPercent, normalStyle, setWidth, setHeight } = useTransformStyle(styleObj, { enableVar, externalVarContext, parentFontSize, parentWidth, parentHeight });
     const nodeRef = useRef(null);
     useNodesRef(props, ref, nodeRef, {
@@ -143,55 +144,59 @@ const Input = forwardRef((props, ref) => {
     };
     const setKeyboardAvoidContext = () => {
         if (keyboardAvoid) {
-            keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition, holdKeyboard, readyToShow: true };
+            keyboardAvoid.current = {
+                cursorSpacing,
+                ref: nodeRef,
+                adjustPosition,
+                holdKeyboard,
+                // fix: iOS 会在 onFocus 之前触发 keyboardWillShow 并且赋值 keyboardHeight
+                // 这里手动同步下 keyboardHeight，防止 onFocus setKeyboardAvoidContext 删掉 keyboardHeight
+                keyboardHeight: keyboardAvoid?.current?.keyboardHeight
+            };
         }
     };
     const onTouchStart = () => {
-        // 手动聚焦时初始化 keyboardAvoid 上下文
-        // auto-focus/focus 不会触发而是在 useEffect 中初始化
+        // sometimes the focus event occurs later than the keyboardWillShow event
         setKeyboardAvoidContext();
     };
     const onTouchEnd = (evt) => {
         evt.nativeEvent.origin = 'input';
     };
     const onFocus = (evt) => {
-        if (!keyboardAvoid?.current) {
-            // Android：从一个正聚焦状态 input，聚焦到另一个新的 input 时，正常会触发如下时序：
-            // 新的 Input `onTouchStart` -> 旧输入框键盘 `keyboardDidHide` -> 新的 Input `onFocus`
-            // 导致这里的 keyboardAvoid.current 为 null，所以需要判空重新初始化。
-            setKeyboardAvoidContext();
-        }
-        const focusAction = () => {
-            bindfocus?.(getCustomEvent('focus', evt, {
-                detail: {
-                    value: tmpValue.current || '',
-                    height: keyboardAvoid?.current?.keyboardHeight
-                },
-                layoutRef
-            }, props));
-            if (keyboardAvoid?.current?.onKeyboardShow) {
-                keyboardAvoid.current.onKeyboardShow = undefined;
-            }
-        };
-        if (keyboardAvoid?.current) {
-            // 有 keyboardAvoiding
-            if (keyboardAvoid.current.keyboardHeight) {
-                // 仅以下场景触发顺序：先 keyboardWillShow 获取高度 -> 后 onFocus，可以立即执行
-                // - iOS + 手动点击聚焦
-                focusAction();
+        setKeyboardAvoidContext();
+        if (bindfocus) {
+            const focusAction = () => {
+                bindfocus(getCustomEvent('focus', evt, {
+                    detail: {
+                        value: tmpValue.current || '',
+                        height: keyboardAvoid?.current?.keyboardHeight
+                    },
+                    layoutRef
+                }, props));
+                if (keyboardAvoid?.current?.onKeyboardShow) {
+                    keyboardAvoid.current.onKeyboardShow = undefined;
+                }
+                if (keyboardAvoid?.current?.keyboardHeight) {
+                    keyboardAvoid.current.keyboardHeight = undefined;
+                }
+            };
+            if (keyboardAvoid?.current) {
+                // 有 keyboardAvoiding
+                if (keyboardAvoid.current.keyboardHeight) {
+                    // iOS: keyboard 获取高度时机 keyboardWillShow 在 input focus 之前，可以立即执行
+                    focusAction();
+                }
+                else {
+                    // Android,Harmony: keyboard 获取高度时机 keyboardDidShow 在 input focus 之后，需要延迟回调
+                    evt.persist();
+                    keyboardAvoid.current.onKeyboardShow = focusAction;
+                }
             }
             else {
-                // 其他场景触发顺序：先 onFocus -> 后 keyboardWillShow 获取高度 -> 执行回调
-                // - iOS + auto-focus/focus=true 自动聚焦
-                // - Android 手动点击聚焦/自动聚焦 都一样
-                evt.persist();
-                keyboardAvoid.current.onKeyboardShow = focusAction;
+                // 无 keyboardAvoiding，直接执行 focus 回调
+                focusAction();
             }
         }
-        else {
-            // 兜底：无 keyboardAvoiding 直接执行 focus 回调
-            focusAction();
-        }
     };
     const onBlur = (evt) => {
         bindblur && bindblur(getCustomEvent('blur', evt, {
@@ -265,21 +270,18 @@ const Input = forwardRef((props, ref) => {
         };
     }, []);
     useEffect(() => {
-        if (isAutoFocus) {
-            // auto-focus/focus=true 初始化 keyboardAvoidContext
+        if (focus) {
             setKeyboardAvoidContext();
         }
-    }, [isAutoFocus]);
+    }, [focus]);
     useUpdateEffect(() => {
         if (!nodeRef?.current) {
             return;
         }
-        // RN autoFocus 属性仅在初次渲染时生效
-        // 后续更新需要手动调用 focus/blur 方法，和微信小程序对齐
-        isAutoFocus
+        focus
             ? nodeRef.current?.focus()
             : nodeRef.current?.blur();
-    }, [isAutoFocus]);
+    }, [focus]);
     const innerProps = useInnerProps(extendObject({}, props, layoutProps, {
         ref: nodeRef,
         style: extendObject({}, normalStyle, layoutStyle),
@@ -291,10 +293,10 @@ const Input = forwardRef((props, ref) => {
         value: inputValue,
         maxLength: maxlength === -1 ? undefined : maxlength,
         editable: !disabled,
-        autoFocus: isAutoFocus,
+        autoFocus: !!autoFocus || !!focus,
         selection: selectionStart > -1 || typeof cursor === 'number' ? selection : undefined,
         selectionColor: cursorColor,
-        blurOnSubmit: multiline ? confirmType !== 'return' : !confirmHold,
+        blurOnSubmit: !multiline && !confirmHold,
         underlineColorAndroid: 'rgba(0,0,0,0)',
         textAlignVertical: textAlignVertical,
         placeholderTextColor: placeholderStyle?.color,
@@ -306,7 +308,7 @@ const Input = forwardRef((props, ref) => {
         onChange,
         onSelectionChange,
         onContentSizeChange,
-        onSubmitEditing: bindconfirm && onSubmitEditing
+        onSubmitEditing: bindconfirm && !multiline && onSubmitEditing
     }, !!multiline && confirmType === 'return' ? {} : { enterKeyHint: confirmType }), [
         'type',
         'password',

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

@@ -28,20 +28,11 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
         isShow.current = false;
         if (keyboardAvoid?.current) {
             const inputRef = keyboardAvoid.current.ref?.current;
-            if (inputRef && inputRef.isFocused() && !keyboardAvoid.current.readyToShow) {
+            if (inputRef && inputRef.isFocused()) {
                 // 修复 Android 点击键盘收起按钮时当前 input 没触发失焦的问题
-                // keyboardAvoid.current.readyToShow = true 表示聚焦到了新的输入框，不需要手动触发失焦
                 inputRef.blur();
             }
-            if (!keyboardAvoid.current.onKeyboardShow) {
-                // 修复部分 Android 机型可能时序问题：当从 input 已聚焦状态，聚焦到另一个 input 时，可能时序：
-                // - 新的 Input `onTouchStart` -> 新的 Input `onFocus` -> 旧输入框键盘 `keyboardDidHide` -> 新输入框键盘 `keyboardDidShow`
-                // - 此时 keyboardAvoid.current 如果清空 null，会导致新输入框键盘 `keyboardDidShow` 回调 keybaordAvoding 执行失败。
-                // 修复方案：
-                // 如果出现时序问题，那么新的 Input `onFocus` 会更早执行，那么 `keyboardAvoid.current.onKeyboardShow` 存在，
-                // 那么不应该重置为 null，反之，说明时正常情况，应当重置为 null。
-                keyboardAvoid.current = null;
-            }
+            keyboardAvoid.current = null;
         }
         cancelAnimation(offset);
         offset.value = withTiming(0, { duration, easing });
@@ -58,10 +49,6 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
     useEffect(() => {
         let subscriptions = [];
         function keybaordAvoding(evt) {
-            if (keyboardAvoid?.current?.readyToShow) {
-                // 重置标记位
-                keyboardAvoid.current.readyToShow = false;
-            }
             if (!keyboardAvoid?.current || isShow.current) {
                 return;
             }