@mpxjs/webpack-plugin 2.10.4-beta.6 → 2.10.4-beta.7

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

@@ -151,6 +151,9 @@ const Input = forwardRef((props, ref) => {
         // sometimes the focus event occurs later than the keyboardWillShow event
         setKeyboardAvoidContext();
     };
+    const onTouchEnd = (evt) => {
+        evt.nativeEvent.origin = 'input';
+    };
     const onFocus = (evt) => {
         setKeyboardAvoidContext();
         bindfocus && bindfocus(getCustomEvent('focus', evt, {
@@ -263,6 +266,7 @@ const Input = forwardRef((props, ref) => {
         placeholderTextColor: placeholderStyle?.color,
         multiline: !!multiline,
         onTouchStart,
+        onTouchEnd,
         onFocus,
         onBlur,
         onChange,

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

@@ -20,8 +20,10 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }) => {
         offset.value = withTiming(0, { duration, easing });
         basic.value = 'auto';
     };
-    const onTouchEnd = () => {
-        Keyboard.isVisible() && Keyboard.dismiss();
+    const onTouchEnd = ({ nativeEvent }) => {
+        if (nativeEvent.origin !== 'input') {
+            Keyboard.isVisible() && Keyboard.dismiss();
+        }
     };
     useEffect(() => {
         let subscriptions = [];

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

@@ -50,7 +50,8 @@ import {
   TextInputSelectionChangeEventData,
   TextInputFocusEventData,
   TextInputChangeEventData,
-  TextInputSubmitEditingEventData
+  TextInputSubmitEditingEventData,
+  NativeTouchEvent
 } from 'react-native'
 import { warn } from '@mpxjs/utils'
 import { useUpdateEffect, useTransformStyle, useLayout, extendObject, isIOS } from './utils'
@@ -287,6 +288,10 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
     setKeyboardAvoidContext()
   }
 
+  const onTouchEnd = (evt: NativeSyntheticEvent<NativeTouchEvent & { origin?: string }>) => {
+    evt.nativeEvent.origin = 'input'
+  }
+
   const onFocus = (evt: NativeSyntheticEvent<TextInputFocusEventData>) => {
     setKeyboardAvoidContext()
     bindfocus && bindfocus(
@@ -448,6 +453,7 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
         placeholderTextColor: placeholderStyle?.color,
         multiline: !!multiline,
         onTouchStart,
+        onTouchEnd,
         onFocus,
         onBlur,
         onChange,

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

@@ -1,5 +1,5 @@
 import React, { ReactNode, useContext, useEffect } from 'react'
-import { DimensionValue, EmitterSubscription, Keyboard, View, ViewStyle } from 'react-native'
+import { DimensionValue, EmitterSubscription, Keyboard, View, ViewStyle, NativeSyntheticEvent, NativeTouchEvent } from 'react-native'
 import Animated, { useSharedValue, useAnimatedStyle, withTiming, Easing } from 'react-native-reanimated'
 import { KeyboardAvoidContext } from './context'
 import { isIOS } from './utils'
@@ -31,8 +31,10 @@ const KeyboardAvoidingView = ({ children, style, contentContainerStyle }: Keyboa
     basic.value = 'auto'
   }
 
-  const onTouchEnd = () => {
-    Keyboard.isVisible() && Keyboard.dismiss()
+  const onTouchEnd = ({ nativeEvent }: NativeSyntheticEvent<NativeTouchEvent & { origin?: string }>) => {
+    if (nativeEvent.origin !== 'input') {
+      Keyboard.isVisible() && Keyboard.dismiss()
+    }
   }
 
   useEffect(() => {

package/package.json

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