From 2966d5079983f3f0c4166ac3dc95affc418c9fc9 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Mon, 30 Mar 2020 17:56:39 +0200 Subject: [PATCH 01/13] add value to Coordinates when hide --- src/useKeyboard.ts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index 36491505..c0a364ab 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -1,5 +1,5 @@ -import {useEffect, useState} from 'react' -import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' +import { useEffect, useState } from 'react' +import { Keyboard, KeyboardEventListener, ScreenRect } from 'react-native' export default function useKeyboard() { const [shown, setShown] = useState(false) @@ -7,26 +7,31 @@ export default function useKeyboard() { start: ScreenRect end: ScreenRect }>({ - start: {screenX: 0, screenY: 0, width: 0, height: 0}, - end: {screenX: 0, screenY: 0, width: 0, height: 0}, + start: { screenX: 0, screenY: 0, width: 0, height: 0 }, + end: { screenX: 0, screenY: 0, width: 0, height: 0 }, }) const [keyboardHeight, setKeyboardHeight] = useState(0) const handleKeyboardWillShow: KeyboardEventListener = e => { - setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) + setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) } const handleKeyboardDidShow: KeyboardEventListener = e => { setShown(true) - setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) + setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) setKeyboardHeight(e.endCoordinates.height) } const handleKeyboardWillHide: KeyboardEventListener = e => { - setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) + setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) } const handleKeyboardDidHide: KeyboardEventListener = e => { setShown(false) if (e) { - setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) + setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) + } else { + setCoordinates({ + start: { screenX: 0, screenY: 0, width: 0, height: 0 } + , end: { screenX: 0, screenY: 0, width: 0, height: 0 } + }) } setKeyboardHeight(0) } From d6bf70dc97e6f72af988000e51076149ebcaa496 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Mon, 30 Mar 2020 19:40:01 +0200 Subject: [PATCH 02/13] lint --- src/useKeyboard.ts | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index c0a364ab..93896ce6 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -1,5 +1,5 @@ -import { useEffect, useState } from 'react' -import { Keyboard, KeyboardEventListener, ScreenRect } from 'react-native' +import {useEffect, useState} from 'react' +import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' export default function useKeyboard() { const [shown, setShown] = useState(false) @@ -7,32 +7,31 @@ export default function useKeyboard() { start: ScreenRect end: ScreenRect }>({ - start: { screenX: 0, screenY: 0, width: 0, height: 0 }, - end: { screenX: 0, screenY: 0, width: 0, height: 0 }, + start: {screenX: 0, screenY: 0, width: 0, height: 0}, + end: {screenX: 0, screenY: 0, width: 0, height: 0}, }) const [keyboardHeight, setKeyboardHeight] = useState(0) const handleKeyboardWillShow: KeyboardEventListener = e => { - setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) + setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) } const handleKeyboardDidShow: KeyboardEventListener = e => { setShown(true) - setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) + setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) setKeyboardHeight(e.endCoordinates.height) } const handleKeyboardWillHide: KeyboardEventListener = e => { - setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) + setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) } const handleKeyboardDidHide: KeyboardEventListener = e => { setShown(false) if (e) { - setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) + setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) } else { setCoordinates({ - start: { screenX: 0, screenY: 0, width: 0, height: 0 } - , end: { screenX: 0, screenY: 0, width: 0, height: 0 } - }) - } + start: { screenX: 0, screenY: 0, width: 0, height: 0 } + , end:{ screenX: 0, screenY: 0, width: 0, height: 0 } + }) setKeyboardHeight(0) } From ed039203f1aec6fb73b94e24cfd13223086ed6f3 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Wed, 1 Apr 2020 18:04:49 +0200 Subject: [PATCH 03/13] fix } error --- src/useKeyboard.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index 93896ce6..3774577c 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -34,6 +34,7 @@ export default function useKeyboard() { }) setKeyboardHeight(0) } +} useEffect(() => { Keyboard.addListener('keyboardWillShow', handleKeyboardWillShow) From 9b5fb42d130f2a4377b05b956872ac462051e560 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Wed, 1 Apr 2020 18:11:11 +0200 Subject: [PATCH 04/13] lint --- src/useKeyboard.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index 3774577c..e98c9742 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -29,8 +29,8 @@ export default function useKeyboard() { setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) } else { setCoordinates({ - start: { screenX: 0, screenY: 0, width: 0, height: 0 } - , end:{ screenX: 0, screenY: 0, width: 0, height: 0 } + start: { screenX: 0, screenY: 0, width: 0, height: 0 }, + end:{ screenX: 0, screenY: 0, width: 0, height: 0 } }) setKeyboardHeight(0) } From 313960bf320b2b09f4fbbff8afb9a0bc96ee6327 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Wed, 1 Apr 2020 18:19:49 +0200 Subject: [PATCH 05/13] another lint --- src/useKeyboard.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index e98c9742..1baaa23c 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -29,12 +29,12 @@ export default function useKeyboard() { setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) } else { setCoordinates({ - start: { screenX: 0, screenY: 0, width: 0, height: 0 }, - end:{ screenX: 0, screenY: 0, width: 0, height: 0 } - }) - setKeyboardHeight(0) + start: {screenX: 0, screenY: 0, width: 0, height: 0}, + end: {screenX: 0, screenY: 0, width: 0, height: 0}, + }) + setKeyboardHeight(0) + } } -} useEffect(() => { Keyboard.addListener('keyboardWillShow', handleKeyboardWillShow) From 212c5c819fabbe196c6aaef9f9d15ee2c22420b7 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Wed, 8 Apr 2020 09:56:02 +0200 Subject: [PATCH 06/13] add initialValue in usekeyboard --- src/useKeyboard.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index 1baaa23c..189d3970 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -1,15 +1,17 @@ import {useEffect, useState} from 'react' import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' +const initialValue = { + start: {screenX: 0, screenY: 0, width: 0, height: 0}, + end: {screenX: 0, screenY: 0, width: 0, height: 0} +} + export default function useKeyboard() { const [shown, setShown] = useState(false) const [coordinates, setCoordinates] = useState<{ start: ScreenRect end: ScreenRect - }>({ - start: {screenX: 0, screenY: 0, width: 0, height: 0}, - end: {screenX: 0, screenY: 0, width: 0, height: 0}, - }) + }>(initialValue) const [keyboardHeight, setKeyboardHeight] = useState(0) const handleKeyboardWillShow: KeyboardEventListener = e => { @@ -28,10 +30,7 @@ export default function useKeyboard() { if (e) { setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) } else { - setCoordinates({ - start: {screenX: 0, screenY: 0, width: 0, height: 0}, - end: {screenX: 0, screenY: 0, width: 0, height: 0}, - }) + setCoordinates(initialValue) setKeyboardHeight(0) } } From cbc74255b853ff306d9112706b1bdaa2fb4a3e50 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Wed, 8 Apr 2020 10:15:15 +0200 Subject: [PATCH 07/13] lint --- src/useKeyboard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index 189d3970..a1da6332 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -3,7 +3,7 @@ import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' const initialValue = { start: {screenX: 0, screenY: 0, width: 0, height: 0}, - end: {screenX: 0, screenY: 0, width: 0, height: 0} + end: {screenX: 0, screenY: 0, width: 0, height: 0}, } export default function useKeyboard() { From 4196613b3ba4e82ad11af93d978ecb7980da2de8 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Wed, 8 Apr 2020 10:20:31 +0200 Subject: [PATCH 08/13] remove export default in use keboard --- src/useKeyboard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index 97f5aeb1..34427bc6 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -6,7 +6,7 @@ const initialValue = { end: {screenX: 0, screenY: 0, width: 0, height: 0}, } -export default function useKeyboard() { +export function useKeyboard() { const [shown, setShown] = useState(false) const [coordinates, setCoordinates] = useState<{ start: ScreenRect From 18c376c525ee55e4a4e05c4fab6e08f2aa060f75 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Mon, 13 Apr 2020 16:25:36 +0200 Subject: [PATCH 09/13] last change --- src/useKeyboard.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index 34427bc6..79d5fbb7 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -1,9 +1,10 @@ import {useEffect, useState} from 'react' import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' +const emptyCoordinates = Object.freeze({ screenX: 0, screenY: 0, width: 0, height: 0 }) const initialValue = { - start: {screenX: 0, screenY: 0, width: 0, height: 0}, - end: {screenX: 0, screenY: 0, width: 0, height: 0}, + start: emptyCoordinates, + end: emptyCoordinates, } export function useKeyboard() { From 7db513f41d96a2d809243f5ced41eca7558c6d39 Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Mon, 13 Apr 2020 16:31:53 +0200 Subject: [PATCH 10/13] lint --- src/useKeyboard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index 79d5fbb7..ee3f5b1c 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -1,7 +1,7 @@ import {useEffect, useState} from 'react' import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' -const emptyCoordinates = Object.freeze({ screenX: 0, screenY: 0, width: 0, height: 0 }) +const emptyCoordinates = Object.freeze({screenX:0,screenY:0,width:0,height:0}) const initialValue = { start: emptyCoordinates, end: emptyCoordinates, From 78150c4a8bd99103b722d192df14d2a73cdcb20b Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Mon, 13 Apr 2020 16:37:48 +0200 Subject: [PATCH 11/13] other lint --- src/useKeyboard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index ee3f5b1c..b6565d80 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -1,7 +1,7 @@ import {useEffect, useState} from 'react' import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' -const emptyCoordinates = Object.freeze({screenX:0,screenY:0,width:0,height:0}) +const emptyCoordinates = Object.freeze({ screenX: 0, screenY: 0, width: 0, height: 0}) const initialValue = { start: emptyCoordinates, end: emptyCoordinates, From 93f2a55fadff2ce61c11c95f8d33d4eb06a947dc Mon Sep 17 00:00:00 2001 From: Pavlos Vinieratos Date: Mon, 13 Apr 2020 16:39:18 +0200 Subject: [PATCH 12/13] Update src/useKeyboard.ts --- src/useKeyboard.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index b6565d80..77a9540e 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -1,7 +1,12 @@ import {useEffect, useState} from 'react' import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' -const emptyCoordinates = Object.freeze({ screenX: 0, screenY: 0, width: 0, height: 0}) +const emptyCoordinates = Object.freeze({ + screenX: 0, + screenY: 0, + width: 0, + height: 0, +}) const initialValue = { start: emptyCoordinates, end: emptyCoordinates, From 43e02e87ec24210ea8ba56f0f3aa05237ba2048e Mon Sep 17 00:00:00 2001 From: Gamal Shaban Date: Mon, 13 Apr 2020 16:41:40 +0200 Subject: [PATCH 13/13] l --- src/useKeyboard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/useKeyboard.ts b/src/useKeyboard.ts index b6565d80..7ac68fde 100644 --- a/src/useKeyboard.ts +++ b/src/useKeyboard.ts @@ -1,7 +1,7 @@ import {useEffect, useState} from 'react' import {Keyboard, KeyboardEventListener, ScreenRect} from 'react-native' -const emptyCoordinates = Object.freeze({ screenX: 0, screenY: 0, width: 0, height: 0}) +const emptyCoordinates = Object.freeze({screenX: 0, screenY: 0, width: 0, height: 0}) const initialValue = { start: emptyCoordinates, end: emptyCoordinates,