@transferwise/components 46.13.0 → 46.15.0

package/src/decision/Decision.spec.js

@@ -3,16 +3,16 @@ import '@testing-library/jest-dom';
 
 import Avatar from '../avatar';
 import { Breakpoint, Size } from '../common';
-import { render, fireEvent } from '../test-utils';
+import { mockMatchMedia } from '../mocks';
+import { render, fireEvent, screen } from '../test-utils';
 
-import { Presentation, Type } from './decisionEnums';
-
-import Decision from '.';
+import Decision, { DecisionPresentation, DecisionType } from '.';
 
 jest.mock('lodash.throttle', () => jest.fn((fn) => fn));
+mockMatchMedia(jest);
 
 describe('Decision', () => {
-  const props = {
+  const commonProps = {
     options: [
       {
         media: {
@@ -25,112 +25,107 @@ describe('Decision', () => {
         onClick: jest.fn(),
       },
     ],
-    presentation: Presentation.LIST_BLOCK,
-    type: Type.NAVIGATION,
+    presentation: DecisionPresentation.LIST_BLOCK,
+    type: DecisionType.NAVIGATION,
   };
 
+  const initialInnerWidth = window.innerWidth;
   const resetClientWidth = (width) => {
-    Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
-      configurable: true,
-      value: width,
-    });
+    window.innerWidth = width;
   };
 
   afterAll(() => {
-    const originalClientWidth = Object.getOwnPropertyDescriptor(
-      HTMLElement.prototype,
-      'clientWidth',
-    );
-
-    Object.defineProperty(HTMLElement.prototype, 'clientWidth', originalClientWidth);
+    window.innerWidth = initialInnerWidth;
   });
 
-  let container;
   beforeEach(() => {
     resetClientWidth(Breakpoint.EXTRA_SMALL - 1);
   });
 
-  describe(`when presentation is ${Presentation.LIST_BLOCK}`, () => {
-    beforeEach(() => {
-      ({ container } = render(<Decision {...props} />));
-    });
+  describe(`when presentation is ${DecisionPresentation.LIST_BLOCK}`, () => {
+    const props = { ...commonProps };
 
     it('renders only Navigation Option before first breakpoint', () => {
-      expect(getNavigationOption()).toBeInTheDocument();
-      expect(getTile()).not.toBeInTheDocument();
+      const { container } = render(<Decision {...props} />);
+
+      expect(getNavigationOption(container)).toBeInTheDocument();
+      expect(getTile(container)).not.toBeInTheDocument();
     });
 
     it('renders only Tile after first breakpoint', () => {
       resetClientWidth(Breakpoint.SMALL);
-      fireEvent(window, new Event('resize'));
+      const { container } = render(<Decision {...props} />);
 
-      expect(getNavigationOption()).not.toBeInTheDocument();
-      expect(getTile()).toBeInTheDocument();
-      expect(getTile()).not.toHaveClass('np-tile--small');
+      expect(getNavigationOption(container)).not.toBeInTheDocument();
+      expect(getTile(container)).toBeInTheDocument();
+      expect(getTile(container)).not.toHaveClass('np-tile--small');
     });
   });
 
-  describe(`when presentation is ${Presentation.LIST_BLOCK_GRID}`, () => {
-    beforeEach(() => {
-      ({ container } = render(<Decision {...props} presentation={Presentation.LIST_BLOCK_GRID} />));
-    });
+  describe(`when presentation is ${DecisionPresentation.LIST_BLOCK_GRID}`, () => {
+    const props = { ...commonProps, presentation: DecisionPresentation.LIST_BLOCK_GRID };
 
     it('renders only Navigation Option before first breakpoint', () => {
-      expect(getNavigationOption()).toBeInTheDocument();
-      expect(getTile()).not.toBeInTheDocument();
+      const { container } = render(<Decision {...props} />);
+
+      expect(getNavigationOption(container)).toBeInTheDocument();
+      expect(getTile(container)).not.toBeInTheDocument();
     });
 
     it('renders only Tile after first breakpoint', () => {
       resetClientWidth(Breakpoint.SMALL);
-      fireEvent(window, new Event('resize'));
+      const { container } = render(<Decision {...props} />);
 
-      expect(getNavigationOption()).not.toBeInTheDocument();
-      expect(getTile()).toBeInTheDocument();
-      expect(getTile()).not.toHaveClass('np-tile--small');
+      expect(getNavigationOption(container)).not.toBeInTheDocument();
+      expect(getTile(container)).toBeInTheDocument();
+      expect(getTile(container)).not.toHaveClass('np-tile--small');
     });
 
     it('renders container as a grid', () => {
       resetClientWidth(Breakpoint.SMALL);
-      fireEvent(window, new Event('resize'));
+      const { container } = render(<Decision {...props} />);
 
-      expect(container.querySelector('.np-decision')).toHaveClass('np-decision--grid');
-      expect(container.querySelector('.np-size-swapper')).toHaveClass('flex-wrap');
+      const decisionElement = container.querySelector('.np-decision');
+      expect(decisionElement).toHaveClass('np-decision--grid');
+      expect(decisionElement).toHaveClass('flex-wrap');
     });
   });
 
-  describe(`when presentation is ${Presentation.LIST_BLOCK} and size is Small`, () => {
-    beforeEach(() => {
-      ({ container } = render(
-        <Decision {...props} presentation={Presentation.LIST_BLOCK} size={Size.SMALL} />,
-      ));
-    });
+  describe(`when presentation is ${DecisionPresentation.LIST_BLOCK} and size is Small`, () => {
+    const props = {
+      ...commonProps,
+      presentation: DecisionPresentation.LIST_BLOCK,
+      size: Size.SMALL,
+    };
 
     it('renders only Navigation Option before breakpoint', () => {
-      expect(getNavigationOption()).toBeInTheDocument();
-      expect(getTile()).not.toBeInTheDocument();
+      const { container } = render(<Decision {...props} />);
+
+      expect(getNavigationOption(container)).toBeInTheDocument();
+      expect(getTile(container)).not.toBeInTheDocument();
     });
 
     it('renders Small Tile after breakpoint', () => {
       resetClientWidth(Breakpoint.EXTRA_SMALL);
-      fireEvent(window, new Event('resize'));
+      const { container } = render(<Decision {...props} />);
 
-      expect(getNavigationOption()).not.toBeInTheDocument();
-      expect(getTile()).toBeInTheDocument();
-      expect(getTile()).toHaveClass('np-tile--small');
+      expect(getNavigationOption(container)).not.toBeInTheDocument();
+      expect(getTile(container)).toBeInTheDocument();
+      expect(getTile(container)).toHaveClass('np-tile--small');
     });
   });
 
-  describe(`when presentation is ${Presentation.LIST}`, () => {
-    beforeEach(() => {
-      ({ container } = render(<Decision {...props} presentation={Presentation.LIST} />));
-    });
+  describe(`when presentation is ${DecisionPresentation.LIST}`, () => {
+    const props = { ...commonProps, presentation: DecisionPresentation.LIST };
 
     it('renders Navigation Option before breakpoint', () => {
-      expect(getNavigationOption()).toBeInTheDocument();
-      expect(getTile()).not.toBeInTheDocument();
+      const { container } = render(<Decision {...props} />);
+
+      expect(getNavigationOption(container)).toBeInTheDocument();
+      expect(getTile(container)).not.toBeInTheDocument();
     });
   });
 
-  const getNavigationOption = () => container.querySelector('.np-navigation-option');
-  const getTile = () => container.querySelector('.np-tile');
+  const getNavigationOption = (container) => container.querySelector('.np-navigation-option');
+  const getTile = (container) => container.querySelector('.np-tile');
 });

package/src/decision/{Decision.story.js → Decision.story.tsx}

@@ -21,7 +21,7 @@ export const Basic = () => {
   const disabled = boolean('disabled', false);
   const showMediaCircleInList = boolean('showMediaCircleInList', true);
   const isContainerAligned = boolean('isContainerAligned', false);
-  const size = select('size', [Size.MEDIUM, Size.SMALL]);
+  const size = select('size', [Size.MEDIUM, Size.SMALL], Size.MEDIUM);
 
   return (
     <>
@@ -33,7 +33,7 @@ export const Basic = () => {
             href: '#href1',
             disabled,
             media: {
-              block: <Illustration name="globe" alt="" disableMargin />,
+              block: <Illustration name="globe" alt="" disablePadding />,
               list: (
                 <Avatar size="md" type="initials">
                   HM
@@ -49,7 +49,7 @@ export const Basic = () => {
             disabled,
             href: '#href2',
             media: {
-              block: <Illustration name="confetti" alt="" disableMargin />,
+              block: <Illustration name="confetti" alt="" disablePadding />,
               list: (
                 <Avatar size="md" type="initials">
                   HM
@@ -61,7 +61,7 @@ export const Basic = () => {
           {
             description: "I'm disabled and don't require an onClick or href.",
             media: {
-              block: <Illustration name="briefcase" alt="" disableMargin />,
+              block: <Illustration name="briefcase" alt="" disablePadding />,
               list: (
                 <img
                   src="https://wise.com/public-resources/assets/illustrations/business_account_web_small.svg"
@@ -91,7 +91,7 @@ export const grid = () => {
     DecisionPresentation.LIST_BLOCK_GRID,
   );
   const disabled = boolean('disabled', false);
-  const size = select('size', [Size.MEDIUM, Size.SMALL]);
+  const size = select('size', [Size.MEDIUM, Size.SMALL], Size.MEDIUM);
 
   return (
     <>

package/src/decision/Decision.tsx

@@ -0,0 +1,133 @@
+import classNames from 'classnames';
+
+import { Size, Breakpoint, SizeSmall, SizeMedium } from '../common';
+import { useScreenSize } from '../common/hooks/useScreenSize';
+import NavigationOption from '../navigationOption';
+import Tile from '../tile';
+
+interface DecisionOption {
+  description?: React.ReactNode;
+  disabled?: boolean;
+  href?: string;
+  target?: React.HTMLAttributeAnchorTarget;
+  media: {
+    block: React.ReactNode;
+    list: React.ReactNode;
+  };
+  onClick?: React.MouseEventHandler<HTMLElement>;
+  title: React.ReactNode;
+}
+
+export enum DecisionPresentation {
+  LIST = 'LIST',
+  LIST_BLOCK = 'LIST_BLOCK',
+  LIST_BLOCK_GRID = 'LIST_BLOCK_GRID',
+}
+
+export enum DecisionType {
+  NAVIGATION = 'NAVIGATION',
+}
+
+export interface DecisionProps {
+  /**  A list of elements to be rendered */
+  options: DecisionOption[];
+  /**  Handles the display mode of the component */
+  presentation?: `${DecisionPresentation}`;
+  /** Size currently affects only Tile dimension */
+  size?: SizeSmall | SizeMedium;
+  /** Decide which kind of element type needs to be rendered ex: Navigation Options or in the future Radio or Checkbox Options */
+  type?: `${DecisionType}`;
+
+  /** Display media in a circle in list presentation */
+  showMediaCircleInList?: boolean;
+
+  /** Sets navigation options to be aligned with the parent container */
+  isContainerAligned?: boolean;
+}
+
+const Decision = ({
+  options,
+  presentation = DecisionPresentation.LIST,
+  size = Size.MEDIUM,
+  type = DecisionType.NAVIGATION,
+  showMediaCircleInList = true,
+  isContainerAligned = false,
+}: DecisionProps) => {
+  const screenXs = useScreenSize(Breakpoint.EXTRA_SMALL);
+  const screenSm = useScreenSize(Breakpoint.SMALL);
+
+  if (type === DecisionType.NAVIGATION) {
+    const renderedOptions = options.map(
+      ({ title, description, disabled, href, target, media: { list }, onClick }, key) => (
+        <NavigationOption
+          // eslint-disable-next-line react/no-array-index-key
+          key={`nav-${key}`}
+          complex={false}
+          content={description}
+          disabled={disabled}
+          href={href}
+          target={target}
+          media={list}
+          showMediaAtAllSizes
+          showMediaCircle={showMediaCircleInList}
+          isContainerAligned={isContainerAligned}
+          title={title}
+          onClick={onClick}
+        />
+      ),
+    );
+
+    if (
+      presentation === DecisionPresentation.LIST_BLOCK ||
+      presentation === DecisionPresentation.LIST_BLOCK_GRID
+    ) {
+      const isSmall = size === Size.SMALL;
+      const breakpoint = isSmall ? screenXs : screenSm;
+
+      const isGrid = presentation === DecisionPresentation.LIST_BLOCK_GRID;
+
+      return (
+        <div
+          className={classNames(
+            'np-decision d-flex',
+            {
+              'np-decision--small': isSmall,
+              'np-decision--grid': isGrid,
+            },
+            breakpoint ? isGrid && 'flex-wrap' : 'flex-column',
+          )}
+        >
+          {breakpoint
+            ? options.map(
+                (
+                  { description, disabled, href, target, media: { block }, onClick, title },
+                  key,
+                ) => (
+                  <Tile
+                    // eslint-disable-next-line react/no-array-index-key
+                    key={`tile-${key}`}
+                    className={classNames(`np-decision__tile${isSmall ? '--small' : ''}`, {
+                      'np-decision__tile--fixed-width': isGrid,
+                    })}
+                    description={description}
+                    disabled={disabled}
+                    href={href}
+                    target={target}
+                    media={block}
+                    size={isSmall ? Size.SMALL : Size.MEDIUM}
+                    title={title}
+                    onClick={onClick}
+                  />
+                ),
+              )
+            : renderedOptions}
+        </div>
+      );
+    }
+    // LIST
+    return <>{renderedOptions}</>;
+  }
+  return null;
+};
+
+export default Decision;

package/src/decision/index.ts

@@ -0,0 +1 @@
+export { default, DecisionPresentation, DecisionType } from './Decision';

package/src/index.ts

@@ -1,7 +1,9 @@
 /**
  * Types
  */
+export type { DecisionProps } from './decision/Decision';
 export type { InputProps } from './inputs/Input';
+export type { DateInputProps } from './dateInput';
 export type { InputWithDisplayFormatProps } from './inputWithDisplayFormat';
 export type { InputGroupProps } from './inputs/InputGroup';
 export type { SearchInputProps } from './inputs/SearchInput';
@@ -16,6 +18,9 @@ export type {
 } from './inputs/SelectInput';
 export type { TextAreaProps } from './inputs/TextArea';
 export type { PhoneNumberInputProps } from './phoneNumberInput/PhoneNumberInput';
+export type { RadioProps } from './radio';
+export type { RadioGroupProps } from './radioGroup';
+export type { RadioOptionProps } from './radioOption';
 export type { SnackbarProps } from './snackbar/Snackbar';
 export type { SnackbarContextType } from './snackbar/SnackbarContext';
 export type { TextareaWithDisplayFormatProps } from './textareaWithDisplayFormat';

package/src/main.css

@@ -1598,95 +1598,19 @@ button.np-option {
 .np-decision .decision {
   display: flex;
 }
-.np-decision__tile--small + .np-decision__tile--small {
-  margin-left: 16px;
-  margin-left: var(--size-16);
-}
-[dir="rtl"] .np-decision__tile--small + .np-decision__tile--small {
-  margin-right: 16px;
-  margin-right: var(--size-16);
-  margin-left: 0;
-  margin-left: initial;
-}
-.np-decision.np-decision--grid .np-decision__tile--small {
-  margin-left: 0;
-  margin-bottom: 16px !important;
-  margin-bottom: var(--size-16) !important;
-}
-[dir="rtl"] .np-decision.np-decision--grid .np-decision__tile--small {
-  margin-right: 0;
-  margin-left: 0;
-  margin-left: initial;
-}
-.np-decision.np-decision--grid .np-decision__tile--small:not(:last-of-type) {
-  margin-right: 16px;
-  margin-right: var(--size-16);
-}
-[dir="rtl"] .np-decision.np-decision--grid .np-decision__tile--small:not(:last-of-type) {
-  margin-left: 16px;
-  margin-left: var(--size-16);
-  margin-right: 0;
-  margin-right: initial;
-}
-.np-decision__tile + .np-decision__tile {
-  margin-left: 24px;
-  margin-left: var(--size-24);
-}
-[dir="rtl"] .np-decision__tile + .np-decision__tile {
-  margin-right: 24px;
-  margin-right: var(--size-24);
-  margin-left: 0;
-  margin-left: initial;
-}
-.np-decision .np-text-title-subsection {
-  margin-bottom: 0;
-}
 .np-decision__tile--small .np-text-title-subsection {
   font-size: 1rem;
   font-size: var(--font-size-16);
   line-height: 1.2;
   line-height: var(--line-height-title);
-  margin-bottom: 0;
-}
-.np-decision.np-decision--grid .np-decision__tile {
-  margin-left: 0;
-  margin-bottom: 24px !important;
-  margin-bottom: var(--size-24) !important;
-}
-[dir="rtl"] .np-decision.np-decision--grid .np-decision__tile {
-  margin-right: 0;
-  margin-left: 0;
-  margin-left: initial;
-}
-.np-decision.np-decision--grid .np-decision__tile:not(:last-of-type) {
-  margin-right: 24px;
-  margin-right: var(--size-24);
 }
-[dir="rtl"] .np-decision.np-decision--grid .np-decision__tile:not(:last-of-type) {
-  margin-left: 24px;
-  margin-left: var(--size-24);
-  margin-right: 0;
-  margin-right: initial;
-}
-.np-decision.np-decision--grid .np-size-swapper {
-  margin-right: calc(0 - 24px);
-  margin-right: calc(0 - var(--size-24));
-}
-[dir="rtl"] .np-decision.np-decision--grid .np-size-swapper {
-  margin-left: calc(0 - 24px);
-  margin-left: calc(0 - var(--size-24));
-  margin-right: 0;
-  margin-right: initial;
-}
-.np-decision.np-decision--grid.np-decision--small .np-size-swapper {
-  margin-right: calc(0 - 16px);
-  margin-right: calc(0 - var(--size-16));
+.np-decision:not(.flex-column) {
+  gap: 24px;
+  gap: var(--size-24);
 }
-[dir="rtl"] .np-decision.np-decision--grid.np-decision--small .np-size-swapper {
-  margin-left: calc(0 - 16px);
-  margin-left: calc(0 - var(--size-16));
-  margin-right: 0;
-  margin-right: initial;
+.np-decision:not(.flex-column).np-decision--small {
+  gap: 16px;
+  gap: var(--size-16);
 }
 .tw-definition-list__item dd {
   word-break: break-all;

package/src/promoCard/PromoCard.tsx

@@ -13,7 +13,6 @@ import { usePromoCardContext } from './PromoCardContext';
 import PromoCardIndicator, { PromoCardIndicatorProps } from './PromoCardIndicator';
 
 export type ReferenceType = React.Ref<HTMLInputElement>;
-export type LinkTarget = '_blank' | '_parent' | '_self' | '_top';
 export type RelatedTypes =
   | ''
   | 'alternate'
@@ -98,7 +97,7 @@ export interface PromoCardLinkProps extends PromoCardCommonProps, Omit<CardProps
   rel?: RelatedTypes;
 
   /** Optional prop to to display where the linked URL will show */
-  target?: LinkTarget;
+  target?: React.HTMLAttributeAnchorTarget;
 
   /** Only applies to role="radio" or "checkbox" */
   defaultChecked?: never;

package/src/radio/{Radio.story.js → Radio.story.tsx}

@@ -1,5 +1,4 @@
 import { boolean, text } from '@storybook/addon-knobs';
-import { Check } from '@transferwise/icons';
 import { Flag } from '@wise/art';
 import { useState } from 'react';
 
@@ -62,7 +61,6 @@ export const Basic = () => {
       <div className={`form-group  ${hasError ? 'has-error' : ''}`}>
         <Checkbox
           label={label}
-          name="lol"
           id="test"
           checked={checked}
           disabled={disabled}
@@ -73,7 +71,6 @@ export const Basic = () => {
       <div className={`form-group  ${hasError ? 'has-error' : ''}`}>
         <Checkbox
           label={label}
-          name="lol"
           id="test"
           checked={checked}
           disabled={disabled}

package/src/radio/{Radio.js → Radio.tsx}

@@ -1,12 +1,27 @@
 import { useTheme } from '@wise/components-theming';
 import classNames from 'classnames';
-import PropTypes from 'prop-types';
 
 import Body from '../body/Body';
 import { Typography } from '../common';
 import RadioButton from '../common/RadioButton';
+import { RadioButtonProps } from '../common/RadioButton/RadioButton';
 
-const Radio = ({ label, id, disabled, className, avatar, secondary, ...otherProps }) => {
+export interface RadioProps<T extends string | number = string> extends RadioButtonProps<T> {
+  avatar?: React.ReactNode;
+  label: string;
+  secondary?: string;
+  className?: string;
+}
+
+export default function Radio<T extends string | number = string>({
+  label,
+  id,
+  disabled,
+  className,
+  avatar,
+  secondary,
+  ...otherProps
+}: RadioProps<T>) {
   const { isModern } = useTheme();
   return (
     <div
@@ -39,29 +54,4 @@ const Radio = ({ label, id, disabled, className, avatar, secondary, ...otherProp
       </label>
     </div>
   );
-};
-
-Radio.propTypes = {
-  avatar: PropTypes.element,
-  checked: PropTypes.bool,
-  disabled: PropTypes.bool,
-  id: PropTypes.string,
-  label: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  onChange: PropTypes.func.isRequired,
-  secondary: PropTypes.string,
-  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  className: PropTypes.string,
-};
-
-Radio.defaultProps = {
-  avatar: undefined,
-  checked: false,
-  disabled: false,
-  id: null,
-  secondary: null,
-  value: '',
-  className: undefined,
-};
-
-export default Radio;
+}

package/src/radio/index.ts

@@ -0,0 +1,2 @@
+export { default } from './Radio';
+export type { RadioProps } from './Radio';

package/src/radioGroup/RadioGroup.spec.js

@@ -40,37 +40,35 @@ describe('RadioGroup', () => {
   it('renders radio options', () => {
     const component = shallow(<RadioGroup radios={RADIOS} {...props} />);
     expect(component.find(Radio)).toHaveLength(RADIOS.length);
-    expect(JSON.stringify(component.find(Radio).at(0).props())).toStrictEqual(
-      JSON.stringify({
-        id: 'id-test-0',
-        value: 'value-test0',
-        label: 'Radio1',
-        name: 'radio-group',
-        disabled: true,
-        checked: false,
-        secondary: 'secondary',
-        onChange: () => props.onChange,
-        avatar,
-      }),
-    );
+
+    const { onChange, ...primitiveProps } = component.find(Radio).at(0).props();
+    expect(primitiveProps).toStrictEqual({
+      id: 'id-test-0',
+      value: 'value-test0',
+      label: 'Radio1',
+      name: 'radio-group',
+      disabled: true,
+      checked: false,
+      secondary: 'secondary',
+      avatar,
+    });
   });
 
   it('renders a single radio option, when radios array contains a single element', () => {
     const component = shallow(<RadioGroup radios={RADIOS.slice(0, 1)} {...props} />);
     expect(component.find(Radio)).toHaveLength(1);
-    expect(JSON.stringify(component.find(Radio).at(0).props())).toStrictEqual(
-      JSON.stringify({
-        id: 'id-test-0',
-        value: 'value-test0',
-        label: 'Radio1',
-        name: 'radio-group',
-        disabled: true,
-        checked: false,
-        secondary: 'secondary',
-        onChange: () => props.onChange,
-        avatar,
-      }),
-    );
+
+    const { onChange, ...primitiveProps } = component.find(Radio).at(0).props();
+    expect(primitiveProps).toStrictEqual({
+      id: 'id-test-0',
+      value: 'value-test0',
+      label: 'Radio1',
+      name: 'radio-group',
+      disabled: true,
+      checked: false,
+      secondary: 'secondary',
+      avatar,
+    });
   });
 
   it('checks specified radio', () => {