@etsoo/react 1.8.3 → 1.8.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.
Files changed (7) hide show
  1. package/lib/components/GridLoader.d.ts +5 -1
  2. package/lib/components/ScrollerGrid.js +2 -1
  3. package/lib/components/ScrollerList.js +2 -1
  4. package/package.json +2 -2
  5. package/src/components/GridLoader.ts +9 -1
  6. package/src/components/ScrollerGrid.tsx +2 -1
  7. package/src/components/ScrollerList.tsx +2 -1
package/lib/components/GridLoader.d.ts CHANGED
@@ -76,7 +76,7 @@ export interface GridLoader<T extends object> {
76
76
  /**
77
77
  * Load data
78
78
  */
79
- loadData: (props: GridLoadDataProps) => PromiseLike<T[] | null | undefined>;
79
+ loadData: (props: GridLoadDataProps, lastItem?: T) => PromiseLike<T[] | null | undefined>;
80
80
  /**
81
81
  * Handler for init load
82
82
  * @param ref Ref
@@ -100,6 +100,10 @@ type GridLoaderProps<T> = {
100
100
  * @default true
101
101
  */
102
102
  autoLoad: boolean;
103
+ /**
104
+ * Last loaded item
105
+ */
106
+ lastItem?: T;
103
107
  /**
104
108
  * Last loaded items
105
109
  */
package/lib/components/ScrollerGrid.js CHANGED
@@ -45,13 +45,14 @@ export const ScrollerGrid = (props) => {
45
45
  queryPaging,
46
46
  data
47
47
  };
48
- loadData(loadProps).then((result) => {
48
+ loadData(loadProps, refs.current.lastItem).then((result) => {
49
49
  if (result == null || refs.current.isMounted === false) {
50
50
  return;
51
51
  }
52
52
  refs.current.isMounted = true;
53
53
  const newItems = result.length;
54
54
  refs.current.lastLoadedItems = newItems;
55
+ refs.current.lastItem = result.at(-1);
55
56
  refs.current.isNextPageLoading = false;
56
57
  refs.current.hasNextPage = newItems >= refs.current.queryPaging.batchSize;
57
58
  if (pageAdd === 0) {
package/lib/components/ScrollerList.js CHANGED
@@ -63,13 +63,14 @@ export const ScrollerList = (props) => {
63
63
  queryPaging,
64
64
  data
65
65
  };
66
- loadData(loadProps).then((result) => {
66
+ loadData(loadProps, stateRefs.current.lastItem).then((result) => {
67
67
  if (result == null || stateRefs.current.isMounted === false) {
68
68
  return;
69
69
  }
70
70
  stateRefs.current.isMounted = true;
71
71
  const newItems = result.length;
72
72
  stateRefs.current.lastLoadedItems = newItems;
73
+ stateRefs.current.lastItem = result.at(-1);
73
74
  stateRefs.current.hasNextPage = newItems >= batchSize;
74
75
  stateRefs.current.isNextPageLoading = false;
75
76
  if (pageAdd === 0) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/react",
3
- "version": "1.8.3",
3
+ "version": "1.8.5",
4
4
  "description": "TypeScript ReactJs UI Independent Framework",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -48,7 +48,7 @@
48
48
  "@emotion/css": "^11.13.5",
49
49
  "@emotion/react": "^11.13.5",
50
50
  "@emotion/styled": "^11.13.5",
51
- "@etsoo/appscript": "^1.5.68",
51
+ "@etsoo/appscript": "^1.5.76",
52
52
  "@etsoo/notificationbase": "^1.1.54",
53
53
  "@etsoo/shared": "^1.2.55",
54
54
  "react": "^18.3.1",
package/src/components/GridLoader.ts CHANGED
@@ -116,7 +116,10 @@ export interface GridLoader<T extends object> {
116
116
  /**
117
117
  * Load data
118
118
  */
119
- loadData: (props: GridLoadDataProps) => PromiseLike<T[] | null | undefined>;
119
+ loadData: (
120
+ props: GridLoadDataProps,
121
+ lastItem?: T
122
+ ) => PromiseLike<T[] | null | undefined>;
120
123
 
121
124
  /**
122
125
  * Handler for init load
@@ -147,6 +150,11 @@ type GridLoaderProps<T> = {
147
150
  */
148
151
  autoLoad: boolean;
149
152
 
153
+ /**
154
+ * Last loaded item
155
+ */
156
+ lastItem?: T;
157
+
150
158
  /**
151
159
  * Last loaded items
152
160
  */
package/src/components/ScrollerGrid.tsx CHANGED
@@ -211,7 +211,7 @@ export const ScrollerGrid = <T extends object>(props: ScrollerGridProps<T>) => {
211
211
  data
212
212
  };
213
213
 
214
- loadData(loadProps).then((result) => {
214
+ loadData(loadProps, refs.current.lastItem).then((result) => {
215
215
  if (result == null || refs.current.isMounted === false) {
216
216
  return;
217
217
  }
@@ -219,6 +219,7 @@ export const ScrollerGrid = <T extends object>(props: ScrollerGridProps<T>) => {
219
219
 
220
220
  const newItems = result.length;
221
221
  refs.current.lastLoadedItems = newItems;
222
+ refs.current.lastItem = result.at(-1);
222
223
  refs.current.isNextPageLoading = false;
223
224
  refs.current.hasNextPage = newItems >= refs.current.queryPaging.batchSize;
224
225
 
package/src/components/ScrollerList.tsx CHANGED
@@ -179,7 +179,7 @@ export const ScrollerList = <T extends object>(props: ScrollerListProps<T>) => {
179
179
  data
180
180
  };
181
181
 
182
- loadData(loadProps).then((result) => {
182
+ loadData(loadProps, stateRefs.current.lastItem).then((result) => {
183
183
  if (result == null || stateRefs.current.isMounted === false) {
184
184
  return;
185
185
  }
@@ -187,6 +187,7 @@ export const ScrollerList = <T extends object>(props: ScrollerListProps<T>) => {
187
187
 
188
188
  const newItems = result.length;
189
189
  stateRefs.current.lastLoadedItems = newItems;
190
+ stateRefs.current.lastItem = result.at(-1);
190
191
  stateRefs.current.hasNextPage = newItems >= batchSize;
191
192
  stateRefs.current.isNextPageLoading = false;
192
193