@granite-js/react-native 1.0.31 → 1.0.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +30 -0
- package/dist/app/AppRoot.d.ts +1 -1
- package/dist/app/Granite.d.ts +8 -1
- package/dist/router/Router.d.ts +1 -1
- package/dist/router/components/CanGoBackGuard.d.ts +13 -5
- package/dist/router/components/useRouterBackHandler.d.ts +4 -1
- package/dist/use-back-event/BackEventContext.d.ts +15 -0
- package/dist/use-back-event/index.d.ts +1 -0
- package/dist/use-back-event/useBackEvent.d.ts +8 -9
- package/dist/use-back-event/useBackEventActionsContext.d.ts +1 -0
- package/dist/use-back-event/useBackEventContext.d.ts +2 -0
- package/dist/use-back-event/useBackHandler.d.ts +53 -0
- package/package.json +12 -11
- package/src/app/AppRoot.tsx +3 -0
- package/src/app/Granite.tsx +8 -1
- package/src/intersection-observer/IntersectionObserver.ts +3 -3
- package/src/router/Router.tsx +6 -2
- package/src/router/components/CanGoBackGuard.spec.tsx +85 -0
- package/src/router/components/CanGoBackGuard.tsx +37 -14
- package/src/router/components/useRouterBackHandler.spec.tsx +129 -0
- package/src/router/components/useRouterBackHandler.tsx +34 -13
- package/src/use-back-event/BackEventContext.ts +26 -0
- package/src/use-back-event/index.ts +1 -0
- package/src/use-back-event/useBackEvent.spec.tsx +107 -0
- package/src/use-back-event/useBackEvent.tsx +138 -48
- package/src/use-back-event/useBackEventActionsContext.ts +11 -0
- package/src/use-back-event/useBackEventContext.ts +28 -0
- package/src/use-back-event/useBackHandler.spec.tsx +113 -0
- package/src/use-back-event/useBackHandler.tsx +114 -0
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { act, renderHook } from '@testing-library/react';
|
|
2
|
+
import { ReactNode } from 'react';
|
|
3
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
4
|
+
import { BackEventProvider } from './useBackEvent';
|
|
5
|
+
import { useBackEventContext } from './useBackEventContext';
|
|
6
|
+
import { useBackHandler } from './useBackHandler';
|
|
7
|
+
|
|
8
|
+
vi.mock('../visibility', () => ({
|
|
9
|
+
useVisibility: () => true,
|
|
10
|
+
}));
|
|
11
|
+
|
|
12
|
+
function BackEventProviderWrapper({ children }: { children: ReactNode }) {
|
|
13
|
+
return <BackEventProvider>{children}</BackEventProvider>;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
function useBackHandlerTest() {
|
|
17
|
+
const backHandler = useBackHandler();
|
|
18
|
+
const backEventContext = useBackEventContext();
|
|
19
|
+
|
|
20
|
+
return {
|
|
21
|
+
backHandler,
|
|
22
|
+
backEventContext,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
describe('useBackHandler', () => {
|
|
27
|
+
it('exposes removal only through the returned subscription', () => {
|
|
28
|
+
const { result } = renderHook(() => useBackHandler(), {
|
|
29
|
+
wrapper: BackEventProviderWrapper,
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
expect(result.current).toEqual({
|
|
33
|
+
addEventListener: expect.any(Function),
|
|
34
|
+
});
|
|
35
|
+
expect('removeEventListener' in result.current).toBe(false);
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it('bubbles from the latest handler and stops when one explicitly handles the event', () => {
|
|
39
|
+
const parent = vi.fn(() => true);
|
|
40
|
+
const child = vi.fn(() => false);
|
|
41
|
+
const overlay = vi.fn(() => true);
|
|
42
|
+
const { result } = renderHook(() => useBackHandlerTest(), {
|
|
43
|
+
wrapper: BackEventProviderWrapper,
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
act(() => {
|
|
47
|
+
result.current.backHandler.addEventListener(parent);
|
|
48
|
+
result.current.backHandler.addEventListener(child);
|
|
49
|
+
result.current.backHandler.addEventListener(overlay);
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
expect(result.current.backEventContext.onBackHandler({ source: 'iosSwipeGesture' })).toBe(true);
|
|
53
|
+
expect(overlay).toHaveBeenCalledWith({ source: 'iosSwipeGesture' });
|
|
54
|
+
expect(child).not.toHaveBeenCalled();
|
|
55
|
+
expect(parent).not.toHaveBeenCalled();
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it('continues bubbling while handlers return false', () => {
|
|
59
|
+
const parent = vi.fn(() => true);
|
|
60
|
+
const child = vi.fn(() => false);
|
|
61
|
+
const { result } = renderHook(() => useBackHandlerTest(), {
|
|
62
|
+
wrapper: BackEventProviderWrapper,
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
act(() => {
|
|
66
|
+
result.current.backHandler.addEventListener(parent);
|
|
67
|
+
result.current.backHandler.addEventListener(child);
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
expect(result.current.backEventContext.onBackHandler({ source: 'backButton' })).toBe(true);
|
|
71
|
+
expect(child).toHaveBeenCalledWith({ source: 'backButton' });
|
|
72
|
+
expect(parent).toHaveBeenCalledWith({ source: 'backButton' });
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it('allows default navigation when handlers return false or undefined', () => {
|
|
76
|
+
const parent = vi.fn(() => false);
|
|
77
|
+
const child = vi.fn();
|
|
78
|
+
const { result } = renderHook(() => useBackHandlerTest(), {
|
|
79
|
+
wrapper: BackEventProviderWrapper,
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
act(() => {
|
|
83
|
+
result.current.backHandler.addEventListener(parent);
|
|
84
|
+
result.current.backHandler.addEventListener(child);
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
expect(result.current.backEventContext.onBackHandler({ source: 'androidHardwareBackPress' })).toBe(false);
|
|
88
|
+
expect(child).toHaveBeenCalledWith({ source: 'androidHardwareBackPress' });
|
|
89
|
+
expect(parent).toHaveBeenCalledWith({ source: 'androidHardwareBackPress' });
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
it('removes a back handler through the returned subscription', () => {
|
|
93
|
+
const handler = vi.fn(() => true);
|
|
94
|
+
const { result } = renderHook(() => useBackHandlerTest(), {
|
|
95
|
+
wrapper: BackEventProviderWrapper,
|
|
96
|
+
});
|
|
97
|
+
let subscription!: ReturnType<typeof result.current.backHandler.addEventListener>;
|
|
98
|
+
|
|
99
|
+
act(() => {
|
|
100
|
+
subscription = result.current.backHandler.addEventListener(handler);
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
expect(result.current.backEventContext.onBackHandler({ source: 'backButton' })).toBe(true);
|
|
104
|
+
|
|
105
|
+
act(() => {
|
|
106
|
+
subscription.remove();
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
expect(result.current.backEventContext.hasBackHandler).toBe(false);
|
|
110
|
+
expect(result.current.backEventContext.onBackHandler({ source: 'backButton' })).toBe(false);
|
|
111
|
+
expect(handler).toHaveBeenCalledTimes(1);
|
|
112
|
+
});
|
|
113
|
+
});
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { useCallback, useEffect, useMemo, useRef } from 'react';
|
|
2
|
+
import { useVisibility } from '../visibility';
|
|
3
|
+
import type { BackEvent } from './useBackEvent';
|
|
4
|
+
import { useBackEventContext } from './useBackEventContext';
|
|
5
|
+
|
|
6
|
+
export type BackHandlerCallback = (event: BackEvent) => boolean | void;
|
|
7
|
+
|
|
8
|
+
export interface BackHandlerSubscription {
|
|
9
|
+
remove: () => void;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export interface BackHandlerControls {
|
|
13
|
+
addEventListener: (handler: BackHandlerCallback) => BackHandlerSubscription;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* @public
|
|
18
|
+
* @category Screen Control
|
|
19
|
+
* @name useBackHandler
|
|
20
|
+
* @description
|
|
21
|
+
* A Hook that registers back handlers. Back handlers run before handlers registered through `useBackEvent`.
|
|
22
|
+
* Return `true` to stop bubbling and prevent default back navigation. Return `false` or return nothing to continue bubbling to the next handler.
|
|
23
|
+
*
|
|
24
|
+
* @example
|
|
25
|
+
*
|
|
26
|
+
* ### Example of Closing an Overlay First
|
|
27
|
+
*
|
|
28
|
+
* ```tsx
|
|
29
|
+
* import { useEffect, useState } from 'react';
|
|
30
|
+
* import { Button, View } from 'react-native';
|
|
31
|
+
* import { useBackHandler } from '@granite-js/react-native';
|
|
32
|
+
*
|
|
33
|
+
* export function OverlayExample() {
|
|
34
|
+
* const backHandler = useBackHandler();
|
|
35
|
+
* const [isOverlayOpen, setIsOverlayOpen] = useState(false);
|
|
36
|
+
*
|
|
37
|
+
* useEffect(() => {
|
|
38
|
+
* const subscription = backHandler.addEventListener(() => {
|
|
39
|
+
* if (isOverlayOpen) {
|
|
40
|
+
* setIsOverlayOpen(false);
|
|
41
|
+
* return true;
|
|
42
|
+
* }
|
|
43
|
+
*
|
|
44
|
+
* return undefined;
|
|
45
|
+
* });
|
|
46
|
+
*
|
|
47
|
+
* return () => {
|
|
48
|
+
* subscription.remove();
|
|
49
|
+
* };
|
|
50
|
+
* }, [backHandler, isOverlayOpen]);
|
|
51
|
+
*
|
|
52
|
+
* return (
|
|
53
|
+
* <View>
|
|
54
|
+
* <Button title="Open Overlay" onPress={() => setIsOverlayOpen(true)} />
|
|
55
|
+
* </View>
|
|
56
|
+
* );
|
|
57
|
+
* }
|
|
58
|
+
* ```
|
|
59
|
+
*/
|
|
60
|
+
export function useBackHandler() {
|
|
61
|
+
const context = useBackEventContext();
|
|
62
|
+
const handlersRef = useRef<Set<BackHandlerCallback>>(new Set()).current;
|
|
63
|
+
|
|
64
|
+
const isVisible = useVisibility();
|
|
65
|
+
|
|
66
|
+
const contextAddBackHandler = context.addBackHandler;
|
|
67
|
+
const contextRemoveBackHandler = context.removeBackHandler;
|
|
68
|
+
|
|
69
|
+
const removeHandler = useCallback(
|
|
70
|
+
(...handlers: Array<BackHandlerCallback>) => {
|
|
71
|
+
for (const handler of handlers) {
|
|
72
|
+
handlersRef.delete(handler);
|
|
73
|
+
contextRemoveBackHandler(handler);
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
[contextRemoveBackHandler]
|
|
77
|
+
);
|
|
78
|
+
|
|
79
|
+
const addEventListener = useCallback(
|
|
80
|
+
(handler: BackHandlerCallback) => {
|
|
81
|
+
handlersRef.add(handler);
|
|
82
|
+
contextAddBackHandler(handler);
|
|
83
|
+
|
|
84
|
+
return {
|
|
85
|
+
remove: () => removeHandler(handler),
|
|
86
|
+
};
|
|
87
|
+
},
|
|
88
|
+
[contextAddBackHandler, removeHandler]
|
|
89
|
+
);
|
|
90
|
+
|
|
91
|
+
useEffect(() => {
|
|
92
|
+
if (!isVisible) {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
for (const handler of handlersRef) {
|
|
97
|
+
contextAddBackHandler(handler);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
return () => {
|
|
101
|
+
for (const handler of handlersRef) {
|
|
102
|
+
contextRemoveBackHandler(handler);
|
|
103
|
+
}
|
|
104
|
+
};
|
|
105
|
+
}, [contextAddBackHandler, contextRemoveBackHandler, isVisible]);
|
|
106
|
+
|
|
107
|
+
const backHandler = useMemo((): BackHandlerControls => {
|
|
108
|
+
return {
|
|
109
|
+
addEventListener,
|
|
110
|
+
};
|
|
111
|
+
}, [addEventListener]);
|
|
112
|
+
|
|
113
|
+
return backHandler;
|
|
114
|
+
}
|