page-transition 0.1.0-beta.1 → 0.1.0-beta.2
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/README.md +1 -5
- package/dist/context/CssTransitionProvider.js +6 -3
- package/dist/context/ManualTransitionProvider.js +6 -3
- package/dist/hooks/manual/useHandleLinkClick.d.ts +3 -2
- package/dist/hooks/manual/useHandleLinkClick.js +3 -3
- package/dist/hooks/manual/usePopState.d.ts +3 -2
- package/dist/hooks/manual/usePopState.js +4 -3
- package/dist/hooks/useHandleLinkClick.d.ts +3 -2
- package/dist/hooks/useHandleLinkClick.js +5 -4
- package/dist/hooks/usePopState.d.ts +3 -2
- package/dist/hooks/usePopState.js +4 -3
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -8,11 +8,7 @@ A page transition library for the Next.js App Router.
|
|
|
8
8
|
|
|
9
9
|
## Install
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
Install the package using npm:
|
|
14
|
-
|
|
15
|
-
`npm install ./page-transition-0.1.0-beta.1.tgz`
|
|
11
|
+
`npm install page-transition@beta`
|
|
16
12
|
|
|
17
13
|
## Usage
|
|
18
14
|
Import your page transition styles and wrap your page content with `TransitionProvider` in your root layout.
|
|
@@ -20,12 +20,13 @@ export function CssTransitionProvider({ header, options = {
|
|
|
20
20
|
const overlayItems = useRef([]);
|
|
21
21
|
const pathname = usePathname();
|
|
22
22
|
const currentPathname = useRef(pathname);
|
|
23
|
+
const resolveUseFn = useRef(null);
|
|
23
24
|
const mount = useRef({
|
|
24
25
|
mounted: false,
|
|
25
26
|
initPathname: pathname
|
|
26
27
|
});
|
|
27
28
|
const state = useRef('idle');
|
|
28
|
-
const
|
|
29
|
+
const useUse = useRef(false);
|
|
29
30
|
const reverse = useRef({
|
|
30
31
|
_lock: true,
|
|
31
32
|
get lock() {
|
|
@@ -55,7 +56,8 @@ export function CssTransitionProvider({ header, options = {
|
|
|
55
56
|
state,
|
|
56
57
|
reverse,
|
|
57
58
|
delay,
|
|
58
|
-
|
|
59
|
+
useUse,
|
|
60
|
+
resolveUseFn
|
|
59
61
|
});
|
|
60
62
|
useHandleLinkClick({
|
|
61
63
|
container,
|
|
@@ -66,7 +68,8 @@ export function CssTransitionProvider({ header, options = {
|
|
|
66
68
|
state,
|
|
67
69
|
reverse,
|
|
68
70
|
delay,
|
|
69
|
-
|
|
71
|
+
useUse,
|
|
72
|
+
resolveUseFn
|
|
70
73
|
});
|
|
71
74
|
useScrollRestoration();
|
|
72
75
|
const removeEnter = useTransitionEndObj({
|
|
@@ -10,17 +10,20 @@ export function ManualTransitionProvider({ children }) {
|
|
|
10
10
|
const handleLinkClick = useRef(() => { });
|
|
11
11
|
const resolveFn = useRef(null);
|
|
12
12
|
const state = useRef('idle');
|
|
13
|
-
const
|
|
13
|
+
const useUse = useRef(false);
|
|
14
|
+
const resolveUseFn = useRef(null);
|
|
14
15
|
usePopState({
|
|
15
16
|
resolveFn,
|
|
16
17
|
state,
|
|
17
|
-
|
|
18
|
+
useUse,
|
|
19
|
+
resolveUseFn
|
|
18
20
|
});
|
|
19
21
|
useHandleLinkClick({
|
|
20
22
|
handleLinkClick,
|
|
21
23
|
resolveFn,
|
|
22
24
|
state,
|
|
23
|
-
|
|
25
|
+
useUse,
|
|
26
|
+
resolveUseFn
|
|
24
27
|
});
|
|
25
28
|
useEffect(() => {
|
|
26
29
|
state.current = 'entering';
|
|
@@ -3,7 +3,8 @@ interface Props {
|
|
|
3
3
|
handleLinkClick: RefObject<((e: React.MouseEvent, url: string) => void)>;
|
|
4
4
|
resolveFn: RefObject<(() => void) | null>;
|
|
5
5
|
state: RefObject<'idle' | 'exiting' | 'entering'>;
|
|
6
|
-
|
|
6
|
+
useUse: RefObject<boolean>;
|
|
7
|
+
resolveUseFn: RefObject<(() => void) | null>;
|
|
7
8
|
}
|
|
8
|
-
export declare function useHandleLinkClick({ handleLinkClick, resolveFn, state,
|
|
9
|
+
export declare function useHandleLinkClick({ handleLinkClick, resolveFn, state, useUse, resolveUseFn }: Props): void;
|
|
9
10
|
export {};
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { useCallback } from "react";
|
|
3
3
|
import { useRouter } from "next/navigation";
|
|
4
|
-
export function useHandleLinkClick({ handleLinkClick, resolveFn, state,
|
|
4
|
+
export function useHandleLinkClick({ handleLinkClick, resolveFn, state, useUse, resolveUseFn }) {
|
|
5
5
|
const router = useRouter();
|
|
6
6
|
handleLinkClick.current = useCallback((e, url) => {
|
|
7
7
|
e.preventDefault();
|
|
8
|
-
if (popRun.current)
|
|
9
|
-
return;
|
|
10
8
|
new Promise((resolve) => {
|
|
11
9
|
resolveFn.current = resolve;
|
|
12
10
|
state.current = 'exiting';
|
|
13
11
|
}).then(() => {
|
|
12
|
+
if (useUse.current)
|
|
13
|
+
resolveUseFn.current?.();
|
|
14
14
|
router.push(url);
|
|
15
15
|
});
|
|
16
16
|
}, []);
|
|
@@ -2,7 +2,8 @@ import type { RefObject } from "react";
|
|
|
2
2
|
interface Props {
|
|
3
3
|
resolveFn: RefObject<(() => void) | null>;
|
|
4
4
|
state: RefObject<'idle' | 'exiting' | 'entering'>;
|
|
5
|
-
|
|
5
|
+
useUse: RefObject<boolean>;
|
|
6
|
+
resolveUseFn: RefObject<(() => void) | null>;
|
|
6
7
|
}
|
|
7
|
-
export declare function usePopState({ resolveFn, state,
|
|
8
|
+
export declare function usePopState({ resolveFn, state, useUse, resolveUseFn }: Props): void;
|
|
8
9
|
export {};
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { useEffect, useState, use } from "react";
|
|
3
|
-
export function usePopState({ resolveFn, state,
|
|
3
|
+
export function usePopState({ resolveFn, state, useUse, resolveUseFn }) {
|
|
4
4
|
const [promise, setPromise] = useState(null);
|
|
5
5
|
if (promise) {
|
|
6
|
-
|
|
6
|
+
useUse.current = true;
|
|
7
7
|
use(promise);
|
|
8
|
-
|
|
8
|
+
useUse.current = false;
|
|
9
9
|
}
|
|
10
10
|
useEffect(() => {
|
|
11
11
|
const handlePopstate = () => {
|
|
12
12
|
setPromise(new Promise((resolve) => {
|
|
13
13
|
resolveFn.current = resolve;
|
|
14
|
+
resolveUseFn.current = resolve;
|
|
14
15
|
state.current = 'exiting';
|
|
15
16
|
}));
|
|
16
17
|
};
|
|
@@ -19,7 +19,8 @@ interface Props {
|
|
|
19
19
|
lock: boolean;
|
|
20
20
|
}>;
|
|
21
21
|
delay: RefObject<number | null>;
|
|
22
|
-
|
|
22
|
+
useUse: RefObject<boolean>;
|
|
23
|
+
resolveUseFn: RefObject<(() => void) | null>;
|
|
23
24
|
}
|
|
24
|
-
export declare function useHandleLinkClick({ container, handleLinkClick, currentPathname, transitionEndData, transitionEndHandler, reverse, delay, state,
|
|
25
|
+
export declare function useHandleLinkClick({ container, handleLinkClick, currentPathname, transitionEndData, transitionEndHandler, reverse, delay, state, useUse, resolveUseFn }: Props): void;
|
|
25
26
|
export {};
|
|
@@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";
|
|
|
4
4
|
import { useTransitionEndObj } from "../hooks/useTransitionEndObj";
|
|
5
5
|
import { transitionEnd } from "../functions/transitionEnd";
|
|
6
6
|
import { checkTransitionFinish } from "../functions/checkTransitionFinish";
|
|
7
|
-
export function useHandleLinkClick({ container, handleLinkClick, currentPathname, transitionEndData, transitionEndHandler, reverse, delay, state,
|
|
7
|
+
export function useHandleLinkClick({ container, handleLinkClick, currentPathname, transitionEndData, transitionEndHandler, reverse, delay, state, useUse, resolveUseFn }) {
|
|
8
8
|
const router = useRouter();
|
|
9
9
|
const afterExitFn = useRef(null);
|
|
10
10
|
const nextPage = useRef(null);
|
|
@@ -13,6 +13,8 @@ export function useHandleLinkClick({ container, handleLinkClick, currentPathname
|
|
|
13
13
|
fn: () => {
|
|
14
14
|
if (!nextPage.current)
|
|
15
15
|
return;
|
|
16
|
+
if (useUse.current)
|
|
17
|
+
resolveUseFn.current?.();
|
|
16
18
|
state.current = 'navigating';
|
|
17
19
|
router.push(nextPage.current);
|
|
18
20
|
nextPage.current = null;
|
|
@@ -35,6 +37,8 @@ export function useHandleLinkClick({ container, handleLinkClick, currentPathname
|
|
|
35
37
|
reverse,
|
|
36
38
|
delay
|
|
37
39
|
});
|
|
40
|
+
if (useUse.current)
|
|
41
|
+
resolveUseFn.current?.();
|
|
38
42
|
container.current?.classList.remove('exit');
|
|
39
43
|
container.current?.classList.add('enter');
|
|
40
44
|
reverse.current.lock = false;
|
|
@@ -43,12 +47,9 @@ export function useHandleLinkClick({ container, handleLinkClick, currentPathname
|
|
|
43
47
|
});
|
|
44
48
|
handleLinkClick.current = useCallback((e, url) => {
|
|
45
49
|
e.preventDefault();
|
|
46
|
-
if (popRun.current)
|
|
47
|
-
return;
|
|
48
50
|
nextPage.current = url;
|
|
49
51
|
new Promise((resolve) => {
|
|
50
52
|
if (state.current === 'navigating') {
|
|
51
|
-
console.log('navigating');
|
|
52
53
|
if (url === currentPathname.current) {
|
|
53
54
|
return;
|
|
54
55
|
}
|
|
@@ -18,7 +18,8 @@ interface Props {
|
|
|
18
18
|
}>;
|
|
19
19
|
delay: RefObject<number | null>;
|
|
20
20
|
state: RefObject<'idle' | 'exiting' | 'entering' | 'navigating'>;
|
|
21
|
-
|
|
21
|
+
useUse: RefObject<boolean>;
|
|
22
|
+
resolveUseFn: RefObject<(() => void) | null>;
|
|
22
23
|
}
|
|
23
|
-
export declare function usePopState({ container, currentPathname, transitionEndData, transitionEndHandler, reverse, delay, state,
|
|
24
|
+
export declare function usePopState({ container, currentPathname, transitionEndData, transitionEndHandler, reverse, delay, state, useUse, resolveUseFn }: Props): void;
|
|
24
25
|
export {};
|
|
@@ -3,12 +3,12 @@ import { useEffect, useRef, useState, use } from "react";
|
|
|
3
3
|
import { useTransitionEndObj } from "./useTransitionEndObj";
|
|
4
4
|
import { transitionEnd } from "../functions/transitionEnd";
|
|
5
5
|
import { checkTransitionFinish } from "../functions/checkTransitionFinish";
|
|
6
|
-
export function usePopState({ container, currentPathname, transitionEndData, transitionEndHandler, reverse, delay, state,
|
|
6
|
+
export function usePopState({ container, currentPathname, transitionEndData, transitionEndHandler, reverse, delay, state, useUse, resolveUseFn }) {
|
|
7
7
|
const [promise, setPromise] = useState(null);
|
|
8
8
|
if (promise) {
|
|
9
|
-
|
|
9
|
+
useUse.current = true;
|
|
10
10
|
use(promise);
|
|
11
|
-
|
|
11
|
+
useUse.current = false;
|
|
12
12
|
}
|
|
13
13
|
const resolveFn = useRef(null);
|
|
14
14
|
const afterExitFn = useRef(null);
|
|
@@ -49,6 +49,7 @@ export function usePopState({ container, currentPathname, transitionEndData, tra
|
|
|
49
49
|
const handlePopstate = () => {
|
|
50
50
|
setPromise(new Promise((resolve) => {
|
|
51
51
|
resolveFn.current = resolve;
|
|
52
|
+
resolveUseFn.current = resolve;
|
|
52
53
|
new Promise((resolveNavigating) => {
|
|
53
54
|
if (state.current === "navigating") {
|
|
54
55
|
if (currentPathname.current !== window.location.pathname) {
|