@transferwise/components 46.36.1 → 46.38.0

package/src/uploadInput/UploadInput.story.tsx

@@ -4,7 +4,7 @@ import { Story, Meta } from '@storybook/react';
 import { Status } from '../common';
 
 import UploadInput, { UploadInputProps } from './UploadInput';
-import { UploadResponse } from './types';
+import { UploadedFile, UploadResponse } from './types';
 
 const meta: Meta<typeof UploadInput> = {
   title: 'Forms/UploadInput',
@@ -17,7 +17,12 @@ export default meta;
 const files = [
   {
     id: 1,
-    filename: 'purchase-receipt.pdf',
+    filename: 'purchase-receipt-0.pdf',
+    url: 'https://wise.com/public-resources/assets/logos/wise/brand_logo_inverse.svg',
+  },
+  {
+    id: 2,
+    filename: 'purchase-receipt-1.pdf',
     url: 'https://wise.com/public-resources/assets/logos/wise/brand_logo_inverse.svg',
   },
   {
@@ -28,16 +33,18 @@ const files = [
   {
     id: 3,
     filename: 'receipt failed with error string.png',
-    status: Status.SUCCEEDED,
+    status: Status.FAILED,
+    error: 'Something went wrong',
   },
   {
     id: 4,
     filename: 'receipt failed with error object.png',
-    status: Status.SUCCEEDED,
+    status: Status.FAILED,
+    error: { message: 'Something went wrong' },
   },
-];
+] satisfies UploadedFile[];
 
-const createDelayedPromise = ({
+const createDelayedPromise = async ({
   successful = true,
   delaySeconds = 3,
   response = { id: Math.round(Math.random() * 10000), url: '#' },
@@ -54,10 +61,10 @@ const createDelayedPromise = ({
   });
 
 const props = {
-  onUploadFile: (formData: FormData) => {
+  onUploadFile: async (formData: FormData) => {
     return createDelayedPromise();
   },
-  onDeleteFile: (id: string | number) => {
+  onDeleteFile: async (id: string | number) => {
     return createDelayedPromise();
   },
 };
@@ -93,6 +100,49 @@ WithMultipleExistingFiles.args = {
   multiple: true,
 };
 
+export const WithFileErrors: Story<UploadInputProps> = Template.bind({});
+WithFileErrors.args = {
+  ...props,
+  files: [
+    {
+      id: 1,
+      filename: 'Error with default message.png',
+      status: Status.FAILED,
+    },
+    {
+      id: 2,
+      filename: 'Error with `string` error.png',
+      status: Status.FAILED,
+      error: 'Single string error',
+    },
+    {
+      id: 3,
+      filename: 'Error with `obj` error ({ message : `string` }).png',
+      status: Status.FAILED,
+      error: { message: 'Single obj error' },
+    },
+    {
+      id: 4,
+      filename: 'Error with single error passed in `array`.png',
+      status: Status.FAILED,
+      errors: ['Single error in array'],
+    },
+    {
+      id: 5,
+      filename: 'Error with multiple `string` errors passed in `array`.png',
+      status: Status.FAILED,
+      errors: ['Error 1', 'Error 2', 'Error 3'],
+    },
+    {
+      id: 6,
+      filename: 'Error with multiple `obj` errors passed in `array`.png',
+      status: Status.FAILED,
+      errors: [{ message: 'Error 1' }, { message: 'Error 2' }, { message: 'Error 3' }],
+    },
+  ],
+  multiple: true,
+};
+
 export const WithoutDelete: Story<UploadInputProps> = Template.bind({});
 WithoutDelete.args = {
   ...props,
@@ -105,7 +155,7 @@ export const WithUploadFailed: Story<UploadInputProps> = Template.bind({});
 WithUploadFailed.args = {
   ...props,
   files: files.slice(0),
-  onUploadFile: () => createDelayedPromise({ successful: false }),
+  onUploadFile: async () => createDelayedPromise({ successful: false }),
   multiple: true,
 };
 
@@ -113,7 +163,7 @@ export const WithDeleteFailed: Story<UploadInputProps> = Template.bind({});
 WithDeleteFailed.args = {
   ...props,
   files: files.slice(0),
-  onDeleteFile: () => createDelayedPromise({ successful: false }),
+  onDeleteFile: async () => createDelayedPromise({ successful: false }),
   multiple: true,
 };
 

package/src/uploadInput/UploadInput.tsx

@@ -1,6 +1,5 @@
-import { useTheme } from '@wise/components-theming';
 import classNames from 'classnames';
-import { ReactElement, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 
 import Button from '../button';
@@ -127,8 +126,7 @@ const UploadInput = ({
   id,
   sizeLimitErrorMessage,
   uploadButtonTitle,
-}: UploadInputProps): ReactElement => {
-  const { isModern } = useTheme();
+}: UploadInputProps) => {
   const [markedFileForDelete, setMarkedFileForDelete] = useState<UploadedFile | null>(null);
   const [mounted, setMounted] = useState(false);
   const { formatMessage } = useIntl();
@@ -301,7 +299,7 @@ const UploadInput = ({
 
   return (
     <>
-      <div className={classNames('np-upload-input', className, { disabled: isModern && disabled })}>
+      <div className={classNames('np-upload-input', className, { disabled })}>
         {uploadedFiles.map((file) => (
           <UploadItem
             key={file.id}
@@ -329,7 +327,6 @@ const UploadInput = ({
             sizeLimit={sizeLimit}
             description={description}
             maxFiles={maxFiles}
-            multipleFileInputWithFilesAdded={multiple && uploadedFiles.length > 0}
             onChange={addFiles}
           />
         )}

package/src/uploadInput/types.ts

@@ -19,9 +19,14 @@ export type UploadResponse = {
   url?: string;
 
   /**
-   * Optionally set a translated error message when file was rejected
+   * Optionally sets translated error message when a file gets rejected
    */
   error?: UploadError;
+
+  /**
+   * Optionally sets translated error messages when a file gets rejected
+   */
+  errors?: UploadError[];
   [key: string]: any;
 };
 
@@ -46,6 +51,11 @@ export type UploadedFile = {
    */
   error?: UploadError;
 
+  /**
+   * Any API errors array. The messages should be localized.
+   */
+  errors?: UploadError[];
+
   /**
    * Optional. An external URL where the file can be opened from.
    */

package/src/uploadInput/uploadButton/UploadButton.css

@@ -1,49 +1,35 @@
-.np-upload-button {
-  width: 100%;
-  border: 0 !important;
-  padding: 12px 16px;
-  padding: var(--size-12) var(--size-16);
-}
-.np-upload-button.np-upload-accent {
-  color: #00a2dd;
-  color: var(--color-interactive-accent);
-}
-label.np-upload-button:not(.disabled):hover,
-label.np-upload-button:not(.disabled):focus-visible,
-label.np-upload-button:not(.disabled):active {
-  background-color: rgba(134,167,189,0.10196);
-  background-color: var(--color-background-neutral);
-}
-.np-theme-personal label.np-upload-button:not(.disabled):hover,
-.np-theme-personal label.np-upload-button:not(.disabled):focus-visible,
-.np-theme-personal label.np-upload-button:not(.disabled):active {
-  background-color: var(--color-background-screen-hover);
-}
-.np-theme-personal .disabled label.np-upload-button:not(.disabled):hover,
-.np-theme-personal .disabled label.np-upload-button:not(.disabled):focus-visible,
-.np-theme-personal .disabled label.np-upload-button:not(.disabled):active {
-  background-color: transparent;
-}
-.np-upload-button .np-upload-icon {
-  display: flex;
-  align-items: center;
-}
-.np-upload-button-container.droppable {
-  border: 0;
+.np-upload-button-container {
+  border-style: solid;
 }
 .np-upload-button-container .droppable-card-content {
   display: flex;
 }
-.np-theme-personal .np-upload-button-container .droppable-card-content {
-  border-radius: calc(10px - 1px);
-  border-radius: calc(var(--radius-small) - 1px);
+.np-upload-button-container.droppable-dropping {
+  border-color: #c9cbce !important;
+  border-color: var(--color-interactive-secondary) !important;
 }
 .np-upload-button-container input[type="file"] {
   opacity: 0;
   z-index: -1;
   position: absolute;
 }
-.np-upload-button-container input[type="file"]:focus-visible + label {
-  background-color: rgba(134,167,189,0.10196);
-  background-color: var(--color-background-neutral);
+.np-upload-button-container .np-upload-button {
+  border: none;
+}
+.np-upload-button {
+  width: 100%;
+  padding: 16px;
+  padding: var(--padding-small);
+  border-radius: 0;
+}
+label.np-upload-button:not(.disabled):hover,
+label.np-upload-button:not(.disabled):active {
+  background-color: var(--color-background-screen-hover);
+}
+.disabled label.np-upload-button:not(.disabled):hover,
+.disabled label.np-upload-button:not(.disabled):active {
+  background-color: transparent;
+}
+.np-upload-button .media {
+  align-items: flex-start;
 }

package/src/uploadInput/uploadButton/UploadButton.less

@@ -1,57 +1,44 @@
-@import (reference) '../uploadItem/UploadItem.less';
+.np-upload-button-container {
+  border-style: solid;
 
-.np-upload-button {
-  width: 100%;
-  border: 0 !important; // Remove from btn
-  padding: var(--size-12) var(--size-16);
+  .droppable-card-content {
+    display: flex;
+  }
 
-  &.np-upload-accent {
-    color: var(--color-interactive-accent);
+  &.droppable-dropping {
+    border-color: var(--color-interactive-secondary) !important;
   }
 
+  input[type="file"] {
+    opacity: 0;
+    z-index: -1;
+    position: absolute;
+  }
+
+  .np-upload-button {
+    border: none;
+  }
+}
+
+.np-upload-button {
+  width: 100%;
+  padding: var(--padding-small);
+  border-radius: 0;
+
   label& {
     &:not(.disabled) {
       &:hover,
-      &:focus-visible,
       &:active {
-        background-color: var(--color-background-neutral);
-
-        .np-theme-personal & {
-          background-color: var(--color-background-screen-hover);
-        }
+        background-color: var(--color-background-screen-hover);
 
-        .np-theme-personal .disabled & {
+        .disabled & {
           background-color: transparent;
         }
       }
     }
   }
 
-  .np-upload-icon {
-    display: flex;
-    align-items: center;
-  }
-}
-
-.np-upload-button-container {
-  &.droppable {
-    border: 0;
-  }
-
-  .droppable-card-content {
-    display: flex;
-    .np-theme-personal & {
-      border-radius: @small-border-minus-one;
-    }
-  }
-
-  input[type="file"] {
-    opacity: 0;
-    z-index: -1;
-    position: absolute;
-
-    &:focus-visible + label {
-      background-color: var(--color-background-neutral); // Tab focus style
-    }
+  .media {
+    align-items: flex-start;
   }
 }

package/src/uploadInput/uploadButton/UploadButton.spec.tsx

@@ -9,7 +9,6 @@ describe('UploadButton', () => {
 
   const props: UploadButtonProps = {
     onChange: jest.fn(),
-    multipleFileInputWithFilesAdded: true,
   };
 
   const renderComponent = (customProps = props) => render(<UploadButton {...customProps} />);

package/src/uploadInput/uploadButton/UploadButton.tsx

@@ -1,12 +1,10 @@
 import { PlusCircle as PlusIcon, Upload as UploadIcon } from '@transferwise/icons';
-import { useTheme } from '@wise/components-theming';
 import classNames from 'classnames';
 import { ChangeEvent, DragEvent, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 
 import Body from '../../body';
 import { FileType, Typography } from '../../common';
-import { useDirection } from '../../common/hooks';
 
 import MESSAGES from './UploadButton.messages';
 import { DEFAULT_SIZE_LIMIT, imageFileTypes } from './defaults';
@@ -60,11 +58,6 @@ export type UploadButtonProps = {
    * Title for the upload button
    */
   uploadButtonTitle?: string;
-
-  /**
-   * Are there any uploaded items on a multiple-file upload? Used for calculating border radiuses
-   */
-  multipleFileInputWithFilesAdded: boolean;
 };
 
 export enum TEST_IDS {
@@ -87,10 +80,7 @@ const UploadButton = ({
   onChange,
   id = DEFAULT_FILE_INPUT_ID,
   uploadButtonTitle,
-  multipleFileInputWithFilesAdded,
 }: UploadButtonProps) => {
-  const { isModern } = useTheme();
-  const { isRTL } = useDirection();
   const { formatMessage } = useIntl();
   const inputReference = useRef<HTMLInputElement>(null);
 
@@ -167,7 +157,7 @@ const UploadButton = ({
     const areAllFilesAllowed = getFileTypesDescription() === '*';
 
     if (areAllFilesAllowed) {
-      return {}; //file input by default allows all files
+      return {}; // file input by default allows all files
     }
 
     if (Array.isArray(fileTypes)) {
@@ -179,23 +169,15 @@ const UploadButton = ({
 
   function renderDescription() {
     return (
-      <>
-        <Body
-          className={classNames({
-            'text-primary': !disabled,
-            small: !isModern,
-            'font-weight-normal': !isModern,
-          })}
-        >
-          {getDescription()}
-          {maxFiles && (
-            <>
-              <br />
-              {`Maximum ${maxFiles} files.`}
-            </>
-          )}
-        </Body>
-      </>
+      <Body className={classNames({ 'text-primary': !disabled })}>
+        {getDescription()}
+        {maxFiles && (
+          <>
+            <br />
+            {`Maximum ${maxFiles} files.`}
+          </>
+        )}
+      </Body>
     );
   }
 
@@ -226,15 +208,9 @@ const UploadButton = ({
         onChange={filesSelected}
       />
       {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
-      <label
-        htmlFor={id}
-        className={classNames('btn', 'np-upload-accent', 'np-upload-button', {
-          disabled,
-          'np-upload-input--square-top': multipleFileInputWithFilesAdded,
-        })}
-      >
+      <label htmlFor={id} className={classNames('btn', 'np-upload-button')}>
         <div className="media">
-          <div className="np-upload-icon media-left">
+          <div className="np-upload-icon media-middle media-left">
             <UploadIcon size={24} className="text-link" />
           </div>
           <div className="media-body text-xs-left" data-testid={TEST_IDS.mediaBody}>
@@ -253,7 +229,6 @@ const UploadButton = ({
             'droppable-card',
             'droppable-dropping-card',
             'droppable-card-content',
-            { 'np-upload-input--square-top': multipleFileInputWithFilesAdded },
           )}
         >
           <PlusIcon className="m-x-1" size={24} />

package/src/uploadInput/uploadItem/UploadItem.css

@@ -1,74 +1,109 @@
-.np-upload-item:not(:last-child)::after {
+.np-upload-item {
+  border: 1px solid #c9cbce;
+  border: 1px solid var(--color-interactive-secondary);
+}
+.np-upload-item:first-child ~ div:before {
   display: block;
   position: relative;
-  border-bottom: 1px solid rgba(0,0,0,0.10196);
-  border-bottom: 1px solid var(--color-border-neutral);
+  height: 1px;
+  background-color: rgba(0,0,0,0.10196);
+  background-color: var(--color-border-neutral);
   content: " ";
   margin: 0 16px;
   margin: 0 var(--size-16);
 }
-.np-theme-personal .np-upload-item:first-child a:hover,
-.np-theme-personal .np-upload-item:first-child a:focus-visible,
-.np-theme-personal .np-upload-item:first-child a:active {
-  border-top-left-radius: calc(10px - 1px);
-  border-top-left-radius: calc(var(--radius-small) - 1px);
+.np-upload-item:first-child ~ div {
+  border-top: 0;
+}
+.np-upload-item:not(:last-child) {
+  border-bottom: 0;
+}
+.np-upload-item.np-upload-item__link:hover:before,
+.np-upload-button-container:hover:before {
+  margin: 0 !important;
+}
+.np-upload-item.np-upload-item__link:hover + div:before,
+.np-upload-button-container:hover + div:before {
+  margin: 0 !important;
+}
+.np-upload-button-container:has(:focus-visible) {
+  outline: var(--ring-outline-color) solid var(--ring-outline-width);
+  outline-offset: var(--ring-outline-offset);
+  border-color: transparent;
+  outline-offset: -3px;
 }
-.np-theme-personal .np-upload-item:first-child a:hover ~ .np-upload-item__remove-button,
-.np-theme-personal .np-upload-item:first-child a:focus-visible ~ .np-upload-item__remove-button,
-.np-theme-personal .np-upload-item:first-child a:active ~ .np-upload-item__remove-button {
-  border-top-right-radius: calc(10px - 1px);
-  border-top-right-radius: calc(var(--radius-small) - 1px);
+.np-upload-item--single-file:focus-visible,
+.np-upload-item--link:focus-visible,
+.np-upload-button-container:has(:focus-visible) {
+  outline-width: 3px;
 }
 .np-upload-item__link a {
   flex: 1;
   -webkit-text-decoration: none;
   text-decoration: none;
-  outline: none;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+  border-radius: inherit;
 }
-.np-theme-personal .np-upload-item__link a {
-  border-radius: 0;
-  border-radius: initial;
-}
-.np-upload-item__link a.np-upload-item--single-file {
-  border-bottom-left-radius: calc(10px - 1px);
-  border-bottom-left-radius: calc(var(--radius-small) - 1px);
+.np-upload-item__link a:focus-visible {
+  outline-offset: -2px;
 }
 .np-upload-item__link a:hover,
-.np-upload-item__link a:focus-visible,
 .np-upload-item__link a:active {
   -webkit-text-decoration: none;
   text-decoration: none;
   background-color: rgba(134,167,189,0.10196);
   background-color: var(--color-background-neutral);
 }
-.np-upload-item__link a:hover ~ .np-upload-item__remove-button,
-.np-upload-item__link a:focus-visible ~ .np-upload-item__remove-button,
-.np-upload-item__link a:active ~ .np-upload-item__remove-button {
-  background-color: rgba(134,167,189,0.10196);
-  background-color: var(--color-background-neutral);
-}
-.np-upload-item__link .np-upload-item__remove-button.np-upload-item--single-file {
-  border-bottom-right-radius: calc(10px - 1px);
-  border-bottom-right-radius: calc(var(--radius-small) - 1px);
-}
 .np-upload-item__body {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  position: relative;
+  border-radius: inherit;
 }
 .np-upload-item__remove-button {
-  flex-shrink: 0;
-  align-self: stretch;
-  padding: 12px 16px;
-  padding: var(--size-12) var(--size-16);
-  color: #c9cbce;
-  color: var(--color-interactive-secondary);
-  background: transparent;
-}
-.np-upload-item__remove-button:hover,
-.np-upload-item__remove-button:focus {
-  color: #d03238 !important;
-  color: var(--color-interactive-negative-hover) !important;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  align-self: flex-start;
+  position: absolute;
+  height: 24px;
+  height: var(--size-24);
+  min-height: 0;
+  width: 24px;
+  width: var(--size-24);
+  padding: 0;
+  border-radius: 50% !important;
+  outline-offset: 0 !important;
+  background-color: rgba(134,167,189,0.10196);
+  background-color: var(--color-background-neutral);
+  color: var(--color-interactive-primary);
+  right: 16px;
+  right: var(--size-16);
+  top: 16px;
+  top: var(--size-16);
+  transition: color, background-color 0.15s ease-in-out;
+}
+@media (max-width: 320px) {
+  .np-upload-item__remove-button {
+    top: 16px;
+    top: var(--size-16);
+    right: 16px;
+    right: var(--size-16);
+    height: 48px;
+    height: var(--size-48);
+    width: 48px;
+    width: var(--size-48);
+  }
+}
+.np-upload-item__remove-button:hover {
+  background-color: var(--color-sentiment-negative);
+  color: var(--color-contrast-overlay) !important;
+}
+.np-upload-item__remove-button:before {
+  display: block;
+  width: 44px;
+  height: 44px;
+  content: '';
+  border-radius: 50%;
+  position: absolute;
 }