@mpxjs/webpack-plugin 2.10.18-beta.3 → 2.10.18-beta.5

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

@@ -422,7 +422,7 @@ module.exports = function getSpec({ warn, error }) {
     if (Array.isArray(value) || cssVariableExp.test(value)) return { prop, value }
     const values = parseValues(value)
     // Todo transform 排序不一致时，transform动画会闪烁，故这里同样的排序输出 transform
-    values.sort()
+    // values.sort()
     const transform = []
     values.forEach(item => {
       const match = item.match(/([/\w]+)\((.+)\)/)

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

@@ -145,7 +145,10 @@ const Input = forwardRef((props, ref) => {
     };
     const setKeyboardAvoidContext = () => {
         if (keyboardAvoid) {
-            keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition, holdKeyboard, readyToShow: true };
+            // readyToShow 仅在从另一个输入框切换聚焦时为 true（ref 不同），
+            // 避免同一个输入框重复调用（onTouchStart + useEffect）或单次聚焦时误设为 true 导致无法正常失焦
+            const readyToShow = !!(keyboardAvoid.current && keyboardAvoid.current.ref !== nodeRef);
+            keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition, holdKeyboard, readyToShow };
         }
     };
     const onTouchStart = () => {

package/lib/runtime/components/react/dist/utils.jsx

@@ -285,7 +285,7 @@ export function parseValues(str, char = ' ') {
 function parseTransform(transformStr) {
     const values = parseValues(transformStr);
     // Todo transform 排序不一致时，transform动画会闪烁，故这里同样的排序输出 transform
-    values.sort();
+    // values.sort()
     const transform = [];
     values.forEach(item => {
         const match = item.match(/([/\w]+)\((.+)\)/);

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

@@ -285,7 +285,10 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
 
   const setKeyboardAvoidContext = () => {
     if (keyboardAvoid) {
-      keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition, holdKeyboard, readyToShow: true }
+      // readyToShow 仅在从另一个输入框切换聚焦时为 true（ref 不同），
+      // 避免同一个输入框重复调用（onTouchStart + useEffect）或单次聚焦时误设为 true 导致无法正常失焦
+      const readyToShow = !!(keyboardAvoid.current && keyboardAvoid.current.ref !== nodeRef)
+      keyboardAvoid.current = { cursorSpacing, ref: nodeRef, adjustPosition, holdKeyboard, readyToShow }
     }
   }
 

package/lib/runtime/components/react/utils.tsx

@@ -335,7 +335,7 @@ export function parseValues (str: string, char = ' ') {
 function parseTransform (transformStr: string) {
   const values = parseValues(transformStr)
   // Todo transform 排序不一致时，transform动画会闪烁，故这里同样的排序输出 transform
-  values.sort()
+  // values.sort()
   const transform: { [propName: string]: string | number | number[] }[] = []
   values.forEach(item => {
     const match = item.match(/([/\w]+)\((.+)\)/)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.18-beta.3",
+  "version": "2.10.18-beta.5",
   "description": "mpx compile core",
   "keywords": [
     "mpx"