page-transition 0.1.0-beta.2 → 0.1.0-beta.3
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.
|
@@ -5,15 +5,17 @@ export function usePopState({ resolveFn, state, useUse, resolveUseFn }) {
|
|
|
5
5
|
if (promise) {
|
|
6
6
|
useUse.current = true;
|
|
7
7
|
use(promise);
|
|
8
|
+
}
|
|
9
|
+
else {
|
|
8
10
|
useUse.current = false;
|
|
9
11
|
}
|
|
10
12
|
useEffect(() => {
|
|
11
13
|
const handlePopstate = () => {
|
|
12
|
-
setPromise(new Promise((resolve) => {
|
|
14
|
+
setPromise(new Promise((resolve, reject) => {
|
|
13
15
|
resolveFn.current = resolve;
|
|
14
|
-
resolveUseFn.current =
|
|
16
|
+
resolveUseFn.current = reject;
|
|
15
17
|
state.current = 'exiting';
|
|
16
|
-
}));
|
|
18
|
+
}).then(() => setPromise(null)).catch(() => setPromise(null)));
|
|
17
19
|
};
|
|
18
20
|
window.addEventListener('popstate', handlePopstate);
|
|
19
21
|
return () => window.removeEventListener('popstate', handlePopstate);
|
|
@@ -37,8 +37,11 @@ export function useHandleLinkClick({ container, handleLinkClick, currentPathname
|
|
|
37
37
|
reverse,
|
|
38
38
|
delay
|
|
39
39
|
});
|
|
40
|
-
if (useUse.current)
|
|
40
|
+
if (useUse.current) {
|
|
41
41
|
resolveUseFn.current?.();
|
|
42
|
+
state.current = 'navigating';
|
|
43
|
+
router.push(currentPathname.current);
|
|
44
|
+
}
|
|
42
45
|
container.current?.classList.remove('exit');
|
|
43
46
|
container.current?.classList.add('enter');
|
|
44
47
|
reverse.current.lock = false;
|
|
@@ -8,6 +8,8 @@ export function usePopState({ container, currentPathname, transitionEndData, tra
|
|
|
8
8
|
if (promise) {
|
|
9
9
|
useUse.current = true;
|
|
10
10
|
use(promise);
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
11
13
|
useUse.current = false;
|
|
12
14
|
}
|
|
13
15
|
const resolveFn = useRef(null);
|
|
@@ -34,6 +36,8 @@ export function usePopState({ container, currentPathname, transitionEndData, tra
|
|
|
34
36
|
state.current = 'entering';
|
|
35
37
|
reverse.current.lock = false;
|
|
36
38
|
resolveFn.current?.();
|
|
39
|
+
setPromise(null);
|
|
40
|
+
useUse.current = false;
|
|
37
41
|
}
|
|
38
42
|
});
|
|
39
43
|
const pop = useTransitionEndObj({
|
|
@@ -42,19 +46,20 @@ export function usePopState({ container, currentPathname, transitionEndData, tra
|
|
|
42
46
|
state.current = 'navigating';
|
|
43
47
|
window.scrollTo(0, window.history.state.scrollY ?? 0);
|
|
44
48
|
resolveFn.current?.();
|
|
45
|
-
|
|
49
|
+
setPromise(null);
|
|
46
50
|
}
|
|
47
51
|
});
|
|
48
52
|
useEffect(() => {
|
|
49
53
|
const handlePopstate = () => {
|
|
50
|
-
setPromise(new Promise((resolve) => {
|
|
54
|
+
setPromise(new Promise((resolve, reject) => {
|
|
51
55
|
resolveFn.current = resolve;
|
|
52
|
-
resolveUseFn.current =
|
|
56
|
+
resolveUseFn.current = reject;
|
|
53
57
|
new Promise((resolveNavigating) => {
|
|
54
58
|
if (state.current === "navigating") {
|
|
55
59
|
if (currentPathname.current !== window.location.pathname) {
|
|
56
60
|
if (checkTransitionFinish(transitionEndData.current, () => {
|
|
57
61
|
resolveFn.current?.();
|
|
62
|
+
setPromise(null);
|
|
58
63
|
}))
|
|
59
64
|
return;
|
|
60
65
|
}
|
|
@@ -90,7 +95,7 @@ export function usePopState({ container, currentPathname, transitionEndData, tra
|
|
|
90
95
|
container.current?.classList.add('exit');
|
|
91
96
|
state.current = 'exiting';
|
|
92
97
|
});
|
|
93
|
-
}));
|
|
98
|
+
}).catch(() => setPromise(null)));
|
|
94
99
|
};
|
|
95
100
|
window.addEventListener('popstate', handlePopstate);
|
|
96
101
|
return () => window.removeEventListener('popstate', handlePopstate);
|