@transferwise/components 0.0.0-experimental-62a0fe9 → 0.0.0-experimental-c483cc2

package/src/uploadInput/UploadInput.spec.tsx

@@ -12,6 +12,36 @@ import { TEST_IDS as UPLOAD_ITEM_TEST_IDS } from './uploadItem/UploadItem';
 
 const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTimeAsync });
 
+const deleteFileAndWaitForFocus = async (fileToDeleteTestId: string, nextFocusTestId: string) => {
+  const fileToDelete = screen.getByTestId(fileToDeleteTestId);
+  const nextFocus = screen.getByTestId(nextFocusTestId);
+
+  await act(async () => {
+    within(fileToDelete).getByLabelText('Remove file', { exact: false }).click();
+    await jest.runOnlyPendingTimersAsync();
+  });
+
+  await act(async () => {
+    const removeButton = screen.queryByText('Remove');
+    if (removeButton) {
+      removeButton.click();
+      await jest.runOnlyPendingTimersAsync();
+    }
+  });
+
+  await waitFor(() => {
+    expect(screen.queryByTestId(fileToDeleteTestId)).not.toBeInTheDocument();
+  });
+
+  await act(async () => {
+    await jest.runOnlyPendingTimersAsync();
+  });
+
+  await waitFor(() => {
+    expect(nextFocus).toHaveFocus();
+  });
+};
+
 mockMatchMedia();
 
 describe('UploadInput', () => {
@@ -139,15 +169,21 @@ describe('UploadInput', () => {
         onFilesChange,
       });
 
-      const fileToDelete = screen.getAllByTestId(UPLOAD_ITEM_TEST_IDS.uploadItem)[0];
-      within(fileToDelete).getByLabelText('Remove file', { exact: false }).click();
+      const fileToDelete = screen.getByTestId('1-uploadItem');
       await act(async () => {
+        within(fileToDelete).getByLabelText('Remove file', { exact: false }).click();
         await jest.runOnlyPendingTimersAsync();
       });
 
-      screen.getByText('Remove').click();
+      await act(async () => {
+        screen.getByText('Remove').click();
+        await jest.runOnlyPendingTimersAsync();
+      });
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('1-uploadItem')).not.toBeInTheDocument();
+      });
 
-      await waitForElementToBeRemoved(fileToDelete);
       expect(props.onDeleteFile).toHaveBeenCalledWith(files[0].id);
 
       expect(onFilesChange).toHaveBeenCalledTimes(2);
@@ -190,9 +226,9 @@ describe('UploadInput', () => {
         onFilesChange,
       });
 
-      const fileToDelete = screen.getAllByTestId(UPLOAD_ITEM_TEST_IDS.uploadItem)[0];
-      within(fileToDelete).getByLabelText('Remove file', { exact: false }).click();
+      const fileToDelete = screen.getByTestId('1-uploadItem');
       await act(async () => {
+        within(fileToDelete).getByLabelText('Remove file', { exact: false }).click();
         await jest.runOnlyPendingTimersAsync();
       });
 
@@ -212,6 +248,114 @@ describe('UploadInput', () => {
 
       expect(screen.queryByLabelText('Remove file ', { exact: false })).not.toBeInTheDocument();
     });
+
+    it('should focus the next item after a file is deleted', async () => {
+      const files = [
+        {
+          id: 1,
+          filename: 'Sales-2024-invoice.pdf',
+          status: Status.DONE,
+        },
+        {
+          id: 2,
+          filename: 'CoWork-0317-invoice.pdf',
+          status: Status.DONE,
+        },
+        {
+          id: 3,
+          filename: 'purchase-receipt.pdf',
+          status: Status.DONE,
+        },
+      ];
+
+      renderComponent({
+        ...props,
+        files,
+        multiple: true,
+        onFilesChange,
+      });
+
+      await deleteFileAndWaitForFocus('1-uploadItem', '2-action');
+    });
+
+    it('should focus the upload input after the last file is deleted', async () => {
+      const files = [
+        {
+          id: 1,
+          filename: 'Sales-2024-invoice.pdf',
+          status: Status.DONE,
+        },
+        {
+          id: 2,
+          filename: 'CoWork-0317-invoice.pdf',
+          status: Status.DONE,
+        },
+        {
+          id: 3,
+          filename: 'purchase-receipt.pdf',
+          status: Status.DONE,
+        },
+      ];
+
+      renderComponent({
+        ...props,
+        files,
+        multiple: true,
+        onFilesChange,
+      });
+
+      await deleteFileAndWaitForFocus('3-uploadItem', 'uploadInput');
+    });
+
+    it('should focus the upload input after the only file is deleted', async () => {
+      const singleFile = [
+        {
+          id: 3,
+          filename: 'purchase-receipt.pdf',
+          status: Status.DONE,
+        },
+      ];
+
+      renderComponent({
+        ...props,
+        files: singleFile,
+        multiple: true,
+        onFilesChange,
+      });
+
+      await deleteFileAndWaitForFocus('3-uploadItem', 'uploadInput');
+    });
+
+    it('should focus the third item, then the second and finally upload input', async () => {
+      const filesWithFailed = [
+        {
+          id: 1,
+          filename: 'Sales-2024-invoice.pdf',
+          status: Status.DONE,
+        },
+        {
+          id: 2,
+          filename: 'CoWork-0317-invoice.pdf',
+          status: Status.FAILED,
+        },
+        {
+          id: 3,
+          filename: 'purchase-receipt.pdf',
+          status: Status.DONE,
+        },
+      ];
+
+      renderComponent({
+        ...props,
+        files: filesWithFailed,
+        multiple: true,
+        onFilesChange,
+      });
+
+      await deleteFileAndWaitForFocus('3-uploadItem', 'uploadInput');
+      await deleteFileAndWaitForFocus('1-uploadItem', '2-action');
+      await deleteFileAndWaitForFocus('2-uploadItem', 'uploadInput');
+    });
   });
 
   describe('Max File Upload limit', () => {

package/src/uploadInput/UploadInput.tsx

@@ -1,5 +1,5 @@
 import { clsx } from 'clsx';
-import { useEffect, useRef, useState, useLayoutEffect } from 'react';
+import { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 
 import Button from '../button';
@@ -99,16 +99,45 @@ 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',
@@ -131,15 +160,15 @@ const UploadInput = ({
   uploadButtonTitle,
 }: UploadInputProps) => {
   const inputAttributes = useInputAttributes({ nonLabelable: true });
-
   const [markedFileForDelete, setMarkedFileForDelete] = useState<UploadedFile | null>(null);
-  const [fileToRemoveIndex, setFileToRemoveIndex] = useState<number | null>(null);
+  const [nextFocusItem, setNextFocusItem] = useState<NextFocusItem | 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;
 
   const [uploadedFiles, setUploadedFiles] = useState<readonly UploadedFile[]>(
     multiple || files.length === 0 ? files : [files[0]],
@@ -147,50 +176,64 @@ const UploadInput = ({
 
   const uploadedFilesListReference = useRef(multiple || files.length === 0 ? files : [files[0]]);
 
-  function addFileToList(recentUploadedFile: UploadedFile) {
-    function addToList(listToAddTo: readonly UploadedFile[]) {
-      return [...listToAddTo, recentUploadedFile];
-    }
-
-    setUploadedFiles(addToList);
-    uploadedFilesListReference.current = addToList(uploadedFilesListReference.current);
+  function updateFileList(updateFn: (list: readonly UploadedFile[]) => readonly UploadedFile[]) {
+    setUploadedFiles(updateFn);
+    uploadedFilesListReference.current = updateFn(uploadedFilesListReference.current);
   }
 
-  const removeFileFromList = (file: UploadedFile) => {
-    function filterOutFrom(listToFilterFrom: readonly UploadedFile[]) {
-      return listToFilterFrom.filter(
-        (fileInList) => file !== fileInList && file.id !== fileInList.id,
-      );
-    }
-
-    setUploadedFiles(filterOutFrom);
-    uploadedFilesListReference.current = filterOutFrom(uploadedFilesListReference.current);
-  };
+  function addFileToList(recentUploadedFile: UploadedFile) {
+    updateFileList((list) => [...list, recentUploadedFile]);
+  }
 
-  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;
-      });
+  function removeFileFromList(file: UploadedFile) {
+    updateFileList((list) =>
+      list.filter((fileInList) => file !== fileInList && file.id !== fileInList.id),
+    );
+  }
 
-    setUploadedFiles(updateListItem);
-    uploadedFilesListReference.current = updateListItem(uploadedFilesListReference.current);
-  };
+  function modifyFileInList(file: UploadedFile, updates: Partial<UploadedFile>) {
+    updateFileList((list) =>
+      list.map((fileInList) =>
+        fileInList === file || fileInList.id === file.id ? { ...file, ...updates } : fileInList,
+      ),
+    );
+  }
 
-  const [fileToRemove, setFileToRemove] = useState<UploadedFile | null>(null);
+  function focusNextItem(
+    focusId: number | null = null,
+    isLastItem = false,
+    timeout: number = FOCUS_TIMEOUT,
+  ) {
+    const nextFocusIdIndex = focusId
+      ? uploadedFilesListReference.current.findIndex((item: UploadedFile) => item.id === focusId)
+      : -1;
+
+    requestAnimationFrame(() => {
+      setTimeout(() => {
+        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);
+    });
+  }
 
   const removeFile = (file: UploadedFile) => {
     const { id, status } = file;
     const index = uploadedFiles.findIndex((f) => f.id === file.id);
-    setFileToRemoveIndex(index);
+    const isLastItem = index === uploadedFiles.length - 1;
+    const nextIndexId = uploadedFiles[index + 1]?.id as number;
+    const focusId = nextIndexId ?? null;
 
     if (status === Status.FAILED) {
       removeFileFromList(file);
-      setFileToRemove(file);
+      setNextFocusItem({ focusId: focusId ?? null, isLastItem });
     } else if (onDeleteFile && id) {
       modifyFileInList(file, { status: Status.PROCESSING, error: undefined });
+      setNextFocusItem({ focusId, isLastItem });
 
       onDeleteFile(id)
         .then(() => {
@@ -198,9 +241,7 @@ const UploadInput = ({
         })
         .catch((error) => {
           modifyFileInList(file, { error: error as UploadError });
-        })
-        .finally(() => {
-          setFileToRemove(file);
+          setNextFocusItem({ focusId, isLastItem });
         });
     }
   };
@@ -239,12 +280,10 @@ 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) {
@@ -253,14 +292,11 @@ 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);
@@ -275,14 +311,11 @@ 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),
@@ -292,10 +325,8 @@ 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) => {
@@ -303,7 +334,6 @@ const UploadInput = ({
           });
 
         if (!multiple) {
-          // Only upload a single file
           break;
         }
       }
@@ -311,20 +341,11 @@ const UploadInput = ({
   };
 
   useLayoutEffect(() => {
-    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
+    if (nextFocusItem) {
+      focusNextItem(nextFocusItem.focusId, nextFocusItem.isLastItem);
     }
-  }, [uploadedFiles, fileToRemove, fileToRemoveIndex, itemRefs, uploadInputRef]);
+    setNextFocusItem(null);
+  }, [nextFocusItem]);
 
   useEffect(() => {
     setMounted(true);

package/src/uploadInput/uploadItem/UploadItem.tsx

@@ -4,9 +4,8 @@ import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { useIntl } from 'react-intl';
 
 import Body from '../../body';
-import { Size, Status, Typography, Sentiment } from '../../common';
+import { Size, Status, Typography } from '../../common';
 import ProcessIndicator from '../../processIndicator/ProcessIndicator';
-import StatusIcon from '../../statusIcon/StatusIcon';
 import { UploadedFile, UploadError } from '../types';
 
 import MESSAGES from './UploadItem.messages';
@@ -38,6 +37,8 @@ interface UploadItemRef {
 export enum TEST_IDS {
   uploadItem = 'uploadItem',
   mediaBody = 'mediaBody',
+  link = 'link',
+  action = 'action',
 }
 
 const UploadItem = forwardRef<UploadItemRef, UploadItemProps>(
@@ -46,6 +47,7 @@ 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 => {
@@ -57,8 +59,6 @@ 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,16 +152,20 @@ const UploadItem = forwardRef<UploadItemRef, UploadItemProps>(
     return (
       <div
         className={clsx('np-upload-input__item', { 'is-interactive': isSucceeded && url })}
-        data-testid={TEST_IDS.uploadItem}
+        data-testid={`${file.id}-${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={TEST_IDS.mediaBody}>
+          <div
+            className="np-upload-input__item-content"
+            data-testid={`${file.id}-${TEST_IDS.mediaBody}`}
+          >
             <Body type={Typography.BODY_LARGE} className="np-upload-input__title text-word-break">
               {getTitle()}
             </Body>
@@ -175,6 +179,8 @@ 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,7 +10,14 @@ 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 (
@@ -23,6 +30,7 @@ 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}