@makroz/web 1.2.2 → 1.2.4
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/dist/auth/MkAuthProvider.d.ts.map +1 -1
- package/dist/auth/MkAuthProvider.js +21 -26
- package/dist/auth/MkAuthProvider.js.map +1 -1
- package/dist/context/MkAuthContext.d.ts +14 -0
- package/dist/context/MkAuthContext.d.ts.map +1 -1
- package/dist/context/MkAuthContext.js +9 -0
- package/dist/context/MkAuthContext.js.map +1 -1
- package/dist/hooks/useApi.d.ts +8 -8
- package/dist/hooks/useApi.d.ts.map +1 -1
- package/dist/hooks/useApi.js +55 -41
- package/dist/hooks/useApi.js.map +1 -1
- package/dist/hooks/useMkForm.d.ts.map +1 -1
- package/dist/hooks/useMkForm.js +21 -19
- package/dist/hooks/useMkForm.js.map +1 -1
- package/dist/hooks/useMkInfiniteList.d.ts +2 -2
- package/dist/hooks/useMkInfiniteList.d.ts.map +1 -1
- package/dist/hooks/useMkInfiniteList.js +41 -15
- package/dist/hooks/useMkInfiniteList.js.map +1 -1
- package/dist/hooks/useMkList.d.ts +29 -11
- package/dist/hooks/useMkList.d.ts.map +1 -1
- package/dist/hooks/useMkList.js.map +1 -1
- package/dist/theme/MkThemeProvider.d.ts.map +1 -1
- package/dist/theme/MkThemeProvider.js +34 -28
- package/dist/theme/MkThemeProvider.js.map +1 -1
- package/eslint-plugin-mk/__tests__/no-cross-module-import.test.js +26 -1
- package/eslint-plugin-mk/rules/no-cross-module-import.js +33 -4
- package/package.json +2 -2
- package/dist/components/MkAccordion.stories.test.d.ts +0 -2
- package/dist/components/MkAccordion.stories.test.d.ts.map +0 -1
- package/dist/components/MkAccordion.stories.test.js +0 -18
- package/dist/components/MkAccordion.stories.test.js.map +0 -1
- package/dist/components/MkAlert.stories.test.d.ts +0 -2
- package/dist/components/MkAlert.stories.test.d.ts.map +0 -1
- package/dist/components/MkAlert.stories.test.js +0 -16
- package/dist/components/MkAlert.stories.test.js.map +0 -1
- package/dist/components/MkAvatar.stories.test.d.ts +0 -2
- package/dist/components/MkAvatar.stories.test.d.ts.map +0 -1
- package/dist/components/MkAvatar.stories.test.js +0 -16
- package/dist/components/MkAvatar.stories.test.js.map +0 -1
- package/dist/components/MkBadge.stories.test.d.ts +0 -2
- package/dist/components/MkBadge.stories.test.d.ts.map +0 -1
- package/dist/components/MkBadge.stories.test.js +0 -16
- package/dist/components/MkBadge.stories.test.js.map +0 -1
- package/dist/components/MkButton.test.d.ts +0 -2
- package/dist/components/MkButton.test.d.ts.map +0 -1
- package/dist/components/MkButton.test.js +0 -56
- package/dist/components/MkButton.test.js.map +0 -1
- package/dist/components/MkCheck.stories.test.d.ts +0 -2
- package/dist/components/MkCheck.stories.test.d.ts.map +0 -1
- package/dist/components/MkCheck.stories.test.js +0 -16
- package/dist/components/MkCheck.stories.test.js.map +0 -1
- package/dist/components/MkDatePicker.stories.test.d.ts +0 -2
- package/dist/components/MkDatePicker.stories.test.d.ts.map +0 -1
- package/dist/components/MkDatePicker.stories.test.js +0 -16
- package/dist/components/MkDatePicker.stories.test.js.map +0 -1
- package/dist/components/MkDivider.stories.test.d.ts +0 -2
- package/dist/components/MkDivider.stories.test.d.ts.map +0 -1
- package/dist/components/MkDivider.stories.test.js +0 -15
- package/dist/components/MkDivider.stories.test.js.map +0 -1
- package/dist/components/MkDropDown.stories.test.d.ts +0 -2
- package/dist/components/MkDropDown.stories.test.d.ts.map +0 -1
- package/dist/components/MkDropDown.stories.test.js +0 -18
- package/dist/components/MkDropDown.stories.test.js.map +0 -1
- package/dist/components/MkEmptyState.stories.test.d.ts +0 -2
- package/dist/components/MkEmptyState.stories.test.d.ts.map +0 -1
- package/dist/components/MkEmptyState.stories.test.js +0 -15
- package/dist/components/MkEmptyState.stories.test.js.map +0 -1
- package/dist/components/MkFileUpload.stories.test.d.ts +0 -2
- package/dist/components/MkFileUpload.stories.test.d.ts.map +0 -1
- package/dist/components/MkFileUpload.stories.test.js +0 -15
- package/dist/components/MkFileUpload.stories.test.js.map +0 -1
- package/dist/components/MkInfiniteList.stories.test.d.ts +0 -2
- package/dist/components/MkInfiniteList.stories.test.d.ts.map +0 -1
- package/dist/components/MkInfiniteList.stories.test.js +0 -24
- package/dist/components/MkInfiniteList.stories.test.js.map +0 -1
- package/dist/components/MkInput.stories.test.d.ts +0 -2
- package/dist/components/MkInput.stories.test.d.ts.map +0 -1
- package/dist/components/MkInput.stories.test.js +0 -16
- package/dist/components/MkInput.stories.test.js.map +0 -1
- package/dist/components/MkLoading.stories.test.d.ts +0 -2
- package/dist/components/MkLoading.stories.test.d.ts.map +0 -1
- package/dist/components/MkLoading.stories.test.js +0 -15
- package/dist/components/MkLoading.stories.test.js.map +0 -1
- package/dist/components/MkProgressBar.stories.test.d.ts +0 -2
- package/dist/components/MkProgressBar.stories.test.d.ts.map +0 -1
- package/dist/components/MkProgressBar.stories.test.js +0 -15
- package/dist/components/MkProgressBar.stories.test.js.map +0 -1
- package/dist/components/MkRadio.stories.test.d.ts +0 -2
- package/dist/components/MkRadio.stories.test.d.ts.map +0 -1
- package/dist/components/MkRadio.stories.test.js +0 -18
- package/dist/components/MkRadio.stories.test.js.map +0 -1
- package/dist/components/MkSearchInput.stories.test.d.ts +0 -2
- package/dist/components/MkSearchInput.stories.test.d.ts.map +0 -1
- package/dist/components/MkSearchInput.stories.test.js +0 -15
- package/dist/components/MkSearchInput.stories.test.js.map +0 -1
- package/dist/components/MkSelect.stories.test.d.ts +0 -2
- package/dist/components/MkSelect.stories.test.d.ts.map +0 -1
- package/dist/components/MkSelect.stories.test.js +0 -21
- package/dist/components/MkSelect.stories.test.js.map +0 -1
- package/dist/components/MkSkeleton.stories.test.d.ts +0 -2
- package/dist/components/MkSkeleton.stories.test.d.ts.map +0 -1
- package/dist/components/MkSkeleton.stories.test.js +0 -15
- package/dist/components/MkSkeleton.stories.test.js.map +0 -1
- package/dist/components/MkSwitch.stories.test.d.ts +0 -2
- package/dist/components/MkSwitch.stories.test.d.ts.map +0 -1
- package/dist/components/MkSwitch.stories.test.js +0 -15
- package/dist/components/MkSwitch.stories.test.js.map +0 -1
- package/dist/components/MkTable.stories.test.d.ts +0 -2
- package/dist/components/MkTable.stories.test.d.ts.map +0 -1
- package/dist/components/MkTable.stories.test.js +0 -25
- package/dist/components/MkTable.stories.test.js.map +0 -1
- package/dist/components/MkTextArea.stories.test.d.ts +0 -2
- package/dist/components/MkTextArea.stories.test.d.ts.map +0 -1
- package/dist/components/MkTextArea.stories.test.js +0 -15
- package/dist/components/MkTextArea.stories.test.js.map +0 -1
- package/dist/components/MkToastContainer.stories.test.d.ts +0 -2
- package/dist/components/MkToastContainer.stories.test.d.ts.map +0 -1
- package/dist/components/MkToastContainer.stories.test.js +0 -29
- package/dist/components/MkToastContainer.stories.test.js.map +0 -1
- package/dist/components/MkTooltip.stories.test.d.ts +0 -2
- package/dist/components/MkTooltip.stories.test.d.ts.map +0 -1
- package/dist/components/MkTooltip.stories.test.js +0 -15
- package/dist/components/MkTooltip.stories.test.js.map +0 -1
- package/dist/components/MkWindowList.stories.test.d.ts +0 -2
- package/dist/components/MkWindowList.stories.test.d.ts.map +0 -1
- package/dist/components/MkWindowList.stories.test.js +0 -19
- package/dist/components/MkWindowList.stories.test.js.map +0 -1
- package/dist/hooks/useApi.test.d.ts +0 -2
- package/dist/hooks/useApi.test.d.ts.map +0 -1
- package/dist/hooks/useApi.test.js +0 -184
- package/dist/hooks/useApi.test.js.map +0 -1
- package/dist/hooks/useMkCrud.test.d.ts +0 -2
- package/dist/hooks/useMkCrud.test.d.ts.map +0 -1
- package/dist/hooks/useMkCrud.test.js +0 -87
- package/dist/hooks/useMkCrud.test.js.map +0 -1
- package/dist/hooks/useMkForm.test.d.ts +0 -2
- package/dist/hooks/useMkForm.test.d.ts.map +0 -1
- package/dist/hooks/useMkForm.test.js +0 -81
- package/dist/hooks/useMkForm.test.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkAuthProvider.d.ts","sourceRoot":"","sources":["../../src/auth/MkAuthProvider.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAUvC,OAAO,KAAK,EAER,kBAAkB,EAKrB,MAAM,SAAS,CAAC;AAmBjB,MAAM,WAAW,mBAAmB;IAChC,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,QAAQ,EAAE,SAAS,CAAC;IACpB;;;OAGG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;
|
|
1
|
+
{"version":3,"file":"MkAuthProvider.d.ts","sourceRoot":"","sources":["../../src/auth/MkAuthProvider.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAUvC,OAAO,KAAK,EAER,kBAAkB,EAKrB,MAAM,SAAS,CAAC;AAmBjB,MAAM,WAAW,mBAAmB;IAChC,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,QAAQ,EAAE,SAAS,CAAC;IACpB;;;OAGG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;AAgSD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAkB5E"}
|
|
@@ -183,47 +183,42 @@ function MkAuthProviderInner({ scope, apiBaseUrl, children, storage = DEFAULT_ST
|
|
|
183
183
|
},
|
|
184
184
|
});
|
|
185
185
|
// ---- bootstrap ---------------------------------------------------------
|
|
186
|
-
//
|
|
187
|
-
//
|
|
188
|
-
const
|
|
186
|
+
// Handle boot user status and token refresh on boot failure.
|
|
187
|
+
// meQuery executes automatically on mount if access token exists (enabled: true).
|
|
188
|
+
const tokenRefreshed = useRef(false);
|
|
189
189
|
useEffect(() => {
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
if (!access) {
|
|
196
|
-
setUser(null);
|
|
197
|
-
return;
|
|
198
|
-
}
|
|
199
|
-
// /me will run automatically (enabled: true since we have access).
|
|
200
|
-
// We hook into its result via subscription below.
|
|
201
|
-
const unsubscribe = meQuery.refetch().then((result) => {
|
|
202
|
-
if (result.isError && refresh) {
|
|
203
|
-
// Try to refresh, then re-run /me.
|
|
190
|
+
var _a;
|
|
191
|
+
if (meQuery.isError && !tokenRefreshed.current) {
|
|
192
|
+
const refresh = (_a = storage === null || storage === void 0 ? void 0 : storage.getItem(tokenKey(scope, 'refresh'))) !== null && _a !== void 0 ? _a : null;
|
|
193
|
+
if (refresh) {
|
|
194
|
+
tokenRefreshed.current = true;
|
|
204
195
|
refreshMutation
|
|
205
196
|
.mutateAsync()
|
|
206
197
|
.then((data) => {
|
|
207
198
|
persistTokens(data.access_token, data.refresh_token);
|
|
208
199
|
setUser(data.admin);
|
|
200
|
+
// Re-run meQuery after token refresh succeeds
|
|
201
|
+
meQuery.refetch();
|
|
209
202
|
})
|
|
210
203
|
.catch(() => {
|
|
211
204
|
clearAll();
|
|
212
205
|
setUser(null);
|
|
213
206
|
});
|
|
214
207
|
}
|
|
215
|
-
else
|
|
208
|
+
else {
|
|
216
209
|
clearAll();
|
|
217
210
|
setUser(null);
|
|
218
211
|
}
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
212
|
+
}
|
|
213
|
+
}, [meQuery.isError, scope, storage, refreshMutation, persistTokens, setUser, clearAll, meQuery]);
|
|
214
|
+
// Handle initial state if no token exists
|
|
215
|
+
useEffect(() => {
|
|
216
|
+
var _a;
|
|
217
|
+
const access = (_a = storage === null || storage === void 0 ? void 0 : storage.getItem(tokenKey(scope, 'access'))) !== null && _a !== void 0 ? _a : null;
|
|
218
|
+
if (!access) {
|
|
219
|
+
setUser(null);
|
|
220
|
+
}
|
|
221
|
+
}, [scope, storage, setUser]);
|
|
227
222
|
// ---- exposed API -------------------------------------------------------
|
|
228
223
|
const refresh = useCallback(async () => {
|
|
229
224
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkAuthProvider.js","sourceRoot":"","sources":["../../src/auth/MkAuthProvider.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MkAuthProvider.js","sourceRoot":"","sources":["../../src/auth/MkAuthProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import type { ReactNode } from 'react';
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import type { MkAuthContextType } from '@makroz/core';
|
|
4
|
+
/**
|
|
5
|
+
* @deprecated Use the new Auth module located in `src/auth/` instead.
|
|
6
|
+
* This legacy context is kept for backward compatibility only and will be removed in future releases.
|
|
7
|
+
* Migrate to `MkAuthProvider` from `src/auth/MkAuthProvider.tsx`.
|
|
8
|
+
*/
|
|
4
9
|
export interface MkAuthProviderProps {
|
|
5
10
|
children: ReactNode;
|
|
6
11
|
endpoints?: {
|
|
@@ -15,6 +20,15 @@ export interface MkAuthProviderProps {
|
|
|
15
20
|
removeItem: (key: string) => Promise<void> | void;
|
|
16
21
|
};
|
|
17
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* @deprecated Use `MkAuthProvider` from `@makroz/web` (backed by `src/auth/MkAuthProvider.tsx`) instead.
|
|
25
|
+
* This legacy provider is kept for backward compatibility only and will be removed in future releases.
|
|
26
|
+
*/
|
|
18
27
|
export declare function MkAuthProvider({ children, endpoints, storage }: MkAuthProviderProps): React.JSX.Element;
|
|
28
|
+
/**
|
|
29
|
+
* @deprecated Use `useMkAuth` from `@makroz/web` (backed by `src/auth/useMkAuth.ts`) instead.
|
|
30
|
+
* The new hook throws `'MkAuthProvider missing'` when invoked outside a provider.
|
|
31
|
+
* This legacy hook is kept for backward compatibility only and will be removed in future releases.
|
|
32
|
+
*/
|
|
19
33
|
export declare const useMkAuth: () => MkAuthContextType;
|
|
20
34
|
//# sourceMappingURL=MkAuthContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkAuthContext.d.ts","sourceRoot":"","sources":["../../src/context/MkAuthContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAkE,MAAM,OAAO,CAAC;AACvF,OAAO,KAAK,EAAU,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAQ7D,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE;QACN,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;QACjE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC9D,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;KACrD,CAAC;CACL;AAED,wBAAgB,cAAc,CAAC,EAC3B,QAAQ,EACR,SAA8E,EAC9E,OAA0E,EAC7E,EAAE,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CA8EzC;AAED,eAAO,MAAM,SAAS,yBAIrB,CAAA"}
|
|
1
|
+
{"version":3,"file":"MkAuthContext.d.ts","sourceRoot":"","sources":["../../src/context/MkAuthContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAkE,MAAM,OAAO,CAAC;AACvF,OAAO,KAAK,EAAU,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAQ7D;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE;QACN,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;QACjE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC9D,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;KACrD,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,EAC3B,QAAQ,EACR,SAA8E,EAC9E,OAA0E,EAC7E,EAAE,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CA8EzC;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,yBAIrB,CAAA"}
|
|
@@ -4,6 +4,10 @@ import { canUser } from '@makroz/core';
|
|
|
4
4
|
import { useApi } from '../hooks/useApi';
|
|
5
5
|
const MkAuthContext = createContext(undefined);
|
|
6
6
|
const TOKEN_KEY = 'mk_auth_token';
|
|
7
|
+
/**
|
|
8
|
+
* @deprecated Use `MkAuthProvider` from `@makroz/web` (backed by `src/auth/MkAuthProvider.tsx`) instead.
|
|
9
|
+
* This legacy provider is kept for backward compatibility only and will be removed in future releases.
|
|
10
|
+
*/
|
|
7
11
|
export function MkAuthProvider({ children, endpoints = { login: '/auth/login', logout: '/auth/logout', user: '/auth/me' }, storage = (typeof localStorage !== 'undefined' ? localStorage : undefined) }) {
|
|
8
12
|
const api = useApi();
|
|
9
13
|
const [user, setUser] = useState(null);
|
|
@@ -79,6 +83,11 @@ export function MkAuthProvider({ children, endpoints = { login: '/auth/login', l
|
|
|
79
83
|
return (_jsx(MkAuthContext.Provider, { value: value, children: children }));
|
|
80
84
|
}
|
|
81
85
|
;
|
|
86
|
+
/**
|
|
87
|
+
* @deprecated Use `useMkAuth` from `@makroz/web` (backed by `src/auth/useMkAuth.ts`) instead.
|
|
88
|
+
* The new hook throws `'MkAuthProvider missing'` when invoked outside a provider.
|
|
89
|
+
* This legacy hook is kept for backward compatibility only and will be removed in future releases.
|
|
90
|
+
*/
|
|
82
91
|
export const useMkAuth = () => {
|
|
83
92
|
const context = useContext(MkAuthContext);
|
|
84
93
|
if (!context)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkAuthContext.js","sourceRoot":"","sources":["../../src/context/MkAuthContext.tsx"],"names":[],"mappings":";AACA,OAAc,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvF,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,aAAa,GAAG,aAAa,CAAgC,SAAS,CAAC,CAAC;AAE9E,MAAM,SAAS,GAAG,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"MkAuthContext.js","sourceRoot":"","sources":["../../src/context/MkAuthContext.tsx"],"names":[],"mappings":"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"}
|
package/dist/hooks/useApi.d.ts
CHANGED
|
@@ -3,17 +3,17 @@ interface UseApiOptions {
|
|
|
3
3
|
baseUrl?: string;
|
|
4
4
|
headers?: Record<string, string>;
|
|
5
5
|
}
|
|
6
|
-
export declare function useApi(options?: UseApiOptions): {
|
|
6
|
+
export declare function useApi<T = unknown>(options?: UseApiOptions): {
|
|
7
7
|
status: ApiStatus;
|
|
8
|
-
data:
|
|
9
|
-
error:
|
|
8
|
+
data: T | null;
|
|
9
|
+
error: unknown;
|
|
10
10
|
waiting: number;
|
|
11
11
|
loading: boolean;
|
|
12
|
-
get: (endpoint: string, params?: any) => Promise<MkResponse<
|
|
13
|
-
post: (endpoint: string, body:
|
|
14
|
-
put: (endpoint: string, body:
|
|
15
|
-
delete: (endpoint: string) => Promise<MkResponse<
|
|
16
|
-
remove: (endpoint: string) => Promise<MkResponse<
|
|
12
|
+
get: <R = T>(endpoint: string, params?: Record<string, string | number | boolean | Record<string, any>> | null) => Promise<MkResponse<R>>;
|
|
13
|
+
post: <R = T>(endpoint: string, body: Record<string, unknown> | FormData | null) => Promise<MkResponse<R>>;
|
|
14
|
+
put: <R = T>(endpoint: string, body: Record<string, unknown> | FormData | null) => Promise<MkResponse<R>>;
|
|
15
|
+
delete: (endpoint: string) => Promise<MkResponse<void>>;
|
|
16
|
+
remove: (endpoint: string) => Promise<MkResponse<void>>;
|
|
17
17
|
};
|
|
18
18
|
export {};
|
|
19
19
|
//# sourceMappingURL=useApi.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useApi.d.ts","sourceRoot":"","sources":["../../src/hooks/useApi.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG1D,UAAU,aAAa;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;
|
|
1
|
+
{"version":3,"file":"useApi.d.ts","sourceRoot":"","sources":["../../src/hooks/useApi.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG1D,UAAU,aAAa;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AA8BD,wBAAgB,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,GAAE,aAAkB;;;;;;UA8DlC,CAAC,gBACZ,MAAM,WACR,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI;WAGxD,CAAC,gBACb,MAAM,QACV,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,GAAG,IAAI;UAG1B,CAAC,gBACZ,MAAM,QACV,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,QAAQ,GAAG,IAAI;uBAGX,MAAM;uBACN,MAAM;EAcjD"}
|
package/dist/hooks/useApi.js
CHANGED
|
@@ -1,51 +1,59 @@
|
|
|
1
|
-
import { useState } from 'react';
|
|
1
|
+
import { useState, useCallback, useRef } from 'react';
|
|
2
2
|
import { useMkApiContext } from '../context/MkApiContext';
|
|
3
|
+
const buildQueryParams = (params) => {
|
|
4
|
+
const query = new URLSearchParams();
|
|
5
|
+
if (!params)
|
|
6
|
+
return "";
|
|
7
|
+
// Specific MK-Director mappings
|
|
8
|
+
if (params.q)
|
|
9
|
+
query.append('q', String(params.q));
|
|
10
|
+
if (params.sort)
|
|
11
|
+
query.append('sort', String(params.sort));
|
|
12
|
+
if (params.page)
|
|
13
|
+
query.append('page', String(params.page));
|
|
14
|
+
if (params.per_page)
|
|
15
|
+
query.append('per_page', String(params.per_page));
|
|
16
|
+
// Advanced Filtering mapping: { filter: { status: 'A', price: { gt: 100 } } }
|
|
17
|
+
if (params.filter && typeof params.filter === 'object') {
|
|
18
|
+
Object.entries(params.filter).forEach(([field, value]) => {
|
|
19
|
+
if (typeof value === 'object' && value !== null) {
|
|
20
|
+
Object.entries(value).forEach(([op, opVal]) => {
|
|
21
|
+
query.append(`filter[${field}][${op}]`, String(opVal));
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
query.append(`filter[${field}]`, String(value));
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
const queryString = query.toString();
|
|
30
|
+
return queryString ? `?${queryString}` : "";
|
|
31
|
+
};
|
|
3
32
|
export function useApi(options = {}) {
|
|
4
33
|
const context = useMkApiContext();
|
|
5
34
|
const [status, setStatus] = useState('idle');
|
|
6
35
|
const [data, setData] = useState(null);
|
|
7
36
|
const [error, setError] = useState(null);
|
|
8
37
|
const baseUrl = options.baseUrl || context.baseUrl;
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
if (params.q)
|
|
15
|
-
query.append('q', params.q);
|
|
16
|
-
if (params.sort)
|
|
17
|
-
query.append('sort', params.sort);
|
|
18
|
-
if (params.page)
|
|
19
|
-
query.append('page', params.page.toString());
|
|
20
|
-
if (params.per_page)
|
|
21
|
-
query.append('per_page', params.per_page.toString());
|
|
22
|
-
// Advanced Filtering mapping: { filter: { status: 'A', price: { gt: 100 } } }
|
|
23
|
-
if (params.filter && typeof params.filter === 'object') {
|
|
24
|
-
Object.entries(params.filter).forEach(([field, value]) => {
|
|
25
|
-
if (typeof value === 'object' && value !== null) {
|
|
26
|
-
Object.entries(value).forEach(([op, opVal]) => {
|
|
27
|
-
query.append(`filter[${field}][${op}]`, String(opVal));
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
query.append(`filter[${field}]`, String(value));
|
|
32
|
-
}
|
|
33
|
-
});
|
|
34
|
-
}
|
|
35
|
-
const queryString = query.toString();
|
|
36
|
-
return queryString ? `?${queryString}` : "";
|
|
37
|
-
};
|
|
38
|
-
const call = async (endpoint, method = 'GET', body = null, params = null) => {
|
|
38
|
+
const baseUrlRef = useRef(baseUrl);
|
|
39
|
+
baseUrlRef.current = baseUrl;
|
|
40
|
+
const optionsRef = useRef(options);
|
|
41
|
+
optionsRef.current = options;
|
|
42
|
+
const call = useCallback(async (endpoint, method = 'GET', body = null, params = null) => {
|
|
39
43
|
setStatus('loading');
|
|
40
44
|
setError(null);
|
|
41
45
|
context.setWaiting(1, `call:${endpoint}`);
|
|
42
46
|
const urlParams = method === 'GET' && params ? buildQueryParams(params) : "";
|
|
43
47
|
const fullEndpoint = `${endpoint}${urlParams}`;
|
|
44
48
|
try {
|
|
45
|
-
const
|
|
49
|
+
const reqHeaders = Object.assign(Object.assign({}, context.headers), optionsRef.current.headers);
|
|
50
|
+
if (!(body instanceof FormData)) {
|
|
51
|
+
reqHeaders['Content-Type'] = 'application/json';
|
|
52
|
+
}
|
|
53
|
+
const response = await fetch(`${baseUrlRef.current}${fullEndpoint}`, {
|
|
46
54
|
method,
|
|
47
|
-
headers:
|
|
48
|
-
body: body ? JSON.stringify(body) : null,
|
|
55
|
+
headers: reqHeaders,
|
|
56
|
+
body: body instanceof FormData ? body : (body ? JSON.stringify(body) : null),
|
|
49
57
|
});
|
|
50
58
|
const result = await response.json();
|
|
51
59
|
if (!result.success) {
|
|
@@ -56,25 +64,31 @@ export function useApi(options = {}) {
|
|
|
56
64
|
return result;
|
|
57
65
|
}
|
|
58
66
|
catch (err) {
|
|
59
|
-
|
|
67
|
+
const errorMessage = err instanceof Error ? err.message : String(err);
|
|
68
|
+
setError(errorMessage);
|
|
60
69
|
setStatus('error');
|
|
61
70
|
throw err;
|
|
62
71
|
}
|
|
63
72
|
finally {
|
|
64
73
|
context.setWaiting(-1, `-call:${endpoint}`);
|
|
65
74
|
}
|
|
66
|
-
};
|
|
75
|
+
}, [context]);
|
|
76
|
+
const get = useCallback((endpoint, params = null) => call(endpoint, 'GET', null, params), [call]);
|
|
77
|
+
const post = useCallback((endpoint, body) => call(endpoint, 'POST', body), [call]);
|
|
78
|
+
const put = useCallback((endpoint, body) => call(endpoint, 'PUT', body), [call]);
|
|
79
|
+
const deleteFn = useCallback((endpoint) => call(endpoint, 'DELETE'), [call]);
|
|
80
|
+
const removeFn = useCallback((endpoint) => call(endpoint, 'DELETE'), [call]);
|
|
67
81
|
return {
|
|
68
82
|
status,
|
|
69
83
|
data,
|
|
70
84
|
error,
|
|
71
85
|
waiting: context.waiting,
|
|
72
86
|
loading: status === 'loading',
|
|
73
|
-
get
|
|
74
|
-
post
|
|
75
|
-
put
|
|
76
|
-
delete:
|
|
77
|
-
remove:
|
|
87
|
+
get,
|
|
88
|
+
post,
|
|
89
|
+
put,
|
|
90
|
+
delete: deleteFn,
|
|
91
|
+
remove: removeFn,
|
|
78
92
|
};
|
|
79
93
|
}
|
|
80
94
|
//# sourceMappingURL=useApi.js.map
|
package/dist/hooks/useApi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useApi.js","sourceRoot":"","sources":["../../src/hooks/useApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"useApi.js","sourceRoot":"","sources":["../../src/hooks/useApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMkForm.d.ts","sourceRoot":"","sources":["../../src/hooks/useMkForm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG3F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACrD,kDAAkD;IAClD,MAAM,EAAE,YAAY,CAAC;IACrB,iCAAiC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,sEAAsE;IACtE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAC3E,MAAM,EACN,WAA8B,EAC9B,MAAc,EACd,gBAAwB,GAC3B,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"useMkForm.d.ts","sourceRoot":"","sources":["../../src/hooks/useMkForm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAgB,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG3F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACrD,kDAAkD;IAClD,MAAM,EAAE,YAAY,CAAC;IACrB,iCAAiC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,sEAAsE;IACtE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAC3E,MAAM,EACN,WAA8B,EAC9B,MAAc,EACd,gBAAwB,GAC3B,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAsIvC"}
|
package/dist/hooks/useMkForm.js
CHANGED
|
@@ -13,34 +13,36 @@ export function useMkForm({ fields, initialData = {}, action = 'add', validateOn
|
|
|
13
13
|
const [formState, setFormState] = useState(defaults);
|
|
14
14
|
const [errors, setErrorsState] = useState({});
|
|
15
15
|
const initialRef = useRef(defaults);
|
|
16
|
+
// Keep a ref of formState to allow synchronous/pure validations in setField
|
|
17
|
+
const formStateRef = useRef(formState);
|
|
18
|
+
formStateRef.current = formState;
|
|
16
19
|
// ──── Field setters ────
|
|
17
20
|
const setField = useCallback((name, value) => {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
return prev;
|
|
23
|
-
const next = Object.assign({}, prev);
|
|
24
|
-
delete next[name];
|
|
25
|
-
return next;
|
|
26
|
-
});
|
|
27
|
-
// Optionally validate on each change
|
|
21
|
+
const next = Object.assign(Object.assign({}, formStateRef.current), { [name]: value });
|
|
22
|
+
formStateRef.current = next;
|
|
23
|
+
setFormState(next);
|
|
24
|
+
let error = null;
|
|
28
25
|
if (validateOnChange) {
|
|
29
26
|
const field = fields[name];
|
|
30
27
|
if (field === null || field === void 0 ? void 0 : field.rules) {
|
|
31
|
-
|
|
32
|
-
const updated = Object.assign(Object.assign({}, current), { [name]: value });
|
|
33
|
-
const error = mkValidation.check(value, field.rules, updated);
|
|
34
|
-
if (error) {
|
|
35
|
-
setErrorsState(prev => (Object.assign(Object.assign({}, prev), { [name]: error })));
|
|
36
|
-
}
|
|
37
|
-
return updated;
|
|
38
|
-
});
|
|
28
|
+
error = mkValidation.check(value, field.rules, next);
|
|
39
29
|
}
|
|
40
30
|
}
|
|
31
|
+
setErrorsState(prev => {
|
|
32
|
+
const nextErrors = Object.assign({}, prev);
|
|
33
|
+
if (error) {
|
|
34
|
+
nextErrors[name] = error;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
delete nextErrors[name];
|
|
38
|
+
}
|
|
39
|
+
return nextErrors;
|
|
40
|
+
});
|
|
41
41
|
}, [fields, validateOnChange]);
|
|
42
42
|
const setFields = useCallback((partial) => {
|
|
43
|
-
|
|
43
|
+
const next = Object.assign(Object.assign({}, formStateRef.current), partial);
|
|
44
|
+
formStateRef.current = next;
|
|
45
|
+
setFormState(next);
|
|
44
46
|
}, []);
|
|
45
47
|
// ──── Error management ────
|
|
46
48
|
const setError = useCallback((name, message) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMkForm.js","sourceRoot":"","sources":["../../src/hooks/useMkForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA4C5C,MAAM,UAAU,SAAS,CAAsD,EAC3E,MAAM,EACN,WAAW,GAAG,EAAgB,EAC9B,MAAM,GAAG,KAAK,EACd,gBAAgB,GAAG,KAAK,GACN;IAElB,wDAAwD;IACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE;;QAC1B,MAAM,CAAC,GAAwB,EAAE,CAAC;QAClC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACvB,CAAC,CAAC,GAAG,CAAC,GAAG,MAAA,MAAM,CAAC,GAAG,CAAC,CAAC,YAAY,mCAAI,EAAE,CAAC;QAC5C,CAAC;QACD,OAAO,gCAAK,CAAC,GAAK,WAAW,CAAO,CAAC;IACzC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,6BAA6B;IAErC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAI,QAAQ,CAAC,CAAC;IACxD,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAe,EAAE,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,MAAM,CAAI,QAAQ,CAAC,CAAC;IAEvC,0BAA0B;IAE1B,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,IAAY,EAAE,KAAU,EAAE,EAAE;QACtD,
|
|
1
|
+
{"version":3,"file":"useMkForm.js","sourceRoot":"","sources":["../../src/hooks/useMkForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,9 @@ export interface InfiniteListOptions {
|
|
|
7
7
|
export declare function useMkInfiniteList(endpoint: string, options?: InfiniteListOptions): {
|
|
8
8
|
items: any[];
|
|
9
9
|
loading: boolean;
|
|
10
|
-
error:
|
|
10
|
+
error: unknown;
|
|
11
11
|
hasMore: boolean;
|
|
12
|
-
loadMore: () =>
|
|
12
|
+
loadMore: () => void;
|
|
13
13
|
reset: () => void;
|
|
14
14
|
};
|
|
15
15
|
//# sourceMappingURL=useMkInfiniteList.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMkInfiniteList.d.ts","sourceRoot":"","sources":["../../src/hooks/useMkInfiniteList.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB;;;;;;;
|
|
1
|
+
{"version":3,"file":"useMkInfiniteList.d.ts","sourceRoot":"","sources":["../../src/hooks/useMkInfiniteList.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB;;;;;;;EA8EpF"}
|
|
@@ -1,46 +1,72 @@
|
|
|
1
|
-
import { useState, useCallback, useEffect } from 'react';
|
|
1
|
+
import { useState, useCallback, useEffect, useRef } from 'react';
|
|
2
2
|
import { useApi } from './useApi';
|
|
3
3
|
export function useMkInfiniteList(endpoint, options = {}) {
|
|
4
4
|
const api = useApi();
|
|
5
5
|
const [items, setItems] = useState([]);
|
|
6
6
|
const [hasMore, setHasMore] = useState(true);
|
|
7
7
|
const [page, setPage] = useState(1);
|
|
8
|
-
//
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const loadMore = useCallback(async () => {
|
|
15
|
-
if (
|
|
8
|
+
// Stable serialization of filter to avoid reference-based re-renders
|
|
9
|
+
const filterString = options.filter ? JSON.stringify(options.filter) : '';
|
|
10
|
+
const endpointRef = useRef(endpoint);
|
|
11
|
+
endpointRef.current = endpoint;
|
|
12
|
+
const optionsRef = useRef(options);
|
|
13
|
+
optionsRef.current = options;
|
|
14
|
+
const loadMore = useCallback(async (isInitial = false) => {
|
|
15
|
+
if (api.loading)
|
|
16
16
|
return;
|
|
17
|
-
|
|
17
|
+
if (!isInitial && !hasMore)
|
|
18
|
+
return;
|
|
19
|
+
const opts = optionsRef.current;
|
|
20
|
+
const pageToFetch = isInitial ? 1 : page;
|
|
21
|
+
const response = await api.get(endpointRef.current, Object.assign(Object.assign({}, opts), { page: pageToFetch, per_page: opts.per_page || 15 }));
|
|
18
22
|
if (response.success) {
|
|
19
23
|
const newData = Array.isArray(response.data) ? response.data : [];
|
|
20
24
|
if (newData.length === 0) {
|
|
25
|
+
if (isInitial) {
|
|
26
|
+
setItems([]);
|
|
27
|
+
}
|
|
21
28
|
setHasMore(false);
|
|
22
29
|
}
|
|
23
30
|
else {
|
|
24
|
-
|
|
25
|
-
|
|
31
|
+
if (isInitial) {
|
|
32
|
+
setItems(newData);
|
|
33
|
+
setPage(2);
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
setItems((prev) => [...prev, ...newData]);
|
|
37
|
+
setPage(prev => prev + 1);
|
|
38
|
+
}
|
|
26
39
|
// Check pagination from extraData
|
|
27
40
|
const extra = response.__extraData;
|
|
28
|
-
if (extra && typeof extra.last_page === 'number' &&
|
|
41
|
+
if (extra && typeof extra.last_page === 'number' && pageToFetch >= extra.last_page) {
|
|
29
42
|
setHasMore(false);
|
|
30
43
|
}
|
|
44
|
+
else {
|
|
45
|
+
setHasMore(true);
|
|
46
|
+
}
|
|
31
47
|
}
|
|
32
48
|
}
|
|
33
|
-
}, [
|
|
49
|
+
}, [page, hasMore, api.loading]);
|
|
50
|
+
// Reset list and auto-fetch when filters/search/endpoint changes
|
|
51
|
+
useEffect(() => {
|
|
52
|
+
setItems([]);
|
|
53
|
+
setPage(1);
|
|
54
|
+
setHasMore(true);
|
|
55
|
+
void loadMore(true);
|
|
56
|
+
}, [endpoint, options.q, filterString, options.sort]);
|
|
34
57
|
return {
|
|
35
58
|
items,
|
|
36
59
|
loading: api.loading,
|
|
37
60
|
error: api.error,
|
|
38
61
|
hasMore,
|
|
39
|
-
loadMore
|
|
62
|
+
loadMore: () => {
|
|
63
|
+
void loadMore(false);
|
|
64
|
+
},
|
|
40
65
|
reset: () => {
|
|
41
66
|
setItems([]);
|
|
42
67
|
setPage(1);
|
|
43
68
|
setHasMore(true);
|
|
69
|
+
void loadMore(true);
|
|
44
70
|
}
|
|
45
71
|
};
|
|
46
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMkInfiniteList.js","sourceRoot":"","sources":["../../src/hooks/useMkInfiniteList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"useMkInfiniteList.js","sourceRoot":"","sources":["../../src/hooks/useMkInfiniteList.ts"],"names":[],"mappings":"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"}
|