@makroz/mobile 1.2.0 → 1.2.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/dist/auth/authExports.test.d.ts +2 -0
- package/dist/auth/authExports.test.d.ts.map +1 -0
- package/dist/auth/authExports.test.js +40 -0
- package/dist/auth/authExports.test.js.map +1 -0
- package/dist/components/MkInfiniteList.d.ts.map +1 -1
- package/dist/components/MkInfiniteList.js +7 -7
- package/dist/components/MkInfiniteList.js.map +1 -1
- package/dist/components/MkSkeleton.d.ts.map +1 -1
- package/dist/components/MkSkeleton.js +10 -7
- package/dist/components/MkSkeleton.js.map +1 -1
- package/dist/components/MkToastRenderer.d.ts.map +1 -1
- package/dist/components/MkToastRenderer.js +9 -7
- package/dist/components/MkToastRenderer.js.map +1 -1
- package/dist/context/MkAuthContext.d.ts +15 -0
- package/dist/context/MkAuthContext.d.ts.map +1 -1
- package/dist/context/MkAuthContext.js +10 -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 +53 -39
- package/dist/hooks/useApi.js.map +1 -1
- package/dist/hooks/useApi.test.js +76 -3
- package/dist/hooks/useApi.test.js.map +1 -1
- package/dist/hooks/useMkForm.d.ts.map +1 -1
- package/dist/hooks/useMkForm.js +19 -16
- package/dist/hooks/useMkForm.js.map +1 -1
- package/dist/hooks/useMkForm.test.d.ts +2 -0
- package/dist/hooks/useMkForm.test.d.ts.map +1 -0
- package/dist/hooks/useMkForm.test.js +99 -0
- package/dist/hooks/useMkForm.test.js.map +1 -0
- package/dist/hooks/useMkInfiniteList.d.ts +2 -2
- package/dist/hooks/useMkInfiniteList.d.ts.map +1 -1
- package/dist/hooks/useMkInfiniteList.js +20 -4
- package/dist/hooks/useMkInfiniteList.js.map +1 -1
- package/dist/hooks/useMkInfiniteList.test.d.ts +2 -0
- package/dist/hooks/useMkInfiniteList.test.d.ts.map +1 -0
- package/dist/hooks/useMkInfiniteList.test.js +82 -0
- package/dist/hooks/useMkInfiniteList.test.js.map +1 -0
- package/dist/hooks/useMkList.d.ts +28 -10
- package/dist/hooks/useMkList.d.ts.map +1 -1
- package/dist/hooks/useMkList.js.map +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/test-setup.d.ts.map +1 -1
- package/dist/test-setup.js +10 -5
- package/dist/test-setup.js.map +1 -1
- package/dist/theme/MkThemeProvider.d.ts.map +1 -1
- package/dist/theme/MkThemeProvider.js +3 -6
- package/dist/theme/MkThemeProvider.js.map +1 -1
- package/dist/theme/MkThemeProvider.test.d.ts +2 -0
- package/dist/theme/MkThemeProvider.test.d.ts.map +1 -0
- package/dist/theme/MkThemeProvider.test.js +34 -0
- package/dist/theme/MkThemeProvider.test.js.map +1 -0
- package/package.json +3 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authExports.test.d.ts","sourceRoot":"","sources":["../../src/auth/authExports.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { rnMocks } from '../test-utils';
|
|
2
|
+
rnMocks();
|
|
3
|
+
import { describe, it, expect, vi } from 'vitest';
|
|
4
|
+
const secureStoreMemory = new Map();
|
|
5
|
+
vi.mock('expo-secure-store', () => {
|
|
6
|
+
return {
|
|
7
|
+
getItemAsync: vi.fn(async (key) => { var _a; return (_a = secureStoreMemory.get(key)) !== null && _a !== void 0 ? _a : null; }),
|
|
8
|
+
setItemAsync: vi.fn(async (key, value) => {
|
|
9
|
+
secureStoreMemory.set(key, value);
|
|
10
|
+
}),
|
|
11
|
+
deleteItemAsync: vi.fn(async (key) => {
|
|
12
|
+
secureStoreMemory.delete(key);
|
|
13
|
+
}),
|
|
14
|
+
};
|
|
15
|
+
});
|
|
16
|
+
vi.mock('@react-native-async-storage/async-storage', () => {
|
|
17
|
+
return {
|
|
18
|
+
default: {
|
|
19
|
+
getItem: vi.fn(async () => null),
|
|
20
|
+
setItem: vi.fn(async () => { }),
|
|
21
|
+
removeItem: vi.fn(async () => { }),
|
|
22
|
+
clear: vi.fn(async () => { }),
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
});
|
|
26
|
+
import { renderHook } from '@testing-library/react';
|
|
27
|
+
describe('Public API Auth Exports (mk-mobile)', () => {
|
|
28
|
+
it('should export the new useMkAuth hook instead of the legacy one', async () => {
|
|
29
|
+
const { useMkAuth } = await import('../index');
|
|
30
|
+
expect(useMkAuth).toBeDefined();
|
|
31
|
+
// El hook nuevo lanza "useMkAuth must be used within an <MkAuthProvider>" si se invoca fuera de un proveedor.
|
|
32
|
+
// El hook viejo lanzaba "useMkAuth debe usarse dentro de MkAuthProvider".
|
|
33
|
+
expect(() => renderHook(() => useMkAuth())).toThrowError(/useMkAuth must be used within an <MkAuthProvider>/);
|
|
34
|
+
});
|
|
35
|
+
it('should export the new MkAuthProvider', async () => {
|
|
36
|
+
const { MkAuthProvider } = await import('../index');
|
|
37
|
+
expect(MkAuthProvider).toBeDefined();
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
//# sourceMappingURL=authExports.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authExports.test.js","sourceRoot":"","sources":["../../src/auth/authExports.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC;AAEV,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAElD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;AACpD,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC9B,OAAO;QACH,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE,WAAC,OAAA,MAAA,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,mCAAI,IAAI,CAAA,EAAA,CAAC;QAC9E,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,KAAa,EAAE,EAAE;YACrD,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC;QACF,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;YACzC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC,CAAC;KACL,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACtD,OAAO;QACH,OAAO,EAAE;YACL,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC;YAChC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;YAC9B,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;YACjC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;SAC/B;KACJ,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC5E,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;QAChC,8GAA8G;QAC9G,0EAA0E;QAC1E,MAAM,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,mDAAmD,CAAC,CAAC;IAClH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkInfiniteList.d.ts","sourceRoot":"","sources":["../../src/components/MkInfiniteList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"MkInfiniteList.d.ts","sourceRoot":"","sources":["../../src/components/MkInfiniteList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AAUpD,MAAM,WAAW,mBAAmB,CAAC,CAAC;IAClC,KAAK,EAAE,CAAC,EAAE,CAAC;IACX,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IACvF,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,EAC9B,KAAK,EACL,UAAU,EACV,OAAO,EACP,YAAY,EACZ,OAAO,EACP,UAAU,EACV,SAAS,EACT,YAAyC,EACzC,iBAAuB,EAC1B,EAAE,mBAAmB,CAAC,CAAC,CAAC,2CAwDxB"}
|
|
@@ -2,22 +2,24 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
2
2
|
import { useCallback } from 'react';
|
|
3
3
|
import { FlashList } from '@shopify/flash-list';
|
|
4
4
|
import { ActivityIndicator, View, Text, RefreshControl, StyleSheet } from 'react-native';
|
|
5
|
+
import { useMkTheme } from '../theme/MkThemeProvider';
|
|
5
6
|
/**
|
|
6
7
|
* MkInfiniteList (Mobile)
|
|
7
8
|
* Optimized for React Native using best practices:
|
|
8
9
|
* Virtualization, memory management, and Batching.
|
|
9
10
|
*/
|
|
10
11
|
export function MkInfiniteList({ items, renderItem, loading, isRefreshing, hasMore, onLoadMore, onRefresh, emptyMessage = "No se encontraron datos.", estimatedItemSize = 100 }) {
|
|
12
|
+
const { theme } = useMkTheme();
|
|
11
13
|
const renderFooter = useCallback(() => {
|
|
12
14
|
if (!loading || isRefreshing)
|
|
13
15
|
return null;
|
|
14
|
-
return (_jsx(View, { style: styles.footer, children: _jsx(ActivityIndicator, { size: "small", color:
|
|
15
|
-
}, [loading, isRefreshing]);
|
|
16
|
+
return (_jsx(View, { style: styles.footer, children: _jsx(ActivityIndicator, { size: "small", color: theme.primary }) }));
|
|
17
|
+
}, [loading, isRefreshing, theme.primary]);
|
|
16
18
|
const renderEmpty = useCallback(() => {
|
|
17
19
|
if (loading)
|
|
18
20
|
return null;
|
|
19
|
-
return (_jsx(View, { style: styles.emptyContainer, children: _jsx(Text, { style: styles.emptyText, children: emptyMessage }) }));
|
|
20
|
-
}, [loading, emptyMessage]);
|
|
21
|
+
return (_jsx(View, { style: styles.emptyContainer, children: _jsx(Text, { style: [styles.emptyText, { color: theme.mutedForeground }], children: emptyMessage }) }));
|
|
22
|
+
}, [loading, emptyMessage, theme.mutedForeground]);
|
|
21
23
|
return (_jsx(FlashList, { data: items, renderItem: renderItem, keyExtractor: (item, index) => {
|
|
22
24
|
if (item && typeof item === 'object') {
|
|
23
25
|
if (item.id !== undefined && item.id !== null)
|
|
@@ -34,8 +36,7 @@ export function MkInfiniteList({ items, renderItem, loading, isRefreshing, hasMo
|
|
|
34
36
|
// Feedback Components
|
|
35
37
|
ListFooterComponent: renderFooter, ListEmptyComponent: renderEmpty,
|
|
36
38
|
// Pull to Refresh
|
|
37
|
-
refreshControl: _jsx(RefreshControl, { refreshing: isRefreshing === true, onRefresh: onRefresh, colors: [
|
|
38
|
-
}),
|
|
39
|
+
refreshControl: _jsx(RefreshControl, { refreshing: isRefreshing === true, onRefresh: onRefresh, colors: [theme.primary], tintColor: theme.primary }),
|
|
39
40
|
// Standard spacing
|
|
40
41
|
contentContainerStyle: styles.content }));
|
|
41
42
|
}
|
|
@@ -52,7 +53,6 @@ const styles = StyleSheet.create({
|
|
|
52
53
|
alignItems: 'center',
|
|
53
54
|
},
|
|
54
55
|
emptyText: {
|
|
55
|
-
color: '#64748b',
|
|
56
56
|
fontSize: 14,
|
|
57
57
|
textAlign: 'center',
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkInfiniteList.js","sourceRoot":"","sources":["../../src/components/MkInfiniteList.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,WAAW,EAAW,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EACH,iBAAiB,EACjB,IAAI,EACJ,IAAI,EACJ,cAAc,EACd,UAAU,EACb,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"MkInfiniteList.js","sourceRoot":"","sources":["../../src/components/MkInfiniteList.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkSkeleton.d.ts","sourceRoot":"","sources":["../../src/components/MkSkeleton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"MkSkeleton.d.ts","sourceRoot":"","sources":["../../src/components/MkSkeleton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI9C,MAAM,WAAW,eAAe;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,SAAS,CAAC;CACrB;AAmBD,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAoChD,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { useEffect, useRef } from 'react';
|
|
3
3
|
import { View, Animated, StyleSheet } from 'react-native';
|
|
4
|
-
|
|
4
|
+
import { useMkTheme } from '../theme/MkThemeProvider';
|
|
5
|
+
const ShimmerBox = ({ style, backgroundColor }) => {
|
|
5
6
|
const opacity = useRef(new Animated.Value(0.3)).current;
|
|
6
7
|
useEffect(() => {
|
|
7
8
|
const animation = Animated.loop(Animated.sequence([
|
|
@@ -11,22 +12,24 @@ const ShimmerBox = ({ style }) => {
|
|
|
11
12
|
animation.start();
|
|
12
13
|
return () => animation.stop();
|
|
13
14
|
}, [opacity]);
|
|
14
|
-
return _jsx(Animated.View, { style: [styles.skeleton, style, { opacity }] });
|
|
15
|
+
return _jsx(Animated.View, { style: [styles.skeleton, { backgroundColor }, style, { opacity }] });
|
|
15
16
|
};
|
|
16
17
|
export const MkSkeleton = ({ variant = 'text', width = '100%', height, lines = 1, gap = 8, radius, style, }) => {
|
|
18
|
+
const { theme } = useMkTheme();
|
|
19
|
+
const bg = theme.muted;
|
|
17
20
|
if (variant === 'circle') {
|
|
18
21
|
const size = typeof width === 'number' ? width : 40;
|
|
19
|
-
return _jsx(ShimmerBox, { style: Object.assign({ width: size, height: size, borderRadius: size / 2 }, style) });
|
|
22
|
+
return _jsx(ShimmerBox, { backgroundColor: bg, style: Object.assign({ width: size, height: size, borderRadius: size / 2 }, style) });
|
|
20
23
|
}
|
|
21
24
|
if (variant === 'rect') {
|
|
22
|
-
return _jsx(ShimmerBox, { style: Object.assign({ width: width, height: height || 80, borderRadius: radius !== null && radius !== void 0 ? radius : 8 }, style) });
|
|
25
|
+
return _jsx(ShimmerBox, { backgroundColor: bg, style: Object.assign({ width: width, height: height || 80, borderRadius: radius !== null && radius !== void 0 ? radius : 8 }, style) });
|
|
23
26
|
}
|
|
24
27
|
if (lines <= 1) {
|
|
25
|
-
return _jsx(ShimmerBox, { style: Object.assign({ width: width, height: height || 14, borderRadius: radius !== null && radius !== void 0 ? radius : 4 }, style) });
|
|
28
|
+
return _jsx(ShimmerBox, { backgroundColor: bg, style: Object.assign({ width: width, height: height || 14, borderRadius: radius !== null && radius !== void 0 ? radius : 4 }, style) });
|
|
26
29
|
}
|
|
27
|
-
return (_jsx(View, { style: [{ gap }, style], children: Array.from({ length: lines }).map((_, i) => (_jsx(ShimmerBox, { style: { width: i === lines - 1 ? '70%' : '100%', height: height || 14, borderRadius: radius !== null && radius !== void 0 ? radius : 4 } }, i))) }));
|
|
30
|
+
return (_jsx(View, { style: [{ gap }, style], children: Array.from({ length: lines }).map((_, i) => (_jsx(ShimmerBox, { backgroundColor: bg, style: { width: i === lines - 1 ? '70%' : '100%', height: height || 14, borderRadius: radius !== null && radius !== void 0 ? radius : 4 } }, i))) }));
|
|
28
31
|
};
|
|
29
32
|
const styles = StyleSheet.create({
|
|
30
|
-
skeleton: {
|
|
33
|
+
skeleton: {},
|
|
31
34
|
});
|
|
32
35
|
//# sourceMappingURL=MkSkeleton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkSkeleton.js","sourceRoot":"","sources":["../../src/components/MkSkeleton.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"MkSkeleton.js","sourceRoot":"","sources":["../../src/components/MkSkeleton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkToastRenderer.d.ts","sourceRoot":"","sources":["../../src/components/MkToastRenderer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"MkToastRenderer.d.ts","sourceRoot":"","sources":["../../src/components/MkToastRenderer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AA2C9D,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAkBnC,CAAC"}
|
|
@@ -20,12 +20,14 @@ import { useMkTheme } from '../theme/MkThemeProvider';
|
|
|
20
20
|
* ```
|
|
21
21
|
*/
|
|
22
22
|
const { width: SCREEN_WIDTH } = Dimensions.get('window');
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
const getTypeColor = (type, theme) => {
|
|
24
|
+
switch (type) {
|
|
25
|
+
case 'success': return theme.success;
|
|
26
|
+
case 'error': return theme.error;
|
|
27
|
+
case 'warning': return theme.warning;
|
|
28
|
+
case 'info': return theme.info;
|
|
29
|
+
default: return theme.primary;
|
|
30
|
+
}
|
|
29
31
|
};
|
|
30
32
|
const TYPE_ICONS = {
|
|
31
33
|
default: '🔔',
|
|
@@ -45,7 +47,7 @@ const ToastItem = React.memo(({ toast, onDismiss, theme }) => {
|
|
|
45
47
|
const translateY = useRef(new Animated.Value(-80)).current;
|
|
46
48
|
const opacity = useRef(new Animated.Value(0)).current;
|
|
47
49
|
const progress = useRef(new Animated.Value(1)).current;
|
|
48
|
-
const typeColor =
|
|
50
|
+
const typeColor = getTypeColor(toast.options.type || 'default', theme);
|
|
49
51
|
const typeIcon = TYPE_ICONS[toast.options.type || 'default'] || TYPE_ICONS.default;
|
|
50
52
|
const timeout = toast.options.timeout || 4000;
|
|
51
53
|
const handleDismiss = useCallback(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MkToastRenderer.js","sourceRoot":"","sources":["../../src/components/MkToastRenderer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC9F,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAGtD;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAEzD,MAAM,
|
|
1
|
+
{"version":3,"file":"MkToastRenderer.js","sourceRoot":"","sources":["../../src/components/MkToastRenderer.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?: {
|
|
@@ -14,6 +19,16 @@ export interface MkAuthProviderProps {
|
|
|
14
19
|
removeItem: (key: string) => Promise<void> | void;
|
|
15
20
|
};
|
|
16
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* @deprecated Use `MkAuthProvider` from `@makroz/mobile` (backed by `src/auth/MkAuthProvider.tsx`) instead.
|
|
24
|
+
* The new provider uses SecureStore for token persistence and scope-aware authentication.
|
|
25
|
+
* This legacy provider is kept for backward compatibility only and will be removed in future releases.
|
|
26
|
+
*/
|
|
17
27
|
export declare const MkAuthProvider: React.FC<MkAuthProviderProps>;
|
|
28
|
+
/**
|
|
29
|
+
* @deprecated Use `useMkAuth` from `@makroz/mobile` (backed by `src/auth/useMkAuth.ts`) instead.
|
|
30
|
+
* The new hook uses SecureStore and throws `'useMkAuth must be used within an <MkAuthProvider>'`.
|
|
31
|
+
* This legacy hook is kept for backward compatibility only and will be removed in future releases.
|
|
32
|
+
*/
|
|
18
33
|
export declare const useMkAuth: () => MkAuthContextType;
|
|
19
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,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,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAiFxD,CAAC;AAEF,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,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;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAiFxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,yBAIrB,CAAA"}
|
|
@@ -4,6 +4,11 @@ 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/mobile` (backed by `src/auth/MkAuthProvider.tsx`) instead.
|
|
9
|
+
* The new provider uses SecureStore for token persistence and scope-aware authentication.
|
|
10
|
+
* This legacy provider is kept for backward compatibility only and will be removed in future releases.
|
|
11
|
+
*/
|
|
7
12
|
export const MkAuthProvider = ({ children, endpoints = { login: '/auth/login', logout: '/auth/logout', user: '/auth/me' }, storage = (typeof localStorage !== 'undefined' ? localStorage : undefined) }) => {
|
|
8
13
|
const api = useApi();
|
|
9
14
|
const [user, setUser] = useState(null);
|
|
@@ -77,6 +82,11 @@ export const MkAuthProvider = ({ children, endpoints = { login: '/auth/login', l
|
|
|
77
82
|
}), [user, api.error, api.waiting, splash, loaded]);
|
|
78
83
|
return (_jsx(MkAuthContext.Provider, { value: value, children: children }));
|
|
79
84
|
};
|
|
85
|
+
/**
|
|
86
|
+
* @deprecated Use `useMkAuth` from `@makroz/mobile` (backed by `src/auth/useMkAuth.ts`) instead.
|
|
87
|
+
* The new hook uses SecureStore and throws `'useMkAuth must be used within an <MkAuthProvider>'`.
|
|
88
|
+
* This legacy hook is kept for backward compatibility only and will be removed in future releases.
|
|
89
|
+
*/
|
|
80
90
|
export const useMkAuth = () => {
|
|
81
91
|
const context = useContext(MkAuthContext);
|
|
82
92
|
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;AA4BD,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,49 +1,57 @@
|
|
|
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
|
+
if (params.q)
|
|
8
|
+
query.append('q', String(params.q));
|
|
9
|
+
if (params.sort)
|
|
10
|
+
query.append('sort', String(params.sort));
|
|
11
|
+
if (params.page)
|
|
12
|
+
query.append('page', String(params.page));
|
|
13
|
+
if (params.per_page)
|
|
14
|
+
query.append('per_page', String(params.per_page));
|
|
15
|
+
if (params.filter && typeof params.filter === 'object') {
|
|
16
|
+
Object.entries(params.filter).forEach(([field, value]) => {
|
|
17
|
+
if (typeof value === 'object' && value !== null) {
|
|
18
|
+
Object.entries(value).forEach(([op, opVal]) => {
|
|
19
|
+
query.append(`filter[${field}][${op}]`, String(opVal));
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
query.append(`filter[${field}]`, String(value));
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
const queryString = query.toString();
|
|
28
|
+
return queryString ? `?${queryString}` : "";
|
|
29
|
+
};
|
|
3
30
|
export function useApi(options = {}) {
|
|
4
31
|
const context = useMkApiContext();
|
|
5
32
|
const [status, setStatus] = useState('idle');
|
|
6
33
|
const [data, setData] = useState(null);
|
|
7
34
|
const [error, setError] = useState(null);
|
|
8
35
|
const baseUrl = options.baseUrl || context.baseUrl;
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
query.append('q', params.q);
|
|
15
|
-
if (params.sort)
|
|
16
|
-
query.append('sort', params.sort);
|
|
17
|
-
if (params.page)
|
|
18
|
-
query.append('page', params.page.toString());
|
|
19
|
-
if (params.per_page)
|
|
20
|
-
query.append('per_page', params.per_page.toString());
|
|
21
|
-
if (params.filter && typeof params.filter === 'object') {
|
|
22
|
-
Object.entries(params.filter).forEach(([field, value]) => {
|
|
23
|
-
if (typeof value === 'object' && value !== null) {
|
|
24
|
-
Object.entries(value).forEach(([op, opVal]) => {
|
|
25
|
-
query.append(`filter[${field}][${op}]`, String(opVal));
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
query.append(`filter[${field}]`, String(value));
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
}
|
|
33
|
-
const queryString = query.toString();
|
|
34
|
-
return queryString ? `?${queryString}` : "";
|
|
35
|
-
};
|
|
36
|
-
const call = async (endpoint, method = 'GET', body = null, params = null) => {
|
|
36
|
+
const baseUrlRef = useRef(baseUrl);
|
|
37
|
+
baseUrlRef.current = baseUrl;
|
|
38
|
+
const optionsRef = useRef(options);
|
|
39
|
+
optionsRef.current = options;
|
|
40
|
+
const call = useCallback(async (endpoint, method = 'GET', body = null, params = null) => {
|
|
37
41
|
setStatus('loading');
|
|
38
42
|
setError(null);
|
|
39
43
|
context.setWaiting(1, `call:${endpoint}`);
|
|
40
44
|
const urlParams = method === 'GET' && params ? buildQueryParams(params) : "";
|
|
41
45
|
const fullEndpoint = `${endpoint}${urlParams}`;
|
|
42
46
|
try {
|
|
43
|
-
const
|
|
47
|
+
const reqHeaders = Object.assign(Object.assign({}, context.headers), optionsRef.current.headers);
|
|
48
|
+
if (!(body instanceof FormData)) {
|
|
49
|
+
reqHeaders['Content-Type'] = 'application/json';
|
|
50
|
+
}
|
|
51
|
+
const response = await fetch(`${baseUrlRef.current}${fullEndpoint}`, {
|
|
44
52
|
method,
|
|
45
|
-
headers:
|
|
46
|
-
body: body ? JSON.stringify(body) : null,
|
|
53
|
+
headers: reqHeaders,
|
|
54
|
+
body: body instanceof FormData ? body : (body ? JSON.stringify(body) : null),
|
|
47
55
|
});
|
|
48
56
|
const result = await response.json();
|
|
49
57
|
if (!result.success) {
|
|
@@ -54,25 +62,31 @@ export function useApi(options = {}) {
|
|
|
54
62
|
return result;
|
|
55
63
|
}
|
|
56
64
|
catch (err) {
|
|
57
|
-
|
|
65
|
+
const errorMessage = err instanceof Error ? err.message : String(err);
|
|
66
|
+
setError(errorMessage);
|
|
58
67
|
setStatus('error');
|
|
59
68
|
throw err;
|
|
60
69
|
}
|
|
61
70
|
finally {
|
|
62
71
|
context.setWaiting(-1, `-call:${endpoint}`);
|
|
63
72
|
}
|
|
64
|
-
};
|
|
73
|
+
}, [context]);
|
|
74
|
+
const get = useCallback((endpoint, params = null) => call(endpoint, 'GET', null, params), [call]);
|
|
75
|
+
const post = useCallback((endpoint, body) => call(endpoint, 'POST', body), [call]);
|
|
76
|
+
const put = useCallback((endpoint, body) => call(endpoint, 'PUT', body), [call]);
|
|
77
|
+
const deleteFn = useCallback((endpoint) => call(endpoint, 'DELETE'), [call]);
|
|
78
|
+
const removeFn = useCallback((endpoint) => call(endpoint, 'DELETE'), [call]);
|
|
65
79
|
return {
|
|
66
80
|
status,
|
|
67
81
|
data,
|
|
68
82
|
error,
|
|
69
83
|
waiting: context.waiting,
|
|
70
84
|
loading: status === 'loading',
|
|
71
|
-
get
|
|
72
|
-
post
|
|
73
|
-
put
|
|
74
|
-
delete:
|
|
75
|
-
remove:
|
|
85
|
+
get,
|
|
86
|
+
post,
|
|
87
|
+
put,
|
|
88
|
+
delete: deleteFn,
|
|
89
|
+
remove: removeFn,
|
|
76
90
|
};
|
|
77
91
|
}
|
|
78
92
|
//# 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,10 +1,83 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
describe
|
|
1
|
+
import { rnMocks } from '../test-utils';
|
|
2
|
+
rnMocks();
|
|
3
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
4
|
+
import { renderHook, act } from '@testing-library/react';
|
|
5
|
+
import { useApi } from './useApi';
|
|
6
|
+
const mockSetWaiting = vi.fn();
|
|
7
|
+
const mockContext = {
|
|
8
|
+
baseUrl: 'http://localhost:8000/api',
|
|
9
|
+
headers: { 'X-Custom-Header': 'test' },
|
|
10
|
+
waiting: 0,
|
|
11
|
+
setWaiting: mockSetWaiting,
|
|
12
|
+
};
|
|
13
|
+
vi.mock('../context/MkApiContext', () => ({
|
|
14
|
+
useMkApiContext: () => mockContext,
|
|
15
|
+
}));
|
|
16
|
+
const mockFetch = vi.fn();
|
|
17
|
+
global.fetch = mockFetch;
|
|
18
|
+
describe('useApi hook module (mobile)', () => {
|
|
19
|
+
beforeEach(() => {
|
|
20
|
+
vi.clearAllMocks();
|
|
21
|
+
mockFetch.mockReset();
|
|
22
|
+
});
|
|
4
23
|
it('should export useApi function', async () => {
|
|
5
24
|
const module = await import('./useApi');
|
|
6
25
|
expect(module.useApi).toBeDefined();
|
|
7
26
|
expect(typeof module.useApi).toBe('function');
|
|
8
27
|
});
|
|
28
|
+
it('should flow the generic response type correctly', async () => {
|
|
29
|
+
const mockResponse = {
|
|
30
|
+
success: true,
|
|
31
|
+
data: { uuid: 'abc-123', title: 'Mobile Item' },
|
|
32
|
+
message: 'OK',
|
|
33
|
+
};
|
|
34
|
+
mockFetch.mockResolvedValueOnce({
|
|
35
|
+
ok: true,
|
|
36
|
+
json: () => Promise.resolve(mockResponse),
|
|
37
|
+
});
|
|
38
|
+
const { result } = renderHook(() => useApi());
|
|
39
|
+
await act(async () => {
|
|
40
|
+
const response = await result.current.get('/dummy');
|
|
41
|
+
expect(response.data.uuid).toBe('abc-123');
|
|
42
|
+
expect(response.data.title).toBe('Mobile Item');
|
|
43
|
+
});
|
|
44
|
+
expect(result.current.data).toEqual({ uuid: 'abc-123', title: 'Mobile Item' });
|
|
45
|
+
});
|
|
46
|
+
describe('T4: useApi stability and FormData headers (mobile)', () => {
|
|
47
|
+
it('should omit Content-Type header when body is FormData', async () => {
|
|
48
|
+
const mockResponse = { success: true, data: { uploaded: true }, message: 'OK' };
|
|
49
|
+
mockFetch.mockResolvedValueOnce({
|
|
50
|
+
ok: true,
|
|
51
|
+
json: () => Promise.resolve(mockResponse),
|
|
52
|
+
});
|
|
53
|
+
const { result } = renderHook(() => useApi());
|
|
54
|
+
const formData = new FormData();
|
|
55
|
+
formData.append('file', { uri: 'file://test.png', name: 'test.png', type: 'image/png' });
|
|
56
|
+
await act(async () => {
|
|
57
|
+
await result.current.post('/upload', formData);
|
|
58
|
+
});
|
|
59
|
+
expect(mockFetch).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({
|
|
60
|
+
method: 'POST',
|
|
61
|
+
headers: expect.not.objectContaining({
|
|
62
|
+
'Content-Type': 'application/json',
|
|
63
|
+
}),
|
|
64
|
+
body: formData,
|
|
65
|
+
}));
|
|
66
|
+
});
|
|
67
|
+
it('should maintain referential stability for HTTP methods on re-render', () => {
|
|
68
|
+
const { result, rerender } = renderHook(() => useApi());
|
|
69
|
+
const getRef = result.current.get;
|
|
70
|
+
const postRef = result.current.post;
|
|
71
|
+
const putRef = result.current.put;
|
|
72
|
+
const deleteRef = result.current.delete;
|
|
73
|
+
const removeRef = result.current.remove;
|
|
74
|
+
rerender();
|
|
75
|
+
expect(result.current.get).toBe(getRef);
|
|
76
|
+
expect(result.current.post).toBe(postRef);
|
|
77
|
+
expect(result.current.put).toBe(putRef);
|
|
78
|
+
expect(result.current.delete).toBe(deleteRef);
|
|
79
|
+
expect(result.current.remove).toBe(removeRef);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
9
82
|
});
|
|
10
83
|
//# sourceMappingURL=useApi.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useApi.test.js","sourceRoot":"","sources":["../../src/hooks/useApi.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"useApi.test.js","sourceRoot":"","sources":["../../src/hooks/useApi.test.ts"],"names":[],"mappings":"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"}
|