@aws-amplify/ui-react-storage 3.3.2 → 3.3.4

package/dist/esm/components/FileUploader/FileUploader.mjs

@@ -58,7 +58,7 @@ const FileUploaderBase = React.forwardRef(function FileUploader({ acceptedFileTy
             getFileSizeErrorText,
         });
     };
-    const { addFiles, clearFiles, files, removeUpload, queueFiles, setProcessedKey, setUploadingFile, setUploadPaused, setUploadProgress, setUploadSuccess, setUploadResumed, } = useFileUploader(defaultFiles);
+    const { addFiles, clearFiles, files, removeUpload, queueFiles, setUploadingFile, setUploadPaused, setUploadProgress, setUploadSuccess, setUploadResumed, } = useFileUploader(defaultFiles);
     React.useImperativeHandle(ref, () => ({ clearFiles }));
     const { dragState, ...dropZoneProps } = useDropZone({
         acceptedFileTypes,
@@ -84,7 +84,6 @@ const FileUploaderBase = React.forwardRef(function FileUploader({ acceptedFileTy
         onUploadError,
         onUploadSuccess,
         onUploadStart,
-        onProcessFileSuccess: setProcessedKey,
         setUploadingFile,
         setUploadProgress,
         setUploadSuccess,
@@ -132,8 +131,7 @@ const FileUploaderBase = React.forwardRef(function FileUploader({ acceptedFileTy
         if (typeof onFileRemove === 'function') {
             const file = files.find((file) => file.id === id);
             if (file) {
-                // return `processedKey` if available and `processFile` is provided
-                const key = (processFile && file?.processedKey) ?? file.key;
+                const key = file.resolvedKey ?? file.key;
                 onFileRemove({ key });
             }
         }

package/dist/esm/components/FileUploader/hooks/useFileUploader/actions.mjs

@@ -1,3 +1,4 @@
+import { FileStatus } from '../../types.mjs';
 import { FileUploaderActionTypes } from './types.mjs';
 
 const addFilesAction = ({ files, status, getFileErrorMessage, }) => ({
@@ -12,10 +13,6 @@ const clearFilesAction = () => ({
 const queueFilesAction = () => ({
     type: FileUploaderActionTypes.QUEUE_FILES,
 });
-const setProcessedKeyAction = (input) => ({
-    ...input,
-    type: FileUploaderActionTypes.SET_PROCESSED_FILE_KEY,
-});
 const setUploadingFileAction = ({ id, uploadTask, }) => ({
     type: FileUploaderActionTypes.SET_STATUS_UPLOADING,
     id,
@@ -31,9 +28,15 @@ const setUploadStatusAction = ({ id, status, }) => ({
     id,
     status,
 });
+const setUploadSuccessAction = ({ id, resolvedKey, }) => ({
+    type: FileUploaderActionTypes.SET_STATUS_UPLOADED,
+    id,
+    resolvedKey,
+    status: FileStatus.UPLOADED,
+});
 const removeUploadAction = ({ id }) => ({
     type: FileUploaderActionTypes.REMOVE_UPLOAD,
     id,
 });
 
-export { addFilesAction, clearFilesAction, queueFilesAction, removeUploadAction, setProcessedKeyAction, setUploadProgressAction, setUploadStatusAction, setUploadingFileAction };
+export { addFilesAction, clearFilesAction, queueFilesAction, removeUploadAction, setUploadProgressAction, setUploadStatusAction, setUploadSuccessAction, setUploadingFileAction };

package/dist/esm/components/FileUploader/hooks/useFileUploader/reducer.mjs

@@ -33,21 +33,16 @@ function fileUploaderStateReducer(state, action) {
         }
         case FileUploaderActionTypes.QUEUE_FILES: {
             const { files } = state;
-            const newFiles = files.reduce((files, currentFile) => {
-                return [
-                    ...files,
-                    {
-                        ...currentFile,
-                        ...(currentFile.status === FileStatus.ADDED
-                            ? { status: FileStatus.QUEUED }
-                            : {}),
-                    },
-                ];
-            }, []);
-            return {
-                ...state,
-                files: newFiles,
-            };
+            const newFiles = files.reduce((files, currentFile) => [
+                ...files,
+                {
+                    ...currentFile,
+                    ...(currentFile.status === FileStatus.ADDED
+                        ? { status: FileStatus.QUEUED }
+                        : {}),
+                },
+            ], []);
+            return { ...state, files: newFiles };
         }
         case FileUploaderActionTypes.SET_STATUS_UPLOADING: {
             const { id, uploadTask } = action;
@@ -57,10 +52,9 @@ function fileUploaderStateReducer(state, action) {
             const files = updateFiles(state.files, nextFileData);
             return { ...state, files };
         }
-        case FileUploaderActionTypes.SET_PROCESSED_FILE_KEY: {
-            const { processedKey, id } = action;
-            const files = updateFiles(state.files, { processedKey, id });
-            return { files };
+        case FileUploaderActionTypes.SET_STATUS_UPLOADED: {
+            const files = updateFiles(state.files, action);
+            return { ...state, files };
         }
         case FileUploaderActionTypes.SET_UPLOAD_PROGRESS: {
             const { id, progress } = action;
@@ -76,16 +70,10 @@ function fileUploaderStateReducer(state, action) {
             const { id } = action;
             const { files } = state;
             const newFiles = files.reduce((files, currentFile) => {
-                if (currentFile.id === id) {
-                    // remove by not returning currentFile
-                    return [...files];
-                }
-                return [...files, currentFile];
+                // remove by not returning currentFile
+                return currentFile.id === id ? [...files] : [...files, currentFile];
             }, []);
-            return {
-                ...state,
-                files: newFiles,
-            };
+            return { ...state, files: newFiles };
         }
     }
 }

package/dist/esm/components/FileUploader/hooks/useFileUploader/types.mjs

@@ -1,13 +1,14 @@
 var FileUploaderActionTypes;
 (function (FileUploaderActionTypes) {
-    FileUploaderActionTypes["ADD_FILES"] = "ADD_FILES";
-    FileUploaderActionTypes["CLEAR_FILES"] = "CLEAR_FILES";
-    FileUploaderActionTypes["QUEUE_FILES"] = "QUEUE_FILES";
-    FileUploaderActionTypes["SET_STATUS"] = "SET_STATUS";
-    FileUploaderActionTypes["SET_PROCESSED_FILE_KEY"] = "SET_PROCESSED_FILE_KEY";
-    FileUploaderActionTypes["SET_STATUS_UPLOADING"] = "SET_STATUS_UPLOADING";
-    FileUploaderActionTypes["SET_UPLOAD_PROGRESS"] = "SET_UPLOAD_PROGRESS";
-    FileUploaderActionTypes["REMOVE_UPLOAD"] = "REMOVE_UPLOAD";
+    FileUploaderActionTypes[FileUploaderActionTypes["ADD_FILES"] = 0] = "ADD_FILES";
+    FileUploaderActionTypes[FileUploaderActionTypes["CLEAR_FILES"] = 1] = "CLEAR_FILES";
+    FileUploaderActionTypes[FileUploaderActionTypes["QUEUE_FILES"] = 2] = "QUEUE_FILES";
+    FileUploaderActionTypes[FileUploaderActionTypes["REMOVE_UPLOAD"] = 3] = "REMOVE_UPLOAD";
+    FileUploaderActionTypes[FileUploaderActionTypes["SET_STATUS"] = 4] = "SET_STATUS";
+    FileUploaderActionTypes[FileUploaderActionTypes["SET_PROCESSED_FILE_KEY"] = 5] = "SET_PROCESSED_FILE_KEY";
+    FileUploaderActionTypes[FileUploaderActionTypes["SET_STATUS_UPLOADED"] = 6] = "SET_STATUS_UPLOADED";
+    FileUploaderActionTypes[FileUploaderActionTypes["SET_STATUS_UPLOADING"] = 7] = "SET_STATUS_UPLOADING";
+    FileUploaderActionTypes[FileUploaderActionTypes["SET_UPLOAD_PROGRESS"] = 8] = "SET_UPLOAD_PROGRESS";
 })(FileUploaderActionTypes || (FileUploaderActionTypes = {}));
 
 export { FileUploaderActionTypes };

package/dist/esm/components/FileUploader/hooks/useFileUploader/useFileUploader.mjs

@@ -2,7 +2,7 @@ import React__default from 'react';
 import { isObject } from '@aws-amplify/ui';
 import { FileStatus } from '../../types.mjs';
 import { fileUploaderStateReducer } from './reducer.mjs';
-import { addFilesAction, clearFilesAction, queueFilesAction, setUploadingFileAction, setProcessedKeyAction, setUploadProgressAction, setUploadStatusAction, removeUploadAction } from './actions.mjs';
+import { addFilesAction, clearFilesAction, queueFilesAction, setUploadingFileAction, setUploadProgressAction, setUploadSuccessAction, setUploadStatusAction, removeUploadAction } from './actions.mjs';
 
 const isDefaultFile = (file) => !!(isObject(file) && file.key);
 const createFileFromDefault = (file) => isDefaultFile(file)
@@ -14,49 +14,36 @@ function useFileUploader(defaultFiles = []) {
             ? defaultFiles.map(createFileFromDefault).filter((file) => !!file)
             : []),
     });
-    const addFiles = ({ files, status, getFileErrorMessage, }) => {
-        dispatch(addFilesAction({ files, status, getFileErrorMessage }));
-    };
-    const clearFiles = () => {
-        dispatch(clearFilesAction());
-    };
-    const queueFiles = () => {
-        dispatch(queueFilesAction());
-    };
-    const setUploadingFile = ({ uploadTask, id, }) => {
-        dispatch(setUploadingFileAction({ id, uploadTask }));
-    };
-    const setProcessedKey = (input) => {
-        dispatch(setProcessedKeyAction(input));
-    };
-    const setUploadProgress = ({ progress, id, }) => {
-        dispatch(setUploadProgressAction({ id, progress }));
-    };
-    const setUploadSuccess = ({ id }) => {
-        dispatch(setUploadStatusAction({ id, status: FileStatus.UPLOADED }));
-    };
-    const setUploadPaused = ({ id }) => {
-        dispatch(setUploadStatusAction({ id, status: FileStatus.PAUSED }));
-    };
-    const setUploadResumed = ({ id }) => {
-        dispatch(setUploadStatusAction({ id, status: FileStatus.UPLOADING }));
-    };
-    const removeUpload = ({ id }) => {
-        dispatch(removeUploadAction({ id }));
-    };
-    return {
-        removeUpload,
-        setProcessedKey,
-        setUploadPaused,
-        setUploadProgress,
-        setUploadResumed,
-        setUploadSuccess,
-        setUploadingFile,
-        queueFiles,
-        addFiles,
-        clearFiles,
-        files,
-    };
+    const dispatchers = React__default.useMemo(() => ({
+        addFiles: (params) => {
+            dispatch(addFilesAction(params));
+        },
+        clearFiles: () => {
+            dispatch(clearFilesAction());
+        },
+        queueFiles: () => {
+            dispatch(queueFilesAction());
+        },
+        setUploadingFile: (params) => {
+            dispatch(setUploadingFileAction(params));
+        },
+        setUploadProgress: (params) => {
+            dispatch(setUploadProgressAction(params));
+        },
+        setUploadSuccess: (params) => {
+            dispatch(setUploadSuccessAction(params));
+        },
+        setUploadPaused: ({ id }) => {
+            dispatch(setUploadStatusAction({ id, status: FileStatus.PAUSED }));
+        },
+        setUploadResumed: ({ id }) => {
+            dispatch(setUploadStatusAction({ id, status: FileStatus.UPLOADING }));
+        },
+        removeUpload: ({ id }) => {
+            dispatch(removeUploadAction({ id }));
+        },
+    }), []);
+    return { ...dispatchers, files };
 }
 
 export { useFileUploader };

package/dist/esm/components/FileUploader/hooks/useUploadFiles/useUploadFiles.mjs

@@ -4,7 +4,7 @@ import { getInput } from '../../utils/getInput.mjs';
 import { uploadFile } from '../../utils/uploadFile.mjs';
 import { FileStatus } from '../../types.mjs';
 
-function useUploadFiles({ accessLevel, files, isResumable, maxFileCount, onProcessFileSuccess, onUploadError, onUploadStart, onUploadSuccess, path, processFile, setUploadingFile, setUploadProgress, setUploadSuccess, useAccelerateEndpoint, }) {
+function useUploadFiles({ accessLevel, files, isResumable, maxFileCount, onUploadError, onUploadStart, onUploadSuccess, path, processFile, setUploadingFile, setUploadProgress, setUploadSuccess, useAccelerateEndpoint, }) {
     React.useEffect(() => {
         const filesReadyToUpload = files.filter((file) => file.status === FileStatus.QUEUED);
         if (filesReadyToUpload.length > maxFileCount) {
@@ -22,12 +22,10 @@ function useUploadFiles({ accessLevel, files, isResumable, maxFileCount, onProce
                 setUploadProgress({ id, progress });
             };
             if (file) {
-                const handleProcessFileSuccess = (input) => onProcessFileSuccess({ id, ...input });
                 const input = getInput({
                     accessLevel,
                     file,
                     key,
-                    onProcessFileSuccess: handleProcessFileSuccess,
                     onProgress,
                     path,
                     processFile,
@@ -36,13 +34,12 @@ function useUploadFiles({ accessLevel, files, isResumable, maxFileCount, onProce
                 uploadFile({
                     input,
                     onComplete: (event) => {
+                        const resolvedKey = event.key ??
+                            event.path;
                         if (isFunction(onUploadSuccess)) {
-                            onUploadSuccess({
-                                key: event.key ??
-                                    event.path,
-                            });
+                            onUploadSuccess({ key: resolvedKey });
                         }
-                        setUploadSuccess({ id });
+                        setUploadSuccess({ id, resolvedKey });
                     },
                     onError: ({ key, error }) => {
                         if (isFunction(onUploadError)) {
@@ -65,7 +62,6 @@ function useUploadFiles({ accessLevel, files, isResumable, maxFileCount, onProce
         setUploadProgress,
         setUploadingFile,
         onUploadError,
-        onProcessFileSuccess,
         onUploadSuccess,
         onUploadStart,
         maxFileCount,

package/dist/esm/components/FileUploader/utils/getInput.mjs

@@ -2,7 +2,7 @@ import { fetchAuthSession } from 'aws-amplify/auth';
 import { isTypedFunction, isString } from '@aws-amplify/ui';
 import { resolveFile } from './resolveFile.mjs';
 
-const getInput = ({ accessLevel, file, key, onProcessFileSuccess, onProgress, path, processFile, useAccelerateEndpoint, }) => {
+const getInput = ({ accessLevel, file, key, onProgress, path, processFile, useAccelerateEndpoint, }) => {
     return async () => {
         const hasCallbackPath = isTypedFunction(path);
         const hasStringPath = isString(path);
@@ -28,10 +28,6 @@ const getInput = ({ accessLevel, file, key, onProcessFileSuccess, onProgress, pa
             const resolvedPath = `${hasCallbackPath ? path({ identityId }) : path}${processedKey}`;
             inputResult = { data: file, path: resolvedPath, options };
         }
-        if (processFile) {
-            // provide post-processing value of target `key`
-            onProcessFileSuccess({ processedKey });
-        }
         return inputResult;
     };
 };

package/dist/esm/components/StorageManager/StorageManager.mjs

@@ -3,18 +3,18 @@ import { getLogger, ComponentClassName } from '@aws-amplify/ui';
 import { VisuallyHidden } from '@aws-amplify/ui-react';
 import { useDeprecationWarning, useSetUserAgent } from '@aws-amplify/ui-react-core';
 import { useDropZone } from '@aws-amplify/ui-react/internal';
-import { useStorageManager } from './hooks/useStorageManager/useStorageManager.mjs';
-import { useUploadFiles } from './hooks/useUploadFiles/useUploadFiles.mjs';
-import { FileStatus } from './types.mjs';
+import { useFileUploader } from '../FileUploader/hooks/useFileUploader/useFileUploader.mjs';
+import { useUploadFiles } from '../FileUploader/hooks/useUploadFiles/useUploadFiles.mjs';
+import { FileStatus } from '../FileUploader/types.mjs';
 import { Container } from './ui/Container/Container.mjs';
 import { DropZone } from './ui/DropZone/DropZone.mjs';
 import { FileList } from './ui/FileList/FileList.mjs';
 import { FileListHeader } from './ui/FileListHeader/FileListHeader.mjs';
 import { FileListFooter } from './ui/FileListFooter/FileListFooter.mjs';
 import { FilePicker } from './ui/FilePicker/FilePicker.mjs';
-import { checkMaxFileSize } from './utils/checkMaxFileSize.mjs';
-import { defaultStorageManagerDisplayText } from './utils/displayText.mjs';
-import { filterAllowedFiles } from './utils/filterAllowedFiles.mjs';
+import { checkMaxFileSize } from '../FileUploader/utils/checkMaxFileSize.mjs';
+import { defaultFileUploaderDisplayText } from '../FileUploader/utils/displayText.mjs';
+import { filterAllowedFiles } from '../FileUploader/utils/filterAllowedFiles.mjs';
 import 'aws-amplify/auth';
 import 'aws-amplify/storage';
 import { VERSION } from '../../version.mjs';
@@ -51,7 +51,7 @@ const StorageManagerBase = React.forwardRef(function StorageManager({ acceptedFi
     const allowMultipleFiles = maxFileCount === undefined ||
         (typeof maxFileCount === 'number' && maxFileCount > 1);
     const displayText = {
-        ...defaultStorageManagerDisplayText,
+        ...defaultFileUploaderDisplayText,
         ...overrideDisplayText,
     };
     const { getFileSizeErrorText } = displayText;
@@ -62,7 +62,7 @@ const StorageManagerBase = React.forwardRef(function StorageManager({ acceptedFi
             getFileSizeErrorText,
         });
     };
-    const { addFiles, clearFiles, files, removeUpload, queueFiles, setProcessedKey, setUploadingFile, setUploadPaused, setUploadProgress, setUploadSuccess, setUploadResumed, } = useStorageManager(defaultFiles);
+    const { addFiles, clearFiles, files, removeUpload, queueFiles, setUploadingFile, setUploadPaused, setUploadProgress, setUploadSuccess, setUploadResumed, } = useFileUploader(defaultFiles);
     React.useImperativeHandle(ref, () => ({ clearFiles }));
     const { dragState, ...dropZoneProps } = useDropZone({
         acceptedFileTypes,
@@ -88,7 +88,6 @@ const StorageManagerBase = React.forwardRef(function StorageManager({ acceptedFi
         onUploadError,
         onUploadSuccess,
         onUploadStart,
-        onProcessFileSuccess: setProcessedKey,
         setUploadingFile,
         setUploadProgress,
         setUploadSuccess,
@@ -136,8 +135,7 @@ const StorageManagerBase = React.forwardRef(function StorageManager({ acceptedFi
         if (typeof onFileRemove === 'function') {
             const file = files.find((file) => file.id === id);
             if (file) {
-                // return `processedKey` if available and `processFile` is provided
-                const key = (processFile && file?.processedKey) ?? file.key;
+                const key = file.resolvedKey ?? file.key;
                 onFileRemove({ key });
             }
         }

package/dist/esm/components/StorageManager/ui/FileList/FileControl.mjs

@@ -1,7 +1,7 @@
 import React__default from 'react';
 import { ComponentClassName } from '@aws-amplify/ui';
 import { View, Loader, Button } from '@aws-amplify/ui-react';
-import { FileStatus } from '../../types.mjs';
+import { FileStatus } from '../../../FileUploader/types.mjs';
 import { FileStatusMessage } from './FileStatusMessage.mjs';
 import { FileRemoveButton } from './FileRemoveButton.mjs';
 import { UploadDetails } from './FileDetails.mjs';

package/dist/esm/components/StorageManager/ui/FileList/FileList.mjs

@@ -1,7 +1,7 @@
 import React__default from 'react';
 import { ComponentClassName } from '@aws-amplify/ui';
 import { View, Alert } from '@aws-amplify/ui-react';
-import { FileStatus } from '../../types.mjs';
+import { FileStatus } from '../../../FileUploader/types.mjs';
 import { FileControl } from './FileControl.mjs';
 
 function FileList({ displayText, files, hasMaxFilesError, isResumable, onCancelUpload, onDeleteUpload, onResume, onPause, showThumbnails, maxFileCount, }) {

package/dist/esm/components/StorageManager/ui/FileList/FileStatusMessage.mjs

@@ -2,7 +2,7 @@ import React__default from 'react';
 import { classNames, ComponentClassName, classNameModifier } from '@aws-amplify/ui';
 import { Text, View } from '@aws-amplify/ui-react';
 import { useIcons, IconError, IconCheck } from '@aws-amplify/ui-react/internal';
-import { FileStatus } from '../../types.mjs';
+import { FileStatus } from '../../../FileUploader/types.mjs';
 
 const FileStatusMessage = ({ errorMessage, getPausedText, getUploadingText, percentage, status, uploadSuccessfulText, }) => {
     const icons = useIcons('storageManager');

package/dist/esm/version.mjs

@@ -1,3 +1,3 @@
-const VERSION = '3.3.2';
+const VERSION = '3.3.4';
 
 export { VERSION };