@transferwise/components 46.144.1 → 46.146.0

package/src/calendar/Calendar.test.tsx

@@ -0,0 +1,138 @@
+import { mockMatchMedia, render, screen, userEvent } from '../test-utils';
+import Calendar from './Calendar';
+
+mockMatchMedia();
+
+const user = userEvent.setup();
+
+const initialValue = new Date(2000, 0, 1);
+
+describe('Calendar', () => {
+  describe('in day view', () => {
+    it.each([
+      ['{ArrowLeft}', -1],
+      ['{ArrowRight}', +1],
+      ['{ArrowUp}', -7],
+      ['{ArrowDown}', +7],
+    ])("handles '%s' to step %d day(s)", async (text: string, step: number) => {
+      const handleChange = jest.fn();
+      render(<Calendar value={initialValue} onChange={handleChange} />);
+
+      await user.click(screen.getByRole('button', { name: /selected day/iu }));
+      await user.keyboard(text);
+
+      const expected = new Date(initialValue);
+      expected.setDate(initialValue.getDate() + step);
+      expect(handleChange).toHaveBeenCalledWith(expected);
+    });
+
+    it('selects a day on click', async () => {
+      const handleChange = jest.fn();
+      render(<Calendar value={initialValue} onChange={handleChange} />);
+
+      await user.click(screen.getByText('15'));
+
+      expect(handleChange).toHaveBeenCalledWith(new Date(2000, 0, 15));
+    });
+
+    it('calls onSelect instead of onChange when clicking a day', async () => {
+      const handleChange = jest.fn();
+      const handleSelect = jest.fn();
+      render(<Calendar value={initialValue} onChange={handleChange} onSelect={handleSelect} />);
+
+      await user.click(screen.getByText('15'));
+
+      expect(handleSelect).toHaveBeenCalledWith(new Date(2000, 0, 15));
+      expect(handleChange).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('in year view', () => {
+    it.each([
+      ['{ArrowLeft}', -1],
+      ['{ArrowRight}', +1],
+      ['{ArrowUp}', -4],
+      ['{ArrowDown}', +4],
+    ])("handles '%s' to step %d year(s)", async (text: string, step: number) => {
+      const handleChange = jest.fn();
+      render(<Calendar value={initialValue} onChange={handleChange} />);
+
+      await user.click(screen.getByRole('button', { name: /year view/iu }));
+      await user.keyboard(text);
+
+      const expected = new Date(initialValue);
+      expected.setFullYear(initialValue.getFullYear() + step);
+      expect(handleChange).toHaveBeenCalledWith(expected);
+    });
+  });
+
+  describe('in month view', () => {
+    it.each([
+      ['{ArrowLeft}', -1],
+      ['{ArrowRight}', +1],
+      ['{ArrowUp}', -4],
+      ['{ArrowDown}', +4],
+    ])("handles '%s' to step %d month(s)", async (text: string, step: number) => {
+      const handleChange = jest.fn();
+      render(<Calendar value={initialValue} onChange={handleChange} />);
+
+      await user.click(screen.getByRole('button', { name: /year view/iu }));
+      await user.keyboard(' ');
+      await user.keyboard(text);
+
+      const expected = new Date(initialValue);
+      expected.setMonth(initialValue.getMonth() + step);
+      expect(handleChange).toHaveBeenCalledWith(expected);
+    });
+  });
+
+  describe('min/max clamping', () => {
+    it('limits navigation to min value', async () => {
+      const min = new Date(initialValue);
+      min.setDate(min.getDate() - 1);
+      const handleChange = jest.fn();
+      render(<Calendar value={initialValue} min={min} onChange={handleChange} />);
+
+      await user.click(screen.getByRole('button', { name: /selected day/iu }));
+      await user.keyboard('{ArrowLeft}{ArrowLeft}');
+
+      expect(handleChange).toHaveBeenLastCalledWith(min);
+    });
+
+    it('limits navigation to max value', async () => {
+      const max = new Date(initialValue);
+      max.setDate(max.getDate() + 1);
+      const handleChange = jest.fn();
+      render(<Calendar value={initialValue} max={max} onChange={handleChange} />);
+
+      await user.click(screen.getByRole('button', { name: /selected day/iu }));
+      await user.keyboard('{ArrowRight}{ArrowRight}');
+
+      expect(handleChange).toHaveBeenLastCalledWith(max);
+    });
+
+    it('clamps value to range when value is outside min/max', () => {
+      const min = new Date(2000, 0, 5);
+      const max = new Date(2000, 0, 20);
+      const handleChange = jest.fn();
+      render(<Calendar value={initialValue} min={min} max={max} onChange={handleChange} />);
+
+      expect(handleChange).toHaveBeenCalledWith(min);
+    });
+  });
+
+  describe('view switching', () => {
+    it('switches to year view and back to day view', async () => {
+      render(<Calendar value={initialValue} onChange={jest.fn()} />);
+
+      await user.click(screen.getByRole('button', { name: /year view/iu }));
+      expect(screen.getByRole('button', { name: /selected year/iu })).toBeInTheDocument();
+
+      await user.click(screen.getByRole('button', { name: /selected year/iu }));
+      expect(screen.getByRole('button', { name: /selected month/iu })).toBeInTheDocument();
+
+      await user.click(screen.getByRole('button', { name: /selected month/iu }));
+      expect(screen.getByRole('button', { name: /next month/iu })).toBeInTheDocument();
+    });
+  });
+});

package/src/calendar/Calendar.tsx

@@ -0,0 +1,165 @@
+import { useState, useCallback, useEffect, KeyboardEvent } from 'react';
+
+import { MonthFormat } from '../common';
+import { isWithinRange, moveToWithinRange, returnDateView } from '../common/dateUtils';
+import DayCalendar from './dayCalendar';
+import { getStartOfDay } from './getStartOfDay';
+import MonthCalendar from './monthCalendar';
+import YearCalendar from './yearCalendar';
+
+export interface CalendarProps {
+  value: Date | null;
+  min?: Date | null;
+  max?: Date | null;
+  monthFormat?: `${MonthFormat}`;
+  placeholder?: string;
+  onChange: (date: Date | null) => void;
+  onSelect?: (date: Date) => void;
+}
+
+const Calendar = ({
+  value,
+  min: minProp = null,
+  max: maxProp = null,
+  monthFormat = MonthFormat.LONG,
+  placeholder,
+  onChange,
+  onSelect,
+}: CalendarProps) => {
+  const selectedDate = getStartOfDay(value);
+  const min = getStartOfDay(minProp);
+  const max = getStartOfDay(maxProp);
+
+  useEffect(() => {
+    if (selectedDate && !isWithinRange(selectedDate, min, max)) {
+      onChange(moveToWithinRange(selectedDate, min, max));
+    }
+  }, [selectedDate?.getTime(), min?.getTime(), max?.getTime(), onChange]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  const dateView = returnDateView(selectedDate, min, max);
+  const [viewMonth, setViewMonth] = useState(dateView.getMonth());
+  const [viewYear, setViewYear] = useState(dateView.getFullYear());
+  const [mode, setMode] = useState<'day' | 'month' | 'year'>('day');
+
+  useEffect(() => {
+    const view = returnDateView(selectedDate, min, max);
+    // eslint-disable-next-line react-hooks/set-state-in-effect
+    setViewMonth(view.getMonth());
+
+    setViewYear(view.getFullYear());
+  }, [selectedDate?.getTime(), min?.getTime(), max?.getTime()]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  const handleViewDateUpdate = useCallback(
+    // eslint-disable-next-line react-hooks/preserve-manual-memoization
+    ({ month, year }: { month?: number; year?: number }) => {
+      if (month !== undefined) setViewMonth(month);
+      if (year !== undefined) setViewYear(year);
+    },
+    [],
+  );
+
+  const switchToDays = useCallback(() => setMode('day'), []);
+  const switchToMonths = useCallback(() => setMode('month'), []);
+  const switchToYears = useCallback(() => setMode('year'), []);
+
+  const handleSelectedDateUpdate = useCallback(
+    (date: Date) => {
+      if (onSelect) {
+        onSelect(date);
+      } else {
+        onChange(date);
+      }
+    },
+    [onChange, onSelect],
+  );
+
+  const adjustDate = useCallback(
+    (daysToAdd: number, monthsToAdd: number, yearsToAdd: number) => {
+      let date: Date | null;
+      if (selectedDate) {
+        date = new Date(
+          mode === 'year' ? selectedDate.getFullYear() + yearsToAdd : selectedDate.getFullYear(),
+          mode === 'month' ? selectedDate.getMonth() + monthsToAdd : selectedDate.getMonth(),
+          mode === 'day' ? selectedDate.getDate() + daysToAdd : selectedDate.getDate(),
+        );
+      } else {
+        date = getStartOfDay(new Date());
+      }
+      date &&= moveToWithinRange(date, min, max);
+      if (date?.getTime() !== selectedDate?.getTime()) {
+        onChange(date);
+      }
+    },
+    [selectedDate, min, max, mode, onChange],
+  );
+
+  const handleKeyDown = useCallback(
+    (event: KeyboardEvent<HTMLDivElement>) => {
+      switch (event.key) {
+        case 'ArrowLeft':
+          adjustDate(-1, -1, -1);
+          event.preventDefault();
+          break;
+        case 'ArrowUp':
+          adjustDate(-7, -4, -4);
+          event.preventDefault();
+          break;
+        case 'ArrowRight':
+          adjustDate(1, 1, 1);
+          event.preventDefault();
+          break;
+        case 'ArrowDown':
+          adjustDate(7, 4, 4);
+          event.preventDefault();
+          break;
+        default:
+          break;
+      }
+    },
+    [adjustDate],
+  );
+
+  return (
+    // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+    <div onKeyDown={handleKeyDown}>
+      {mode === 'day' && (
+        <DayCalendar
+          selectedDate={selectedDate}
+          min={min}
+          max={max}
+          viewMonth={viewMonth}
+          viewYear={viewYear}
+          monthFormat={monthFormat}
+          onSelect={handleSelectedDateUpdate}
+          onLabelClick={switchToYears}
+          onViewDateUpdate={handleViewDateUpdate}
+        />
+      )}
+      {mode === 'month' && (
+        <MonthCalendar
+          selectedDate={selectedDate}
+          min={min}
+          max={max}
+          viewYear={viewYear}
+          {...(placeholder != null && { placeholder })}
+          onSelect={switchToDays}
+          onLabelClick={switchToYears}
+          onViewDateUpdate={handleViewDateUpdate}
+        />
+      )}
+      {mode === 'year' && (
+        <YearCalendar
+          selectedDate={selectedDate}
+          min={min}
+          max={max}
+          viewYear={viewYear}
+          {...(placeholder != null && { placeholder })}
+          onSelect={switchToMonths}
+          onViewDateUpdate={handleViewDateUpdate}
+        />
+      )}
+    </div>
+  );
+};
+
+export default Calendar;

package/src/{dateLookup → calendar}/dateHeader/DateHeader.tsx

@@ -4,7 +4,7 @@ import { useIntl } from 'react-intl';
 import { Typography } from '../../common';
 import { useLayout } from '../../common/hooks';
 import Title from '../../title';
-import messages from '../DateLookup.messages';
+import messages from '../Calendar.messages';
 import Button from '../../button/Button';
 import { ChevronDown, ChevronLeft, ChevronRight } from '@transferwise/icons';
 import IconButton from '../../iconButton';

package/src/{dateLookup → calendar}/dayCalendar/DayCalendar.tsx

@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 import { injectIntl, WrappedComponentProps } from 'react-intl';
 
 import { MonthFormat } from '../../common';
-import messages from '../DateLookup.messages';
+import messages from '../Calendar.messages';
 import DateHeader from '../dateHeader';
 
 import DayCalendarTable from './table';

package/src/calendar/index.ts

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

package/src/{dateLookup → calendar}/monthCalendar/MonthCalendar.tsx

@@ -2,7 +2,7 @@ import { formatDate } from '@transferwise/formatting';
 import { PureComponent } from 'react';
 import { injectIntl, WrappedComponentProps } from 'react-intl';
 
-import messages from '../DateLookup.messages';
+import messages from '../Calendar.messages';
 import DateHeader from '../dateHeader';
 
 import MonthCalendarTable from './table';
@@ -12,7 +12,7 @@ interface MonthCalendarProps extends WrappedComponentProps {
   min: Date | null;
   max: Date | null;
   viewYear: number;
-  placeholder: string;
+  placeholder?: string;
   onSelect: () => void;
   onLabelClick: () => void;
   onViewDateUpdate: (date: { year?: number; month?: number }) => void;

package/src/{dateLookup → calendar}/monthCalendar/table/MonthCalendarTable.tsx

@@ -9,7 +9,7 @@ interface MonthCalendarTableProps {
   min: Date | null;
   max: Date | null;
   viewYear: number;
-  placeholder: string;
+  placeholder?: string;
   onSelect: (date: number) => void;
 }
 

package/src/{dateLookup → calendar}/tableLink/TableLink.tsx

@@ -2,7 +2,7 @@ import { clsx } from 'clsx';
 import { useEffect, useRef } from 'react';
 import { useIntl } from 'react-intl';
 
-import messages from '../DateLookup.messages';
+import messages from '../Calendar.messages';
 
 interface TableLinkProps {
   item: number;

package/src/{dateLookup → calendar}/yearCalendar/YearCalendar.tsx

@@ -1,7 +1,7 @@
 import { PureComponent } from 'react';
 import { injectIntl, WrappedComponentProps } from 'react-intl';
 
-import messages from '../DateLookup.messages';
+import messages from '../Calendar.messages';
 import DateHeader from '../dateHeader';
 
 import YearCalendarTable from './table';
@@ -11,7 +11,7 @@ interface YearCalendarProps extends WrappedComponentProps {
   min: Date | null;
   max: Date | null;
   viewYear: number;
-  placeholder: string;
+  placeholder?: string;
   onSelect: () => void;
   onViewDateUpdate: (date: { year: number }) => void;
 }

package/src/{dateLookup → calendar}/yearCalendar/table/YearCalendarTable.tsx

@@ -9,7 +9,7 @@ interface YearCalendarTableProps {
   min: Date | null;
   max: Date | null;
   viewYear: number;
-  placeholder: string;
+  placeholder?: string;
   onSelect: (year: number) => void;
 }
 

package/src/criticalBanner/CriticalCommsBanner.test.tsx

@@ -80,7 +80,7 @@ describe('CriticalCommsBanner', () => {
 
     const surface = screen.getByTestId('alert').closest('.critical-comms');
     expect(surface).toHaveClass('wds-sentiment-surface');
-    expect(surface).toHaveClass('wds-sentiment-surface-warning-elevated');
+    expect(surface).toHaveClass('wds-sentiment-warning-light-elevated');
   });
 
   it('applies className to the wrapper', () => {

package/src/dateLookup/DateLookup.css

@@ -1,93 +1,3 @@
 .tw-date-lookup-menu {
   width: 400px;
 }
-.tw-date-lookup-calendar {
-  min-width: 300px;
-  text-align: center;
-  table-layout: fixed;
-  background-color: inherit;
-}
-.tw-date-lookup-calendar > tbody > tr > td.weekend button {
-  color: #5d7079;
-  color: var(--color-content-secondary);
-}
-.tw-date-lookup-calendar > tbody > tr > td {
-  padding: 4px;
-  padding: var(--size-4);
-}
-@media (max-width: 320px) {
-  .tw-date-lookup-calendar > tbody > tr > td {
-    padding: 0;
-  }
-}
-.tw-date-lookup-calendar > tbody > tr > td:has(.tw-date-lookup-day-option) {
-  padding: 1px;
-}
-.tw-date-lookup-calendar > tbody > tr > td button {
-  width: 100%;
-  padding: 4px 0;
-  padding: var(--size-4) 0;
-  color: #0097c7;
-  color: var(--color-content-accent);
-  border: transparent;
-  border-radius: 10px;
-  border-radius: var(--radius-small);
-  background-color: transparent;
-  font-weight: 600;
-  font-weight: var(--font-weight-semi-bold);
-  color: #37517e;
-  color: var(--color-content-primary);
-}
-@media (max-width: 320px) {
-  .tw-date-lookup-calendar > tbody > tr > td button {
-    padding: 0;
-  }
-}
-.tw-date-lookup-calendar > tbody > tr > td button.tw-date-lookup-day-option {
-  height: 40px;
-  height: var(--size-40);
-  border-radius: 9999px;
-  border-radius: var(--radius-full);
-  line-height: 40px;
-  line-height: var(--size-40);
-  width: 40px;
-  width: var(--size-40);
-  padding: 0;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-}
-.tw-date-lookup-calendar > tbody > tr > td button.tw-date-lookup-day-option.today {
-  -webkit-text-decoration: underline;
-  text-decoration: underline;
-  text-decoration-thickness: 2px;
-  text-underline-offset: 4px;
-}
-.tw-date-lookup-calendar > tbody > tr > td:not(.disabled):not(:disabled) button.show-focus,
-.tw-date-lookup-calendar > tbody > tr > td:hover button:not(.disabled):not(:disabled) {
-  background-color: var(--color-background-screen-hover);
-}
-.tw-date-lookup-calendar > tbody > tr > td:not(.disabled):not(:disabled) button.active {
-  background-color: var(--color-interactive-primary);
-  color: var(--color-interactive-contrast);
-}
-.tw-date-lookup-calendar abbr {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-.tw-date-lookup-header-current-container {
-  display: inline;
-}
-.np-theme-personal.tw-date-lookup-menu .table-bordered,
-.np-theme-personal .tw-date-lookup-menu .table-bordered {
-  border: none;
-}
-.np-theme-personal.tw-date-lookup-menu thead,
-.np-theme-personal .tw-date-lookup-menu thead {
-  background-color: transparent;
-  background-color: initial;
-}
-.np-theme-personal.tw-date-lookup-menu td,
-.np-theme-personal .tw-date-lookup-menu td {
-  border: none;
-}

package/src/dateLookup/DateLookup.less

@@ -1,94 +1,3 @@
-@import (reference) "./../styles/variables/neptune-tokens.less";
-
 .tw-date-lookup-menu {
   width: 400px;
 }
-
-.tw-date-lookup-calendar {
-  min-width: 300px;
-  text-align: center;
-  table-layout: fixed;
-
-  > tbody > tr > td.weekend button {
-    color: var(--color-content-secondary);
-  }
-
-  > tbody > tr > td {
-    padding: var(--size-4);
-    @media (--screen-400-zoom) {
-      padding: 0;
-    }
-
-    &:has(.tw-date-lookup-day-option) {
-      padding: 1px;
-    }
-    
-    button {
-      width: 100%;
-      padding: var(--size-4) 0;
-      @media (--screen-400-zoom) {
-        padding: 0;
-      }
-      color: var(--color-content-accent);
-      border: transparent;
-      border-radius: var(--radius-small);
-      background-color: transparent;
-      font-weight: var(--font-weight-semi-bold);
-      color: var(--color-content-primary);
-
-      &.tw-date-lookup-day-option {
-        height: var(--size-40);
-        border-radius: var(--radius-full);
-        line-height: var(--size-40);
-        width: var(--size-40);
-        padding: 0;
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-  
-        &.today {
-          text-decoration: underline;
-          text-decoration-thickness: 2px;
-          text-underline-offset: 4px;
-        }
-      }
-    }
-
-    &:not(.disabled, :disabled) button.show-focus,
-    &:hover button:not(.disabled, :disabled) {
-      background-color: var(--color-background-screen-hover);
-    }
-
-    &:not(.disabled, :disabled) button.active {
-      background-color: var(--color-interactive-primary);
-      color: var(--color-interactive-contrast);
-    }
-  }
-
-  abbr {
-    text-decoration: none;
-  }
-
-  background-color: inherit;
-}
-
-.tw-date-lookup-header-current-container {
-  display: inline;
-}
-
-.np-theme-personal {
-  &.tw-date-lookup-menu,
-  .tw-date-lookup-menu {
-    .table-bordered {
-      border: none;
-    }
-
-    thead {
-      background-color: unset;
-    }
-
-    td {
-      border: none;
-    }
-  }
-}