@transferwise/components 0.0.0-experimental-4ba8514 → 0.0.0-experimental-2ea09db

package/src/main.css

@@ -5478,280 +5478,280 @@ html:not([dir="rtl"]) .np-navigation-option {
 .upload-error-message .alert {
   min-width: 100px;
 }
-.np-upload-button-container {
-  border-style: solid;
-}
-.np-upload-button-container .droppable-card-content {
+.np-upload-input__upload-button {
+  position: relative;
+  padding: 16px;
+  padding: var(--size-16);
   display: flex;
+  align-items: center;
+  margin: 0;
+  border-bottom-left-radius: 10px;
+  border-bottom-left-radius: var(--radius-small);
+  border-bottom-right-radius: 10px;
+  border-bottom-right-radius: var(--radius-small);
+  border: var(--outerBorder);
+  cursor: pointer;
 }
-.np-upload-button-container.droppable-dropping {
-  border-color: #c9cbce !important;
-  border-color: var(--color-interactive-secondary) !important;
+.np-upload-input__upload-button .np-upload-input__title {
+  color: var(--color-content-link);
+  -webkit-text-decoration: underline;
+  text-decoration: underline;
+  text-underline-offset: 0.3em;
 }
-.np-upload-button-container.droppable-dropping:before {
-  z-index: 2;
+.np-upload-input__upload-button .np-upload-input__title + .np-upload-input__text {
+  margin-top: 4px;
+  margin-top: var(--size-4);
+  line-height: 22px;
+}
+.np-upload-input__upload-button .np-upload-input__icon {
+  padding-right: 16px;
+  padding-right: var(--size-16);
+  color: var(--color-interactive-primary);
+}
+.np-upload-input__upload-button.is-dropping .np-upload-input__icon,
+.np-upload-input__upload-button.is-dropping .np-upload-input__item-content {
+  display: none;
+}
+.np-upload-input__upload-button:focus-within,
+.np-upload-input__upload-button:focus-visible {
+  outline: var(--ring-outline-color) solid 3px;
+  outline-offset: -3px;
 }
-.np-upload-button-container input[type="file"] {
+.np-upload-input__upload-button-input {
+  position: absolute;
   opacity: 0;
   z-index: -1;
+}
+.np-upload-input__upload-button-input:focus {
+  outline: none;
+}
+.np-upload-input__upload-button .np-upload-input__drop-file-overlay {
+  display: flex;
+  flex: 1;
+  padding: 13px 0 !important;
+  background-color: transparent;
+  transition: transform 0.3s ease;
+  position: relative;
+}
+.np-upload-input__upload-button--with-entries {
+  border-top-width: 0;
+}
+.np-upload-input__upload-button--with-entries:before {
+  display: block;
   position: absolute;
+  height: 1px;
+  background-color: rgba(0,0,0,0.10196);
+  background-color: var(--color-border-neutral);
+  content: " ";
+  left: 16px;
+  left: var(--size-16);
+  width: calc(100% - 2 * 16px);
+  width: calc(100% - 2 * var(--size-16));
+  top: 0;
 }
-.np-upload-button-container .np-upload-button {
-  border: none;
+.np-upload-input__upload-button--without-entries {
+  border-top: var(--outerBorder);
+  border-radius: 10px;
+  border-radius: var(--radius-small);
+}
+.np-upload-input__upload-button--enabled.is-dropping,
+.np-upload-input__upload-button--enabled:hover,
+.np-upload-input__upload-button--enabled:active {
+  background: rgba(134,167,189,0.10196);
+  background: var(--color-background-neutral);
 }
-.np-upload-button {
+.np-upload-input__upload-button--enabled.is-dropping:before,
+.np-upload-input__upload-button--enabled:hover:before,
+.np-upload-input__upload-button--enabled:active:before {
   width: 100%;
-  border-top: 1px solid transparent;
-  padding: 16px;
-  padding: var(--padding-small);
-  border-radius: 0;
+  left: 0;
 }
-label.np-upload-button:not(.disabled):hover,
-label.np-upload-button:not(.disabled):active {
-  background-color: var(--color-background-screen-hover);
+.np-upload-input__upload-button--disabled {
+  cursor: inherit;
 }
-.disabled label.np-upload-button:not(.disabled):hover,
-.disabled label.np-upload-button:not(.disabled):active {
-  background-color: transparent;
+.np-upload-input {
+  --outerBorder: 1px solid var(--color-interactive-secondary);
+  border-radius: 10px;
+  border-radius: var(--radius-small);
 }
-.np-upload-button .media {
-  align-items: flex-start;
+.np-upload-input .np-upload-input__section {
+  margin: 0;
 }
-@media (max-width: 320px) {
-  .np-upload-icon {
-    padding-left: 0;
-  }
+.np-upload-input .np-upload-input__section:only-child .np-upload-input__item {
+  border-radius: 10px;
+  border-radius: var(--radius-small);
+  border-bottom: var(--outerBorder);
 }
-.np-upload-input.form-control {
-  height: auto;
-  padding: 0;
-  padding: initial;
+.np-upload-input .np-upload-input__section:has(.np-upload-input__item:last-child.is-interactive:hover):not(:has(.np-upload-input__item-button:hover)) + .np-upload-input__section--uploader .np-upload-input__upload-button::before {
+  left: 0;
+  width: 100%;
+  top: 0;
 }
-.np-upload-input > div:first-child,
-.np-upload-input > div:first-child .np-upload-item--single-file,
-.np-upload-input > div:first-child .np-upload-item--link {
+.np-upload-input__item {
+  position: relative;
+  padding: 16px;
+  padding: var(--size-16);
+  display: flex;
+  align-items: flex-start;
+  border-left: var(--outerBorder);
+  border-right: var(--outerBorder);
+}
+.np-upload-input__item:first-child {
+  border-top: var(--outerBorder);
   border-top-left-radius: 10px;
   border-top-left-radius: var(--radius-small);
   border-top-right-radius: 10px;
   border-top-right-radius: var(--radius-small);
 }
-.np-upload-input > div:last-child {
-  border-bottom-left-radius: 10px;
-  border-bottom-left-radius: var(--radius-small);
-  border-bottom-right-radius: 10px;
-  border-bottom-right-radius: var(--radius-small);
-}
-.np-theme-personal .np-upload-input.disabled .btn {
-  cursor: inherit;
-}
-.np-theme-personal .np-upload-input .np-upload-icon {
-  color: var(--color-interactive-primary);
+.np-upload-input__item + .np-upload-input__item:before {
+  content: " ";
+  display: block;
+  position: absolute;
+  height: 1px;
+  left: 16px;
+  left: var(--size-16);
+  width: calc(100% - 2 * 16px);
+  width: calc(100% - 2 * var(--size-16));
+  top: 0;
+  background: rgba(0,0,0,0.10196);
+  background: var(--color-border-neutral);
 }
-.np-theme-personal .np-upload-input .media-body {
+.np-upload-input__item .np-upload-input__item-content {
   padding-right: 32px;
   padding-right: var(--size-32);
-  color: var(--color-content-link);
-  white-space: break-spaces;
+  flex: 1;
 }
 @media (max-width: 320px) {
-  .np-theme-personal .np-upload-input .media-body {
+  .np-upload-input__item .np-upload-input__item-content {
     padding-right: 64px;
     padding-right: var(--size-64);
   }
 }
-.np-theme-personal .np-upload-input .media-body .np-text-body-large-bold {
-  -webkit-text-decoration: underline;
-  text-decoration: underline;
-  text-underline-offset: 0.3em;
-}
-.np-theme-personal .np-upload-input .media-body .np-text-body-default,
-.np-theme-personal .np-upload-input .media-body .np-upload-description,
-.np-theme-personal .np-upload-input .media-body .text-positive {
-  color: #5d7079 !important;
-  color: var(--color-content-secondary) !important;
-}
-.np-theme-personal .np-upload-input .media-body .text-negative {
-  color: var(--color-sentiment-negative) !important;
+.np-upload-input__item .np-upload-input__title,
+.np-upload-input__item .np-upload-input__text {
+  margin: 0;
+  -moz-text-align-last: left;
+       text-align-last: left;
+  color: #5d7079;
+  color: var(--color-content-secondary);
 }
-.np-theme-personal .np-upload-input-errors {
-  list-style: none;
-  padding-left: 0;
+.np-upload-input__item .np-upload-input__title + .np-upload-input__text {
+  margin-top: 4px;
+  margin-top: var(--size-4);
 }
-.np-theme-personal .np-upload-input-errors li {
-  position: relative;
-  padding-left: 16px;
-  padding-left: var(--size-16);
+.np-upload-input__item .np-upload-input__icon {
+  padding-right: 16px;
+  padding-right: var(--size-16);
 }
-@media (max-width: 320px) {
-  .np-theme-personal .np-upload-input-errors li {
-    padding-left: 32px;
-    padding-left: var(--size-32);
-  }
+.np-upload-input__item .np-upload-input__item-link,
+.np-upload-input__item .np-upload-input__item-container {
+  align-items: flex-start;
+  display: flex;
+  width: 100%;
 }
-.np-theme-personal .np-upload-input-errors li:before {
-  content: '•';
+.np-upload-input__item .np-upload-input__item-action {
+  --iconSize: var(--size-24);
+  --clickAreaSize: 44px;
+  --buttonTopRightOffset: var(--size-16);
+  --clickAreaTopRightOffset: calc((var(--clickAreaSize) - var(--iconSize)) * -0.5);
   position: absolute;
-  display: block;
-  left: 0;
-}
-.np-theme-personal .np-upload-input .status-circle {
-  width: 24px;
-  width: var(--size-x-small);
-  height: 24px;
-  height: var(--size-x-small);
+  right: 16px;
+  right: var(--buttonTopRightOffset);
+  top: 16px;
+  top: var(--buttonTopRightOffset);
 }
 @media (max-width: 320px) {
-  .np-theme-personal .np-upload-input .status-circle {
-    width: 48px;
-    width: var(--size-large);
-    height: 48px;
-    height: var(--size-large);
+  .np-upload-input__item .np-upload-input__item-action {
+    --iconSize: var(--size-48);
+    --clickAreaTopRightOffset: calc(-1 * var(--buttonTopRightOffset));
   }
 }
-.np-upload-item {
-  border: 1px solid #c9cbce;
-  border: 1px solid var(--color-interactive-secondary);
-  position: relative;
+.np-upload-input__item .np-upload-input__item-action .np-upload-input__item-button {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none;
+  height: var(--iconSize);
+  width: var(--iconSize);
+  padding: 0 4px;
+  padding: 0 var(--size-4);
+  border-radius: 50%;
+  border: 0;
+  background-color: rgba(134,167,189,0.10196);
+  background-color: var(--color-background-neutral);
+  color: var(--color-interactive-primary);
+  transition: color, background-color 0.15s ease-in-out;
+  outline-offset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
-.np-upload-item:first-child ~ div:not(.np-upload-item--link):before,
-.np-upload-item:not(:first-child).np-upload-item--link .np-upload-item__link:before,
-.np-upload-item.np-upload-item--link:hover .np-upload-item__link:after {
+.np-upload-input__item .np-upload-input__item-action .np-upload-input__item-button:before {
+  content: '';
   display: block;
+  width: var(--clickAreaSize);
+  height: var(--clickAreaSize);
+  border-radius: 50%;
   position: absolute;
-  height: 1px;
-  background-color: rgba(0,0,0,0.10196);
-  background-color: var(--color-border-neutral);
-  content: " ";
-  left: 16px;
-  left: var(--size-16);
-  width: calc(100% - 2 * 16px);
-  width: calc(100% - 2 * var(--size-16));
+  top: var(--clickAreaTopRightOffset);
+  right: var(--clickAreaTopRightOffset);
 }
-.np-upload-item:first-child ~ div:not(.np-upload-item--link):before,
-.np-upload-item:not(:first-child).np-upload-item--link .np-upload-item__link:before {
-  top: 0;
-}
-.np-upload-item.np-upload-item--link:hover .np-upload-item__link:after {
-  bottom: -1px;
-}
-.np-upload-item:first-child ~ div {
-  border-top: 1px;
-}
-.np-upload-item:not(:first-child) .np-upload-item__link:hover {
-  border-top-color: rgba(0,0,0,0.10196);
-  border-top-color: var(--color-border-neutral);
-}
-.np-upload-item:not(:last-child) {
-  border-bottom: 0;
-}
-.np-upload-item.np-upload-item--link:hover + .np-upload-item:before,
-.np-upload-item.np-upload-item--link:hover + .np-upload-button-container:before,
-.np-upload-item.np-upload-item--link:hover + .np-upload-item .np-upload-item__link:before,
-.np-upload-item.np-upload-item--link:hover + .np-upload-button-container .np-upload-item__link:before {
-  display: none;
+.np-upload-input__item .np-upload-input__item-action .np-upload-input__item-button:hover {
+  background-color: var(--color-sentiment-negative);
+  color: var(--color-contrast-overlay) !important;
 }
-.np-upload-button-container:hover:before,
-.np-upload-button-container.droppable-dropping:before {
-  left: 0 !important;
-  width: 100% !important;
+.np-upload-input__item .np-upload-input__item-action .np-upload-input__item-button:active {
+  background-color: var(--color-background-neutral-active);
 }
-.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-upload-input__item.is-interactive {
+  padding: 0;
 }
-.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-input__item.is-interactive:hover:not(:has(.np-upload-input__item-button:hover)):before,
+.np-upload-input__item.is-interactive:hover:not(:has(.np-upload-input__item-button:hover)) + .np-upload-input__item:before {
+  width: 100%;
+  left: 0;
 }
-.np-upload-item--link a {
-  flex: 1;
+.np-upload-input__item.is-interactive .np-upload-input__item-link {
+  padding: 16px;
+  padding: var(--size-16);
   -webkit-text-decoration: none;
   text-decoration: none;
-  border-top: 1px solid transparent;
   border-radius: inherit;
+  border-top: 1px solid transparent;
+  background-clip: padding-box;
 }
-.np-upload-item--link a:focus-visible {
+.np-upload-input__item.is-interactive .np-upload-input__item-link:focus-visible {
   outline-offset: -2px;
+  outline-width: 3px;
 }
-.np-upload-item--link a:hover:before {
-  display: none !important;
-}
-.np-upload-item--link a:hover:after {
-  left: 0 !important;
-  width: 100% !important;
-}
-.np-upload-item--link a:hover,
-.np-upload-item--link a:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-.np-upload-item--link a:hover .np-upload-button,
-.np-upload-item--link a:active .np-upload-button {
+.np-upload-input__item.is-interactive .np-upload-input__item-link:hover,
+.np-upload-input__item.is-interactive .np-upload-input__item-link:active {
   background-color: rgba(134,167,189,0.10196);
   background-color: var(--color-background-neutral);
-  border-radius: inherit;
 }
-.np-upload-item--link:first-of-type a {
-  border-top: 0;
+.np-upload-input__item.is-interactive:first-child .np-upload-input__item-link {
+  border-top-width: 0;
 }
-.np-upload-item__body {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+.np-upload-input__item .np-upload-input-errors {
+  padding-left: 0;
+  list-style-type: "";
+}
+.np-upload-input__item .np-upload-input-errors > li {
   position: relative;
-  border-radius: inherit;
+  padding-left: 16px;
+  padding-left: var(--size-16);
 }
-.np-upload-item__remove-button {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  align-self: flex-start;
+.np-upload-input__item .np-upload-input-errors > li::before {
+  content: '•';
   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);
-  border: none;
-  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;
+  display: block;
+  left: 0;
 }
 @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-input__item .np-upload-input-errors > li {
+    padding-left: 32px;
+    padding-left: var(--size-32);
   }
 }
-.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;
-}
 .np-progress {
   border-radius: 10px;
   border-radius: var(--radius-small);

package/src/moneyInput/MoneyInput.messages.ts

@@ -5,9 +5,4 @@ export default defineMessages({
     id: 'neptune.MoneyInput.Select.placeholder',
     defaultMessage: 'Select an option...',
   },
-  selectCurrencyLabel: {
-    id: 'neptune.MoneyInput.Select.selectCurrencyLabel',
-    defaultMessage: 'Select currency',
-    description: 'Visually hidden label for the currency selector input.',
-  },
 });

package/src/moneyInput/MoneyInput.rtl.spec.tsx

@@ -2,7 +2,6 @@ import { Field } from '../field/Field';
 import { mockMatchMedia, mockResizeObserver, render, screen, userEvent } from '../test-utils';
 
 import MoneyInput from './MoneyInput';
-import messages from './MoneyInput.messages';
 
 mockMatchMedia();
 mockResizeObserver();
@@ -52,7 +51,6 @@ describe('MoneyInput', () => {
   const props = {
     currencies,
     selectedCurrency: currencies[1],
-    searchPlaceholder: 'Type a currency / country',
     amount: 1000,
     onAmountChange: jest.fn(),
     onCurrencyChange: jest.fn(),
@@ -92,49 +90,4 @@ describe('MoneyInput', () => {
     );
     expect(screen.getAllByRole('group')[0]).toHaveAccessibleName(/^Recipient gets/);
   });
-
-  describe('ids', () => {
-    it('should guarantee id and connect the input with the selected currency via withId HoC', () => {
-      render(<MoneyInput {...props} />);
-      const input = screen.getByRole('textbox');
-      const button = screen.getByRole('combobox');
-      expect(input.getAttribute('id')).toBeTruthy();
-      expect(input).toHaveAttribute('aria-describedby', button.getAttribute('id'));
-    });
-
-    it('should have unique id for the select filter with predefined id', async () => {
-      const fieldId = 'myFieldId';
-      render(
-        <Field label="Multiple currencies" id={fieldId}>
-          <MoneyInput {...props} />
-        </Field>,
-      );
-      await userEvent.click(screen.getByRole('combobox'));
-      expect(screen.getByLabelText(props.searchPlaceholder)).toHaveAttribute(
-        'id',
-        `${fieldId}SelectedCurrencySearch`,
-      );
-    });
-
-    it('should have unique id for the select filter without predefined id', async () => {
-      render(
-        <Field label="Multiple currencies">
-          <MoneyInput {...props} />
-        </Field>,
-      );
-      await userEvent.click(screen.getByRole('combobox'));
-      expect(screen.getByLabelText(props.searchPlaceholder)).toHaveAttribute(
-        'id',
-        expect.stringMatching(/^:.*?:SelectedCurrencySearch$/),
-      );
-    });
-  });
-
-  it('should have AT label for the currency dropdown', () => {
-    render(<MoneyInput {...props} />);
-    expect(screen.getByRole('combobox')).toHaveAttribute(
-      'aria-label',
-      messages.selectCurrencyLabel.defaultMessage,
-    );
-  });
 });

package/src/moneyInput/MoneyInput.spec.js

@@ -1,4 +1,5 @@
 import { shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
 
 import { MoneyInput, Title, Input, SelectInput } from '..';
 import { mockMatchMedia, mockResizeObserver } from '../test-utils';
@@ -817,4 +818,14 @@ describe('Money Input', () => {
       });
     });
   });
+
+  describe('withId', () => {
+    it('should guarantee id and connect the input with the selected currency', () => {
+      render(<MoneyInput {...props} />);
+      const input = screen.getByRole('textbox');
+      const button = screen.getByRole('combobox');
+      expect(input.getAttribute('id')).toBeTruthy();
+      expect(input).toHaveAttribute('aria-describedby', button.getAttribute('id'));
+    });
+  });
 });

package/src/moneyInput/MoneyInput.story.tsx

@@ -9,13 +9,13 @@ import { Field } from '../field/Field';
 export default {
   component: MoneyInput,
   title: 'Forms/MoneyInput',
-  render: function Render({ id, ...args }) {
+  render: function Render(args) {
     const [selectedCurrency, setSelectedCurrency] = useState(args.selectedCurrency);
 
     const handleOnCurrencyChange = (value: CurrencyOptionItem) => setSelectedCurrency(value);
 
     return (
-      <Field label="Editable money input label" required id={id}>
+      <Field label="Editable money input label" required>
         <MoneyInput
           {...args}
           selectedCurrency={selectedCurrency}
@@ -129,7 +129,6 @@ export const MultipleCurrencies: Story = {
     },
     selectedCurrency: exampleCurrency.usd,
     searchPlaceholder: 'Type a currency / country',
-    id: 'moneyInput',
   },
 };
 
@@ -156,22 +155,20 @@ export const OpenedInput: Story = {
 };
 
 export const SmallInput: Story = {
-  render: ({ id, ...args }) => {
+  render: (args) => {
     return (
       <>
-        <Field label="Money inputs" required>
+        <Field id={args.id} label="Money inputs" required>
           <MoneyInput {...args} {...SingleCurrency.args} />
         </Field>
         <br />
-        <Field label="Multiple currencies">
-          <MoneyInput {...args} {...MultipleCurrencies.args} />
-        </Field>
+        <MoneyInput {...args} {...MultipleCurrencies.args} />
         <hr />
-        <Field label="Error state" sentiment="negative" required>
+        <Field id={args.id} label="Error states" sentiment="negative" required>
           <MoneyInput {...args} {...SingleCurrency.args} />
         </Field>
         <br />
-        <Field label="Multiple currencies: error state" sentiment="negative">
+        <Field sentiment="negative">
           <MoneyInput {...args} {...MultipleCurrencies.args} />
         </Field>
       </>

package/src/moneyInput/MoneyInput.tsx

@@ -314,7 +314,7 @@ class MoneyInput extends Component<MoneyInputPropsWithInputAttributes, MoneyInpu
 
     const isFixedCurrency = (!this.state.searchQuery && hasSingleCurrency()) || !onCurrencyChange;
     const disabled = !this.props.onAmountChange;
-    const selectedCurrencyElementId = `${inputAttributes?.id ?? amountInputId}SelectedCurrency`;
+    const selectedCurrencyElementId = `${amountInputId}SelectedCurrency`;
 
     return (
       <div
@@ -387,13 +387,6 @@ class MoneyInput extends Component<MoneyInputPropsWithInputAttributes, MoneyInpu
             )}
           >
             <SelectInput
-              UNSAFE_triggerButtonProps={{
-                id: undefined,
-                'aria-labelledby': undefined,
-                'aria-describedby': undefined,
-                'aria-invalid': undefined,
-                'aria-label': this.props.intl.formatMessage(messages.selectCurrencyLabel),
-              }}
               id={selectedCurrencyElementId}
               items={selectOptions}
               value={selectedCurrency}