Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/hooks/useKeyboardDismissable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,31 @@ export const useKeyboardDismissable = ({ enabled, callback }: IParams) => {

export function useBackHandler({ enabled, callback }: IParams) {
useEffect(() => {
let backHandler = () => {
const backHandler = () => {
callback();
return true;
};
let subscription: any;
if (enabled) {
BackHandler.addEventListener('hardwareBackPress', backHandler);
subscription = BackHandler.addEventListener(
'hardwareBackPress',
backHandler
);
} else {
BackHandler.removeEventListener('hardwareBackPress', backHandler);
if (BackHandler.removeEventListener) {
BackHandler.removeEventListener('hardwareBackPress', backHandler);
}
}
return () =>
BackHandler.removeEventListener('hardwareBackPress', backHandler);
return () => {
// React Native >= 0.65
// @ts-ignore:next-line ignoring ts error as devDependency contains "@types/react-native" < 0.65
if (subscription?.remove) {
subscription.remove();
}

if (BackHandler.removeEventListener) {
BackHandler.removeEventListener('hardwareBackPress', backHandler);
}
};
}, [enabled, callback]);
}
12 changes: 10 additions & 2 deletions src/hooks/useScreenReaderEnabled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function useScreenReaderEnabled() {
handleSetEnabled(res);
}

let handler: any = AccessibilityInfo.addEventListener(
const handler: any = AccessibilityInfo.addEventListener(
'screenReaderChanged',
(event: any) => {
handleSetEnabled(event);
Expand All @@ -28,7 +28,15 @@ export function useScreenReaderEnabled() {
setInitialValue();
return () => {
mountedRef.current = false;
AccessibilityInfo.removeEventListener('screenReaderChanged', handler);
// React Native >= 0.65
// @ts-ignore:next-line ignoring ts error as devDependency contains "@types/react-native" < 0.65
if (handler.remove) {
handler.remove();
}

if (AccessibilityInfo.removeEventListener) {
AccessibilityInfo.removeEventListener('screenReaderChanged', handler);
}
};
});

Expand Down
18 changes: 15 additions & 3 deletions src/utils/useResponsiveQuery/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const getResponsiveStylesImpl = (width: number) => (
queries: GetResponsiveStylesParams
): GetResponsiveStylesReturnType => {
if (typeof width === 'number') {
let styles = queries.initial
const styles = queries.initial
? [
StyleSheet.create({ initial: StyleSheet.flatten(queries.initial) })
.initial,
Expand Down Expand Up @@ -72,14 +72,26 @@ export const useDimensionsWithEnable = ({ enable }: { enable?: boolean }) => {
setDimensions(window);
}
}
Dimensions.addEventListener('change', handleChange);

const subscription: any = Dimensions.addEventListener(
'change',
handleChange
);
// We might have missed an update between calling `get` in render and
// `addEventListener` in this handler, so we set it here. If there was
// no change, React will filter out this update as a no-op.
handleChange({ window: Dimensions.get('window') });

return () => {
Dimensions.removeEventListener('change', handleChange);
// React Native >= 0.65
// @ts-ignore:next-line ignoring ts error as devDependency contains "@types/react-native" < 0.65
if (subscription.remove) {
subscription.remove();
}

if (Dimensions.removeEventListener) {
Dimensions.removeEventListener('change', handleChange);
}
};
}
return () => {};
Expand Down