akanjs 2.3.5-rc.4 → 2.3.5-rc.5
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/package.json +1 -1
- package/types/ui/InfiniteScroll.d.ts +3 -1
- package/types/ui/More.d.ts +3 -1
- package/ui/InfiniteScroll.tsx +2 -2
- package/ui/Load/Units.tsx +6 -4
- package/ui/More.tsx +9 -2
package/package.json
CHANGED
|
@@ -3,7 +3,9 @@ export interface InfiniteScrollProps {
|
|
|
3
3
|
currentPage: number;
|
|
4
4
|
itemsPerPage: number;
|
|
5
5
|
onAddPage: (page: number) => Promise<void>;
|
|
6
|
-
onPageSelect: (page: number
|
|
6
|
+
onPageSelect: (page: number, option?: {
|
|
7
|
+
scrollToTop?: boolean;
|
|
8
|
+
}) => void;
|
|
7
9
|
children: React.ReactNode;
|
|
8
10
|
reverse?: boolean;
|
|
9
11
|
}
|
package/types/ui/More.d.ts
CHANGED
|
@@ -3,7 +3,9 @@ interface MoreProps {
|
|
|
3
3
|
itemsPerPage: number;
|
|
4
4
|
currentPage: number;
|
|
5
5
|
onAddPage: (page: number) => Promise<void>;
|
|
6
|
-
onPageSelect: (page: number
|
|
6
|
+
onPageSelect: (page: number, option?: {
|
|
7
|
+
scrollToTop?: boolean;
|
|
8
|
+
}) => void;
|
|
7
9
|
children?: React.ReactNode;
|
|
8
10
|
className?: string;
|
|
9
11
|
reverse?: boolean;
|
package/ui/InfiniteScroll.tsx
CHANGED
|
@@ -7,7 +7,7 @@ export interface InfiniteScrollProps {
|
|
|
7
7
|
currentPage: number;
|
|
8
8
|
itemsPerPage: number;
|
|
9
9
|
onAddPage: (page: number) => Promise<void>;
|
|
10
|
-
onPageSelect: (page: number) => void;
|
|
10
|
+
onPageSelect: (page: number, option?: { scrollToTop?: boolean }) => void;
|
|
11
11
|
children: React.ReactNode;
|
|
12
12
|
reverse?: boolean;
|
|
13
13
|
}
|
|
@@ -51,7 +51,7 @@ export const InfiniteScroll = ({
|
|
|
51
51
|
setIsFetching(true);
|
|
52
52
|
try {
|
|
53
53
|
await onAddPage(nextPage);
|
|
54
|
-
onPageSelect(nextPage);
|
|
54
|
+
onPageSelect(nextPage, { scrollToTop: false });
|
|
55
55
|
page.current = nextPage;
|
|
56
56
|
|
|
57
57
|
const restoreScroll = () => {
|
package/ui/Load/Units.tsx
CHANGED
|
@@ -156,11 +156,13 @@ function Render<RefName extends string, Light extends { id: string }>({
|
|
|
156
156
|
onAddPage: async (page: number) => {
|
|
157
157
|
await storeDo[namesOfSlice.addPageOfModel](page);
|
|
158
158
|
},
|
|
159
|
-
onPageSelect: (page: number) => {
|
|
159
|
+
onPageSelect: (page: number, option?: { scrollToTop?: boolean }) => {
|
|
160
160
|
void storeDo[namesOfSlice.setPageOfModel](page);
|
|
161
161
|
|
|
162
|
-
|
|
163
|
-
|
|
162
|
+
if (option?.scrollToTop !== false) {
|
|
163
|
+
window.parent.postMessage({ type: "pathChange", page }, "*");
|
|
164
|
+
window.scrollTo({ top: 0, behavior: "instant" });
|
|
165
|
+
}
|
|
164
166
|
},
|
|
165
167
|
reverse,
|
|
166
168
|
};
|
|
@@ -279,7 +281,7 @@ interface MoreProps {
|
|
|
279
281
|
itemsPerPage: number;
|
|
280
282
|
currentPage: number;
|
|
281
283
|
onAddPage: (page: number) => Promise<void>;
|
|
282
|
-
onPageSelect: (page: number) => void;
|
|
284
|
+
onPageSelect: (page: number, option?: { scrollToTop?: boolean }) => void;
|
|
283
285
|
children?: React.ReactNode;
|
|
284
286
|
className?: string;
|
|
285
287
|
reverse?: boolean;
|
package/ui/More.tsx
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { clsx, isMobileDevice } from "akanjs/client";
|
|
3
|
+
import { useEffect, useState } from "react";
|
|
3
4
|
import { InfiniteScroll } from "./InfiniteScroll";
|
|
4
5
|
import { Pagination } from "./Pagination";
|
|
5
6
|
|
|
@@ -8,7 +9,7 @@ interface MoreProps {
|
|
|
8
9
|
itemsPerPage: number;
|
|
9
10
|
currentPage: number;
|
|
10
11
|
onAddPage: (page: number) => Promise<void>;
|
|
11
|
-
onPageSelect: (page: number) => void;
|
|
12
|
+
onPageSelect: (page: number, option?: { scrollToTop?: boolean }) => void;
|
|
12
13
|
children?: React.ReactNode;
|
|
13
14
|
className?: string;
|
|
14
15
|
reverse?: boolean;
|
|
@@ -24,11 +25,17 @@ export const More = ({
|
|
|
24
25
|
className,
|
|
25
26
|
reverse,
|
|
26
27
|
}: MoreProps) => {
|
|
28
|
+
const [isMobile, setIsMobile] = useState(false);
|
|
29
|
+
|
|
30
|
+
useEffect(() => {
|
|
31
|
+
setIsMobile(isMobileDevice());
|
|
32
|
+
}, []);
|
|
33
|
+
|
|
27
34
|
if (total <= itemsPerPage) {
|
|
28
35
|
return <>{children}</>;
|
|
29
36
|
}
|
|
30
37
|
|
|
31
|
-
if (
|
|
38
|
+
if (isMobile) {
|
|
32
39
|
return (
|
|
33
40
|
<InfiniteScroll
|
|
34
41
|
total={total}
|