@aws-amplify/ui-react-storage 2.3.2 → 3.0.0

package/dist/types/components/StorageImage/StorageImage.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import type { StorageImageProps } from './types';
-export declare const StorageImage: ({ accessLevel, className, fallbackSrc, identityId, imgKey, onStorageGetError, ...rest }: StorageImageProps) => JSX.Element;
+export declare const StorageImage: ({ accessLevel, className, fallbackSrc, identityId, imgKey, onStorageGetError, validateObjectExistence, ...rest }: StorageImageProps) => JSX.Element;

package/dist/types/components/StorageImage/types.d.ts

@@ -1,9 +1,10 @@
-import type { StorageAccessLevel } from '@aws-amplify/storage';
-import type { ImageProps } from '@aws-amplify/ui-react';
+import { StorageAccessLevel } from '@aws-amplify/core';
+import { ImageProps } from '@aws-amplify/ui-react';
 export interface StorageImageProps extends Omit<ImageProps, 'src'> {
     imgKey: string;
     accessLevel: StorageAccessLevel;
     identityId?: string;
     fallbackSrc?: string;
+    validateObjectExistence?: boolean;
     onStorageGetError?: (error: Error) => void;
 }

package/dist/types/components/StorageManager/hooks/useStorageManager/actions.d.ts

@@ -1,4 +1,4 @@
-import { UploadTask } from '@aws-amplify/storage';
+import { UploadDataOutput } from 'aws-amplify/storage';
 import { FileStatus } from '../../types';
 import { Action, AddFilesActionParams } from './types';
 export declare const addFilesAction: ({ files, status, getFileErrorMessage, }: AddFilesActionParams) => Action;
@@ -6,7 +6,7 @@ export declare const clearFilesAction: () => Action;
 export declare const queueFilesAction: () => Action;
 export declare const setUploadingFileAction: ({ id, uploadTask, }: {
     id: string;
-    uploadTask: UploadTask | undefined;
+    uploadTask: UploadDataOutput | undefined;
 }) => Action;
 export declare const setUploadProgressAction: ({ id, progress, }: {
     id: string;

package/dist/types/components/StorageManager/hooks/useStorageManager/types.d.ts

@@ -1,4 +1,4 @@
-import type { UploadTask } from '@aws-amplify/storage';
+import { UploadDataOutput } from 'aws-amplify/storage';
 import { FileStatus, StorageFiles } from '../../types';
 export interface UseStorageManagerState {
     files: StorageFiles;
@@ -29,7 +29,7 @@ export type Action = {
 } | {
     type: StorageManagerActionTypes.SET_STATUS_UPLOADING;
     id: string;
-    uploadTask?: UploadTask;
+    uploadTask?: UploadDataOutput;
 } | {
     type: StorageManagerActionTypes.SET_UPLOAD_PROGRESS;
     id: string;

package/dist/types/components/StorageManager/hooks/useStorageManager/useStorageManager.d.ts

@@ -1,4 +1,4 @@
-import { UploadTask } from '@aws-amplify/storage';
+import { UploadDataOutput } from 'aws-amplify/storage';
 import { StorageFiles, FileStatus, DefaultFile } from '../../types';
 import { GetFileErrorMessage } from './types';
 export interface UseStorageManager {
@@ -11,7 +11,7 @@ export interface UseStorageManager {
     queueFiles: () => void;
     setUploadingFile: (params: {
         id: string;
-        uploadTask?: UploadTask;
+        uploadTask?: UploadDataOutput;
     }) => void;
     setUploadProgress: (params: {
         id: string;

package/dist/types/components/StorageManager/hooks/useUploadFiles/useUploadFiles.d.ts

@@ -1,5 +1,5 @@
 import { StorageManagerProps } from '../../types';
 import { UseStorageManager } from '../useStorageManager';
-export interface UseUploadFilesProps extends Pick<StorageManagerProps, 'accessLevel' | 'isResumable' | 'onUploadSuccess' | 'onUploadError' | 'onUploadStart' | 'maxFileCount' | 'processFile' | 'provider' | 'path'>, Pick<UseStorageManager, 'setUploadingFile' | 'setUploadProgress' | 'setUploadSuccess' | 'files'> {
+export interface UseUploadFilesProps extends Pick<StorageManagerProps, 'accessLevel' | 'isResumable' | 'onUploadSuccess' | 'onUploadError' | 'onUploadStart' | 'maxFileCount' | 'processFile' | 'path'>, Pick<UseStorageManager, 'setUploadingFile' | 'setUploadProgress' | 'setUploadSuccess' | 'files'> {
 }
-export declare function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, setUploadingFile, setUploadSuccess, onUploadError, onUploadSuccess, onUploadStart, maxFileCount, processFile, provider, path, }: UseUploadFilesProps): void;
+export declare function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, setUploadingFile, setUploadSuccess, onUploadError, onUploadSuccess, onUploadStart, maxFileCount, processFile, path, }: UseUploadFilesProps): void;

package/dist/types/components/StorageManager/types.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import type { StorageAccessLevel, UploadTask } from '@aws-amplify/storage';
+import type { UploadDataOutput } from 'aws-amplify/storage';
+import type { StorageAccessLevel } from '@aws-amplify/core';
 import { ContainerProps, DropZoneProps, FileListHeaderProps, FileListFooterProps, FileListProps, FilePickerProps } from './ui';
 import { StorageManagerDisplayText } from './utils';
 export declare enum FileStatus {
@@ -15,7 +16,7 @@ export interface StorageFile {
     file?: File;
     status: FileStatus;
     progress: number;
-    uploadTask?: UploadTask;
+    uploadTask?: UploadDataOutput;
     key: string;
     error: string;
     isImage: boolean;
@@ -60,7 +61,7 @@ export interface StorageManagerProps {
     /**
      * Overrides default display text
      */
-    displayText?: Partial<StorageManagerDisplayText>;
+    displayText?: StorageManagerDisplayText;
     /**
      * Determines if upload can be paused / resumed
      */
@@ -105,11 +106,6 @@ export interface StorageManagerProps {
      * Determines if thumbnails show for image files
      */
     showThumbnails?: boolean;
-    /**
-     * Storage provider name
-     * @see https://docs.amplify.aws/lib/storage/custom-plugin/q/platform/js/
-     */
-    provider?: string;
     /**
      * A path to put files in the s3 bucket.
      * This will be prepended to the key sent to

package/dist/types/components/StorageManager/ui/FileList/types.d.ts

@@ -1,31 +1,31 @@
-import type { UploadTask } from '@aws-amplify/storage';
-import { StorageManagerDisplayText } from '../../utils/displayText';
+import { UploadDataOutput } from 'aws-amplify/storage';
+import { StorageManagerDisplayTextDefault } from '../../utils';
 import { FileStatus, StorageFile } from '../../types';
 export interface FileListProps {
-    displayText: StorageManagerDisplayText;
+    displayText: StorageManagerDisplayTextDefault;
     files: StorageFile[];
     isResumable: boolean;
     onCancelUpload: (params: {
         id: string;
-        uploadTask: UploadTask;
+        uploadTask: UploadDataOutput;
     }) => void;
     onDeleteUpload: (params: {
         id: string;
     }) => void;
     onPause: (params: {
         id: string;
-        uploadTask: UploadTask;
+        uploadTask: UploadDataOutput;
     }) => void;
     onResume: (params: {
         id: string;
-        uploadTask: UploadTask;
+        uploadTask: UploadDataOutput;
     }) => void;
     showThumbnails: boolean;
     hasMaxFilesError: boolean;
     maxFileCount: number;
 }
 export interface FileControlProps {
-    displayText: StorageManagerDisplayText;
+    displayText: StorageManagerDisplayTextDefault;
     displayName: string;
     errorMessage: string;
     isImage: boolean;
@@ -41,7 +41,7 @@ export interface FileControlProps {
     status: FileStatus;
     thumbnailUrl: string;
 }
-export interface FileStatusMessageProps extends Pick<StorageManagerDisplayText, 'getUploadingText' | 'getPausedText' | 'uploadSuccessfulText'> {
+export interface FileStatusMessageProps extends Pick<StorageManagerDisplayTextDefault, 'getUploadingText' | 'getPausedText' | 'uploadSuccessfulText'> {
     status: FileStatus;
     errorMessage: string;
     percentage: number;

package/dist/types/components/StorageManager/ui/FileListFooter/FileListFooter.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import { StorageManagerDisplayText } from '../../utils';
+import { StorageManagerDisplayTextDefault } from '../../utils';
 export interface FileListFooterProps {
     remainingFilesCount: number;
-    displayText: StorageManagerDisplayText;
+    displayText: StorageManagerDisplayTextDefault;
     onClearAll: () => void;
     onUploadAll: () => void;
 }

package/dist/types/components/StorageManager/ui/FileListHeader/FileListHeader.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import { StorageManagerDisplayText } from '../../utils/displayText';
+import { StorageManagerDisplayTextDefault } from '../../utils';
 export interface FileListHeaderProps {
     allUploadsSuccessful: boolean;
-    displayText: StorageManagerDisplayText;
+    displayText: StorageManagerDisplayTextDefault;
     fileCount: number;
     remainingFilesCount: number;
     selectedFilesCount?: number;

package/dist/types/components/StorageManager/utils/displayText.d.ts

@@ -1,20 +1,22 @@
-export declare const defaultStorageManagerDisplayText: {
-    getFilesUploadedText(count: number): string;
-    getFileSizeErrorText(sizeText: string): string;
-    getRemainingFilesText(count: number): string;
-    getSelectedFilesText(count: number): string;
-    getUploadingText(percentage: number): string;
-    getUploadButtonText(count: number): string;
-    getMaxFilesErrorText(count: number): string;
-    getErrorText(message: string): string;
-    doneButtonText: string;
-    clearAllButtonText: string;
-    extensionNotAllowedText: string;
-    browseFilesText: string;
-    dropFilesText: string;
-    pauseText: string;
-    resumeText: string;
-    uploadSuccessfulText: string;
-    getPausedText(percentage: number): string;
-};
-export type StorageManagerDisplayText = typeof defaultStorageManagerDisplayText;
+import { DisplayTextTemplate } from '@aws-amplify/ui';
+export type StorageManagerDisplayText = DisplayTextTemplate<{
+    getFilesUploadedText?: (count: number) => string;
+    getFileSizeErrorText?: (sizeText: string) => string;
+    getRemainingFilesText?: (count: number) => string;
+    getSelectedFilesText?: (count: number) => string;
+    getUploadingText?: (percentage: number) => string;
+    getUploadButtonText?: (count: number) => string;
+    getMaxFilesErrorText?: (count: number) => string;
+    getErrorText?: (message: string) => string;
+    doneButtonText?: string;
+    clearAllButtonText?: string;
+    extensionNotAllowedText?: string;
+    browseFilesText?: string;
+    dropFilesText?: string;
+    pauseButtonText?: string;
+    resumeButtonText?: string;
+    uploadSuccessfulText?: string;
+    getPausedText?: (percentage: number) => string;
+}>;
+export type StorageManagerDisplayTextDefault = Required<StorageManagerDisplayText>;
+export declare const defaultStorageManagerDisplayText: StorageManagerDisplayTextDefault;

package/dist/types/components/StorageManager/utils/index.d.ts

@@ -1,5 +1,5 @@
 export { checkMaxFileSize } from './checkMaxFileSize';
-export { defaultStorageManagerDisplayText, StorageManagerDisplayText, } from './displayText';
+export { defaultStorageManagerDisplayText, StorageManagerDisplayText, StorageManagerDisplayTextDefault, } from './displayText';
 export { filterAllowedFiles } from './filterAllowedFiles';
 export { humanFileSize } from './humanFileSize';
 export { uploadFile } from './uploadFile';

package/dist/types/components/StorageManager/utils/uploadFile.d.ts

@@ -1,19 +1,13 @@
-import type { StorageAccessLevel, UploadTask } from '@aws-amplify/storage';
+import { StorageAccessLevel } from '@aws-amplify/core';
+import { TransferProgressEvent, UploadDataOutput } from 'aws-amplify/storage';
 export type UploadFileProps = {
     file: File;
     key: string;
     level: StorageAccessLevel;
-    isResumable?: boolean;
-    progressCallback: (progress: {
-        loaded: number;
-        total: number;
-    }) => void;
+    progressCallback: (event: TransferProgressEvent) => void;
     errorCallback: (error: string) => void;
     completeCallback: (event: {
         key: string | undefined;
     }) => void;
-    provider?: string;
 } & Record<string, any>;
-type UploadFile = Promise<void> | UploadTask;
-export declare function uploadFile({ file, key, level, progressCallback, errorCallback, completeCallback, isResumable, provider, ...rest }: UploadFileProps): UploadFile;
-export {};
+export declare function uploadFile({ file, key, level, progressCallback, errorCallback, completeCallback, ...rest }: UploadFileProps): UploadDataOutput;

package/dist/types/version.d.ts

@@ -0,0 +1 @@
+export declare const VERSION = "2.3.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-storage",
-  "version": "2.3.2",
+  "version": "3.0.0",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {
@@ -35,51 +35,20 @@
     "prebuild": "rimraf dist",
     "size": "yarn size-limit",
     "test": "jest",
-    "test:ci": "yarn test && yarn check:esm",
     "test:watch": "yarn test --watch",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-amplify/ui": "5.8.1",
-    "@aws-amplify/ui-react": "5.3.2",
-    "@aws-amplify/ui-react-core": "2.1.33",
-    "classnames": "2.3.1",
+    "@aws-amplify/ui": "6.0.0",
+    "@aws-amplify/ui-react": "6.0.0",
+    "@aws-amplify/ui-react-core": "3.0.0",
     "lodash": "4.17.21",
-    "tslib": "2.4.1"
+    "tslib": "^2.5.2"
   },
   "peerDependencies": {
-    "aws-amplify": "^5.0.1",
-    "react": ">= 16.14.0",
-    "react-dom": ">= 16.14.0"
-  },
-  "peerDependenciesMeta": {
-    "aws-amplify": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@aws-amplify/eslint-config-amplify-ui": "0.0.0",
-    "@rollup/plugin-typescript": "^8.3.1",
-    "@size-limit/preset-big-lib": "^8.2.6",
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
-    "@testing-library/react-hooks": "^7.0.1",
-    "@testing-library/user-event": "^13.2.1",
-    "@types/jest": "^26.0.23",
-    "@types/react": "^17.0.2",
-    "@types/testing-library__jest-dom": "^5.14.1",
-    "eslint": "^8.44.0",
-    "jest": "^27.0.4",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "rimraf": "^3.0.2",
-    "rollup": "^2.70.0",
-    "rollup-plugin-node-externals": "^4.1.1",
-    "rollup-plugin-styles": "^4.0.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "size-limit": "^8.2.6",
-    "ts-jest": "^27.0.3",
-    "ts-morph": "^12.0.0"
+    "aws-amplify": "^6.0.2",
+    "react": "^16.14.0 || ^17.0 || ^18.0",
+    "react-dom": "^16.14.0 || ^17.0 || ^18.0"
   },
   "sideEffects": [
     "dist/**/*.css"

package/dist/types/components/StorageImage/_tests_/StorageImage.test.d.ts

@@ -1 +0,0 @@
-export {};