Skip to content

Commit 9d3beac

Browse files
author
Dabit
committed
Merge branch 'manuquentin-fix_keyboard_hook'
2 parents c962510 + 0daa8ec commit 9d3beac

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,13 @@ import { useKeyboard } from 'react-native-hooks'
8686

8787
const keyboard = useKeyboard()
8888

89+
<<<<<<< HEAD
8990
console.log('keyboard show: ', keyboard.isKeyboardShow)
9091
console.log('keyboard height: ', keyboard.keyboardHeight)
92+
=======
93+
console.log('keyboard isKeyboardShow: ', keyboard.isKeyboardShow)
94+
console.log('keyboard keyboardHeight: ', keyboard.keyboardHeight)
95+
>>>>>>> cc65860b67d810b6422ecc70c058ad43a9d2b2a0
9196
```
9297

9398
### `useInteractionManager`

lib/useKeyboard.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ export default () => {
1414
function keyboardDidHide(e) {
1515
setKeyboard({
1616
isKeyboardShow: false,
17-
keyboardHeight: e.endCoordinates.height
17+
keyboardHeight: e ? e.endCoordinates.height : null
1818
})
1919
}
2020

2121
useEffect(() => {
22-
this.keyboardDidShowListener = Keyboard.addListener(
22+
keyboardDidShowListener = Keyboard.addListener(
2323
'keyboardDidShow',
2424
keyboardDidShow
2525
)
26-
this.keyboardDidHideListener = Keyboard.addListener(
26+
keyboardDidHideListener = Keyboard.addListener(
2727
'keyboardDidHide',
2828
keyboardDidHide
2929
)
3030

3131
return () => {
32-
this.keyboardDidShowListener.remove()
33-
this.keyboardDidHideListener.remove()
32+
keyboardDidShowListener.remove()
33+
keyboardDidHideListener.remove()
3434
}
3535
}, [])
3636
return keyboard

0 commit comments

Comments
 (0)