Main (#17393)

* fix(rn): keyboard height on hide * fix(rn): 空字符串时，输入中文异常
NervJS · Mar 4, 2025 · 2f43f96 · 2f43f96
1 parent f9a84d1
commit 2f43f96
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/packages/taro-components-rn/src/components/Input/index.tsx b/packages/taro-components-rn/src/components/Input/index.tsx
@@ -121,7 +121,7 @@ const _Input = (props: InputProps) => {
       if (typeof result === 'string') {
         tmpValue.current = result
         setReturnValue(result)
-      } else if (returnValue) {
+      } else if (returnValue !== undefined) {
         // 为了处理输入不合法，setState 相同值时，状态不更新，UI 也得不到更新，重置状态进而更新
         setReturnValue(undefined)
       }

diff --git a/packages/taro-rn/src/lib/keyboard.ts b/packages/taro-rn/src/lib/keyboard.ts
@@ -17,8 +17,8 @@ const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): Promise<TaroGeneral.
 const _cbManager = createCallbackManager()
 let _hasListener = false
 
-const keyboardHeightListener = (e) => {
-  _cbManager.trigger({ height: e.endCoordinates.height })
+const keyboardHeightListener = (height: number) => {
+  _cbManager.trigger({ height })
 }
 
 /**
@@ -28,8 +28,12 @@ const keyboardHeightListener = (e) => {
 const onKeyboardHeightChange = (callback: Taro.onKeyboardHeightChange.Callback): void => {
   _cbManager.add(callback)
   if (!_hasListener) {
-    Keyboard.addListener('keyboardDidShow', keyboardHeightListener)
-    Keyboard.addListener('keyboardDidHide', keyboardHeightListener)
+    Keyboard.addListener('keyboardDidShow', (e) => {
+      keyboardHeightListener(e.endCoordinates.height)
+    })
+    Keyboard.addListener('keyboardDidHide', () => {
+      keyboardHeightListener(0)
+    })
     _hasListener = true
   }
 }
@@ -53,8 +57,4 @@ const offKeyboardHeightChange = (callback?: Taro.onKeyboardHeightChange.Callback
   }
 }
 
-export {
-  hideKeyboard,
-  offKeyboardHeightChange,
-  onKeyboardHeightChange
-}
+export { hideKeyboard, offKeyboardHeightChange, onKeyboardHeightChange }