@transferwise/components 46.144.1 → 46.146.0

package/src/dateLookup/DateLookup.test.tsx

@@ -198,28 +198,6 @@ describe('DateLookup', () => {
       expect(handleChange).toHaveBeenCalledWith(initialValue);
     });
   });
-
-  it('limits min value', async () => {
-    const min = new Date(initialValue);
-    min.setDate(min.getDate() - 1);
-    const handleChange = jest.fn();
-    await setupAndOpenWithMouse({ min, onChange: handleChange });
-
-    await user.keyboard('{ArrowLeft}{ArrowLeft}');
-
-    expect(handleChange).toHaveBeenCalledWith(min);
-  });
-
-  it('limits max value', async () => {
-    const max = new Date(initialValue);
-    max.setDate(max.getDate() + 1);
-    const handleChange = jest.fn();
-    await setupAndOpenWithMouse({ max, onChange: handleChange });
-
-    await user.keyboard('{ArrowRight}{ArrowRight}');
-
-    expect(handleChange).toHaveBeenCalledWith(max);
-  });
 });
 
 describe('DateLookup propTypes', () => {
@@ -296,75 +274,6 @@ describe('DateLookup (events)', () => {
       );
     };
 
-    it('switches to years', async () => {
-      const view = await setup();
-      await openDateLookup();
-      await clickDateButton();
-
-      expect(getActiveYearButton(view)).toHaveFocus();
-
-      await closeDateLookup(view);
-    });
-
-    it('has aria-label for 20 years', async () => {
-      const view = await setup();
-      await openDateLookup();
-      await clickDateButton();
-
-      expect(getButtonByAriaLabel('next 20 years')).toBeInTheDocument();
-      expect(getButtonByAriaLabel('previous 20 years')).toBeInTheDocument();
-
-      await closeDateLookup(view);
-    });
-
-    it('switches to months', async () => {
-      const view = await setup();
-      await openDateLookup();
-      await clickDateButton();
-      await userEvent.click(getActiveYearButton(view));
-
-      expect(getActiveMonthButton(view)).toHaveFocus();
-
-      await closeDateLookup(view);
-    });
-
-    it('has aria label for year', async () => {
-      const view = await setup();
-      await openDateLookup();
-      await clickDateButton();
-      await userEvent.click(getActiveYearButton(view));
-
-      expect(getButtonByAriaLabel('next year')).toBeInTheDocument();
-      expect(getButtonByAriaLabel('previous year')).toBeInTheDocument();
-
-      await closeDateLookup(view);
-    });
-
-    it('switches to days', async () => {
-      const view = await setup();
-      await openDateLookup();
-      await clickDateButton();
-      await userEvent.click(getActiveYearButton(view));
-      await userEvent.click(getActiveMonthButton(view));
-
-      expect(getActiveDayButton(view)).toHaveFocus();
-
-      await closeDateLookup(view);
-    });
-
-    it('has aria label for month', async () => {
-      const view = await setup();
-      await openDateLookup();
-      await clickDateButton();
-      await userEvent.click(getActiveYearButton(view));
-      await userEvent.click(getActiveMonthButton(view));
-
-      expect(getButtonByAriaLabel('next month')).toBeInTheDocument();
-      expect(getButtonByAriaLabel('previous month')).toBeInTheDocument();
-
-      await closeDateLookup(view);
-    });
-
     it('has aria label on selected date', async () => {
       const view = await setup();
       await openDateLookup();
@@ -440,44 +349,11 @@ describe('DateLookup (events)', () => {
     });
   };
 
-  const getDateButton = () => {
-    return screen.getByRole('button', {
-      name: /Go to 20 year view/i,
-    });
-  };
-
   const openDateLookup = async () => userEvent.click(getOpenButton(labelProp));
 
-  const clickDateButton = async () => userEvent.click(getDateButton());
-
   // Close dateLookup and removes events attached to documents.
   const closeDateLookup = async (view: RenderResult) => userEvent.click(view.container);
 
   // @ts-expect-error getClearButton returns node
   const clickClearButton = async (view: RenderResult) => userEvent.click(getClearButton(view));
-
-  const getActiveYearButton = (view: RenderResult) => {
-    return screen.getByRole('button', {
-      name: /selected year/i,
-      pressed: true,
-    });
-  };
-
-  const getActiveMonthButton = (view: RenderResult) => {
-    return screen.getByRole('button', {
-      name: /selected month/i,
-      pressed: true,
-    });
-  };
-
-  const getActiveDayButton = (view: RenderResult) => {
-    return screen.getByRole('button', {
-      name: /selected day/i,
-      pressed: true,
-    });
-  };
-
-  const getButtonByAriaLabel = (ariaLabel: string) => {
-    return screen.getByRole('button', { name: ariaLabel });
-  };
 });

package/src/dateLookup/DateLookup.tsx

@@ -1,7 +1,6 @@
 import { clsx } from 'clsx';
 import { createRef, PureComponent, KeyboardEvent } from 'react';
-import { Breakpoint } from '@transferwise/neptune-tokens';
-
+import Calendar from '../calendar';
 import {
   Size,
   MonthFormat,
@@ -10,15 +9,10 @@ import {
   type SizeMedium,
   type SizeLarge,
 } from '../common';
-import { isWithinRange, moveToWithinRange, returnDateView } from '../common/dateUtils';
 import ResponsivePanel from '../common/responsivePanel';
 import { WithInputAttributesProps, withInputAttributes } from '../inputs/contexts';
 import { OverlayIdProvider } from '../provider/overlay/OverlayIdProvider';
 import DateTrigger from './dateTrigger';
-import DayCalendar from './dayCalendar';
-import { getStartOfDay } from './getStartOfDay';
-import MonthCalendar from './monthCalendar';
-import YearCalendar from './yearCalendar';
 
 export interface DateLookupProps {
   id?: string;
@@ -40,15 +34,8 @@ export interface DateLookupProps {
 type DateLookupPropsWithInputAttributes = DateLookupProps & Partial<WithInputAttributesProps>;
 
 interface DateLookupState {
-  selectedDate: Date | null;
   originalDate: Date | null;
-  min: Date | null;
-  max: Date | null;
-  viewMonth: number;
-  viewYear: number;
   open: boolean;
-  mode: 'day' | 'month' | 'year';
-  isMobile: boolean;
 }
 
 class DateLookup extends PureComponent<DateLookupPropsWithInputAttributes, DateLookupState> {
@@ -68,64 +55,25 @@ class DateLookup extends PureComponent<DateLookupPropsWithInputAttributes, DateL
   } satisfies Partial<DateLookupPropsWithInputAttributes>;
 
   element = createRef<HTMLDivElement>();
-  dropdown = createRef<HTMLDivElement>();
 
   constructor(props: DateLookup['props']) {
     super(props);
-    const dateView = returnDateView(props.value, props.min, props.max);
     this.state = {
-      selectedDate: getStartOfDay(props.value),
       originalDate: null,
-      min: getStartOfDay(props.min),
-      max: getStartOfDay(props.max),
-      viewMonth: dateView.getMonth(),
-      viewYear: dateView.getFullYear(),
       open: false,
-      mode: 'day',
-      isMobile: false,
     };
   }
 
-  static getDerivedStateFromProps(props: DateLookup['props'], state: DateLookupState) {
-    const propsSelected = getStartOfDay(props.value);
-    const propsMin = getStartOfDay(props.min);
-    const propsMax = getStartOfDay(props.max);
-    const hasSelectedChanged = state.selectedDate?.getTime() !== propsSelected?.getTime();
-    const hasMinChanged = state.min?.getTime() !== propsMin?.getTime();
-    const hasMaxChanged = state.max?.getTime() !== propsMax?.getTime();
-    if (hasSelectedChanged || hasMinChanged || hasMaxChanged) {
-      const selectedDate = hasSelectedChanged ? propsSelected : state.selectedDate;
-      const min = hasMinChanged ? propsMin : state.min;
-      const max = hasMaxChanged ? propsMax : state.max;
-      if (selectedDate && !isWithinRange(selectedDate, min, max)) {
-        props.onChange(moveToWithinRange(selectedDate, min, max));
-        return null;
-      }
-      const viewDateThatIsWithinRange: Date = returnDateView(selectedDate, min, max);
-      const viewMonth = viewDateThatIsWithinRange.getMonth();
-      const viewYear = viewDateThatIsWithinRange.getFullYear();
-      return { selectedDate, min, max, viewMonth, viewYear };
-    }
-    return null;
-  }
-
   componentDidUpdate(previousProps: DateLookupPropsWithInputAttributes) {
     if (this.props.value?.getTime() !== previousProps.value?.getTime() && this.state.open) {
       this.focusOn('.active');
     }
-    const mediaQuery = window.matchMedia(`(max-width: ${Breakpoint.SMALL}px)`);
-    this.setState({ isMobile: mediaQuery.matches });
-  }
-
-  componentWillUnmount() {
-    // Prevents memory leak by cleaning state.
-    this.setState = () => {};
   }
 
   open = () => {
     const { onFocus } = this.props;
 
-    this.setState({ open: true, mode: 'day' });
+    this.setState({ open: true });
     if (onFocus) {
       onFocus();
     }
@@ -151,36 +99,13 @@ class DateLookup extends PureComponent<DateLookupPropsWithInputAttributes, DateL
     const { open, originalDate } = this.state;
     switch (event.key) {
       case 'ArrowLeft':
-        if (open) {
-          this.adjustDate(-1, -1, -1);
-        } else {
-          this.open();
-        }
-        event.preventDefault();
-        break;
       case 'ArrowUp':
-        if (open) {
-          this.adjustDate(-7, -4, -4);
-        } else {
-          this.open();
-        }
-        event.preventDefault();
-        break;
       case 'ArrowRight':
-        if (open) {
-          this.adjustDate(1, 1, 1);
-        } else {
-          this.open();
-        }
-        event.preventDefault();
-        break;
       case 'ArrowDown':
-        if (open) {
-          this.adjustDate(7, 4, 4);
-        } else {
+        if (!open) {
           this.open();
+          event.preventDefault();
         }
-        event.preventDefault();
         break;
       case 'Escape':
         if (originalDate !== null) {
@@ -194,27 +119,6 @@ class DateLookup extends PureComponent<DateLookupPropsWithInputAttributes, DateL
     }
   };
 
-  adjustDate = (daysToAdd: number, monthsToAdd: number, yearsToAdd: number) => {
-    const { selectedDate, min, max, mode, originalDate } = this.state;
-    if (originalDate === null) {
-      this.setState({ originalDate: selectedDate });
-    }
-    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()) {
-      this.props.onChange(date);
-    }
-  };
-
   focusOn = (preferredElement: string, fallbackElement?: string) => {
     const element = this.element.current?.querySelector(preferredElement) as HTMLElement | null;
     if (element) {
@@ -224,71 +128,37 @@ class DateLookup extends PureComponent<DateLookupPropsWithInputAttributes, DateL
     }
   };
 
-  switchMode = (mode: 'day' | 'month' | 'year') => {
-    this.setState({ mode }, () => {
-      this.focusOn('.active', '.today');
-    });
-  };
-
-  switchToDays = () => this.switchMode('day');
-
-  switchToMonths = () => this.switchMode('month');
-
-  switchToYears = () => this.switchMode('year');
-
-  handleSelectedDateUpdate = (selectedDate: Date) => {
-    this.setState({ selectedDate }, () => {
-      this.props.onChange(selectedDate);
-      this.close();
-      this.focusOn('.btn');
-    });
+  handleDateChange = (date: Date | null) => {
+    this.setState(
+      (state) => {
+        const originalDate = state.originalDate ?? this.props.value;
+        return { originalDate };
+      },
+      () => {
+        this.props.onChange(date);
+      },
+    );
   };
 
-  handleViewDateUpdate = ({ month = this.state.viewMonth, year = this.state.viewYear }) => {
-    this.setState({ viewMonth: month, viewYear: year });
+  handleDateSelect = (date: Date) => {
+    this.props.onChange(date);
+    this.close();
+    this.focusOn('.btn');
   };
 
   getCalendar = () => {
-    const { selectedDate, min, max, viewMonth, viewYear, mode, isMobile } = this.state;
-    const { placeholder, monthFormat } = this.props;
+    const { value, min, max, monthFormat, placeholder } = this.props;
     return (
-      <div className={clsx({ 'p-a-1': !isMobile })}>
-        {mode === 'day' && (
-          <DayCalendar
-            selectedDate={selectedDate}
-            min={min}
-            max={max}
-            viewMonth={viewMonth}
-            viewYear={viewYear}
-            monthFormat={monthFormat}
-            onSelect={this.handleSelectedDateUpdate}
-            onLabelClick={this.switchToYears}
-            onViewDateUpdate={this.handleViewDateUpdate}
-          />
-        )}
-        {mode === 'month' && (
-          <MonthCalendar
-            selectedDate={selectedDate}
-            min={min}
-            max={max}
-            viewYear={viewYear}
-            placeholder={placeholder}
-            onSelect={this.switchToDays}
-            onLabelClick={this.switchToYears}
-            onViewDateUpdate={this.handleViewDateUpdate}
-          />
-        )}
-        {mode === 'year' && (
-          <YearCalendar
-            selectedDate={selectedDate}
-            min={min}
-            max={max}
-            viewYear={viewYear}
-            placeholder={placeholder}
-            onSelect={this.switchToMonths}
-            onViewDateUpdate={this.handleViewDateUpdate}
-          />
-        )}
+      <div className="p-a-1">
+        <Calendar
+          value={value}
+          min={min}
+          max={max}
+          monthFormat={monthFormat}
+          placeholder={placeholder}
+          onChange={this.handleDateChange}
+          onSelect={this.handleDateSelect}
+        />
       </div>
     );
   };
@@ -299,7 +169,7 @@ class DateLookup extends PureComponent<DateLookupPropsWithInputAttributes, DateL
   };
 
   render() {
-    const { selectedDate, open } = this.state;
+    const { open } = this.state;
 
     const {
       inputAttributes,
@@ -329,7 +199,7 @@ class DateLookup extends PureComponent<DateLookupPropsWithInputAttributes, DateL
           <DateTrigger
             id={id}
             ariaLabelledBy={ariaLabelledBy}
-            selectedDate={selectedDate}
+            selectedDate={value}
             size={size}
             placeholder={placeholder}
             label={label}

package/src/index.ts

@@ -29,6 +29,7 @@ export type {
 export type { BottomSheetProps } from './common/bottomSheet';
 export type { DateInputProps } from './dateInput';
 export type { DateLookupProps } from './dateLookup';
+export type { CalendarProps } from './calendar';
 export type { DecisionProps } from './decision/Decision';
 export type { DefinitionListProps, DefinitionListDefinition } from './definitionList';
 export type { DimmerProps } from './dimmer';
@@ -163,6 +164,7 @@ export { default as CriticalCommsBanner } from './criticalBanner';
 export type { CriticalCommsBannerProps } from './criticalBanner';
 export { default as DateInput } from './dateInput';
 export { default as DateLookup } from './dateLookup';
+export { default as Calendar } from './calendar';
 export { default as Decision } from './decision';
 export { default as DefinitionList } from './definitionList';
 export { default as Dimmer } from './dimmer';