baseui 12.1.3 → 13.0.0

package/es/data-table/measure-column-widths.js

@@ -8,6 +8,7 @@ import * as React from 'react';
 import { useStyletron } from '../styles';
 import HeaderCell from './header-cell';
 import { useRef } from 'react'; // Measures the column header + sampled data
+// @ts-ignore
 
 function MeasureColumn({
   sampleIndexes,
@@ -27,6 +28,7 @@ function MeasureColumn({
     }
   }, [onLayout]);
   return /*#__PURE__*/React.createElement("div", {
+    // @ts-ignore
     ref: ref,
     className: css({
       display: 'flex',
@@ -45,7 +47,8 @@ function MeasureColumn({
     onSelectNone: () => {} // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ,
     onSort: i => {},
-    sortable: column.sortable,
+    sortable: column.sortable // @ts-ignore
+    ,
     sortDirection: null,
     title: column.title,
     isSelectable: isSelectable
@@ -63,17 +66,19 @@ function MeasureColumn({
   }));
 }
 
-const MAX_SAMPLE_SIZE = 50;
+const MAX_SAMPLE_SIZE = 50; // @ts-ignore
 
 function generateSampleIndices(inputMin, inputMax, maxSamples) {
   const indices = [];
   const queue = [[inputMin, inputMax]];
 
   while (queue.length > 0) {
+    // @ts-ignore
     const [min, max] = queue.shift();
 
     if (indices.length < maxSamples) {
-      const pivot = Math.floor((min + max) / 2);
+      const pivot = Math.floor((min + max) / 2); // @ts-ignore
+
       indices.push(pivot);
       const left = pivot - 1;
       const right = pivot + 1;
@@ -131,23 +136,19 @@ export default function MeasureColumnWidths({
     return null;
   }
 
-  return (
-    /*#__PURE__*/
-    // eslint-disable-next-line jsx-a11y/role-supports-aria-props
-    React.createElement("div", {
-      className: hiddenStyle,
-      "aria-hidden": true,
-      role: "none"
-    }, columns.map((column, i) => {
-      return /*#__PURE__*/React.createElement(MeasureColumn, {
-        key: column.title + i,
-        column: column,
-        rows: rows,
-        isSelectable: isSelectable,
-        onLayout: handleDimensionsChange,
-        columnIndex: i,
-        sampleIndexes: sampleIndexes
-      });
-    }))
-  );
+  return /*#__PURE__*/React.createElement("div", {
+    className: hiddenStyle,
+    "aria-hidden": "true",
+    role: "none"
+  }, columns.map((column, i) => {
+    return /*#__PURE__*/React.createElement(MeasureColumn, {
+      key: column.title + i,
+      column: column,
+      rows: rows,
+      isSelectable: isSelectable,
+      onLayout: handleDimensionsChange,
+      columnIndex: i,
+      sampleIndexes: sampleIndexes
+    });
+  }));
 }

package/es/data-table/stateful-container.js

@@ -19,32 +19,48 @@ function useDuplicateColumnTitleWarning(columns) {
   }, [columns]);
 }
 
-function useSortParameters(initialSortIndex = -1, initialSortDirection = null) {
-  const [sortIndex, setSortIndex] = React.useState(initialSortIndex);
-  const [sortDirection, setSortDirection] = React.useState(initialSortDirection);
+export const StatefulContainer = props => {
+  useDuplicateColumnTitleWarning(props.columns);
+  const [sortIndex, setSortIndex] = React.useState(typeof props.initialSortIndex === 'number' ? props.initialSortIndex : -1);
+  const [sortDirection, setSortDirection] = React.useState(props.initialSortDirection);
+  const [filters, setFilters] = React.useState(props.initialFilters || new Map());
+  const [textQuery, setTextQuery] = React.useState('');
+  const [selectedRowIds, setSelectedRowIds] = React.useState(props.initialSelectedRowIds || new Set()); // @ts-ignore
 
   function handleSort(columnIndex) {
+    let nextSortIndex;
+    let nextSortDirection;
+
     if (columnIndex === sortIndex) {
       if (sortDirection === SORT_DIRECTIONS.DESC) {
-        setSortIndex(-1);
-        setSortDirection(SORT_DIRECTIONS.ASC);
+        nextSortIndex = -1;
+        nextSortDirection = SORT_DIRECTIONS.ASC;
       } else {
-        setSortDirection(SORT_DIRECTIONS.DESC);
+        nextSortIndex = columnIndex;
+        nextSortDirection = SORT_DIRECTIONS.DESC;
       }
     } else {
-      setSortIndex(columnIndex);
-      setSortDirection(SORT_DIRECTIONS.ASC);
+      nextSortIndex = columnIndex;
+      nextSortDirection = SORT_DIRECTIONS.ASC;
     }
-  }
 
-  return [sortIndex, sortDirection, handleSort];
-}
+    setSortIndex(nextSortIndex);
+    setSortDirection(nextSortDirection);
+
+    if (props.onSort) {
+      props.onSort(nextSortIndex, nextSortDirection);
+    }
+  } // @ts-ignore
+
+
+  function handleTextQueryChange(nextTextQuery) {
+    setTextQuery(nextTextQuery);
+
+    if (props.onTextQueryChange) {
+      props.onTextQueryChange(nextTextQuery);
+    }
+  } // @ts-ignore
 
-export const StatefulContainer = props => {
-  useDuplicateColumnTitleWarning(props.columns);
-  const [sortIndex, sortDirection, handleSort] = useSortParameters(props.initialSortIndex, props.initialSortDirection);
-  const [filters, setFilters] = React.useState(props.initialFilters || new Map());
-  const [textQuery, setTextQuery] = React.useState('');
 
   function handleFilterAdd(title, filterParams) {
     filters.set(title, filterParams);
@@ -54,7 +70,8 @@ export const StatefulContainer = props => {
     }
 
     setFilters(new Map(filters));
-  }
+  } // @ts-ignore
+
 
   function handleFilterRemove(title) {
     filters.delete(title);
@@ -64,9 +81,8 @@ export const StatefulContainer = props => {
     }
 
     setFilters(new Map(filters));
-  }
+  } // @ts-ignore
 
-  const [selectedRowIds, setSelectedRowIds] = React.useState(props.initialSelectedRowIds || new Set());
 
   function handleSelectChange(next) {
     setSelectedRowIds(next);
@@ -75,16 +91,19 @@ export const StatefulContainer = props => {
     if (selectionCallback) {
       selectionCallback(props.rows.filter(r => next.has(r.id)));
     }
-  }
+  } // @ts-ignore
+
 
   function handleSelectMany(incomingRows) {
     // only adds rows that are visible in the table
+    // @ts-ignore
     handleSelectChange(new Set([...selectedRowIds, ...incomingRows.map(r => r.id)]));
   }
 
   function handleSelectNone() {
     handleSelectChange(new Set());
-  }
+  } // @ts-ignore
+
 
   function handleSelectOne(row) {
     if (selectedRowIds.has(row.id)) {
@@ -116,11 +135,12 @@ export const StatefulContainer = props => {
     onSelectNone: handleSelectNone,
     onSelectOne: handleSelectOne,
     onSort: handleSort,
-    onTextQueryChange: setTextQuery,
+    onTextQueryChange: handleTextQueryChange,
     resizableColumnWidths: Boolean(props.resizableColumnWidths),
     rowHighlightIndex: props.rowHighlightIndex,
     selectedRowIds,
     sortIndex,
+    // @ts-ignore
     sortDirection,
     textQuery // eslint-disable-next-line @typescript-eslint/no-explicit-any
 

package/es/data-table/stateful-data-table.js

@@ -27,7 +27,8 @@ function useResizeObserver(ref, callback) {
       }
     }
   }, [ref]);
-}
+} // @ts-ignore
+
 
 function QueryInput(props) {
   const [css, theme] = useStyletron();
@@ -62,17 +63,20 @@ function QueryInput(props) {
     value: value,
     clearable: true
   }));
-}
+} // @ts-ignore
+
 
 function FilterTag(props) {
   const [, theme] = useStyletron();
-  const [isOpen, setIsOpen] = React.useState(false);
+  const [isOpen, setIsOpen] = React.useState(false); // @ts-ignore
+
   const columnIndex = props.columns.findIndex(c => c.title === props.title);
   const column = props.columns[columnIndex];
 
   if (!column) {
     return null;
-  }
+  } // @ts-ignore
+
 
   const data = props.rows.map(r => column.mapDataToValue(r.data));
   const Filter = column.renderFilter;
@@ -81,15 +85,16 @@ function FilterTag(props) {
     returnFocus: true,
     key: props.title,
     isOpen: isOpen,
+    onClick: () => setIsOpen(!isOpen),
     onClickOutside: () => setIsOpen(false),
     content: () => /*#__PURE__*/React.createElement(Filter, {
       close: () => setIsOpen(false),
       data: data,
-      filterParams: props.filter,
+      filterParams: props.filter // @ts-ignore
+      ,
       setFilter: filterParams => props.onFilterAdd(props.title, filterParams)
     })
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Tag, {
-    onClick: () => setIsOpen(!isOpen),
+  }, /*#__PURE__*/React.createElement(Tag, {
     onActionClick: () => props.onFilterRemove(props.title),
     overrides: {
       Root: {
@@ -116,7 +121,7 @@ function FilterTag(props) {
         }
       }
     }
-  }, props.title, ": ", props.filter.description)));
+  }, props.title, ": ", props.filter.description));
 }
 
 export function StatefulDataTable(props) {
@@ -140,6 +145,8 @@ export function StatefulDataTable(props) {
     onIncludedRowsChange: props.onIncludedRowsChange,
     onRowHighlightChange: props.onRowHighlightChange,
     onSelectionChange: props.onSelectionChange,
+    onSort: props.onSort,
+    onTextQueryChange: props.onTextQueryChange,
     resizableColumnWidths: props.resizableColumnWidths,
     rows: props.rows,
     rowActions: props.rowActions,
@@ -197,6 +204,7 @@ export function StatefulDataTable(props) {
       paddingBottom: theme.sizing.scale300
     })
   }, props.batchActions.map(action => {
+    // @ts-ignore
     function onClick(event) {
       action.onClick({
         clearSelection: onSelectNone,

package/es/data-table/text-search.js

@@ -30,6 +30,7 @@ export function splitByQuery(text, query) {
     i === start - 1 || // query
     i === start + query.length - 1 || // suffix
     i === text.length - 1) {
+      // @ts-ignore
       substrings.push(substring);
       substring = '';
     }

package/es/datepicker/calendar-header.js

@@ -25,6 +25,7 @@ import { getOverrides, mergeOverrides } from '../helpers/overrides';
 import { forkBlur, forkFocus, isFocusVisible } from '../utils/focusVisible';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+// @ts-ignore
 const navBtnStyle = ({
   $theme
 }) => ({
@@ -38,7 +39,24 @@ const MAX_MONTH = 11;
 const DIRECTION = {
   NEXT: 'next',
   PREVIOUS: 'previous'
-};
+}; // When multiple calendar months are rendered, the month selection dropdown
+// must account for which of the rendered calendar months it corresponds with
+
+function adjustForCalendarOrder(monthId, year, order) {
+  let adjustedMonth = Number(monthId) - order;
+  let adjustedYear = year;
+
+  if (adjustedMonth < 0) {
+    adjustedMonth = 11;
+    adjustedYear = adjustedYear - 1;
+  }
+
+  return {
+    adjustedMonthId: adjustedMonth.toString(),
+    adjustedYear: adjustedYear
+  };
+} // @ts-ignore
+
 
 function idToYearMonth(id) {
   return id.split('-').map(Number);
@@ -46,7 +64,7 @@ function idToYearMonth(id) {
 
 export default class CalendarHeader extends React.Component {
   constructor(props) {
-    super(props);
+    super(props); // @ts-ignore
 
     _defineProperty(this, "dateHelpers", void 0);
 
@@ -121,7 +139,7 @@ export default class CalendarHeader extends React.Component {
         length: 12 - monthOfMinDate
       }, (x, i) => i + monthOfMinDate);
       const maxMinYearMonthsIntersection = maxYearMonths.filter(year => minYearMonths.includes(year));
-      const filterMonthsList = year === maxYear && year === minYear ? maxMinYearMonthsIntersection : year === maxYear ? maxYearMonths : year === minYear ? minYearMonths : null;
+      const filterMonthsList = year === maxYear && year === minYear ? maxMinYearMonthsIntersection : year === maxYear ? maxYearMonths : year === minYear ? minYearMonths : null; // @ts-ignore
 
       const formatMonthLabel = month => this.dateHelpers.getMonthInLocale(month, this.props.locale);
 
@@ -232,6 +250,7 @@ export default class CalendarHeader extends React.Component {
       let clickHandler = this.decreaseMonth;
 
       if (allPrevDaysDisabled) {
+        // @ts-ignore
         clickHandler = null;
       }
 
@@ -243,7 +262,8 @@ export default class CalendarHeader extends React.Component {
         $isFocusVisible: this.state.isFocusVisible,
         type: "button",
         $disabled: isDisabled,
-        $order: this.props.order
+        $order: this.props.order,
+        $density: this.props.density
       }, prevButtonProps), isHidden ? null : /*#__PURE__*/React.createElement(PrevButtonIcon, _extends({
         size: density === DENSITY.high ? 24 : 36,
         overrides: {
@@ -292,6 +312,7 @@ export default class CalendarHeader extends React.Component {
       // on click or do nothing
 
       if (allNextDaysDisabled) {
+        // @ts-ignore
         clickHandler = null;
       }
 
@@ -303,7 +324,9 @@ export default class CalendarHeader extends React.Component {
         type: "button",
         $disabled: isDisabled,
         $isFocusVisible: this.state.isFocusVisible,
-        $order: this.props.order
+        $order: this.props.order,
+        $density: this.props.density,
+        $isTrailing: true
       }, nextButtonProps), isHidden ? null : /*#__PURE__*/React.createElement(NextButtonIcon, _extends({
         size: density === DENSITY.high ? 24 : 36,
         overrides: {
@@ -328,6 +351,7 @@ export default class CalendarHeader extends React.Component {
       const date = this.getDateProp();
       const month = this.dateHelpers.getMonth(date);
       const year = this.dateHelpers.getYear(date);
+      const order = this.props.order;
       const {
         locale,
         overrides = {},
@@ -349,7 +373,7 @@ export default class CalendarHeader extends React.Component {
       const initialYearIndex = this.yearItems.findIndex(year => year.id === this.dateHelpers.getYear(date).toString());
       const monthTitle = `${this.dateHelpers.getMonthInLocale(this.dateHelpers.getMonth(date), locale)}`;
       const yearTitle = `${this.dateHelpers.getYear(date)}`;
-      return this.isMultiMonthHorizontal() ? /*#__PURE__*/React.createElement("div", null, `${monthTitle} ${yearTitle}`) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OverriddenPopover, _extends({
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OverriddenPopover, _extends({
         placement: "bottom",
         autoFocus: true,
         focusLock: true,
@@ -370,16 +394,20 @@ export default class CalendarHeader extends React.Component {
             highlightedIndex: initialMonthIndex,
             isFocused: true
           },
-          items: this.monthItems,
+          items: this.monthItems // @ts-ignore
+          ,
           onItemSelect: ({
             item,
             event
           }) => {
             event.preventDefault();
-            const month = idToYearMonth(item.id);
+            const {
+              adjustedMonthId,
+              adjustedYear
+            } = adjustForCalendarOrder(item.id, year, order);
             const updatedDate = this.dateHelpers.set(date, {
-              year,
-              month
+              year: adjustedYear,
+              month: idToYearMonth(adjustedMonthId)
             });
             this.props.onMonthChange && this.props.onMonthChange({
               date: updatedDate
@@ -393,14 +421,16 @@ export default class CalendarHeader extends React.Component {
         "aria-live": "polite",
         type: "button",
         $isFocusVisible: this.state.isFocusVisible,
-        $density: density,
+        $density: density // @ts-ignore
+        ,
         onKeyUp: event => {
           if (this.canArrowsOpenDropdown(event)) {
             this.setState({
               isMonthDropdownOpen: true
             });
           }
-        },
+        } // @ts-ignore
+        ,
         onKeyDown: event => {
           if (this.canArrowsOpenDropdown(event)) {
             // disables page scroll
@@ -413,7 +443,9 @@ export default class CalendarHeader extends React.Component {
             });
           }
         }
-      }, monthYearSelectButtonProps), monthTitle, /*#__PURE__*/React.createElement(MonthYearSelectIconContainer, monthYearSelectIconContainerProps, /*#__PURE__*/React.createElement(ChevronDown, {
+      }, monthYearSelectButtonProps, {
+        "aria-label": `Month, ${monthTitle}`
+      }), monthTitle, /*#__PURE__*/React.createElement(MonthYearSelectIconContainer, monthYearSelectIconContainerProps, /*#__PURE__*/React.createElement(ChevronDown, {
         title: "",
         overrides: {
           Svg: {
@@ -443,7 +475,8 @@ export default class CalendarHeader extends React.Component {
             highlightedIndex: initialYearIndex,
             isFocused: true
           },
-          items: this.yearItems,
+          items: this.yearItems // @ts-ignore
+          ,
           onItemSelect: ({
             item,
             event
@@ -466,14 +499,16 @@ export default class CalendarHeader extends React.Component {
         "aria-live": "polite",
         type: "button",
         $isFocusVisible: this.state.isFocusVisible,
-        $density: density,
+        $density: density // @ts-ignore
+        ,
         onKeyUp: event => {
           if (this.canArrowsOpenDropdown(event)) {
             this.setState({
               isYearDropdownOpen: true
             });
           }
-        },
+        } // @ts-ignore
+        ,
         onKeyDown: event => {
           if (this.canArrowsOpenDropdown(event)) {
             // disables page scroll
@@ -485,7 +520,8 @@ export default class CalendarHeader extends React.Component {
               isYearDropdownOpen: false
             });
           }
-        }
+        },
+        "aria-label": `Year, ${yearTitle}`
       }, monthYearSelectButtonProps), yearTitle, /*#__PURE__*/React.createElement(MonthYearSelectIconContainer, monthYearSelectIconContainerProps, /*#__PURE__*/React.createElement(ChevronDown, {
         title: "",
         overrides: {
@@ -548,11 +584,15 @@ export default class CalendarHeader extends React.Component {
     }, monthHeaderProps), WEEKDAYS.map(offset => {
       const day = this.dateHelpers.addDays(startOfWeek, offset);
       return /*#__PURE__*/React.createElement(WeekdayHeader, _extends({
-        key: offset,
-        alt: this.dateHelpers.getWeekdayInLocale(day, this.props.locale)
+        key: offset
       }, weekdayHeaderProps, {
         $density: density
-      }), this.dateHelpers.getWeekdayMinInLocale(day, this.props.locale));
+      }), /*#__PURE__*/React.createElement("abbr", {
+        style: {
+          textDecoration: 'none'
+        },
+        title: this.dateHelpers.getWeekdayInLocale(day, this.props.locale)
+      }, this.dateHelpers.getWeekdayMinInLocale(day, this.props.locale)));
     })))));
   }
 
@@ -560,8 +600,11 @@ export default class CalendarHeader extends React.Component {
 
 _defineProperty(CalendarHeader, "defaultProps", {
   adapter: dateFnsAdapter,
+  // @ts-ignore
   locale: null,
+  // @ts-ignore
   maxDate: null,
+  // @ts-ignore
   minDate: null,
   onYearChange: () => {},
   overrides: {}

package/es/datepicker/calendar.js

@@ -20,7 +20,10 @@ import dateFnsAdapter from './utils/date-fns-adapter';
 import DateHelpers from './utils/date-helpers';
 import { getOverrides, mergeOverrides } from '../helpers/overrides';
 import { DENSITY, ORIENTATION } from './constants';
+import { Button, KIND } from '../button';
+import { ButtonDock } from '../button-dock';
 export default class Calendar extends React.Component {
+  // @ts-ignore
   constructor(props) {
     super(props);
 
@@ -32,8 +35,10 @@ export default class Calendar extends React.Component {
       const {
         highlightedDate,
         value
-      } = this.props;
-      const minDate = this.dateHelpers.getEffectiveMinDate(this.props);
+      } = this.props; // @ts-ignore
+
+      const minDate = this.dateHelpers.getEffectiveMinDate(this.props); // @ts-ignore
+
       const maxDate = this.dateHelpers.getEffectiveMaxDate(this.props);
       const current = this.dateHelpers.date();
       const initialDate = this.getSingleDate(value) || highlightedDate;
@@ -331,10 +336,15 @@ export default class Calendar extends React.Component {
       for (let i = 0; i < (this.props.monthsShown || 1); ++i) {
         const monthSubComponents = [];
         const monthDate = this.dateHelpers.addMonths(this.state.date, i);
-        const monthKey = `month-${i}`;
+        const monthKey = `month-${i}`; // @ts-ignore
+
         monthSubComponents.push(this.renderCalendarHeader(monthDate, i));
-        monthSubComponents.push( /*#__PURE__*/React.createElement(CalendarContainer, _extends({
-          key: monthKey,
+        monthSubComponents.push(
+        /*#__PURE__*/
+        // @ts-ignore
+        React.createElement(CalendarContainer, _extends({
+          key: monthKey // @ts-ignore
+          ,
           ref: calendar => {
             this.calendar = calendar;
           },
@@ -371,7 +381,8 @@ export default class Calendar extends React.Component {
           fixedHeight: this.props.fixedHeight,
           hasLockedBehavior: !!this.props.hasLockedBehavior,
           selectedInput: this.props.selectedInput
-        })));
+        }))); // @ts-ignore
+
         monthList.push( /*#__PURE__*/React.createElement("div", {
           key: `month-component-${i}`
         }, monthSubComponents));
@@ -423,7 +434,8 @@ export default class Calendar extends React.Component {
         label: locale.datepicker.quickSelectLabel
       }, quickSelectFormControlProps), /*#__PURE__*/React.createElement(QuickSelect, _extends({
         "aria-label": locale.datepicker.quickSelectAriaLabel,
-        labelKey: "id",
+        labelKey: "id" // @ts-ignore
+        ,
         onChange: params => {
           if (!params.option) {
             this.setState({
@@ -487,18 +499,56 @@ export default class Calendar extends React.Component {
       }, restQuickSelectProps)))));
     });
 
+    _defineProperty(this, "renderActionBar", () => {
+      const {
+        overrides = {},
+        primaryButton,
+        secondaryButton
+      } = this.props;
+      const [ButtonDockComponent, buttonDockProps] = getOverrides(overrides.ButtonDock, ButtonDock);
+      const [PrimaryButtonComponent, primaryButtonProps] = getOverrides(overrides.PrimaryButton, Button);
+      const [SecondaryButtonComponent, secondaryButtonProps] = getOverrides(overrides.SecondaryButton, Button);
+      const primaryButtonComponent = primaryButton != null ? /*#__PURE__*/React.createElement(PrimaryButtonComponent, _extends({
+        onClick: () => primaryButton.onClick()
+      }, primaryButtonProps), primaryButton.label) : null;
+      const secondaryButtonComponent = secondaryButton != null ? /*#__PURE__*/React.createElement(SecondaryButtonComponent, _extends({
+        onClick: () => secondaryButton.onClick(),
+        kind: KIND.tertiary
+      }, secondaryButtonProps), secondaryButton.label) : null;
+
+      if (primaryButtonComponent || secondaryButtonComponent) {
+        return /*#__PURE__*/React.createElement(ButtonDockComponent, _extends({
+          primaryAction: primaryButtonComponent,
+          dismissiveAction: secondaryButtonComponent,
+          overrides: mergeOverrides({
+            ActionSubContainer: {
+              style: {
+                flexDirection: 'row-reverse'
+              }
+            }
+          }, buttonDockProps.overrides)
+        }, buttonDockProps));
+      }
+
+      return null;
+    });
+
     const {
       highlightedDate: _highlightedDate,
       value: _value,
       adapter
-    } = this.props;
+    } = this.props; // @ts-ignore
+
     this.dateHelpers = new DateHelpers(adapter);
-    const dateInView = this.getDateInView();
+    const dateInView = this.getDateInView(); // @ts-ignore
+
     let _time = [];
 
     if (Array.isArray(_value)) {
+      // @ts-ignore
       _time = [..._value];
     } else if (_value) {
+      // @ts-ignore
       _time = [_value];
     }
 
@@ -508,6 +558,7 @@ export default class Calendar extends React.Component {
       date: dateInView,
       quickSelectId: null,
       rootElement: null,
+      // @ts-ignore
       time: _time
     };
   }
@@ -585,13 +636,15 @@ export default class Calendar extends React.Component {
     const {
       overrides = {}
     } = this.props;
-    const [Root, rootProps] = getOverrides(overrides.Root, StyledRoot);
+    const [Root, rootProps] = getOverrides(overrides.Root, StyledRoot); // @ts-ignore
+
     const [startDate, endDate] = [].concat(this.props.value);
     return /*#__PURE__*/React.createElement(LocaleContext.Consumer, null, locale => /*#__PURE__*/React.createElement(Root, _extends({
       $density: this.props.density,
       "data-baseweb": "calendar",
       role: "application",
-      "aria-roledescription": "datepicker",
+      "aria-roledescription": "date picker" // @ts-ignore
+      ,
       ref: root => {
         if (root && root instanceof HTMLElement && !this.state.rootElement) {
           this.setState({
@@ -603,7 +656,9 @@ export default class Calendar extends React.Component {
       onKeyDown: this.props.trapTabbing ? this.handleTabbing : null
     }, rootProps), this.renderMonths({
       ariaRoleDescCalMonth: locale.datepicker.ariaRoleDescriptionCalendarMonth
-    }), this.props.timeSelectStart && this.renderTimeSelect(startDate, time => this.handleTimeChange(time, 0), locale.datepicker.timeSelectStartLabel), this.props.timeSelectEnd && this.props.range && this.renderTimeSelect(endDate, time => this.handleTimeChange(time, 1), locale.datepicker.timeSelectEndLabel), this.renderQuickSelect()));
+    }), this.props.timeSelectStart && this.renderTimeSelect(startDate, // @ts-ignore
+    time => this.handleTimeChange(time, 0), locale.datepicker.timeSelectStartLabel), this.props.timeSelectEnd && this.props.range && this.renderTimeSelect(endDate, // @ts-ignore
+    time => this.handleTimeChange(time, 1), locale.datepicker.timeSelectEndLabel), this.renderQuickSelect(), this.renderActionBar()));
   }
 
 }
@@ -630,6 +685,7 @@ _defineProperty(Calendar, "defaultProps", {
   orientation: ORIENTATION.horizontal,
   overrides: {},
   peekNextMonth: false,
+  // @ts-ignore
   adapter: dateFnsAdapter,
   value: null,
   trapTabbing: false