feat: update expo-document-picker and support backward compatibility

Author: bang9

packages/uikit-react-native/package.json

@@ -77,7 +77,7 @@
     "date-fns": "^2.28.0",
     "expo-av": "^13.2.1",
     "expo-clipboard": "^4.1.2",
-    "expo-document-picker": "^11.2.2",
+    "expo-document-picker": "^11.5.3",
     "expo-file-system": "^15.2.2",
     "expo-image-manipulator": "^11.1.1",
     "expo-image-picker": "^14.1.1",

packages/uikit-react-native/src/platform/createFileService.expo.ts

@@ -9,7 +9,6 @@ import SBUError from '../libs/SBUError';
 import expoBackwardUtils from '../utils/expoBackwardUtils';
 import type { ExpoMediaLibraryPermissionResponse, ExpoPermissionResponse } from '../utils/expoPermissionGranted';
 import expoPermissionGranted from '../utils/expoPermissionGranted';
-import normalizeFile from '../utils/normalizeFile';
 import type {
   FilePickerResponse,
   FileServiceInterface,
@@ -77,10 +76,10 @@ const createExpoFileService = ({
         })(),
       });
 
-      if (expoBackwardUtils.toCanceled(response)) return null;
+      if (expoBackwardUtils.imagePicker.isCanceled(response)) return null;
 
-      const filePickerRes = await expoBackwardUtils.toFilePickerResponses(response, fsModule);
-      return filePickerRes[0];
+      const [file] = await expoBackwardUtils.imagePicker.toFilePickerResponses(response, fsModule);
+      return file;
     }
     async openMediaLibrary(options: OpenMediaLibraryOptions) {
       const hasPermission = await this.hasMediaLibraryPermission('read');
@@ -108,16 +107,17 @@ const createExpoFileService = ({
           }
         })(),
       });
-      if (expoBackwardUtils.toCanceled(response)) return null;
-      return expoBackwardUtils.toFilePickerResponses(response, fsModule);
+      if (expoBackwardUtils.imagePicker.isCanceled(response)) return null;
+      return expoBackwardUtils.imagePicker.toFilePickerResponses(response, fsModule);
     }
 
     async openDocument(options?: OpenDocumentOptions): Promise<FilePickerResponse> {
       try {
         const response = await documentPickerModule.getDocumentAsync({ type: '*/*' });
-        if (response.type === 'cancel') return null;
-        const { mimeType, uri, size, name } = response;
-        return normalizeFile({ uri, size, name, type: mimeType });
+        if (expoBackwardUtils.documentPicker.isCanceled(response)) return null;
+
+        const [file] = await expoBackwardUtils.documentPicker.toFilePickerResponses(response);
+        return file;
       } catch (e) {
         options?.onOpenFailure?.(SBUError.UNKNOWN, e);
         return null;

packages/uikit-react-native/src/utils/expoBackwardUtils.ts

@@ -1,13 +1,59 @@
+import type * as ExpoDocumentPicker from 'expo-document-picker';
 import type * as ExpoFs from 'expo-file-system';
 import type * as ExpoImagePicker from 'expo-image-picker';
 
 import type { FilePickerResponse } from '../platform/types';
 import normalizeFile from './normalizeFile';
 
 const expoBackwardUtils = {
-  toCanceled(result: ExpoImagePicker.ImagePickerResult) {
-    // @ts-expect-error backward compatibility
-    return result.canceled ?? result.cancelled;
+  imagePicker: {
+    isCanceled(result: ExpoImagePicker.ImagePickerResult) {
+      // @ts-expect-error backward compatibility
+      return result.canceled ?? result.cancelled;
+    },
+    async toFilePickerResponses(
+      result: ExpoImagePicker.ImagePickerResult,
+      fsModule: typeof ExpoFs,
+    ): Promise<FilePickerResponse[]> {
+      if (result.assets) {
+        const assets = result.assets || [];
+        const promises = assets.map(({ fileName: name, fileSize: size, type, uri }) =>
+          normalizeFile({ uri, size, name, type }),
+        );
+
+        return Promise.all(promises);
+      } else if ('uri' in result && typeof result.uri === 'string') {
+        const fileInfo = await fsModule.getInfoAsync(result.uri);
+        const response = await normalizeFile({ uri: result.uri, size: expoBackwardUtils.toFileSize(fileInfo) });
+        return [response];
+      } else {
+        return [];
+      }
+    },
+  },
+  documentPicker: {
+    isCanceled(result: ExpoDocumentPicker.DocumentPickerResult) {
+      // @ts-expect-error backward compatibility
+      return result.canceled ?? result.type === 'cancel';
+    },
+    async toFilePickerResponses(result: ExpoDocumentPicker.DocumentPickerResult): Promise<FilePickerResponse[]> {
+      if (result.assets) {
+        const assets = result.assets || [];
+        const promises = assets.map(({ name, size, mimeType, uri }) =>
+          normalizeFile({ uri, size, name, type: mimeType }),
+        );
+
+        return Promise.all(promises);
+      } else if ('uri' in result && typeof result.uri === 'string') {
+        // @ts-expect-error backward compatibility
+        const { mimeType, uri, size, name } = result;
+        const response = await normalizeFile({ uri, size, name, type: mimeType });
+
+        return [response];
+      } else {
+        return [];
+      }
+    },
   },
   toFileSize(info: ExpoFs.FileInfo) {
     if ('size' in info) {
@@ -16,25 +62,6 @@ const expoBackwardUtils = {
       return 0;
     }
   },
-  async toFilePickerResponses(
-    result: ExpoImagePicker.ImagePickerResult,
-    fsModule: typeof ExpoFs,
-  ): Promise<FilePickerResponse[]> {
-    if (result.assets) {
-      const assets = result.assets || [];
-      const promises = assets.map(({ fileName: name, fileSize: size, type, uri }) =>
-        normalizeFile({ uri, size, name, type }),
-      );
-
-      return Promise.all(promises);
-    } else if ('uri' in result && typeof result.uri === 'string') {
-      const fileInfo = await fsModule.getInfoAsync(result.uri);
-      const response = await normalizeFile({ uri: result.uri, size: this.toFileSize(fileInfo) });
-      return [response];
-    } else {
-      return [];
-    }
-  },
 };
 
 export default expoBackwardUtils;

yarn.lock

@@ -7438,10 +7438,10 @@ expo-constants@~14.2.0:
     "@expo/config" "~8.0.0"
     uuid "^3.3.2"
 
-expo-document-picker@^11.2.2:
-  version "11.2.2"
-  resolved "https://registry.yarnpkg.com/expo-document-picker/-/expo-document-picker-11.2.2.tgz#707ff994a1c0b38505e12b2c9fe6b67715e6f41c"
-  integrity sha512-EeonRKxkK9E20LEAh93IvlwFjNkUCJKnhBEama9PmIDYWW7RyANZ8eP9C2PupThTDbivzRDNp7Ec7dIeyDAWjw==
+expo-document-picker@^11.5.3:
+  version "11.5.3"
+  resolved "https://registry.yarnpkg.com/expo-document-picker/-/expo-document-picker-11.5.3.tgz#90f23412332ea6ec7ee42fcaaff7ede175114b8e"
+  integrity sha512-nneIdDIKGtU6DQfcF5YJPQdIF2CYug5LapOkktE/0Lc7nXs1O+ejQ8zHLzgbdm2VFymL8d6I6x86sNt8VheBXw==
 
 expo-file-system@^15.2.2:
   version "15.2.2"