@oxyhq/services 22.5.0 → 22.6.1
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/lib/commonjs/index.js +1 -1
- package/lib/commonjs/ui/client.js +1 -1
- package/lib/commonjs/ui/components/FontLoader.js +18 -145
- package/lib/commonjs/ui/components/FontLoader.js.map +1 -1
- package/lib/commonjs/ui/components/FontLoader.native.js +88 -0
- package/lib/commonjs/ui/components/FontLoader.native.js.map +1 -0
- package/lib/commonjs/ui/components/OxyProvider.js +1 -1
- package/lib/commonjs/ui/components/fileManagement/FileDetailsModal.js +34 -41
- package/lib/commonjs/ui/components/fileManagement/FileDetailsModal.js.map +1 -1
- package/lib/commonjs/ui/components/fileManagement/UploadPreview.js.map +1 -1
- package/lib/commonjs/ui/components/fileManagement/styles.js +1 -225
- package/lib/commonjs/ui/components/fileManagement/styles.js.map +1 -1
- package/lib/commonjs/ui/components/photogrid/JustifiedPhotoGrid.js +0 -2
- package/lib/commonjs/ui/components/photogrid/JustifiedPhotoGrid.js.map +1 -1
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js +5 -2
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/commonjs/ui/context/useOxyAccountGraph.js +7 -0
- package/lib/commonjs/ui/context/useOxyAccountGraph.js.map +1 -1
- package/lib/commonjs/ui/hooks/queries/useAccountQueries.js +10 -4
- package/lib/commonjs/ui/hooks/queries/useAccountQueries.js.map +1 -1
- package/lib/commonjs/ui/hooks/queries/userCache.js +33 -9
- package/lib/commonjs/ui/hooks/queries/userCache.js.map +1 -1
- package/lib/commonjs/ui/hooks/useAvatarPicker.js +23 -8
- package/lib/commonjs/ui/hooks/useAvatarPicker.js.map +1 -1
- package/lib/commonjs/ui/hooks/useFileDownloadUrl.js +7 -21
- package/lib/commonjs/ui/hooks/useFileDownloadUrl.js.map +1 -1
- package/lib/commonjs/ui/hooks/useResolvedFileUrls.js +163 -0
- package/lib/commonjs/ui/hooks/useResolvedFileUrls.js.map +1 -0
- package/lib/commonjs/ui/index.js +1 -1
- package/lib/commonjs/ui/screens/FileManagementScreen.js +51 -22
- package/lib/commonjs/ui/screens/FileManagementScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/fileManagement/PhotoPickerSection.js +227 -204
- package/lib/commonjs/ui/screens/fileManagement/PhotoPickerSection.js.map +1 -1
- package/lib/commonjs/ui/screens/fileManagement/hooks/useFileUploadState.js +26 -9
- package/lib/commonjs/ui/screens/fileManagement/hooks/useFileUploadState.js.map +1 -1
- package/lib/commonjs/ui/screens/fileManagement/photoGridLayout.js +44 -0
- package/lib/commonjs/ui/screens/fileManagement/photoGridLayout.js.map +1 -0
- package/lib/commonjs/ui/session/tokenTransport.js +21 -10
- package/lib/commonjs/ui/session/tokenTransport.js.map +1 -1
- package/lib/commonjs/ui/utils/fileManagement.js +3 -43
- package/lib/commonjs/ui/utils/fileManagement.js.map +1 -1
- package/lib/module/index.js +1 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/ui/client.js +1 -1
- package/lib/module/ui/client.js.map +1 -1
- package/lib/module/ui/components/FontLoader.js +18 -146
- package/lib/module/ui/components/FontLoader.js.map +1 -1
- package/lib/module/ui/components/FontLoader.native.js +83 -0
- package/lib/module/ui/components/FontLoader.native.js.map +1 -0
- package/lib/module/ui/components/OxyProvider.js +1 -1
- package/lib/module/ui/components/OxyProvider.js.map +1 -1
- package/lib/module/ui/components/fileManagement/FileDetailsModal.js +34 -41
- package/lib/module/ui/components/fileManagement/FileDetailsModal.js.map +1 -1
- package/lib/module/ui/components/fileManagement/UploadPreview.js.map +1 -1
- package/lib/module/ui/components/fileManagement/styles.js +0 -224
- package/lib/module/ui/components/fileManagement/styles.js.map +1 -1
- package/lib/module/ui/components/photogrid/JustifiedPhotoGrid.js +0 -2
- package/lib/module/ui/components/photogrid/JustifiedPhotoGrid.js.map +1 -1
- package/lib/module/ui/context/hooks/useAuthOperations.js +5 -2
- package/lib/module/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/module/ui/context/useOxyAccountGraph.js +7 -0
- package/lib/module/ui/context/useOxyAccountGraph.js.map +1 -1
- package/lib/module/ui/hooks/queries/useAccountQueries.js +10 -4
- package/lib/module/ui/hooks/queries/useAccountQueries.js.map +1 -1
- package/lib/module/ui/hooks/queries/userCache.js +33 -9
- package/lib/module/ui/hooks/queries/userCache.js.map +1 -1
- package/lib/module/ui/hooks/useAvatarPicker.js +23 -8
- package/lib/module/ui/hooks/useAvatarPicker.js.map +1 -1
- package/lib/module/ui/hooks/useFileDownloadUrl.js +7 -21
- package/lib/module/ui/hooks/useFileDownloadUrl.js.map +1 -1
- package/lib/module/ui/hooks/useResolvedFileUrls.js +157 -0
- package/lib/module/ui/hooks/useResolvedFileUrls.js.map +1 -0
- package/lib/module/ui/index.js +1 -1
- package/lib/module/ui/index.js.map +1 -1
- package/lib/module/ui/screens/FileManagementScreen.js +52 -23
- package/lib/module/ui/screens/FileManagementScreen.js.map +1 -1
- package/lib/module/ui/screens/fileManagement/PhotoPickerSection.js +229 -206
- package/lib/module/ui/screens/fileManagement/PhotoPickerSection.js.map +1 -1
- package/lib/module/ui/screens/fileManagement/hooks/useFileUploadState.js +26 -9
- package/lib/module/ui/screens/fileManagement/hooks/useFileUploadState.js.map +1 -1
- package/lib/module/ui/screens/fileManagement/photoGridLayout.js +39 -0
- package/lib/module/ui/screens/fileManagement/photoGridLayout.js.map +1 -0
- package/lib/module/ui/session/tokenTransport.js +21 -10
- package/lib/module/ui/session/tokenTransport.js.map +1 -1
- package/lib/module/ui/utils/fileManagement.js +3 -42
- package/lib/module/ui/utils/fileManagement.js.map +1 -1
- package/lib/typescript/commonjs/ui/components/FontLoader.d.ts +14 -5
- package/lib/typescript/commonjs/ui/components/FontLoader.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/FontLoader.native.d.ts +13 -0
- package/lib/typescript/commonjs/ui/components/FontLoader.native.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/components/fileManagement/FileDetailsModal.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/fileManagement/styles.d.ts +0 -218
- package/lib/typescript/commonjs/ui/components/fileManagement/styles.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/photogrid/JustifiedPhotoGrid.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/hooks/useAuthOperations.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/useOxyAccountGraph.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts +2 -2
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/queries/useAccountQueries.d.ts +9 -0
- package/lib/typescript/commonjs/ui/hooks/queries/useAccountQueries.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/queries/userCache.d.ts +3 -0
- package/lib/typescript/commonjs/ui/hooks/queries/userCache.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useAvatarPicker.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useFileDownloadUrl.d.ts +3 -2
- package/lib/typescript/commonjs/ui/hooks/useFileDownloadUrl.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useResolvedFileUrls.d.ts +48 -0
- package/lib/typescript/commonjs/ui/hooks/useResolvedFileUrls.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/screens/FileManagementScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/fileManagement/PhotoPickerSection.d.ts +1 -1
- package/lib/typescript/commonjs/ui/screens/fileManagement/PhotoPickerSection.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/fileManagement/hooks/useFileUploadState.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/fileManagement/photoGridLayout.d.ts +37 -0
- package/lib/typescript/commonjs/ui/screens/fileManagement/photoGridLayout.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/session/tokenTransport.d.ts +15 -8
- package/lib/typescript/commonjs/ui/session/tokenTransport.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/utils/fileManagement.d.ts +4 -11
- package/lib/typescript/commonjs/ui/utils/fileManagement.d.ts.map +1 -1
- package/lib/typescript/module/index.d.ts +1 -1
- package/lib/typescript/module/index.d.ts.map +1 -1
- package/lib/typescript/module/ui/client.d.ts +1 -1
- package/lib/typescript/module/ui/client.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/FontLoader.d.ts +14 -5
- package/lib/typescript/module/ui/components/FontLoader.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/FontLoader.native.d.ts +13 -0
- package/lib/typescript/module/ui/components/FontLoader.native.d.ts.map +1 -0
- package/lib/typescript/module/ui/components/fileManagement/FileDetailsModal.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/fileManagement/styles.d.ts +0 -218
- package/lib/typescript/module/ui/components/fileManagement/styles.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/photogrid/JustifiedPhotoGrid.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/hooks/useAuthOperations.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/useOxyAccountGraph.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts +2 -2
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/queries/useAccountQueries.d.ts +9 -0
- package/lib/typescript/module/ui/hooks/queries/useAccountQueries.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/queries/userCache.d.ts +3 -0
- package/lib/typescript/module/ui/hooks/queries/userCache.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useAvatarPicker.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useFileDownloadUrl.d.ts +3 -2
- package/lib/typescript/module/ui/hooks/useFileDownloadUrl.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useResolvedFileUrls.d.ts +48 -0
- package/lib/typescript/module/ui/hooks/useResolvedFileUrls.d.ts.map +1 -0
- package/lib/typescript/module/ui/index.d.ts +1 -1
- package/lib/typescript/module/ui/index.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/FileManagementScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/fileManagement/PhotoPickerSection.d.ts +1 -1
- package/lib/typescript/module/ui/screens/fileManagement/PhotoPickerSection.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/fileManagement/hooks/useFileUploadState.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/fileManagement/photoGridLayout.d.ts +37 -0
- package/lib/typescript/module/ui/screens/fileManagement/photoGridLayout.d.ts.map +1 -0
- package/lib/typescript/module/ui/session/tokenTransport.d.ts +15 -8
- package/lib/typescript/module/ui/session/tokenTransport.d.ts.map +1 -1
- package/lib/typescript/module/ui/utils/fileManagement.d.ts +4 -11
- package/lib/typescript/module/ui/utils/fileManagement.d.ts.map +1 -1
- package/package.json +5 -10
- package/src/ui/components/FontLoader.native.tsx +88 -0
- package/src/ui/components/FontLoader.tsx +16 -151
- package/src/ui/components/fileManagement/FileDetailsModal.tsx +29 -28
- package/src/ui/components/fileManagement/UploadPreview.tsx +1 -1
- package/src/ui/components/fileManagement/styles.ts +0 -225
- package/src/ui/components/photogrid/JustifiedPhotoGrid.tsx +0 -1
- package/src/ui/context/hooks/useAuthOperations.ts +5 -2
- package/src/ui/context/useOxyAccountGraph.ts +5 -0
- package/src/ui/hooks/queries/__tests__/userCache.test.ts +29 -0
- package/src/ui/hooks/queries/useAccountQueries.ts +10 -4
- package/src/ui/hooks/queries/userCache.ts +31 -8
- package/src/ui/hooks/useAvatarPicker.ts +27 -7
- package/src/ui/hooks/useFileDownloadUrl.ts +7 -23
- package/src/ui/hooks/useResolvedFileUrls.ts +170 -0
- package/src/ui/screens/FileManagementScreen.tsx +55 -27
- package/src/ui/screens/__tests__/photoGridLayout.test.ts +57 -0
- package/src/ui/screens/fileManagement/PhotoPickerSection.tsx +229 -215
- package/src/ui/screens/fileManagement/hooks/useFileUploadState.ts +27 -3
- package/src/ui/screens/fileManagement/photoGridLayout.ts +45 -0
- package/src/ui/session/__tests__/tokenTransport.test.ts +25 -10
- package/src/ui/session/tokenTransport.ts +21 -10
- package/src/ui/utils/fileManagement.ts +8 -49
- package/lib/typescript/types/expo-vector-icons.d.ts +0 -22
- package/src/types/expo-vector-icons.d.ts +0 -22
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxyhq/services",
|
|
3
|
-
"version": "22.
|
|
3
|
+
"version": "22.6.1",
|
|
4
4
|
"description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"module": "lib/module/index.js",
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
},
|
|
128
128
|
"dependencies": {
|
|
129
129
|
"@oxyhq/contracts": "0.17.0",
|
|
130
|
-
"@oxyhq/core": "^12.
|
|
130
|
+
"@oxyhq/core": "^12.6.0",
|
|
131
131
|
"@simplewebauthn/browser": "^13.3.0",
|
|
132
132
|
"color": "^4.2.3"
|
|
133
133
|
},
|
|
@@ -135,7 +135,8 @@
|
|
|
135
135
|
"@biomejs/biome": "^1.9.4",
|
|
136
136
|
"@commitlint/cli": "^17.6.5",
|
|
137
137
|
"@commitlint/config-conventional": "^17.6.5",
|
|
138
|
-
"@
|
|
138
|
+
"@expo/vector-icons": "^15.0.3",
|
|
139
|
+
"@oxyhq/core": "12.7.0",
|
|
139
140
|
"@react-native-async-storage/async-storage": "^2.0.0",
|
|
140
141
|
"@react-native-community/netinfo": "^11.4.1",
|
|
141
142
|
"@react-native/babel-preset": "^0.86.0",
|
|
@@ -176,7 +177,7 @@
|
|
|
176
177
|
"peerDependencies": {
|
|
177
178
|
"@expo/vector-icons": "^15.0.3",
|
|
178
179
|
"@oxyhq/bloom": ">=0.16.0",
|
|
179
|
-
"@oxyhq/core": "^12.
|
|
180
|
+
"@oxyhq/core": "^12.6.0",
|
|
180
181
|
"@react-native-async-storage/async-storage": "^2.0.0",
|
|
181
182
|
"@react-native-community/netinfo": "^11.4.1",
|
|
182
183
|
"@tanstack/query-async-storage-persister": "^5.101",
|
|
@@ -213,9 +214,6 @@
|
|
|
213
214
|
"expo-modules-core": {
|
|
214
215
|
"optional": true
|
|
215
216
|
},
|
|
216
|
-
"@expo/vector-icons": {
|
|
217
|
-
"optional": true
|
|
218
|
-
},
|
|
219
217
|
"@types/react-native": {
|
|
220
218
|
"optional": true
|
|
221
219
|
},
|
|
@@ -225,9 +223,6 @@
|
|
|
225
223
|
"react-native-keyboard-controller": {
|
|
226
224
|
"optional": true
|
|
227
225
|
},
|
|
228
|
-
"react-native-qrcode-svg": {
|
|
229
|
-
"optional": true
|
|
230
|
-
},
|
|
231
226
|
"expo": {
|
|
232
227
|
"optional": true
|
|
233
228
|
},
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import type React from 'react';
|
|
2
|
+
import { useState, useEffect } from 'react';
|
|
3
|
+
import * as Font from 'expo-font';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Get the Inter font sources for native environments.
|
|
7
|
+
* Loads all static Inter weights bundled with this package.
|
|
8
|
+
*/
|
|
9
|
+
const getInterFonts = () => {
|
|
10
|
+
try {
|
|
11
|
+
return {
|
|
12
|
+
'Inter-Light': require('../../assets/fonts/Inter/Inter_18pt-Light.ttf'),
|
|
13
|
+
'Inter-Regular': require('../../assets/fonts/Inter/Inter_18pt-Regular.ttf'),
|
|
14
|
+
'Inter-Medium': require('../../assets/fonts/Inter/Inter_18pt-Medium.ttf'),
|
|
15
|
+
'Inter-SemiBold': require('../../assets/fonts/Inter/Inter_18pt-SemiBold.ttf'),
|
|
16
|
+
'Inter-Bold': require('../../assets/fonts/Inter/Inter_18pt-Bold.ttf'),
|
|
17
|
+
'Inter-ExtraBold': require('../../assets/fonts/Inter/Inter_18pt-ExtraBold.ttf'),
|
|
18
|
+
'Inter-Black': require('../../assets/fonts/Inter/Inter_18pt-Black.ttf'),
|
|
19
|
+
};
|
|
20
|
+
} catch (error) {
|
|
21
|
+
if (__DEV__) {
|
|
22
|
+
console.warn('Failed to load Inter fonts:', error);
|
|
23
|
+
}
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* FontLoader — loads custom fonts in the background while rendering children
|
|
30
|
+
* immediately with system fonts as fallback until the custom fonts are ready.
|
|
31
|
+
*/
|
|
32
|
+
export const FontLoader = ({
|
|
33
|
+
children,
|
|
34
|
+
}: {
|
|
35
|
+
children: React.ReactNode;
|
|
36
|
+
}) => {
|
|
37
|
+
const [fontState, setFontState] = useState<'loading' | 'loaded' | 'error'>('loading');
|
|
38
|
+
|
|
39
|
+
useEffect(() => {
|
|
40
|
+
const loadFonts = async () => {
|
|
41
|
+
try {
|
|
42
|
+
const interFonts = getInterFonts();
|
|
43
|
+
|
|
44
|
+
if (!interFonts) {
|
|
45
|
+
throw new Error('Inter font files not found');
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
await Font.loadAsync(interFonts);
|
|
49
|
+
setFontState('loaded');
|
|
50
|
+
} catch (error) {
|
|
51
|
+
if (__DEV__) {
|
|
52
|
+
console.error('Error loading fonts:', error);
|
|
53
|
+
}
|
|
54
|
+
setFontState('error');
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
loadFonts();
|
|
59
|
+
}, []);
|
|
60
|
+
|
|
61
|
+
if (fontState === 'error' && __DEV__) {
|
|
62
|
+
console.warn('Fonts failed to load. Using system fonts instead.');
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
return <>{children}</>;
|
|
66
|
+
};
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Setup fonts for applications consuming this package on native.
|
|
70
|
+
*/
|
|
71
|
+
export const setupFonts = async (): Promise<boolean> => {
|
|
72
|
+
try {
|
|
73
|
+
const interFonts = getInterFonts();
|
|
74
|
+
|
|
75
|
+
if (!interFonts) {
|
|
76
|
+
throw new Error('Inter font files not found');
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
await Font.loadAsync(interFonts);
|
|
80
|
+
return true;
|
|
81
|
+
} catch (error: unknown) {
|
|
82
|
+
if (__DEV__) {
|
|
83
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
84
|
+
console.warn('Error setting up fonts:', errorMessage);
|
|
85
|
+
}
|
|
86
|
+
return false;
|
|
87
|
+
}
|
|
88
|
+
};
|
|
@@ -1,162 +1,27 @@
|
|
|
1
1
|
import type React from 'react';
|
|
2
|
-
import { useState, useEffect } from 'react';
|
|
3
|
-
import { Platform } from 'react-native';
|
|
4
|
-
import * as Font from 'expo-font';
|
|
5
2
|
|
|
6
3
|
/**
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
'Inter-Bold': require('../../assets/fonts/Inter/Inter_18pt-Bold.ttf'),
|
|
20
|
-
'Inter-ExtraBold': require('../../assets/fonts/Inter/Inter_18pt-ExtraBold.ttf'),
|
|
21
|
-
'Inter-Black': require('../../assets/fonts/Inter/Inter_18pt-Black.ttf'),
|
|
22
|
-
};
|
|
23
|
-
} catch (error) {
|
|
24
|
-
if (__DEV__) {
|
|
25
|
-
console.warn('Failed to load Inter fonts:', error);
|
|
26
|
-
}
|
|
27
|
-
return null;
|
|
28
|
-
}
|
|
29
|
-
};
|
|
30
|
-
|
|
31
|
-
/**
|
|
32
|
-
* FontLoader component that loads custom fonts in the background while rendering children immediately
|
|
33
|
-
* This works in both the package development and when consumed as an npm package
|
|
34
|
-
* Children render immediately with system fonts as fallback until custom fonts are loaded
|
|
4
|
+
* Font loading — clean default (web, SSR, and any bundler that does not pick a
|
|
5
|
+
* platform variant).
|
|
6
|
+
*
|
|
7
|
+
* Web fonts are Bloom's job: `applyFontFaces()` in `@oxyhq/bloom` injects the
|
|
8
|
+
* Inter / BlomusModernus / Geist Mono `@font-face` rules as self-contained
|
|
9
|
+
* base64 data URLs, so there is nothing for this package to load off native.
|
|
10
|
+
* The real implementation lives in `FontLoader.native.tsx`.
|
|
11
|
+
*
|
|
12
|
+
* Keeping this module free of `expo-font` is load-bearing, not incidental:
|
|
13
|
+
* `expo-font/build/serverContext.web.js` imports `node:async_hooks`, which
|
|
14
|
+
* every browser bundler externalizes. A top-level `expo-font` import here
|
|
15
|
+
* therefore throws at module-evaluation time on web and React never mounts.
|
|
35
16
|
*/
|
|
36
17
|
export const FontLoader = ({
|
|
37
18
|
children,
|
|
38
19
|
}: {
|
|
39
20
|
children: React.ReactNode;
|
|
40
|
-
}) => {
|
|
41
|
-
const [fontState, setFontState] = useState<'loading' | 'loaded' | 'error'>('loading');
|
|
42
|
-
|
|
43
|
-
useEffect(() => {
|
|
44
|
-
const loadFonts = async () => {
|
|
45
|
-
try {
|
|
46
|
-
// Get all the font weights
|
|
47
|
-
const interFonts = getInterFonts();
|
|
48
|
-
|
|
49
|
-
if (!interFonts) {
|
|
50
|
-
throw new Error('Inter font files not found');
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
// Load all the static Inter fonts with their respective weights
|
|
54
|
-
await Font.loadAsync(interFonts);
|
|
55
|
-
|
|
56
|
-
setFontState('loaded');
|
|
57
|
-
} catch (error) {
|
|
58
|
-
if (__DEV__) {
|
|
59
|
-
console.error('Error loading fonts:', error);
|
|
60
|
-
}
|
|
61
|
-
setFontState('error');
|
|
62
|
-
}
|
|
63
|
-
};
|
|
64
|
-
|
|
65
|
-
loadFonts();
|
|
66
|
-
}, []);
|
|
67
|
-
|
|
68
|
-
// Always render children immediately - fonts will load in background
|
|
69
|
-
// If fonts aren't loaded yet, the app will use system fonts as fallback
|
|
70
|
-
if (fontState === 'error' && __DEV__) {
|
|
71
|
-
console.warn('Fonts failed to load. Using system fonts instead.');
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
// Render children immediately, even while fonts are loading
|
|
75
|
-
// Fonts will apply when they're ready, otherwise system fonts are used
|
|
76
|
-
return <>{children}</>;
|
|
77
|
-
};
|
|
21
|
+
}) => <>{children}</>;
|
|
78
22
|
|
|
79
23
|
/**
|
|
80
|
-
*
|
|
81
|
-
*
|
|
24
|
+
* No-op off native. Returns `true` because setup genuinely succeeded — there is
|
|
25
|
+
* simply nothing to do here — so callers do not log a spurious failure.
|
|
82
26
|
*/
|
|
83
|
-
export const setupFonts = async () =>
|
|
84
|
-
try {
|
|
85
|
-
const interFonts = getInterFonts();
|
|
86
|
-
|
|
87
|
-
if (!interFonts) {
|
|
88
|
-
throw new Error('Inter font files not found');
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
if (Platform.OS === 'web') {
|
|
92
|
-
// For web platform, dynamically inject CSS to load the fonts
|
|
93
|
-
if (typeof document !== 'undefined') {
|
|
94
|
-
// Create a style element
|
|
95
|
-
const style = document.createElement('style');
|
|
96
|
-
|
|
97
|
-
// Define @font-face rules for each font weight
|
|
98
|
-
const fontFaceRules = `
|
|
99
|
-
@font-face {
|
|
100
|
-
font-family: 'Inter';
|
|
101
|
-
src: url(${interFonts['Inter-Light']}) format('truetype');
|
|
102
|
-
font-weight: 300;
|
|
103
|
-
font-style: normal;
|
|
104
|
-
}
|
|
105
|
-
@font-face {
|
|
106
|
-
font-family: 'Inter';
|
|
107
|
-
src: url(${interFonts['Inter-Regular']}) format('truetype');
|
|
108
|
-
font-weight: 400;
|
|
109
|
-
font-style: normal;
|
|
110
|
-
}
|
|
111
|
-
@font-face {
|
|
112
|
-
font-family: 'Inter';
|
|
113
|
-
src: url(${interFonts['Inter-Medium']}) format('truetype');
|
|
114
|
-
font-weight: 500;
|
|
115
|
-
font-style: normal;
|
|
116
|
-
}
|
|
117
|
-
@font-face {
|
|
118
|
-
font-family: 'Inter';
|
|
119
|
-
src: url(${interFonts['Inter-SemiBold']}) format('truetype');
|
|
120
|
-
font-weight: 600;
|
|
121
|
-
font-style: normal;
|
|
122
|
-
}
|
|
123
|
-
@font-face {
|
|
124
|
-
font-family: 'Inter';
|
|
125
|
-
src: url(${interFonts['Inter-Bold']}) format('truetype');
|
|
126
|
-
font-weight: 700;
|
|
127
|
-
font-style: normal;
|
|
128
|
-
}
|
|
129
|
-
@font-face {
|
|
130
|
-
font-family: 'Inter';
|
|
131
|
-
src: url(${interFonts['Inter-ExtraBold']}) format('truetype');
|
|
132
|
-
font-weight: 800;
|
|
133
|
-
font-style: normal;
|
|
134
|
-
}
|
|
135
|
-
@font-face {
|
|
136
|
-
font-family: 'Inter';
|
|
137
|
-
src: url(${interFonts['Inter-Black']}) format('truetype');
|
|
138
|
-
font-weight: 900;
|
|
139
|
-
font-style: normal;
|
|
140
|
-
}
|
|
141
|
-
`;
|
|
142
|
-
|
|
143
|
-
style.textContent = fontFaceRules;
|
|
144
|
-
document.head.appendChild(style);
|
|
145
|
-
if (__DEV__) {
|
|
146
|
-
console.info('All Inter web fonts have been dynamically loaded');
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
} else {
|
|
150
|
-
// Attempt to load the fonts anyway (this works if the consumer has linked the assets)
|
|
151
|
-
await Font.loadAsync(interFonts);
|
|
152
|
-
}
|
|
153
|
-
|
|
154
|
-
return true;
|
|
155
|
-
} catch (error: unknown) {
|
|
156
|
-
if (__DEV__) {
|
|
157
|
-
const errorMessage = error instanceof Error ? (error instanceof Error ? error.message : null) : String(error);
|
|
158
|
-
console.warn('Error setting up fonts:', errorMessage);
|
|
159
|
-
}
|
|
160
|
-
return false;
|
|
161
|
-
}
|
|
162
|
-
};
|
|
27
|
+
export const setupFonts = async (): Promise<boolean> => true;
|
|
@@ -4,8 +4,8 @@ import { Ionicons } from '@expo/vector-icons';
|
|
|
4
4
|
import { Dialog, type DialogControlProps } from '@oxyhq/bloom';
|
|
5
5
|
import { useTheme } from '@oxyhq/bloom/theme';
|
|
6
6
|
import type { FileMetadata } from '@oxyhq/core';
|
|
7
|
+
import { useI18n } from '../../hooks/useI18n';
|
|
7
8
|
import { formatFileSize, getFileIcon } from '../../utils/fileManagement';
|
|
8
|
-
import { fileManagementStyles } from './styles';
|
|
9
9
|
|
|
10
10
|
interface FileDetailsModalProps {
|
|
11
11
|
control: DialogControlProps;
|
|
@@ -24,6 +24,7 @@ export const FileDetailsModal: React.FC<FileDetailsModalProps> = ({
|
|
|
24
24
|
isOwner,
|
|
25
25
|
onClose,
|
|
26
26
|
}) => {
|
|
27
|
+
const { t } = useI18n();
|
|
27
28
|
const { colors } = useTheme();
|
|
28
29
|
|
|
29
30
|
if (!file) return null;
|
|
@@ -31,78 +32,78 @@ export const FileDetailsModal: React.FC<FileDetailsModalProps> = ({
|
|
|
31
32
|
const actions = isOwner
|
|
32
33
|
? [
|
|
33
34
|
{
|
|
34
|
-
label: '
|
|
35
|
+
label: t('fileManagement.details.download'),
|
|
35
36
|
onPress: () => onDownload(file.id, file.filename),
|
|
36
37
|
},
|
|
37
38
|
{
|
|
38
|
-
label: '
|
|
39
|
+
label: t('common.actions.delete'),
|
|
39
40
|
color: 'destructive' as const,
|
|
40
41
|
onPress: () => onDelete(file.id, file.filename),
|
|
41
42
|
},
|
|
42
|
-
{ label: '
|
|
43
|
+
{ label: t('common.cancel'), color: 'cancel' as const },
|
|
43
44
|
]
|
|
44
45
|
: [
|
|
45
46
|
{
|
|
46
|
-
label: '
|
|
47
|
+
label: t('fileManagement.details.download'),
|
|
47
48
|
onPress: () => onDownload(file.id, file.filename),
|
|
48
49
|
},
|
|
49
|
-
{ label: '
|
|
50
|
+
{ label: t('common.cancel'), color: 'cancel' as const },
|
|
50
51
|
];
|
|
51
52
|
|
|
52
53
|
return (
|
|
53
54
|
<Dialog
|
|
54
55
|
control={control}
|
|
55
56
|
onClose={onClose}
|
|
56
|
-
label=
|
|
57
|
+
label={t('fileManagement.details.title')}
|
|
57
58
|
actions={actions}
|
|
58
59
|
>
|
|
59
|
-
<View className="bg-secondary border-border"
|
|
60
|
-
<View
|
|
60
|
+
<View className="bg-secondary border-border p-[18px] rounded-[14px] border items-center">
|
|
61
|
+
<View className="mb-space-16">
|
|
61
62
|
<Ionicons
|
|
62
|
-
name={getFileIcon(file.contentType)
|
|
63
|
+
name={getFileIcon(file.contentType)}
|
|
63
64
|
size={64}
|
|
64
65
|
color={colors.primary}
|
|
65
66
|
/>
|
|
66
67
|
</View>
|
|
67
68
|
|
|
68
|
-
<Text className="text-text"
|
|
69
|
+
<Text className="text-text text-[20px] font-bold text-center mb-space-24">
|
|
69
70
|
{file.filename}
|
|
70
71
|
</Text>
|
|
71
72
|
|
|
72
|
-
<View
|
|
73
|
-
<View
|
|
74
|
-
<Text className="text-text-secondary"
|
|
75
|
-
|
|
73
|
+
<View className="w-full mb-space-32">
|
|
74
|
+
<View className="flex-row justify-between items-start mb-space-12 flex-wrap">
|
|
75
|
+
<Text className="text-text-secondary text-[16px] font-medium flex-1 min-w-[100px]">
|
|
76
|
+
{t('fileManagement.size')}:
|
|
76
77
|
</Text>
|
|
77
|
-
<Text className="text-text"
|
|
78
|
+
<Text className="text-text text-[16px] flex-[2] text-right">
|
|
78
79
|
{formatFileSize(file.length)}
|
|
79
80
|
</Text>
|
|
80
81
|
</View>
|
|
81
82
|
|
|
82
|
-
<View
|
|
83
|
-
<Text className="text-text-secondary"
|
|
84
|
-
|
|
83
|
+
<View className="flex-row justify-between items-start mb-space-12 flex-wrap">
|
|
84
|
+
<Text className="text-text-secondary text-[16px] font-medium flex-1 min-w-[100px]">
|
|
85
|
+
{t('fileManagement.details.type')}:
|
|
85
86
|
</Text>
|
|
86
|
-
<Text className="text-text"
|
|
87
|
+
<Text className="text-text text-[16px] flex-[2] text-right">
|
|
87
88
|
{file.contentType}
|
|
88
89
|
</Text>
|
|
89
90
|
</View>
|
|
90
91
|
|
|
91
|
-
<View
|
|
92
|
-
<Text className="text-text-secondary"
|
|
93
|
-
|
|
92
|
+
<View className="flex-row justify-between items-start mb-space-12 flex-wrap">
|
|
93
|
+
<Text className="text-text-secondary text-[16px] font-medium flex-1 min-w-[100px]">
|
|
94
|
+
{t('fileManagement.details.uploaded')}:
|
|
94
95
|
</Text>
|
|
95
|
-
<Text className="text-text"
|
|
96
|
+
<Text className="text-text text-[16px] flex-[2] text-right">
|
|
96
97
|
{new Date(file.uploadDate).toLocaleString()}
|
|
97
98
|
</Text>
|
|
98
99
|
</View>
|
|
99
100
|
|
|
100
101
|
{file.metadata?.description && (
|
|
101
|
-
<View
|
|
102
|
-
<Text className="text-text-secondary"
|
|
103
|
-
|
|
102
|
+
<View className="flex-row justify-between items-start mb-space-12 flex-wrap">
|
|
103
|
+
<Text className="text-text-secondary text-[16px] font-medium flex-1 min-w-[100px]">
|
|
104
|
+
{t('fileManagement.details.description')}:
|
|
104
105
|
</Text>
|
|
105
|
-
<Text className="text-text"
|
|
106
|
+
<Text className="text-text text-[16px] flex-[2] text-right">
|
|
106
107
|
{file.metadata.description}
|
|
107
108
|
</Text>
|
|
108
109
|
</View>
|
|
@@ -70,7 +70,7 @@ const UploadPreviewContent: React.FC<{
|
|
|
70
70
|
) : (
|
|
71
71
|
<View style={[fileManagementStyles.uploadPreviewIconContainer, { backgroundColor: colors.backgroundSecondary }]}>
|
|
72
72
|
<Ionicons
|
|
73
|
-
name={getFileIcon(pendingFile.type)
|
|
73
|
+
name={getFileIcon(pendingFile.type)}
|
|
74
74
|
size={32}
|
|
75
75
|
color={colors.primary}
|
|
76
76
|
/>
|