@primer/components 0.0.0-202192231947 → 0.0.0-20219254849

package/lib/DatePicker/DatePickerPanel.js

@@ -7,7 +7,7 @@ exports.DatePickerPanel = void 0;
 
 var _dateFns = require("date-fns");
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _Box = _interopRequireDefault(require("../Box"));
 
@@ -19,24 +19,107 @@ var _constants = require("../constants");
 
 var _useDatePicker = _interopRequireDefault(require("./useDatePicker"));
 
+var _octiconsReact = require("@primer/octicons-react");
+
+var _StyledOcticon = _interopRequireDefault(require("../StyledOcticon"));
+
+var _Button = _interopRequireWildcard(require("../Button"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 const DatePickerPanelContainer = (0, _styledComponents.default)(_Box.default).withConfig({
   displayName: "DatePickerPanel__DatePickerPanelContainer",
   componentId: "sc-19upxpo-0"
-})(["align-items:flex-start;display:flex;flex-direction:row;gap:", ";padding:", ";"], (0, _constants.get)('space.6'), (0, _constants.get)('space.3'));
+})(["align-items:stretch;display:flex;flex-direction:column;"]);
+const DatePickerPanelMonths = (0, _styledComponents.default)(_Box.default).withConfig({
+  displayName: "DatePickerPanel__DatePickerPanelMonths",
+  componentId: "sc-19upxpo-1"
+})(["align-items:flex-start;display:flex;flex-direction:row;gap:", ";padding:", ";position:relative;"], (0, _constants.get)('space.6'), (0, _constants.get)('space.3'));
+const DatePickerPanelFooter = (0, _styledComponents.default)(_Box.default).withConfig({
+  displayName: "DatePickerPanel__DatePickerPanelFooter",
+  componentId: "sc-19upxpo-2"
+})(["align-items:flex-start;border-top:1px solid;border-top-color:", ";display:flex;gap:", ";padding-top:12px;padding-bottom:12px;padding-left:", ";padding-right:", ";flex-direction:row;justify-content:space-between;position:relative;"], (0, _constants.get)('colors.border.default'), (0, _constants.get)('space.6'), (0, _constants.get)('space.3'), (0, _constants.get)('space.3'));
+const ArrowButton = (0, _styledComponents.default)(_Button.default).withConfig({
+  displayName: "DatePickerPanel__ArrowButton",
+  componentId: "sc-19upxpo-3"
+})(["position:absolute;width:40px;height:28px;top:12px;", ";"], props => `${props.side}: ${(0, _constants.get)('space.3')(props)}`);
 
 const DatePickerPanel = () => {
   const {
-    configuration
+    configuration,
+    saveValue,
+    revertValue,
+    currentViewingDate,
+    goToMonth,
+    nextMonth,
+    previousMonth
   } = (0, _useDatePicker.default)();
-  return /*#__PURE__*/_react.default.createElement(DatePickerPanelContainer, null, /*#__PURE__*/_react.default.createElement(_Month.Month, {
-    month: new Date().getMonth(),
-    year: new Date().getFullYear()
+  const previousDisabled = (0, _react.useMemo)(() => {
+    const {
+      minDate
+    } = configuration;
+    if (!minDate) return false;
+    const previous = (0, _dateFns.subMonths)(currentViewingDate, 1);
+
+    if (minDate.getFullYear() >= previous.getFullYear() && minDate.getMonth() > previous.getMonth()) {
+      return true;
+    }
+
+    return false;
+  }, [configuration, currentViewingDate]);
+  const nextDisabled = (0, _react.useMemo)(() => {
+    const {
+      maxDate,
+      view
+    } = configuration;
+    if (!maxDate) return false;
+    const next = (0, _dateFns.addMonths)(currentViewingDate, view === '2-month' ? 2 : 1);
+
+    if (maxDate.getFullYear() <= next.getFullYear() && maxDate.getMonth() < next.getMonth()) {
+      return true;
+    }
+
+    return false;
+  }, [configuration, currentViewingDate]);
+  return /*#__PURE__*/_react.default.createElement(DatePickerPanelContainer, null, /*#__PURE__*/_react.default.createElement(DatePickerPanelMonths, null, /*#__PURE__*/_react.default.createElement(ArrowButton, {
+    variant: "small",
+    side: "left",
+    onClick: previousMonth,
+    disabled: previousDisabled
+  }, /*#__PURE__*/_react.default.createElement(_StyledOcticon.default, {
+    icon: _octiconsReact.ChevronLeftIcon,
+    color: "fg.muted"
+  })), /*#__PURE__*/_react.default.createElement(_Month.Month, {
+    month: currentViewingDate.getMonth(),
+    year: currentViewingDate.getFullYear()
   }), configuration.view === '2-month' && /*#__PURE__*/_react.default.createElement(_Month.Month, {
-    month: (0, _dateFns.addMonths)(new Date(), 1).getMonth(),
-    year: (0, _dateFns.addMonths)(new Date(), 1).getFullYear()
-  }));
+    month: (0, _dateFns.addMonths)(currentViewingDate, 1).getMonth(),
+    year: (0, _dateFns.addMonths)(currentViewingDate, 1).getFullYear()
+  }), /*#__PURE__*/_react.default.createElement(ArrowButton, {
+    variant: "small",
+    side: "right",
+    onClick: nextMonth,
+    disabled: nextDisabled
+  }, /*#__PURE__*/_react.default.createElement(_StyledOcticon.default, {
+    icon: _octiconsReact.ChevronRightIcon,
+    color: "fg.muted"
+  }))), /*#__PURE__*/_react.default.createElement(DatePickerPanelFooter, null, /*#__PURE__*/_react.default.createElement(_Box.default, null, /*#__PURE__*/_react.default.createElement(_Button.default, {
+    variant: "small",
+    sx: {
+      mr: 1
+    },
+    onClick: () => revertValue()
+  }, "Reset"), /*#__PURE__*/_react.default.createElement(_Button.default, {
+    variant: "small",
+    onClick: () => goToMonth(new Date())
+  }, "Today")), configuration.confirmation && /*#__PURE__*/_react.default.createElement(_Button.ButtonPrimary, {
+    variant: "small",
+    onClick: () => saveValue()
+  }, "Apply")));
 };
 
 exports.DatePickerPanel = DatePickerPanel;

package/lib/DatePicker/Day.js

@@ -120,7 +120,7 @@ const DayComponent = (0, _styledComponents.default)(DayBaseComponent).attrs(prop
 })).withConfig({
   displayName: "Day__DayComponent",
   componentId: "sc-1japneh-1"
-})(["background-color:", ";border-radius:", ";transition:0.2s background-color ease;& ", "{align-self:center;color:", ";display:flex;font-family:", ";font-size:", ";justify-self:center;user-select:none;transition:0.2s color ease;}&:hover{background-color:", ";cursor:pointer;transition:0.05s background-color ease;& ", "{color:", ";transition:0.1s color ease;}}&:active{background-color:", ";box-shadow:inset ", ";transition:0.1s background-color ease,0.1s box-shadow ease,0.1s color ease;& ", "{color:", ";transition:0.1s color ease;}}"], props => props.background, props => props.borderRadius, _Text.default, props => props.textColor, (0, _constants.get)('fonts.mono'), (0, _constants.get)('fontSizes.0'), props => props.backgroundHover, _Text.default, props => props.textColorHover, props => props.backgroundPressed, (0, _constants.get)('shadows.shadow.medium'), _Text.default, props => props.textColorPressed);
+})(["background-color:", ";border-radius:", ";transition:0.1s background-color ease;& ", "{align-self:center;color:", ";display:flex;font-family:", ";font-size:", ";justify-self:center;user-select:none;transition:0.1s color ease;}&:hover{background-color:", ";cursor:pointer;transition:0.05s background-color ease;& ", "{color:", ";transition:0.1s color ease;}}&:active{background-color:", ";box-shadow:inset ", ";transition:0.1s background-color ease,0.1s box-shadow ease,0.1s color ease;& ", "{color:", ";transition:0.1s color ease;}}"], props => props.background, props => props.borderRadius, _Text.default, props => props.textColor, (0, _constants.get)('fonts.mono'), (0, _constants.get)('fontSizes.0'), props => props.backgroundHover, _Text.default, props => props.textColorHover, props => props.backgroundPressed, (0, _constants.get)('shadows.shadow.medium'), _Text.default, props => props.textColorPressed);
 
 const Day = ({
   date,
@@ -158,6 +158,7 @@ const Day = ({
     disabled: disabled,
     selected: selected,
     onClick: clickHandler,
+    onMouseEnter: () => onDayFocus(date),
     onFocus: () => onDayFocus(date),
     onBlur: () => onDayBlur(date),
     onKeyPress: keyPressHandler

package/lib/DatePicker/useDatePicker.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 export declare type AnchorVariant = 'input' | 'button' | 'icon-only';
 export declare type DateFormat = 'short' | 'long' | string;
+export declare type SelectionVariant = 'single' | 'multi' | 'range';
 export interface DatePickerConfiguration {
     anchorVariant?: AnchorVariant;
     blockedDates?: Array<Date>;
@@ -12,7 +13,7 @@ export interface DatePickerConfiguration {
     maxDate?: Date;
     placeholder?: string;
     rangeIncrement?: number;
-    selection?: 'single' | 'multi' | 'range';
+    selection?: SelectionVariant;
     view?: '1-month' | '2-month';
 }
 export declare type RangeSelection = {
@@ -26,13 +27,20 @@ export declare type StringRangeSelection = {
 export interface DatePickerContext {
     disabled?: boolean;
     configuration: DatePickerConfiguration;
+    currentViewingDate: Date;
+    goToMonth: (date: Date) => void;
+    hoverRange?: RangeSelection | null;
     selection?: Selection;
     softSelection?: Partial<RangeSelection> | null;
     selectionActive?: boolean;
     formattedDate: string;
+    nextMonth: () => void;
     onSelection: (date: Date) => void;
     onDayFocus: (date: Date) => void;
     onDayBlur: (date: Date) => void;
+    previousMonth: () => void;
+    revertValue: () => void;
+    saveValue: (selection?: Selection) => void;
 }
 export declare type Selection = Date | Array<Date> | RangeSelection | null;
 export declare type StringSelection = string | Array<string> | {
@@ -45,13 +53,20 @@ declare const useDatePicker: (date?: Date | undefined) => {
     disabled: boolean;
     selected: DaySelection;
     configuration: DatePickerConfiguration;
+    currentViewingDate: Date;
+    goToMonth: (date: Date) => void;
+    hoverRange?: RangeSelection | null | undefined;
     selection?: Selection | undefined;
     softSelection?: Partial<RangeSelection> | null | undefined;
     selectionActive?: boolean | undefined;
     formattedDate: string;
+    nextMonth: () => void;
     onSelection: (date: Date) => void;
     onDayFocus: (date: Date) => void;
     onDayBlur: (date: Date) => void;
+    previousMonth: () => void;
+    revertValue: () => void;
+    saveValue: (selection?: Selection | undefined) => void;
 };
 export default useDatePicker;
 export interface DatePickerProviderProps {
@@ -60,7 +75,7 @@ export interface DatePickerProviderProps {
     value?: Selection | StringSelection;
 }
 export declare function isSingleSelection(selection: Selection): selection is Date;
-export declare function isMultiSelection(selection: Selection): selection is Array<Date>;
+export declare function isMultiSelection(selection: Selection | StringSelection): selection is Array<Date> | Array<string>;
 export declare function isRangeSelection(selection: Selection | StringSelection): selection is RangeSelection | StringRangeSelection;
 export declare function isStringRangeSelection(selection: StringSelection): selection is StringRangeSelection;
 export declare const DatePickerProvider: React.FC<DatePickerProviderProps>;

package/lib/DatePicker/useDatePicker.js

@@ -25,35 +25,50 @@ const DatePickerContext = /*#__PURE__*/(0, _react.createContext)(null);
 
 const useDatePicker = date => {
   const value = (0, _react.useContext)(DatePickerContext);
+  const [selected, setSelected] = (0, _react.useState)(false);
 
   if (!value) {
     throw new Error('useDatePicker must be used inside a DatePickerProvider');
   }
 
-  let selected = false;
-  let blocked,
-      disabled = false;
-
-  if (date) {
-    if (value.selection) {
-      if (isMultiSelection(value.selection)) {
-        selected = !!value.selection.find(d => (0, _dateFns.isEqual)(d, date));
-      } else if (isRangeSelection(value.selection)) {
-        if ((0, _dateFns.isEqual)(date, value.selection.from)) {
-          selected = 'start';
-        } else if (value.selection.to && (0, _dateFns.isEqual)(date, value.selection.to)) {
-          selected = 'end';
-        } else if ((0, _dateFns.isAfter)(date, value.selection.from) && value.selection.to && (0, _dateFns.isBefore)(date, value.selection.to)) {
-          selected = 'middle';
+  (0, _react.useEffect)(() => {
+    if (date) {
+      if (value.hoverRange) {
+        if (isRangeSelection(value.hoverRange)) {
+          if ((0, _dateFns.isEqual)(date, value.hoverRange.from)) {
+            setSelected('start');
+          } else if (value.hoverRange.to && (0, _dateFns.isEqual)(date, value.hoverRange.to)) {
+            setSelected('end');
+          } else if ((0, _dateFns.isAfter)(date, value.hoverRange.from) && value.hoverRange.to && (0, _dateFns.isBefore)(date, value.hoverRange.to)) {
+            setSelected('middle');
+          } else {
+            setSelected(false);
+          }
+        }
+      } else if (value.selection) {
+        if (isMultiSelection(value.selection)) {
+          setSelected(!!value.selection.find(d => (0, _dateFns.isEqual)(d, date)));
+        } else if (isRangeSelection(value.selection)) {
+          if ((0, _dateFns.isEqual)(date, value.selection.from)) {
+            setSelected('start');
+          } else if (value.selection.to && (0, _dateFns.isEqual)(date, value.selection.to)) {
+            setSelected('end');
+          } else if ((0, _dateFns.isAfter)(date, value.selection.from) && value.selection.to && (0, _dateFns.isBefore)(date, value.selection.to)) {
+            setSelected('middle');
+          } else {
+            setSelected(false);
+          }
         } else {
-          selected = false;
+          setSelected((0, _dateFns.isEqual)(date, value.selection));
         }
-      } else {
-        selected = (0, _dateFns.isEqual)(date, value.selection);
       }
-    } // Determine if date is blocked out
-
+    }
+  }, [date, value.hoverRange, value.selection]);
+  let blocked,
+      disabled = false;
 
+  if (date) {
+    // Determine if date is blocked out
     if (value.configuration.blockedDates) {
       blocked = !!value.configuration.blockedDates.find(d => (0, _dateFns.isEqual)(d, date));
     } // Determine if date is disabled
@@ -79,7 +94,7 @@ function isSingleSelection(selection) {
 }
 
 function isMultiSelection(selection) {
-  return Array.isArray(selection) && selection.every(d => d instanceof Date);
+  return Array.isArray(selection);
 }
 
 function isRangeSelection(selection) {
@@ -90,24 +105,57 @@ function isStringRangeSelection(selection) {
   return !!selection.from;
 }
 
-function parseSelection(selection) {
+function parseSelection(selection, variant) {
   if (!selection) return;
 
-  if (Array.isArray(selection)) {
-    const parsedSelection = [];
+  if (variant === 'multi') {
+    if (isMultiSelection(selection)) {
+      const parsedSelection = [];
 
-    for (const d of selection) {
-      parsedSelection.push(new Date(new Date(d).toDateString()));
-    }
+      for (const d of selection) {
+        parsedSelection.push(new Date(new Date(d).toDateString()));
+      }
 
-    return parsedSelection.sort((a, b) => b.getMilliseconds() - a.getMilliseconds());
-  } else if (isRangeSelection(selection)) {
-    return {
-      from: new Date(new Date(selection.from).toDateString()),
-      to: selection.to ? new Date(new Date(selection.to).toDateString()) : null
-    };
+      return parsedSelection.sort((a, b) => a.getTime() - b.getTime());
+    } else if (selection instanceof Date) {
+      return [new Date(new Date(selection).toDateString())];
+    } else if (isRangeSelection(selection)) {
+      const parsedSelection = [];
+      parsedSelection.push(new Date(new Date(selection.from).toDateString()));
+
+      if (selection.to) {
+        parsedSelection.push(new Date(new Date(selection.to).toDateString()));
+      }
+
+      return parsedSelection.sort((a, b) => a.getTime() - b.getTime());
+    }
+  } else if (variant === 'range') {
+    if (isRangeSelection(selection)) {
+      return {
+        from: new Date(new Date(selection.from).toDateString()),
+        to: selection.to ? new Date(new Date(selection.to).toDateString()) : null
+      };
+    } else if (isMultiSelection(selection)) {
+      return {
+        from: new Date(new Date(selection[0]).toDateString()),
+        to: selection[1] ? new Date(new Date(selection[1]).toDateString()) : null
+      };
+    } else if (selection instanceof Date) {
+      return {
+        from: new Date(new Date(selection).toDateString()),
+        to: null
+      };
+    }
   } else {
-    return new Date(new Date(selection).toDateString());
+    if (selection instanceof Date) {
+      return new Date(new Date(selection).toDateString());
+    } else if (isMultiSelection(selection)) {
+      return new Date(new Date(selection[0]).toDateString());
+    } else if (isRangeSelection(selection)) {
+      return new Date(new Date(selection.from).toDateString());
+    } else {
+      return;
+    }
   }
 }
 
@@ -128,11 +176,24 @@ const DatePickerProvider = ({
   value
 }) => {
   const [configuration, setConfiguration] = (0, _react.useState)((0, _deepmerge.default)(defaultConfiguration, externalConfig));
-  const [selection, setSelection] = (0, _react.useState)(parseSelection(value));
+  const [previousSelection, setPreviousSelection] = (0, _react.useState)(parseSelection(value, configuration.selection));
+  const [selection, setSelection] = (0, _react.useState)(parseSelection(value, configuration.selection));
   const [hoverRange, setHoverRange] = (0, _react.useState)(null);
+  const [currentViewingDate, setCurrentViewingDate] = (0, _react.useState)(new Date());
   (0, _react.useEffect)(() => {
     setConfiguration((0, _deepmerge.default)(defaultConfiguration, externalConfig));
-  }, [externalConfig]);
+    setSelection(parseSelection(selection, configuration.selection)); // Don't want this to run every time selection gets updated
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [configuration.selection, externalConfig]);
+  const goToMonth = (0, _react.useCallback)(date => {
+    setCurrentViewingDate(new Date(new Date(date).toDateString()));
+  }, []);
+  const nextMonth = (0, _react.useCallback)(() => {
+    setCurrentViewingDate((0, _dateFns.addMonths)(currentViewingDate, 1));
+  }, [currentViewingDate]);
+  const previousMonth = (0, _react.useCallback)(() => {
+    setCurrentViewingDate((0, _dateFns.subMonths)(currentViewingDate, 1));
+  }, [currentViewingDate]);
   const getFormattedDate = (0, _react.useMemo)(() => {
     if (!selection) {
       return configuration.placeholder;
@@ -161,6 +222,10 @@ const DatePickerProvider = ({
         {
           if (selection instanceof Date) {
             return (0, _dateFns.format)(selection, template);
+          } else if (Array.isArray(selection)) {
+            return (0, _dateFns.format)(selection[0], template);
+          } else if (isRangeSelection(selection)) {
+            return (0, _dateFns.format)(selection.from, template);
           } else {
             return 'Invalid Selection';
           }
@@ -169,7 +234,13 @@ const DatePickerProvider = ({
       case 'multi':
         {
           if (Array.isArray(selection)) {
-            return selection.map(d => (0, _dateFns.format)(d, template)).join(', ');
+            if (selection.length > 3) return `${selection.length} Selected`;
+            const formatted = selection.map(d => (0, _dateFns.format)(d, template)).join(', ');
+            return formatted;
+          } else if (selection instanceof Date) {
+            return [selection].map(d => (0, _dateFns.format)(d, template)).join(', ');
+          } else if (isRangeSelection(selection)) {
+            return [selection.to, selection.from].map(d => d ? (0, _dateFns.format)(d, template) : '').join(', ');
           } else {
             return 'Invalid Selection';
           }
@@ -179,6 +250,18 @@ const DatePickerProvider = ({
         {
           if (isRangeSelection(selection)) {
             return Object.entries(selection).map(([_, date]) => date ? (0, _dateFns.format)(date, template) : '').join(' - ');
+          } else if (selection instanceof Date) {
+            return Object.entries({
+              from: selection,
+              to: null
+            }).map(([_, date]) => date ? (0, _dateFns.format)(date, template) : '').join(' - ');
+          } else if (Array.isArray(selection)) {
+            return Object.entries({
+              from: selection[0],
+              to: selection[1]
+            }) // to date can still be null
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            .map(([_, date]) => date ? (0, _dateFns.format)(date, template) : '').join(' - ');
           } else {
             return 'Invalid Selection';
           }
@@ -190,30 +273,41 @@ const DatePickerProvider = ({
         }
     }
   }, [configuration.dateFormat, configuration.placeholder, configuration.selection, selection]);
+  const saveValue = (0, _react.useCallback)(updatedSelection => {
+    setPreviousSelection(updatedSelection !== null && updatedSelection !== void 0 ? updatedSelection : selection);
+    closePicker === null || closePicker === void 0 ? void 0 : closePicker();
+  }, [closePicker, selection]);
   const selectionHandler = (0, _react.useCallback)(date => {
     if (configuration.selection === 'multi') {
-      const selections = selection;
+      const selections = [...selection];
       const existingIndex = selections.findIndex(s => (0, _dateFns.isEqual)(s, date));
 
       if (existingIndex > -1) {
-        setSelection(selections.splice(existingIndex, 1));
+        selections.splice(existingIndex, 1);
+        setSelection(selections.sort((a, b) => a.getTime() - b.getTime()));
       } else {
-        setSelection([...selections, date]);
+        setSelection([...selections, date].sort((a, b) => a.getTime() - b.getTime()));
       }
     } else if (configuration.selection === 'range') {
       if (selection && isRangeSelection(selection) && !selection.to) {
-        setSelection((0, _dateFns.isBefore)(date, selection.from) ? {
+        const updatedSelection = (0, _dateFns.isBefore)(date, selection.from) ? {
           from: date,
           to: selection.from
         } : {
           from: selection.from,
           to: date
-        });
+        };
+        setSelection(updatedSelection);
+        setHoverRange(null);
 
         if (!configuration.confirmation) {
-          closePicker === null || closePicker === void 0 ? void 0 : closePicker();
+          saveValue(updatedSelection);
         }
       } else {
+        setHoverRange({
+          from: date,
+          to: date
+        });
         setSelection({
           from: date,
           to: null
@@ -223,14 +317,14 @@ const DatePickerProvider = ({
       setSelection(date);
 
       if (!configuration.confirmation) {
-        closePicker === null || closePicker === void 0 ? void 0 : closePicker();
+        saveValue(date);
       }
     }
-  }, [closePicker, configuration.confirmation, configuration.selection, selection]);
+  }, [configuration.confirmation, configuration.selection, saveValue, selection]);
   const focusHnadler = (0, _react.useCallback)(date => {
     if (!selection) return;
 
-    if (configuration.selection === 'range' && isRangeSelection(selection)) {
+    if (configuration.selection === 'range' && isRangeSelection(selection) && hoverRange) {
       setHoverRange((0, _dateFns.isBefore)(date, selection.from) ? {
         from: date,
         to: selection.from
@@ -239,26 +333,35 @@ const DatePickerProvider = ({
         to: date
       });
     }
-  }, [configuration.selection, selection]);
+  }, [configuration.selection, hoverRange, selection]);
   const blurHnadler = (0, _react.useCallback)(date => {
     if (!selection || !hoverRange) return;
 
-    if (configuration.selection === 'range' && isRangeSelection(selection) && (hoverRange.from === date || hoverRange.to === date)) {
-      setHoverRange(null);
+    if (configuration.selection === 'range' && isRangeSelection(selection) && (hoverRange.from === date || hoverRange.to === date)) {// setHoverRange({from: hoverRange.from, to: hoverRange.from})
     }
   }, [configuration.selection, hoverRange, selection]);
+  const revertValue = (0, _react.useCallback)(() => {
+    setSelection(previousSelection);
+  }, [previousSelection]);
   const datePickerCtx = (0, _react.useMemo)(() => {
     return {
       configuration,
+      currentViewingDate,
       disabled: false,
       formattedDate: getFormattedDate,
+      goToMonth,
+      hoverRange,
+      nextMonth,
       onDayBlur: blurHnadler,
       onDayFocus: focusHnadler,
       onSelection: selectionHandler,
+      previousMonth,
+      revertValue,
+      saveValue,
       selectionActive: false,
       selection
     };
-  }, [blurHnadler, configuration, focusHnadler, getFormattedDate, selection, selectionHandler]);
+  }, [blurHnadler, configuration, currentViewingDate, focusHnadler, getFormattedDate, goToMonth, hoverRange, nextMonth, previousMonth, revertValue, saveValue, selection, selectionHandler]);
   return /*#__PURE__*/_react.default.createElement(DatePickerContext.Provider, {
     value: datePickerCtx
   }, children);

package/lib/Dialog.js

@@ -122,7 +122,7 @@ const Dialog = /*#__PURE__*/(0, _react.forwardRef)(({
   }), children)) : null;
 });
 DialogHeader.defaultProps = {
-  backgroundColor: 'bg.tertiary'
+  backgroundColor: 'canvas.subtle'
 };
 DialogHeader.propTypes = { ..._Box.default.propTypes
 };

package/lib/FilteredActionList/FilteredActionList.js

@@ -7,6 +7,8 @@ exports.FilteredActionList = FilteredActionList;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _ssr = require("@react-aria/ssr");
+
 var _TextInput = _interopRequireDefault(require("../TextInput"));
 
 var _Box = _interopRequireDefault(require("../Box"));
@@ -27,7 +29,7 @@ var _useProvidedRefOrCreate = require("../hooks/useProvidedRefOrCreate");
 
 var _useScrollFlash = _interopRequireDefault(require("../hooks/useScrollFlash"));
 
-var _ssr = require("@react-aria/ssr");
+var _scrollIntoViewingArea = require("../behaviors/scrollIntoViewingArea");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -37,34 +39,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-function scrollIntoViewingArea(child, container, margin = 8, behavior = 'smooth') {
-  const {
-    top: childTop,
-    bottom: childBottom
-  } = child.getBoundingClientRect();
-  const {
-    top: containerTop,
-    bottom: containerBottom
-  } = container.getBoundingClientRect();
-  const isChildTopAboveViewingArea = childTop < containerTop + margin;
-  const isChildBottomBelowViewingArea = childBottom > containerBottom - margin;
-
-  if (isChildTopAboveViewingArea) {
-    const scrollHeightToChildTop = childTop - containerTop + container.scrollTop;
-    container.scrollTo({
-      behavior,
-      top: scrollHeightToChildTop - margin
-    });
-  } else if (isChildBottomBelowViewingArea) {
-    const scrollHeightToChildBottom = childBottom - containerBottom + container.scrollTop;
-    container.scrollTo({
-      behavior,
-      top: scrollHeightToChildBottom + margin
-    });
-  } // either completely in view or outside viewing area on both ends, don't scroll
-
-}
-
 const StyledHeader = _styledComponents.default.div.withConfig({
   displayName: "FilteredActionList__StyledHeader",
   componentId: "yg3jkv-0"
@@ -112,7 +86,7 @@ function FilteredActionList({
       activeDescendantRef.current = current;
 
       if (current && scrollContainerRef.current && directlyActivated) {
-        scrollIntoViewingArea(current, scrollContainerRef.current);
+        (0, _scrollIntoViewingArea.scrollIntoViewingArea)(current, scrollContainerRef.current);
       }
     }
   }, [// List ref isn't set while loading.  Need to re-bind focus zone when it changes
@@ -120,7 +94,7 @@ function FilteredActionList({
   (0, _react.useEffect)(() => {
     // if items changed, we want to instantly move active descendant into view
     if (activeDescendantRef.current && scrollContainerRef.current) {
-      scrollIntoViewingArea(activeDescendantRef.current, scrollContainerRef.current, undefined, 'auto');
+      (0, _scrollIntoViewingArea.scrollIntoViewingArea)(activeDescendantRef.current, scrollContainerRef.current, 'vertical', undefined, undefined, 'auto');
     }
   }, [items]);
   (0, _useScrollFlash.default)(scrollContainerRef);