fix: correction method reference

didi · Nov 28, 2024 · 2fce577 · 2fce577
1 parent 25e8a38
commit 2fce577
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/packages/core/src/platform/patch/react/getDefaultOptions.ios.js b/packages/core/src/platform/patch/react/getDefaultOptions.ios.js
@@ -447,6 +447,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     const pageConfig = Object.assign({}, global.__mpxPageConfig, currentInject.pageConfig)
     const Page = ({ navigation, route }) => {
       const [enabled, setEnabled] = useState(false)
+      const keyboardAvoidContextValue = useRef({ setEnabled })
       const currentPageId = useMemo(() => ++pageId, [])
       const intersectionObservers = useRef({})
       usePageStatus(navigation, currentPageId)
@@ -487,11 +488,14 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
         createElement(
           KeyboardAvoidContext.Provider,
           {
-            value: setEnabled
+            value: keyboardAvoidContextValue
           },
           createElement(
             ReactNative.KeyboardAvoidingView,
             {
+              style: {
+                flex: 1
+              },
               contentContainerStyle: {
                 flex: 1
               },

diff --git a/packages/webpack-plugin/lib/runtime/components/react/context.ts b/packages/webpack-plugin/lib/runtime/components/react/context.ts
@@ -5,6 +5,10 @@ export type LabelContextValue = MutableRefObject<{
   triggerChange: (evt: NativeSyntheticEvent<TouchEvent>) => void
 }>
 
+export type KeyboardAvoidContextValue = MutableRefObject<{
+  setEnabled: (enabled: boolean) => void
+}>
+
 export interface GroupValue {
   [key: string]: { checked: boolean; setValue: Dispatch<SetStateAction<boolean>> }
 }
@@ -31,10 +35,6 @@ export interface IntersectionObserver {
   }
 }
 
-export interface KeyboardAvoidContextValue {
-  setEnabled: (enabled: boolean) => void
-}
-
 export const MovableAreaContext = createContext({ width: 0, height: 0 })
 
 export const FormContext = createContext<FormContextValue | null>(null)

diff --git a/packages/webpack-plugin/lib/runtime/components/react/mpx-input.tsx b/packages/webpack-plugin/lib/runtime/components/react/mpx-input.tsx
@@ -52,7 +52,8 @@ import {
   TextInputSelectionChangeEventData,
   TextInputFocusEventData,
   TextInputChangeEventData,
-  TextInputSubmitEditingEventData
+  TextInputSubmitEditingEventData,
+  Keyboard
 } from 'react-native'
 import { warn } from '@mpxjs/utils'
 import { parseInlineStyle, useUpdateEffect, useTransformStyle, useLayout } from './utils'
@@ -263,7 +264,7 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
         props
       )
     )
-    adjustPosition && kyboardAvoidContext?.setEnabled(true)
+    adjustPosition && kyboardAvoidContext?.current?.setEnabled?.(true)
   }
 
   const onInputBlur = (evt: NativeSyntheticEvent<TextInputFocusEventData>) => {
@@ -281,7 +282,10 @@ const Input = forwardRef<HandlerRef<TextInput, FinalInputProps>, FinalInputProps
         props
       )
     )
-    adjustPosition && kyboardAvoidContext?.setEnabled(false)
+    if (adjustPosition) {
+      kyboardAvoidContext?.current?.setEnabled?.(false)
+      Keyboard.dismiss()
+    }
   }
 
   const onKeyPress = (evt: NativeSyntheticEvent<TextInputKeyPressEventData>) => {