@transferwise/components 0.0.0-experimental-e05dfa3 → 0.0.0-experimental-d0b76b1

package/build/index.esm.js

@@ -2900,6 +2900,8 @@ const INITIAL_DEFAULT_STATE = {
   day: null
 };
 const DateInput = ({
+  'aria-labelledby': ariaLabelledBy,
+  'aria-label': ariaLabel,
   disabled,
   size,
   value,
@@ -3087,6 +3089,8 @@ const DateInput = ({
   return /*#__PURE__*/jsx("div", {
     className: "tw-date",
     id: id,
+    "aria-labelledby": ariaLabelledBy,
+    "aria-label": ariaLabel,
     onFocus: event => shouldPropagateOnFocus(event) ? onFocus && onFocus() : event.stopPropagation(),
     onBlur: event => shouldPropagateOnBlur(event) ? onBlur && onBlur() : event.stopPropagation(),
     children: /*#__PURE__*/jsxs("div", {
@@ -3169,6 +3173,8 @@ function shouldPropagateOnBlur({
   return blurElementParent !== focusElementParent;
 }
 DateInput.propTypes = {
+  'aria-label': PropTypes.string,
+  'aria-labelledby': PropTypes.string,
   disabled: PropTypes.bool,
   size: PropTypes.oneOf(['sm', 'md', 'lg']),
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.instanceOf(Date)]),
@@ -3564,28 +3570,6 @@ DateHeader.defaultProps = {
 };
 var DateHeader$1 = DateHeader;
 
-function getFocusableTime(isSelected, isNow, isDisabled, timeSpan) {
-  let selected = null;
-  let now = null;
-  let disabled = null;
-  for (const time of timeSpan) {
-    if (isSelected(time)) {
-      selected = time;
-      break;
-    }
-    if (isNow(time)) {
-      now = time;
-    }
-    if (!isDisabled(time) && disabled === null) {
-      disabled = time;
-    }
-    if (selected) {
-      break;
-    }
-  }
-  return selected || now || disabled;
-}
-
 // NB! Using with UTC timestamp (YYYY-MM-DD) might lead to unexpected results, for example
 // getStartOfDay(new Date('1995-01-01')) in Los Angeles returns 31 Dec 1994, but in
 // in Singapore it is 1 Jan 1995.
@@ -3597,57 +3581,59 @@ function getStartOfDay(date) {
   return new Date(date.getFullYear(), date.getMonth(), date.getDate());
 }
 
-const TableLink = ({
-  item,
-  type,
-  title,
-  longTitle,
-  active,
-  disabled,
-  today,
-  autofocus,
-  onClick,
-  intl: {
-    formatMessage
-  }
-}) => {
-  const buttonRef = useRef(null);
-  useEffect(() => {
-    if (autofocus) {
-      setTimeout(() => {
-        buttonRef.current?.focus();
-      }, 0);
-    }
-  }, [autofocus]);
-  const onCalendarClick = event => {
+class TableLink extends PureComponent {
+  onClick = event => {
     event.preventDefault();
-    if (!disabled) {
-      onClick(item);
+    if (!this.props.disabled) {
+      this.props.onClick(this.props.item);
     }
   };
-  const calculateAriaLabel = () => {
+  calculateAriaLabel = (longTitle, title, active, type, formatMessage) => {
     if (active) {
-      return `${longTitle || title || ''}, ${formatMessage(messages$6.selected)} ${formatMessage(messages$6[type])}`;
+      return `${longTitle || title}, ${formatMessage(messages$6.selected)} ${formatMessage(messages$6[type])}`;
     }
     return longTitle || title;
   };
-  return /*#__PURE__*/jsx(Fragment, {
-    children: /*#__PURE__*/jsx("button", {
-      ref: buttonRef,
-      type: "button",
-      className: classNames(`tw-date-lookup-${type}-option np-text-body-default-bold`, {
-        active: !!active
-      }, {
-        today: !!today
-      }),
-      disabled: disabled,
-      tabIndex: autofocus ? 0 : -1,
-      "aria-label": calculateAriaLabel(),
-      "aria-pressed": active,
-      onClick: onCalendarClick,
-      children: title || item
-    })
-  });
+  render() {
+    const {
+      item,
+      type,
+      title,
+      longTitle,
+      active,
+      disabled,
+      today,
+      intl: {
+        formatMessage
+      }
+    } = this.props;
+    return /*#__PURE__*/jsx(Fragment, {
+      children: /*#__PURE__*/jsx("button", {
+        type: "button",
+        className: `tw-date-lookup-${type}-option ${active ? 'active' : ''} ${today ? 'today' : ''} np-text-body-default-bold`,
+        disabled: disabled,
+        "aria-label": this.calculateAriaLabel(longTitle, title, active, type, formatMessage),
+        "aria-pressed": active,
+        onClick: this.onClick,
+        children: title || item
+      })
+    });
+  }
+}
+TableLink.propTypes = {
+  item: PropTypes.number.isRequired,
+  // day (1-31), month (0-11) or year (2018 etc)
+  type: PropTypes.oneOf(['day', 'month', 'year']).isRequired,
+  title: PropTypes.string,
+  longTitle: PropTypes.string,
+  active: PropTypes.bool.isRequired,
+  disabled: PropTypes.bool.isRequired,
+  today: PropTypes.bool.isRequired,
+  onClick: PropTypes.func.isRequired
+};
+TableLink.defaultProps = {
+  title: null,
+  longTitle: null
 };
 var TableLink$1 = injectIntl(TableLink);
 
@@ -3720,17 +3706,6 @@ class DayCalendarTable extends PureComponent {
     } = this.props;
     return !!(selectedDate && +new Date(viewYear, viewMonth, day) === +selectedDate);
   };
-  isToday = day => {
-    const {
-      viewMonth,
-      viewYear
-    } = this.props;
-    return +getStartOfDay(new Date()) === +new Date(viewYear, viewMonth, day);
-  };
-  getAutofocusDay = weeks => {
-    const days = weeks.flatMap(week => week);
-    return getFocusableTime(this.isActive, this.isToday, this.isDisabled, days);
-  };
   render() {
     const {
       viewMonth,
@@ -3740,7 +3715,6 @@ class DayCalendarTable extends PureComponent {
       }
     } = this.props;
     const weeks = this.getTableStructure();
-    let autoFocusDay = this.getAutofocusDay(weeks, viewMonth, viewYear);
     return /*#__PURE__*/jsxs("table", {
       className: "table table-condensed table-bordered tw-date-lookup-calendar m-b-0",
       children: [/*#__PURE__*/jsx("thead", {
@@ -3770,11 +3744,10 @@ class DayCalendarTable extends PureComponent {
               item: day,
               type: "day",
               title: formatDate(new Date(viewYear, viewMonth, day), locale, SHORT_DAY_FORMAT),
-              autofocus: day === autoFocusDay,
               longTitle: formatDate(new Date(viewYear, viewMonth, day), locale),
               active: this.isActive(day),
               disabled: this.isDisabled(day),
-              today: this.isToday(day),
+              today: +getStartOfDay(new Date()) === +new Date(viewYear, viewMonth, day),
               onClick: this.selectDay
             })
           }, dayIndex))
@@ -3875,11 +3848,11 @@ var DayCalendar$1 = injectIntl(DayCalendar);
 
 const ROWS$1 = 3;
 const COLS$1 = 4;
-const MONTH_ONLY_FORMAT = {
+const MONTH_ONLY_FORMAY = {
   month: 'short'
 };
 const MonthCalendarTable = ({
-  selectedDate,
+  selectedDate: selected,
   min,
   max,
   viewYear,
@@ -3889,32 +3862,19 @@ const MonthCalendarTable = ({
   const {
     locale
   } = useIntl();
-  const getLink = month => {
-    return /*#__PURE__*/jsx(TableLink$1, {
-      item: month,
-      type: "month",
-      title: formatDate(new Date(viewYear, month), locale, MONTH_ONLY_FORMAT),
-      active: isSelected(month),
-      disabled: isDisabled(month),
-      today: viewYear === new Date().getFullYear() && month === new Date().getMonth(),
-      autofocus: autofocusMonth === month,
-      onClick: onSelect
-    });
-  };
-  const isSelected = month => {
-    return selectedDate && month === selectedDate.getMonth() && viewYear === selectedDate.getFullYear();
-  };
-  const isThisMonth = month => {
-    return viewYear === new Date().getFullYear() && month === new Date().getMonth();
-  };
+  const getLink = month => /*#__PURE__*/jsx(TableLink$1, {
+    item: month,
+    type: "month",
+    title: formatDate(new Date(viewYear, month), locale, MONTH_ONLY_FORMAY),
+    active: !!(selected && month === selected.getMonth() && viewYear === selected.getFullYear()),
+    disabled: isDisabled(month),
+    today: viewYear === new Date().getFullYear() && month === new Date().getMonth(),
+    onClick: onSelect
+  });
   const isDisabled = month => {
     const date = new Date(viewYear, month);
     return !!(min && date < new Date(min.getFullYear(), min.getMonth()) || max && date > new Date(max.getFullYear(), max.getMonth()));
   };
-  const autofocusMonth = (() => {
-    const months = [...new Array(ROWS$1 * COLS$1)].map((_, index) => index);
-    return getFocusableTime(isSelected, isThisMonth, isDisabled, months);
-  })();
   return /*#__PURE__*/jsxs("table", {
     className: "table table-condensed table-bordered tw-date-lookup-calendar np-text-body-default-bold m-b-0",
     children: [/*#__PURE__*/jsx("thead", {
@@ -4033,31 +3993,15 @@ const YearCalendarTable = ({
     locale
   } = useIntl();
   const startYear = viewYear - viewYear % 20;
-  const getLink = year => {
-    return /*#__PURE__*/jsx(TableLink$1, {
-      item: year,
-      type: "year",
-      title: formatDate(new Date(year, 0), locale, YEAR_ONLY_FORMAT),
-      active: !!(selectedDate && year === selectedDate.getFullYear()),
-      disabled: isDisabled(year),
-      today: year === new Date().getFullYear(),
-      autofocus: autofocusYear === year,
-      onClick: onSelect
-    });
-  };
-  const isSelected = year => {
-    return selectedDate && year === selectedDate.getFullYear();
-  };
-  const isThisYear = year => {
-    return year === new Date().getFullYear();
-  };
-  const isDisabled = year => {
-    return !!(min && year < min.getFullYear() || max && year > max.getFullYear());
-  };
-  const autofocusYear = (() => {
-    const years = [...new Array(ROWS * COLS)].map((_, index) => startYear + index);
-    return getFocusableTime(isSelected, isThisYear, isDisabled, years);
-  })();
+  const getLink = year => /*#__PURE__*/jsx(TableLink$1, {
+    item: year,
+    type: "year",
+    title: formatDate(new Date(year, 0), locale, YEAR_ONLY_FORMAT),
+    active: !!(selectedDate && year === selectedDate.getFullYear()),
+    disabled: !!(min && year < min.getFullYear() || max && year > max.getFullYear()),
+    today: year === new Date().getFullYear(),
+    onClick: onSelect
+  });
   return /*#__PURE__*/jsxs("table", {
     className: "table table-condensed table-bordered tw-date-lookup-calendar m-b-0",
     children: [/*#__PURE__*/jsx("thead", {
@@ -4164,7 +4108,6 @@ class DateLookup extends PureComponent {
     super(props);
     this.state = {
       selectedDate: getStartOfDay(props.value),
-      originalDate: null,
       min: getStartOfDay(props.min),
       max: getStartOfDay(props.max),
       viewMonth: (props.value || new Date()).getMonth(),
@@ -4227,15 +4170,6 @@ class DateLookup extends PureComponent {
       onFocus();
     }
   };
-  discard = () => {
-    const {
-      originalDate
-    } = this.state;
-    if (originalDate !== null) {
-      this.props.onChange(originalDate);
-    }
-    this.close();
-  };
   close = () => {
     const {
       onBlur
@@ -4249,8 +4183,7 @@ class DateLookup extends PureComponent {
   };
   handleKeyDown = event => {
     const {
-      open,
-      originalDate
+      open
     } = this.state;
     switch (event.keyCode) {
       case KeyCodes.LEFT:
@@ -4286,7 +4219,6 @@ class DateLookup extends PureComponent {
         event.preventDefault();
         break;
       case KeyCodes.ESCAPE:
-        originalDate && this.props.onChange(originalDate);
         this.close();
         event.preventDefault();
         break;
@@ -4297,14 +4229,8 @@ class DateLookup extends PureComponent {
       selectedDate,
       min,
       max,
-      mode,
-      originalDate
+      mode
     } = this.state;
-    if (originalDate === null) {
-      this.setState({
-        originalDate: selectedDate
-      });
-    }
     let date;
     if (selectedDate) {
       date = new Date(mode === MODE.YEAR ? selectedDate.getFullYear() + yearsToAdd : selectedDate.getFullYear(), mode === MODE.MONTH ? selectedDate.getMonth() + monthsToAdd : selectedDate.getMonth(), mode === MODE.DAY ? selectedDate.getDate() + daysToAdd : selectedDate.getDate());
@@ -4437,7 +4363,7 @@ class DateLookup extends PureComponent {
         open: open,
         className: "tw-date-lookup-menu",
         position: Position.BOTTOM,
-        onClose: this.discard,
+        onClose: this.close,
         children: this.getCalendar()
       })]
     });