@sendbird/uikit-react-native 2.4.0 → 2.4.2

package/src/libs/EmojiManager.ts

@@ -31,17 +31,17 @@ class EmojiManager {
   ) {}
 
   private emojiStorage = {
-    data: null as null | SendbirdEmojiContainer,
+    container: null as null | SendbirdEmojiContainer,
     get: async () => {
-      if (!this.emojiStorage.data) {
+      if (!this.emojiStorage.container) {
         const strItem = await this.internalStorage.getItem(EmojiManager.key);
-        if (strItem) this.emojiStorage.data = Object.freeze(JSON.parse(strItem));
+        if (strItem) this.emojiStorage.container = Object.freeze(JSON.parse(strItem));
       }
-      return this.emojiStorage.data;
+      return this.emojiStorage.container;
     },
-    set: async (data: SendbirdEmojiContainer) => {
-      this.emojiStorage.data = Object.freeze(data);
-      await this.internalStorage.setItem(EmojiManager.key, JSON.stringify(data));
+    set: async (container: SendbirdEmojiContainer) => {
+      this.emojiStorage.container = Object.freeze(container);
+      await this.internalStorage.setItem(EmojiManager.key, JSON.stringify(container));
     },
   };
 
@@ -75,6 +75,10 @@ class EmojiManager {
       this._allEmoji = Object.values(this._allEmojiMap);
     }
   };
+
+  public get emojiHash() {
+    return this.emojiStorage.container?.emojiHash;
+  }
 }
 
 export default EmojiManager;

package/src/platform/createFileService.expo.ts

@@ -3,12 +3,12 @@ import type * as ExpoFs from 'expo-file-system';
 import type * as ExpoImagePicker from 'expo-image-picker';
 import type * as ExpoMediaLibrary from 'expo-media-library';
 
-import { getFileExtension, getFileType } from '@sendbird/uikit-utils';
+import { getFileType } from '@sendbird/uikit-utils';
 
 import SBUError from '../libs/SBUError';
 import type { ExpoMediaLibraryPermissionResponse, ExpoPermissionResponse } from '../utils/expoPermissionGranted';
 import expoPermissionGranted from '../utils/expoPermissionGranted';
-import fileTypeGuard from '../utils/fileTypeGuard';
+import normalizeFile from '../utils/normalizeFile';
 import type {
   FilePickerResponse,
   FileServiceInterface,
@@ -80,10 +80,8 @@ const createExpoFileService = ({
 
       const { uri } = response;
       const { size } = await fsModule.getInfoAsync(response.uri);
-      const ext = getFileExtension(uri);
-      const type = getFileType(ext);
 
-      return fileTypeGuard({ uri, size, type: `${type}/${ext.slice(1)}`, name: Date.now() + ext });
+      return normalizeFile({ uri, size });
     }
     async openMediaLibrary(options: OpenMediaLibraryOptions) {
       const hasPermission = await this.hasMediaLibraryPermission('read');
@@ -111,11 +109,8 @@ const createExpoFileService = ({
       });
       if (response.cancelled) return null;
       const { uri } = response;
-
       const { size } = await fsModule.getInfoAsync(uri);
-      const ext = getFileExtension(uri);
-      const type = getFileType(ext);
-      return [fileTypeGuard({ uri, size, type: `${type}/${ext.slice(1)}`, name: Date.now() + ext })];
+      return [await normalizeFile({ uri, size })];
     }
 
     async openDocument(options?: OpenDocumentOptions): Promise<FilePickerResponse> {
@@ -123,7 +118,7 @@ const createExpoFileService = ({
         const response = await documentPickerModule.getDocumentAsync({ type: '*/*' });
         if (response.type === 'cancel') return null;
         const { mimeType, uri, size, name } = response;
-        return fileTypeGuard({ uri, size, name, type: mimeType });
+        return normalizeFile({ uri, size, name, type: mimeType });
       } catch (e) {
         options?.onOpenFailure?.(SBUError.UNKNOWN, e);
         return null;

package/src/platform/createFileService.native.ts

@@ -6,11 +6,17 @@ import type * as ImagePicker from 'react-native-image-picker';
 import type * as Permissions from 'react-native-permissions';
 import type { Permission } from 'react-native-permissions';
 
-import { getFileExtension, getFileType, normalizeFileName } from '@sendbird/uikit-utils';
+import {
+  getFileExtension,
+  getFileExtensionFromMime,
+  getFileExtensionFromUri,
+  getFileType,
+  normalizeFileName,
+} from '@sendbird/uikit-utils';
 
 import SBUError from '../libs/SBUError';
-import fileTypeGuard from '../utils/fileTypeGuard';
 import nativePermissionGranted from '../utils/nativePermissionGranted';
+import normalizeFile from '../utils/normalizeFile';
 import type {
   FilePickerResponse,
   FileServiceInterface,
@@ -124,7 +130,7 @@ const createNativeFileService = ({
       }
 
       const { fileName: name, fileSize: size, type, uri } = response.assets?.[0] ?? {};
-      return fileTypeGuard({ uri, size, name, type });
+      return normalizeFile({ uri, size, name, type });
     }
     async openMediaLibrary(options?: OpenMediaLibraryOptions): Promise<FilePickerResponse[] | null> {
       /**
@@ -163,14 +169,16 @@ const createNativeFileService = ({
         return null;
       }
 
-      return (response.assets || [])
-        .slice(0, selectionLimit)
-        .map(({ fileName: name, fileSize: size, type, uri }) => fileTypeGuard({ uri, size, name, type }));
+      return Promise.all(
+        (response.assets || [])
+          .slice(0, selectionLimit)
+          .map(({ fileName: name, fileSize: size, type, uri }) => normalizeFile({ uri, size, name, type })),
+      );
     }
     async openDocument(options?: OpenDocumentOptions): Promise<FilePickerResponse> {
       try {
         const { uri, size, name, type } = await documentPickerModule.pickSingle();
-        return fileTypeGuard({ uri, size, name, type });
+        return normalizeFile({ uri, size, name, type });
       } catch (e) {
         if (!documentPickerModule.isCancel(e) && documentPickerModule.isInProgress(e)) {
           options?.onOpenFailure?.(SBUError.UNKNOWN, e);
@@ -185,33 +193,50 @@ const createNativeFileService = ({
         if (!granted) throw new Error('Permission not granted');
       }
 
-      const basePath = Platform.select({ android: fsModule.Dirs.CacheDir, default: fsModule.Dirs.DocumentDir });
-      let downloadPath = `${basePath}/${options.fileName}`;
-      if (!getFileExtension(options.fileName)) {
-        const extensionFromUrl = getFileExtension(options.fileUrl);
-        if (getFileType(extensionFromUrl).match(/image|video/)) {
-          downloadPath += extensionFromUrl;
-        }
-      }
-
-      await fsModule.FileSystem.fetch(options.fileUrl, { path: downloadPath });
-      const fileType = getFileType(getFileExtension(options.fileUrl));
+      const { downloadedPath, file } = await this.downloadFile(options);
 
-      if (Platform.OS === 'ios' && (fileType === 'image' || fileType === 'video')) {
-        const type = ({ 'image': 'photo', 'video': 'video' } as const)[fileType];
-        await mediaLibraryModule.save(downloadPath, { type });
+      if (Platform.OS === 'ios') {
+        if (file.type === 'image' || file.type === 'video') {
+          const mediaTypeMap = { 'image': 'photo', 'video': 'video' } as const;
+          const mediaType = mediaTypeMap[file.type];
+          await mediaLibraryModule.save(downloadedPath, { type: mediaType });
+        }
       }
 
       if (Platform.OS === 'android') {
-        const dirType = { 'file': 'downloads', 'audio': 'audio', 'image': 'images', 'video': 'video' } as const;
-        await fsModule.FileSystem.cpExternal(
-          downloadPath,
-          normalizeFileName(options.fileName, getFileExtension(options.fileUrl)),
-          dirType[fileType],
-        );
+        const externalDirMap = { 'file': 'downloads', 'audio': 'audio', 'image': 'images', 'video': 'video' } as const;
+        const externalDir = externalDirMap[file.type];
+        await fsModule.FileSystem.cpExternal(downloadedPath, file.name, externalDir);
       }
-      return downloadPath;
+
+      return downloadedPath;
     }
+
+    private buildDownloadPath = async (options: SaveOptions) => {
+      const dirname = Platform.select({ android: fsModule.Dirs.CacheDir, default: fsModule.Dirs.DocumentDir });
+      const context = { dirname, filename: options.fileName };
+      const extension =
+        getFileExtension(options.fileName) ||
+        getFileExtensionFromMime(options.fileType) ||
+        getFileExtension(options.fileUrl) ||
+        (await getFileExtensionFromUri(options.fileUrl));
+
+      if (extension) context.filename = normalizeFileName(context.filename, extension);
+
+      return { path: `${context.dirname}/${context.filename}`, ...context };
+    };
+
+    private downloadFile = async (options: SaveOptions) => {
+      const { path, filename } = await this.buildDownloadPath(options);
+      await fsModule.FileSystem.fetch(options.fileUrl, { path });
+      return {
+        downloadedPath: path,
+        file: {
+          name: filename,
+          type: getFileType(getFileExtension(path)),
+        } as const,
+      };
+    };
   }
 
   return new NativeFileService();

package/src/platform/types.ts

@@ -3,7 +3,12 @@ import type SBUError from '../libs/SBUError';
 export type Unsubscribe = () => void | undefined;
 export type DownloadedPath = string;
 export type FilePickerResponse = FileType | null;
-export type FileType = { uri: string; size: number; name: string; type: string };
+
+/**
+ * We are following the file format of react-native FormData
+ * @see https://github.com/facebook/react-native/blob/main/packages/react-native/Libraries/Network/FormData.js#L37-L41
+ * */
+export type FileType = { name: string; uri: string; size: number; type: string };
 
 // ---------- NotificationService ---------- //
 export interface NotificationServiceInterface {

package/src/utils/normalizeFile.ts

@@ -0,0 +1,32 @@
+import type { PartialNullable } from '@sendbird/uikit-utils';
+import {
+  getFileExtension,
+  getFileExtensionFromMime,
+  getFileExtensionFromUri,
+  getMimeFromFileExtension,
+  normalizeFileName,
+} from '@sendbird/uikit-utils';
+
+import type { FilePickerResponse, FileType } from '../platform/types';
+
+const normalizeFile = async ({ uri, size, name, type }: PartialNullable<FileType>): Promise<FilePickerResponse> => {
+  // URI is required property
+  if (!uri) return null;
+
+  let filename = name || String(Date.now());
+  let filetype = type || '';
+
+  const extension =
+    getFileExtension(filename) || getFileExtensionFromMime(filetype) || (await getFileExtensionFromUri(uri));
+
+  if (extension) {
+    filename = normalizeFileName(filename, extension);
+    if (!filetype) {
+      filetype = getMimeFromFileExtension(extension);
+    }
+  }
+
+  return { uri, name: filename, type: filetype, size: size ?? 0 };
+};
+
+export default normalizeFile;

package/src/version.ts

@@ -1,2 +1,2 @@
-const VERSION = '2.4.0';
+const VERSION = '2.4.2';
 export default VERSION;

package/lib/commonjs/utils/fileTypeGuard.js

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-const fileTypeGuard = _ref => {
-  let {
-    uri,
-    size,
-    name,
-    type
-  } = _ref;
-  if (!uri) return null;
-  return {
-    uri,
-    size: size ?? 0,
-    name: name ?? '',
-    type: type ?? ''
-  };
-};
-
-var _default = fileTypeGuard;
-exports.default = _default;
-//# sourceMappingURL=fileTypeGuard.js.map

package/lib/commonjs/utils/fileTypeGuard.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["fileTypeGuard","uri","size","name","type"],"sources":["fileTypeGuard.ts"],"sourcesContent":["import type { PartialNullable } from '@sendbird/uikit-utils';\n\nimport type { FilePickerResponse, FileType } from '../platform/types';\n\nconst fileTypeGuard = ({ uri, size, name, type }: PartialNullable<FileType>): FilePickerResponse => {\n  if (!uri) return null;\n  return { uri, size: size ?? 0, name: name ?? '', type: type ?? '' };\n};\n\nexport default fileTypeGuard;\n"],"mappings":";;;;;;;AAIA,MAAMA,aAAa,GAAG,QAA8E;EAAA,IAA7E;IAAEC,GAAF;IAAOC,IAAP;IAAaC,IAAb;IAAmBC;EAAnB,CAA6E;EAClG,IAAI,CAACH,GAAL,EAAU,OAAO,IAAP;EACV,OAAO;IAAEA,GAAF;IAAOC,IAAI,EAAEA,IAAI,IAAI,CAArB;IAAwBC,IAAI,EAAEA,IAAI,IAAI,EAAtC;IAA0CC,IAAI,EAAEA,IAAI,IAAI;EAAxD,CAAP;AACD,CAHD;;eAKeJ,a"}

package/lib/module/utils/fileTypeGuard.js

@@ -1,18 +0,0 @@
-const fileTypeGuard = _ref => {
-  let {
-    uri,
-    size,
-    name,
-    type
-  } = _ref;
-  if (!uri) return null;
-  return {
-    uri,
-    size: size ?? 0,
-    name: name ?? '',
-    type: type ?? ''
-  };
-};
-
-export default fileTypeGuard;
-//# sourceMappingURL=fileTypeGuard.js.map

package/lib/module/utils/fileTypeGuard.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["fileTypeGuard","uri","size","name","type"],"sources":["fileTypeGuard.ts"],"sourcesContent":["import type { PartialNullable } from '@sendbird/uikit-utils';\n\nimport type { FilePickerResponse, FileType } from '../platform/types';\n\nconst fileTypeGuard = ({ uri, size, name, type }: PartialNullable<FileType>): FilePickerResponse => {\n  if (!uri) return null;\n  return { uri, size: size ?? 0, name: name ?? '', type: type ?? '' };\n};\n\nexport default fileTypeGuard;\n"],"mappings":"AAIA,MAAMA,aAAa,GAAG,QAA8E;EAAA,IAA7E;IAAEC,GAAF;IAAOC,IAAP;IAAaC,IAAb;IAAmBC;EAAnB,CAA6E;EAClG,IAAI,CAACH,GAAL,EAAU,OAAO,IAAP;EACV,OAAO;IAAEA,GAAF;IAAOC,IAAI,EAAEA,IAAI,IAAI,CAArB;IAAwBC,IAAI,EAAEA,IAAI,IAAI,EAAtC;IAA0CC,IAAI,EAAEA,IAAI,IAAI;EAAxD,CAAP;AACD,CAHD;;AAKA,eAAeJ,aAAf"}

package/lib/typescript/src/utils/fileTypeGuard.d.ts

@@ -1,4 +0,0 @@
-import type { PartialNullable } from '@sendbird/uikit-utils';
-import type { FilePickerResponse, FileType } from '../platform/types';
-declare const fileTypeGuard: ({ uri, size, name, type }: PartialNullable<FileType>) => FilePickerResponse;
-export default fileTypeGuard;

package/src/utils/fileTypeGuard.ts

@@ -1,10 +0,0 @@
-import type { PartialNullable } from '@sendbird/uikit-utils';
-
-import type { FilePickerResponse, FileType } from '../platform/types';
-
-const fileTypeGuard = ({ uri, size, name, type }: PartialNullable<FileType>): FilePickerResponse => {
-  if (!uri) return null;
-  return { uri, size: size ?? 0, name: name ?? '', type: type ?? '' };
-};
-
-export default fileTypeGuard;