@aws-amplify/ui-react-storage 3.0.13 → 3.0.15

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

@@ -1,9 +1,10 @@
 import * as React from 'react';
+import { isString, isFunction } from '@aws-amplify/ui';
 import { uploadFile } from '../../utils/uploadFile.mjs';
 import { FileStatus } from '../../types.mjs';
 import { resolveFile } from './resolveFile.mjs';
 
-function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, setUploadingFile, setUploadSuccess, onUploadError, onUploadSuccess, onUploadStart, maxFileCount, processFile, path = '', }) {
+function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, setUploadingFile, setUploadSuccess, onUploadError, onUploadSuccess, onUploadStart, maxFileCount, processFile, path, }) {
     React.useEffect(() => {
         const filesReadyToUpload = files.filter((file) => file.status === FileStatus.QUEUED);
         if (filesReadyToUpload.length > maxFileCount) {
@@ -11,7 +12,9 @@ function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, se
         }
         for (const { file, key, id } of filesReadyToUpload) {
             const onComplete = (event) => {
-                onUploadSuccess?.(event);
+                if (isFunction(onUploadSuccess)) {
+                    onUploadSuccess(event);
+                }
                 setUploadSuccess({ id });
             };
             const onProgress = (event) => {
@@ -24,24 +27,28 @@ function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, se
                     : Math.floor((event.transferredBytes / event.totalBytes) * 100);
                 setUploadProgress({ id, progress: progressPercentage });
             };
-            const onError = (error) => {
-                onUploadError?.(error, { key });
-            };
             if (file) {
                 resolveFile({ processFile, file, key }).then(({ key: processedKey, ...rest }) => {
-                    onUploadStart?.({ key: processedKey });
+                    // prepend `path` to `processedKey`
+                    const resolvedKey = isString(path)
+                        ? `${path}${processedKey}`
+                        : processedKey;
+                    if (isFunction(onUploadStart)) {
+                        onUploadStart({ key: resolvedKey });
+                    }
                     const uploadTask = uploadFile({
                         ...rest,
-                        key: processedKey,
+                        key: resolvedKey,
                         level: accessLevel,
                         progressCallback: onProgress,
-                        errorCallback: onError,
+                        errorCallback: (error) => {
+                            if (isFunction(onUploadError)) {
+                                onUploadError(error, { key: resolvedKey });
+                            }
+                        },
                         completeCallback: onComplete,
                     });
-                    setUploadingFile({
-                        id,
-                        uploadTask,
-                    });
+                    setUploadingFile({ id, uploadTask });
                 });
             }
         }

package/dist/esm/version.mjs

@@ -1,3 +1,3 @@
-const VERSION = '3.0.13';
+const VERSION = '3.0.15';
 
 export { VERSION };

package/dist/index.js

@@ -32,7 +32,7 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-const VERSION = '3.0.13';
+const VERSION = '3.0.15';
 
 const StorageImage = ({ accessLevel, className, fallbackSrc, identityId, imgKey, onStorageGetError, validateObjectExistence, ...rest }) => {
     const resolvedValidateObjectExistence = ui.isUndefined(validateObjectExistence)
@@ -348,7 +348,7 @@ const resolveFile = ({ processFile, file, key, }) => {
     });
 };
 
-function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, setUploadingFile, setUploadSuccess, onUploadError, onUploadSuccess, onUploadStart, maxFileCount, processFile, path = '', }) {
+function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, setUploadingFile, setUploadSuccess, onUploadError, onUploadSuccess, onUploadStart, maxFileCount, processFile, path, }) {
     React__namespace.useEffect(() => {
         const filesReadyToUpload = files.filter((file) => file.status === FileStatus.QUEUED);
         if (filesReadyToUpload.length > maxFileCount) {
@@ -356,7 +356,9 @@ function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, se
         }
         for (const { file, key, id } of filesReadyToUpload) {
             const onComplete = (event) => {
-                onUploadSuccess?.(event);
+                if (ui.isFunction(onUploadSuccess)) {
+                    onUploadSuccess(event);
+                }
                 setUploadSuccess({ id });
             };
             const onProgress = (event) => {
@@ -369,24 +371,28 @@ function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, se
                     : Math.floor((event.transferredBytes / event.totalBytes) * 100);
                 setUploadProgress({ id, progress: progressPercentage });
             };
-            const onError = (error) => {
-                onUploadError?.(error, { key });
-            };
             if (file) {
                 resolveFile({ processFile, file, key }).then(({ key: processedKey, ...rest }) => {
-                    onUploadStart?.({ key: processedKey });
+                    // prepend `path` to `processedKey`
+                    const resolvedKey = ui.isString(path)
+                        ? `${path}${processedKey}`
+                        : processedKey;
+                    if (ui.isFunction(onUploadStart)) {
+                        onUploadStart({ key: resolvedKey });
+                    }
                     const uploadTask = uploadFile({
                         ...rest,
-                        key: processedKey,
+                        key: resolvedKey,
                         level: accessLevel,
                         progressCallback: onProgress,
-                        errorCallback: onError,
+                        errorCallback: (error) => {
+                            if (ui.isFunction(onUploadError)) {
+                                onUploadError(error, { key: resolvedKey });
+                            }
+                        },
                         completeCallback: onComplete,
                     });
-                    setUploadingFile({
-                        id,
-                        uploadTask,
-                    });
+                    setUploadingFile({ id, uploadTask });
                 });
             }
         }

package/dist/styles.css

@@ -512,6 +512,7 @@
   --amplify-components-checkbox-icon-indeterminate-opacity: var(--amplify-opacities-100);
   --amplify-components-checkbox-icon-indeterminate-transform: scale(1);
   --amplify-components-checkbox-icon-indeterminate-disabled-background-color: var(--amplify-colors-background-disabled);
+  --amplify-components-checkbox-label-color: var(--amplify-components-text-color);
   --amplify-components-checkbox-label-disabled-color: var(--amplify-colors-font-disabled);
   --amplify-components-checkboxfield-align-items: flex-start;
   --amplify-components-checkboxfield-align-content: center;
@@ -3668,7 +3669,10 @@ strong.amplify-text {
 }
 
 .amplify-checkbox__label {
-  color: inherit;
+  color: var(--amplify-components-checkbox-label-color);
+}
+.amplify-checkbox__label--disabled {
+  color: var(--amplify-components-checkbox-label-disabled-color);
 }
 
 .amplify-checkboxfield {

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.13";
+export declare const VERSION = "3.0.15";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-storage",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {
@@ -39,9 +39,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-amplify/ui": "6.0.9",
-    "@aws-amplify/ui-react": "6.1.3",
-    "@aws-amplify/ui-react-core": "3.0.9",
+    "@aws-amplify/ui": "6.0.11",
+    "@aws-amplify/ui-react": "6.1.5",
+    "@aws-amplify/ui-react-core": "3.0.11",
     "lodash": "4.17.21",
     "tslib": "^2.5.2"
   },