@transferwise/components 0.0.0-experimental-4b8556a → 0.0.0-experimental-3064bdb

package/src/uploadInput/UploadInput.tsx

@@ -1,5 +1,5 @@
 import { clsx } from 'clsx';
-import { useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState, useLayoutEffect } from 'react';
 import { useIntl } from 'react-intl';
 
 import Button from '../button';
@@ -99,45 +99,16 @@ export type UploadInputProps = {
   'disabled' | 'multiple' | 'fileTypes' | 'sizeLimit' | 'description' | 'id' | 'uploadButtonTitle'
 > & { onDownload?: UploadItemProps['onDownload'] } & CommonProps;
 
-/**
- * Interface representing a reference to an UploadItem component.
- * Provides a method to focus the UploadItem.
- */
 interface UploadItemRef {
-  /**
-   * Focuses the UploadItem component.
-   */
   focus: () => void;
 }
 
-/**
- * Represents the next item to focus on after an action is performed.
- */
-type NextFocusItem = {
-  /** The ID of the next item to focus on. If null, no specific item is targeted. */
-  focusId: number | null;
-  /** Indicates if the next item to focus on is the last item in the list. */
-  isLastItem: boolean;
-};
-
-/**
- * Generates a unique ID for a file based on its name, size, and the current timestamp
- */
 function generateFileId(file: File) {
   const { name, size } = file;
   const uploadTimeStamp = new Date().getTime();
   return `${name}_${size}_${uploadTimeStamp}`;
 }
 
-/**
- * The component allows users to upload files, manage the list of uploaded files,
- * and handle file validation and deletion.
- *
- * @param {UploadInputProps} props - The properties for the UploadInput component.
- *
- * @see {@link UploadInput} for further information.
- * @see {@link https://storybook.wise.design/?path=/docs/forms-uploadinput--docs|Storybook Wise Design}
- */
 const UploadInput = ({
   files = [],
   fileInputName = 'file',
@@ -160,15 +131,15 @@ const UploadInput = ({
   uploadButtonTitle,
 }: UploadInputProps) => {
   const inputAttributes = useInputAttributes({ nonLabelable: true });
+
   const [markedFileForDelete, setMarkedFileForDelete] = useState<UploadedFile | null>(null);
-  const [nextFocusItem, setNextFocusItem] = useState<NextFocusItem | null>(null);
+  const [fileToRemoveIndex, setFileToRemoveIndex] = useState<number | null>(null);
   const [mounted, setMounted] = useState(false);
   const { formatMessage } = useIntl();
   const itemRefs = useRef<(HTMLDivElement | UploadItemRef | null)[]>([]);
   const uploadInputRef = useRef<HTMLInputElement | null>(null);
 
   const PROGRESS_STATUSES = new Set([Status.PENDING, Status.PROCESSING]);
-  const FOCUS_TIMEOUT = 400; // Set to 400ms to allow animations and Modal to unmount
 
   const [uploadedFiles, setUploadedFiles] = useState<readonly UploadedFile[]>(
     multiple || files.length === 0 ? files : [files[0]],
@@ -176,65 +147,49 @@ const UploadInput = ({
 
   const uploadedFilesListReference = useRef(multiple || files.length === 0 ? files : [files[0]]);
 
-  function updateFileList(updateFn: (list: readonly UploadedFile[]) => readonly UploadedFile[]) {
-    setUploadedFiles(updateFn);
-    uploadedFilesListReference.current = updateFn(uploadedFilesListReference.current);
-  }
-
   function addFileToList(recentUploadedFile: UploadedFile) {
-    updateFileList((list) => [...list, recentUploadedFile]);
-  }
+    function addToList(listToAddTo: readonly UploadedFile[]) {
+      return [...listToAddTo, recentUploadedFile];
+    }
 
-  function removeFileFromList(file: UploadedFile) {
-    updateFileList((list) =>
-      list.filter((fileInList) => file !== fileInList && file.id !== fileInList.id),
-    );
+    setUploadedFiles(addToList);
+    uploadedFilesListReference.current = addToList(uploadedFilesListReference.current);
   }
 
-  function modifyFileInList(file: UploadedFile, updates: Partial<UploadedFile>) {
-    updateFileList((list) =>
-      list.map((fileInList) =>
-        fileInList === file || fileInList.id === file.id ? { ...file, ...updates } : fileInList,
-      ),
-    );
-  }
+  const removeFileFromList = (file: UploadedFile) => {
+    function filterOutFrom(listToFilterFrom: readonly UploadedFile[]) {
+      return listToFilterFrom.filter(
+        (fileInList) => file !== fileInList && file.id !== fileInList.id,
+      );
+    }
 
-  function focusNextItem(
-    focusId: number | null = null,
-    isLastItem = false,
-    timeout: number = FOCUS_TIMEOUT,
-  ) {
-    requestAnimationFrame(() => {
-      setTimeout(() => {
-        const nextFocusIdIndex = focusId
-          ? uploadedFilesListReference.current.findIndex(
-              (item: UploadedFile) => item.id === focusId,
-            )
-          : -1;
-
-        if (isLastItem || nextFocusIdIndex === -1) {
-          // If it's the last item or no next item, focus on the upload input reference
-          uploadInputRef.current?.focus();
-        } else {
-          const nextFocusElement = itemRefs.current[nextFocusIdIndex];
-          nextFocusElement?.focus();
-        }
-      }, timeout);
-    });
-  }
+    setUploadedFiles(filterOutFrom);
+    uploadedFilesListReference.current = filterOutFrom(uploadedFilesListReference.current);
+  };
+
+  const modifyFileInList = (file: UploadedFile, updates: Partial<UploadedFile>) => {
+    const updateListItem = (listToUpdate: readonly UploadedFile[]) =>
+      listToUpdate.map((fileInList) => {
+        return fileInList === file || fileInList.id === file.id
+          ? { ...file, ...updates }
+          : fileInList;
+      });
+
+    setUploadedFiles(updateListItem);
+    uploadedFilesListReference.current = updateListItem(uploadedFilesListReference.current);
+  };
+
+  const [fileToRemove, setFileToRemove] = useState<UploadedFile | null>(null);
 
   const removeFile = (file: UploadedFile) => {
     const { id, status } = file;
     const index = uploadedFiles.findIndex((f) => f.id === file.id);
-    const isLastItem = index === uploadedFiles.length - 1;
-    const nextIndexId = uploadedFiles[index + 1]?.id as number;
-    const focusId = nextIndexId ?? null;
+    setFileToRemoveIndex(index);
 
     if (status === Status.FAILED) {
-      setNextFocusItem({ focusId: focusId ?? null, isLastItem });
       removeFileFromList(file);
+      setFileToRemove(file);
     } else if (onDeleteFile && id) {
-      setNextFocusItem({ focusId, isLastItem });
       modifyFileInList(file, { status: Status.PROCESSING, error: undefined });
 
       onDeleteFile(id)
@@ -242,8 +197,10 @@ const UploadInput = ({
           removeFileFromList(file);
         })
         .catch((error) => {
-          setNextFocusItem({ focusId, isLastItem });
           modifyFileInList(file, { error: error as UploadError });
+        })
+        .finally(() => {
+          setFileToRemove(file);
         });
     }
   };
@@ -282,10 +239,12 @@ const UploadInput = ({
     return numberOfValidFiles >= maxFiles;
   }
 
+  // One or more files selected, create entries for them
   const addFiles = (selectedFiles: FileList) => {
     for (let i = 0; i < selectedFiles.length; i += 1) {
       const file = selectedFiles.item(i);
 
+      // Returning a FormData[] array instead of FileList so we can filter out incorrect files
       const formData = new FormData();
 
       if (file) {
@@ -294,11 +253,14 @@ const UploadInput = ({
 
         const allowedFileTypes = typeof fileTypes === 'string' ? fileTypes : fileTypes.join(',');
 
+        // Check if file type is valid
         if (!isTypeValid(file, allowedFileTypes)) {
           handleFileUploadFailure(file, formatMessage(MESSAGES.fileTypeNotSupported));
           continue;
         }
 
+        // Check if the filesize is valid
+        // Convert to rough bytes
         if (!isSizeValid(file, sizeLimit * 1000)) {
           const failureMessage = sizeLimitErrorMessage || formatMessage(MESSAGES.fileIsTooLarge);
           handleFileUploadFailure(file, failureMessage);
@@ -313,11 +275,14 @@ const UploadInput = ({
           continue;
         }
 
+        // Check if the file is already in the list
         const existingFile = uploadedFiles.find((f) => f.filename === file.name);
         if (existingFile) {
+          // Remove the file from the list before adding it again
           removeFileFromList(existingFile);
         }
 
+        // Add the file to the list
         formData.append(fileInputName, file);
         const pendingFile = {
           id: generateFileId(file),
@@ -327,8 +292,10 @@ const UploadInput = ({
 
         addFileToList(pendingFile);
 
+        // Start uploading the file
         onUploadFile(formData)
           .then(({ id, url, error }: UploadResponse) => {
+            // Replace the temporary id with the final one received from the API, and also set any errors
             modifyFileInList(pendingFile, { id, url, error, status: Status.SUCCEEDED });
           })
           .catch((error) => {
@@ -336,6 +303,7 @@ const UploadInput = ({
           });
 
         if (!multiple) {
+          // Only upload a single file
           break;
         }
       }
@@ -343,11 +311,20 @@ const UploadInput = ({
   };
 
   useLayoutEffect(() => {
-    if (nextFocusItem) {
-      focusNextItem(nextFocusItem.focusId, nextFocusItem.isLastItem);
+    if (fileToRemove && fileToRemoveIndex !== null) {
+      requestAnimationFrame(() => {
+        const nextFocusIndex = Math.min(fileToRemoveIndex, uploadedFiles.length - 1);
+        if (itemRefs.current[nextFocusIndex]) {
+          itemRefs.current[nextFocusIndex].focus(); // Focus the next UploadItem
+        } else {
+          // If there's only one item left, focus the UploadButton
+          uploadInputRef.current?.focus();
+        }
+      });
+      setFileToRemove(null); // Reset the state
+      setFileToRemoveIndex(null); // Reset the index
     }
-    setNextFocusItem(null);
-  }, [nextFocusItem]);
+  }, [uploadedFiles, fileToRemove, fileToRemoveIndex, itemRefs, uploadInputRef]);
 
   useEffect(() => {
     setMounted(true);

package/src/uploadInput/uploadItem/UploadItem.tsx

@@ -4,8 +4,9 @@ import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { useIntl } from 'react-intl';
 
 import Body from '../../body';
-import { Size, Status, Typography } from '../../common';
+import { Size, Status, Typography, Sentiment } from '../../common';
 import ProcessIndicator from '../../processIndicator/ProcessIndicator';
+import StatusIcon from '../../statusIcon/StatusIcon';
 import { UploadedFile, UploadError } from '../types';
 
 import MESSAGES from './UploadItem.messages';
@@ -37,8 +38,6 @@ interface UploadItemRef {
 export enum TEST_IDS {
   uploadItem = 'uploadItem',
   mediaBody = 'mediaBody',
-  link = 'link',
-  action = 'action',
 }
 
 const UploadItem = forwardRef<UploadItemRef, UploadItemProps>(
@@ -47,7 +46,6 @@ const UploadItem = forwardRef<UploadItemRef, UploadItemProps>(
     const { status, filename, error, errors, url } = file;
     const linkRef = useRef<HTMLAnchorElement>(null);
     const buttonRef = useRef<HTMLButtonElement>(null);
-    const isSucceeded = [Status.SUCCEEDED, undefined].includes(status) && !!url;
 
     useImperativeHandle<UploadItemRef, UploadItemRef>(ref, () => ({
       focus: (): void => {
@@ -59,6 +57,8 @@ const UploadItem = forwardRef<UploadItemRef, UploadItemProps>(
       },
     }));
 
+    const isSucceeded = [Status.SUCCEEDED, undefined].includes(status) && !!url;
+
     /**
      * We're temporarily reverting to the regular icon components,
      * until the StatusIcon receives 24px sizing. Some misalignment
@@ -152,20 +152,16 @@ const UploadItem = forwardRef<UploadItemRef, UploadItemProps>(
     return (
       <div
         className={clsx('np-upload-input__item', { 'is-interactive': isSucceeded && url })}
-        data-testid={`${file.id}-${TEST_IDS.uploadItem}`}
+        data-testid={TEST_IDS.uploadItem}
       >
         <UploadItemLink
           ref={linkRef}
           url={isSucceeded ? url : undefined}
           singleFileUpload={singleFileUpload}
-          data-testid={`${file.id}-${TEST_IDS.link}`}
           onDownload={onDownloadFile}
         >
           <span className="np-upload-input__icon">{getIcon()}</span>
-          <div
-            className="np-upload-input__item-content"
-            data-testid={`${file.id}-${TEST_IDS.mediaBody}`}
-          >
+          <div className="np-upload-input__item-content" data-testid={TEST_IDS.mediaBody}>
             <Body type={Typography.BODY_LARGE} className="np-upload-input__title text-word-break">
               {getTitle()}
             </Body>
@@ -179,8 +175,6 @@ const UploadItem = forwardRef<UploadItemRef, UploadItemProps>(
               aria-label={formatMessage(MESSAGES.removeFile, { filename })}
               className="np-upload-input__item-button"
               type="button"
-              tabIndex={0}
-              data-testid={`${file.id}-${TEST_IDS.action}`}
               onClick={() => onDelete()}
             >
               <Bin size={16} />

package/src/uploadInput/uploadItem/UploadItemLink.tsx

@@ -10,14 +10,7 @@ type UploadItemLinkProps = PropsWithChildren<{
 export const UploadItemLink = forwardRef<HTMLAnchorElement | HTMLDivElement, UploadItemLinkProps>(
   ({ children, url, onDownload, singleFileUpload }, ref) => {
     if (!url) {
-      return (
-        <div
-          ref={ref as React.RefObject<HTMLDivElement>}
-          className={clsx('np-upload-input__item-container')}
-        >
-          {children}
-        </div>
-      );
+      return <div ref={ref as React.RefObject<HTMLDivElement>} className={clsx('np-upload-input__item-container')}>{children}</div>;
     }
 
     return (
@@ -30,7 +23,6 @@ export const UploadItemLink = forwardRef<HTMLAnchorElement | HTMLDivElement, Upl
           'np-upload-input__item-link',
           singleFileUpload ? 'np-upload-input__item-link--single-file' : '',
         )}
-        tabIndex={0}
         onClick={onDownload}
       >
         {children}