@primer/components 0.0.0-202192422618 → 0.0.0-202192522854

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @primer/components
 
-## 0.0.0-202192422618
+## 0.0.0-202192522854
 
 ### Patch Changes
 

package/lib/DatePicker/DatePicker.js

@@ -21,8 +21,11 @@ const DatePicker = ({
   anchorVariant,
   anchorRef: externalAnchorRef,
   confirmation,
+  dateFormat,
   focusTrapSettings,
   focusZoneSettings,
+  maxDate,
+  minDate,
   onOpen: onOpenExternal,
   onClose: onCloseExternal,
   open,
@@ -30,15 +33,20 @@ const DatePicker = ({
   renderAnchor,
   selection,
   value,
-  view
+  view,
+  weekStartsOn
 }) => {
   const buttonRef = (0, _react.useRef)(null);
   const [isOpen, setIsOpen] = (0, _react.useState)(false);
   const datePickerConfiguration = {
     anchorVariant,
     confirmation,
+    dateFormat,
+    maxDate,
+    minDate,
     selection,
-    view
+    view,
+    weekStartsOn
   };
 
   const onOpen = gesture => {

package/lib/DatePicker/DatePickerAnchor.d.ts

@@ -2,4 +2,4 @@ import React from 'react';
 export interface DatePickerAnchorProps {
     onAction?: (event?: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>) => void;
 }
-export declare const DatePickerAnchor: React.ForwardRefExoticComponent<DatePickerAnchorProps & React.RefAttributes<HTMLButtonElement>>;
+export declare const DatePickerAnchor: React.ForwardRefExoticComponent<DatePickerAnchorProps & React.RefAttributes<HTMLDivElement>>;

package/lib/DatePicker/DatePickerAnchor.js

@@ -11,7 +11,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _Button = _interopRequireDefault(require("../Button"));
+var _Button = _interopRequireWildcard(require("../Button"));
 
 var _Text = _interopRequireDefault(require("../Text"));
 
@@ -23,6 +23,8 @@ var _useDatePicker = _interopRequireDefault(require("./useDatePicker"));
 
 var _TextInput = _interopRequireDefault(require("../TextInput"));
 
+var _Box = _interopRequireDefault(require("../Box"));
+
 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; }
@@ -39,7 +41,8 @@ const DatePickerAnchor = /*#__PURE__*/_react.default.forwardRef(({
 }, ref) => {
   const {
     configuration: {
-      anchorVariant
+      anchorVariant,
+      iconPlacement
     },
     disabled,
     formattedDate
@@ -60,15 +63,61 @@ const DatePickerAnchor = /*#__PURE__*/_react.default.forwardRef(({
 
     onAction === null || onAction === void 0 ? void 0 : onAction(event);
   }, [disabled, onAction]);
+  const onKeyPressHandler = (0, _react.useCallback)(e => {
+    console.log(e.currentTarget.value);
+  }, []);
+  const onInputChangeHandler = (0, _react.useCallback)(e => {
+    console.log(e.currentTarget.value);
+  }, []);
 
   if (anchorVariant === 'input') {
-    return /*#__PURE__*/_react.default.createElement(_TextInput.default, {
-      value: formattedDate
-    });
+    const calendarButton = side => /*#__PURE__*/_react.default.createElement(_Button.ButtonInvisible, {
+      onClick: clickHandler,
+      sx: {
+        width: '32px',
+        px: '6px',
+        position: 'absolute',
+        [side]: '1px',
+        top: '1px'
+      }
+    }, /*#__PURE__*/_react.default.createElement(_StyledOcticon.default, {
+      icon: _octiconsReact.CalendarIcon
+    }));
+
+    const inputSx = () => {
+      if (iconPlacement === 'start') {
+        return {
+          pl: 5,
+          pr: 2
+        };
+      } else if (iconPlacement === 'end') {
+        return {
+          pl: 2,
+          pr: 5
+        };
+      } else {
+        return {};
+      }
+    };
+
+    return /*#__PURE__*/_react.default.createElement(_Box.default, {
+      ref: ref,
+      sx: {
+        position: 'relative',
+        display: 'flex',
+        flex: 1
+      }
+    }, iconPlacement === 'start' && calendarButton('left'), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
+      defaultValue: formattedDate,
+      onKeyPress: onKeyPressHandler,
+      onChange: onInputChangeHandler,
+      sx: inputSx()
+    }), iconPlacement === 'end' && calendarButton('right'));
   }
 
-  return /*#__PURE__*/_react.default.createElement(DatePickerAnchorButton, {
-    ref: ref,
+  return /*#__PURE__*/_react.default.createElement(_Box.default, {
+    ref: ref
+  }, /*#__PURE__*/_react.default.createElement(DatePickerAnchorButton, {
     onClick: clickHandler,
     onKeyPress: keyPressHandler
   }, /*#__PURE__*/_react.default.createElement(_StyledOcticon.default, {
@@ -82,7 +131,7 @@ const DatePickerAnchor = /*#__PURE__*/_react.default.forwardRef(({
       overflow: 'hidden',
       textOverflow: 'ellipsis'
     }
-  }, formattedDate));
+  }, formattedDate)));
 });
 
 exports.DatePickerAnchor = DatePickerAnchor;

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"));
 
@@ -25,12 +25,12 @@ 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; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const DatePickerPanelContainer = (0, _styledComponents.default)(_Box.default).withConfig({
   displayName: "DatePickerPanel__DatePickerPanelContainer",
   componentId: "sc-19upxpo-0"
@@ -52,23 +52,58 @@ const DatePickerPanel = () => {
   const {
     configuration,
     saveValue,
-    revertValue
+    revertValue,
+    currentViewingDate,
+    goToMonth,
+    nextMonth,
+    previousMonth
   } = (0, _useDatePicker.default)();
+  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"
+    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: new Date().getMonth(),
-    year: new Date().getFullYear()
+    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"
+    side: "right",
+    onClick: nextMonth,
+    disabled: nextDisabled
   }, /*#__PURE__*/_react.default.createElement(_StyledOcticon.default, {
     icon: _octiconsReact.ChevronRightIcon,
     color: "fg.muted"
@@ -79,7 +114,8 @@ const DatePickerPanel = () => {
     },
     onClick: () => revertValue()
   }, "Reset"), /*#__PURE__*/_react.default.createElement(_Button.default, {
-    variant: "small"
+    variant: "small",
+    onClick: () => goToMonth(new Date())
   }, "Today")), configuration.confirmation && /*#__PURE__*/_react.default.createElement(_Button.ButtonPrimary, {
     variant: "small",
     onClick: () => saveValue()

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,

package/lib/DatePicker/Month.js

@@ -19,6 +19,8 @@ var _constants = require("../constants");
 
 var _Day = require("./Day");
 
+var _useDatePicker = _interopRequireDefault(require("./useDatePicker"));
+
 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); }
@@ -42,17 +44,23 @@ const Month = ({
   month,
   year
 }) => {
+  const {
+    configuration
+  } = (0, _useDatePicker.default)();
   const [selectedDay, setSelectedDay] = (0, _react.useState)(null);
   const getTitle = (0, _react.useMemo)(() => `${(0, _dateFns.format)(new Date(year, month), 'MMMM yyyy')}`, [month, year]);
   const weekdayHeaders = (0, _react.useMemo)(() => {
     const now = new Date(year, month);
+    const weekOptions = {
+      weekStartsOn: configuration.weekStartsOn === 'Sunday' ? 0 : 1
+    };
     return (0, _dateFns.eachDayOfInterval)({
-      start: (0, _dateFns.startOfWeek)(now),
-      end: (0, _dateFns.endOfWeek)(now)
+      start: (0, _dateFns.startOfWeek)(now, weekOptions),
+      end: (0, _dateFns.endOfWeek)(now, weekOptions)
     }).map(d => /*#__PURE__*/_react.default.createElement(WeekdayHeader, {
       key: `weekday-${d}-header`
     }, (0, _dateFns.format)(d, 'EEEEEE')));
-  }, [month, year]);
+  }, [configuration.weekStartsOn, month, year]);
 
   const dayAction = date => {
     setSelectedDay(date);
@@ -61,8 +69,9 @@ const Month = ({
   const dayComponents = (0, _react.useMemo)(() => {
     const components = [];
     const firstDay = new Date(year, month, 1);
+    const preBlanks = configuration.weekStartsOn === 'Sunday' ? firstDay.getDay() : (firstDay.getDay() + 6) % 7;
 
-    for (let i = 0; i < firstDay.getDay(); i++) {
+    for (let i = 0; i < preBlanks; i++) {
       components.push( /*#__PURE__*/_react.default.createElement(_Day.BlankDay, {
         key: `month-pre-blank-${i}`
       }));
@@ -79,15 +88,16 @@ const Month = ({
     }
 
     const lastDay = (0, _dateFns.lastDayOfMonth)(firstDay);
+    const postBlanks = configuration.weekStartsOn === 'Sunday' ? lastDay.getDay() : (lastDay.getDay() + 6) % 7;
 
-    for (let i = 6; i > lastDay.getDay(); i--) {
+    for (let i = 6; i > postBlanks; i--) {
       components.push( /*#__PURE__*/_react.default.createElement(_Day.BlankDay, {
         key: `month-post-blank-${i}`
       }));
     }
 
     return components;
-  }, [month, selectedDay, year]);
+  }, [configuration.weekStartsOn, month, selectedDay, year]);
   return /*#__PURE__*/_react.default.createElement(MonthComponent, {
     role: "grid"
   }, /*#__PURE__*/_react.default.createElement(MonthTitle, null, getTitle), weekdayHeaders, dayComponents);

package/lib/DatePicker/useDatePicker.d.ts

@@ -9,12 +9,14 @@ export interface DatePickerConfiguration {
     contiguousSelection?: boolean;
     dateFormat?: DateFormat;
     dimWeekends?: boolean;
+    iconPlacement?: 'start' | 'end' | 'none';
     minDate?: Date;
     maxDate?: Date;
     placeholder?: string;
     rangeIncrement?: number;
     selection?: SelectionVariant;
     view?: '1-month' | '2-month';
+    weekStartsOn?: 'Sunday' | 'Monday' | 'Tuesday' | 'Wednesday' | 'Thursday' | 'Friday' | 'Saturday';
 }
 export declare type RangeSelection = {
     from: Date;
@@ -27,14 +29,18 @@ 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;
 }
@@ -49,14 +55,18 @@ 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;
 };

package/lib/DatePicker/useDatePicker.js

@@ -164,9 +164,11 @@ const defaultConfiguration = {
   confirmation: false,
   contiguousSelection: false,
   dimWeekends: false,
+  iconPlacement: 'start',
   placeholder: 'Select a Date...',
   selection: 'single',
-  view: '2-month'
+  view: '2-month',
+  weekStartsOn: 'Sunday'
 };
 
 const DatePickerProvider = ({
@@ -179,11 +181,21 @@ const DatePickerProvider = ({
   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));
     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;
@@ -191,7 +203,7 @@ const DatePickerProvider = ({
 
     let template = 'MMM d';
 
-    if (configuration.dateFormat) {
+    if (configuration.anchorVariant !== 'input' && configuration.dateFormat) {
       switch (configuration.dateFormat) {
         case 'short':
           template = 'MMM d';
@@ -205,6 +217,8 @@ const DatePickerProvider = ({
           template = configuration.dateFormat;
           break;
       }
+    } else {
+      template = 'MM/dd/yyyy';
     }
 
     switch (configuration.selection) {
@@ -262,7 +276,7 @@ const DatePickerProvider = ({
           return 'Invalid Configuration';
         }
     }
-  }, [configuration.dateFormat, configuration.placeholder, configuration.selection, selection]);
+  }, [configuration.anchorVariant, 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();
@@ -336,18 +350,22 @@ const DatePickerProvider = ({
   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, hoverRange, revertValue, saveValue, 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-esm/DatePicker/DatePicker.js

@@ -6,8 +6,11 @@ export const DatePicker = ({
   anchorVariant,
   anchorRef: externalAnchorRef,
   confirmation,
+  dateFormat,
   focusTrapSettings,
   focusZoneSettings,
+  maxDate,
+  minDate,
   onOpen: onOpenExternal,
   onClose: onCloseExternal,
   open,
@@ -15,15 +18,20 @@ export const DatePicker = ({
   renderAnchor,
   selection,
   value,
-  view
+  view,
+  weekStartsOn
 }) => {
   const buttonRef = useRef(null);
   const [isOpen, setIsOpen] = useState(false);
   const datePickerConfiguration = {
     anchorVariant,
     confirmation,
+    dateFormat,
+    maxDate,
+    minDate,
     selection,
-    view
+    view,
+    weekStartsOn
   };
 
   const onOpen = gesture => {

package/lib-esm/DatePicker/DatePickerAnchor.d.ts

@@ -2,4 +2,4 @@ import React from 'react';
 export interface DatePickerAnchorProps {
     onAction?: (event?: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>) => void;
 }
-export declare const DatePickerAnchor: React.ForwardRefExoticComponent<DatePickerAnchorProps & React.RefAttributes<HTMLButtonElement>>;
+export declare const DatePickerAnchor: React.ForwardRefExoticComponent<DatePickerAnchorProps & React.RefAttributes<HTMLDivElement>>;

package/lib-esm/DatePicker/DatePickerAnchor.js

@@ -1,12 +1,13 @@
 import { CalendarIcon } from '@primer/octicons-react';
 import styled from 'styled-components';
 import React, { useCallback } from 'react';
-import Button from '../Button';
+import Button, { ButtonInvisible } from '../Button';
 import Text from '../Text';
 import { get } from '../constants';
 import StyledOcticon from '../StyledOcticon';
 import useDatePicker from './useDatePicker';
 import TextInput from '../TextInput';
+import Box from '../Box';
 const DatePickerAnchorButton = styled(Button).withConfig({
   displayName: "DatePickerAnchor__DatePickerAnchorButton",
   componentId: "sc-8gpb9d-0"
@@ -16,7 +17,8 @@ export const DatePickerAnchor = /*#__PURE__*/React.forwardRef(({
 }, ref) => {
   const {
     configuration: {
-      anchorVariant
+      anchorVariant,
+      iconPlacement
     },
     disabled,
     formattedDate
@@ -37,15 +39,61 @@ export const DatePickerAnchor = /*#__PURE__*/React.forwardRef(({
 
     onAction === null || onAction === void 0 ? void 0 : onAction(event);
   }, [disabled, onAction]);
+  const onKeyPressHandler = useCallback(e => {
+    console.log(e.currentTarget.value);
+  }, []);
+  const onInputChangeHandler = useCallback(e => {
+    console.log(e.currentTarget.value);
+  }, []);
 
   if (anchorVariant === 'input') {
-    return /*#__PURE__*/React.createElement(TextInput, {
-      value: formattedDate
-    });
+    const calendarButton = side => /*#__PURE__*/React.createElement(ButtonInvisible, {
+      onClick: clickHandler,
+      sx: {
+        width: '32px',
+        px: '6px',
+        position: 'absolute',
+        [side]: '1px',
+        top: '1px'
+      }
+    }, /*#__PURE__*/React.createElement(StyledOcticon, {
+      icon: CalendarIcon
+    }));
+
+    const inputSx = () => {
+      if (iconPlacement === 'start') {
+        return {
+          pl: 5,
+          pr: 2
+        };
+      } else if (iconPlacement === 'end') {
+        return {
+          pl: 2,
+          pr: 5
+        };
+      } else {
+        return {};
+      }
+    };
+
+    return /*#__PURE__*/React.createElement(Box, {
+      ref: ref,
+      sx: {
+        position: 'relative',
+        display: 'flex',
+        flex: 1
+      }
+    }, iconPlacement === 'start' && calendarButton('left'), /*#__PURE__*/React.createElement(TextInput, {
+      defaultValue: formattedDate,
+      onKeyPress: onKeyPressHandler,
+      onChange: onInputChangeHandler,
+      sx: inputSx()
+    }), iconPlacement === 'end' && calendarButton('right'));
   }
 
-  return /*#__PURE__*/React.createElement(DatePickerAnchorButton, {
-    ref: ref,
+  return /*#__PURE__*/React.createElement(Box, {
+    ref: ref
+  }, /*#__PURE__*/React.createElement(DatePickerAnchorButton, {
     onClick: clickHandler,
     onKeyPress: keyPressHandler
   }, /*#__PURE__*/React.createElement(StyledOcticon, {
@@ -59,5 +107,5 @@ export const DatePickerAnchor = /*#__PURE__*/React.forwardRef(({
       overflow: 'hidden',
       textOverflow: 'ellipsis'
     }
-  }, formattedDate));
+  }, formattedDate)));
 });

package/lib-esm/DatePicker/DatePickerPanel.js

@@ -1,5 +1,5 @@
-import { addMonths } from 'date-fns';
-import React from 'react';
+import { addMonths, subMonths } from 'date-fns';
+import React, { useMemo } from 'react';
 import Box from '../Box';
 import { Month } from './Month';
 import styled from 'styled-components';
@@ -28,23 +28,58 @@ export const DatePickerPanel = () => {
   const {
     configuration,
     saveValue,
-    revertValue
+    revertValue,
+    currentViewingDate,
+    goToMonth,
+    nextMonth,
+    previousMonth
   } = useDatePicker();
+  const previousDisabled = useMemo(() => {
+    const {
+      minDate
+    } = configuration;
+    if (!minDate) return false;
+    const previous = subMonths(currentViewingDate, 1);
+
+    if (minDate.getFullYear() >= previous.getFullYear() && minDate.getMonth() > previous.getMonth()) {
+      return true;
+    }
+
+    return false;
+  }, [configuration, currentViewingDate]);
+  const nextDisabled = useMemo(() => {
+    const {
+      maxDate,
+      view
+    } = configuration;
+    if (!maxDate) return false;
+    const next = 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.createElement(DatePickerPanelContainer, null, /*#__PURE__*/React.createElement(DatePickerPanelMonths, null, /*#__PURE__*/React.createElement(ArrowButton, {
     variant: "small",
-    side: "left"
+    side: "left",
+    onClick: previousMonth,
+    disabled: previousDisabled
   }, /*#__PURE__*/React.createElement(StyledOcticon, {
     icon: ChevronLeftIcon,
     color: "fg.muted"
   })), /*#__PURE__*/React.createElement(Month, {
-    month: new Date().getMonth(),
-    year: new Date().getFullYear()
+    month: currentViewingDate.getMonth(),
+    year: currentViewingDate.getFullYear()
   }), configuration.view === '2-month' && /*#__PURE__*/React.createElement(Month, {
-    month: addMonths(new Date(), 1).getMonth(),
-    year: addMonths(new Date(), 1).getFullYear()
+    month: addMonths(currentViewingDate, 1).getMonth(),
+    year: addMonths(currentViewingDate, 1).getFullYear()
   }), /*#__PURE__*/React.createElement(ArrowButton, {
     variant: "small",
-    side: "right"
+    side: "right",
+    onClick: nextMonth,
+    disabled: nextDisabled
   }, /*#__PURE__*/React.createElement(StyledOcticon, {
     icon: ChevronRightIcon,
     color: "fg.muted"
@@ -55,7 +90,8 @@ export const DatePickerPanel = () => {
     },
     onClick: () => revertValue()
   }, "Reset"), /*#__PURE__*/React.createElement(Button, {
-    variant: "small"
+    variant: "small",
+    onClick: () => goToMonth(new Date())
   }, "Today")), configuration.confirmation && /*#__PURE__*/React.createElement(ButtonPrimary, {
     variant: "small",
     onClick: () => saveValue()

package/lib-esm/DatePicker/Day.js

@@ -101,7 +101,7 @@ const DayComponent = styled(DayBaseComponent).attrs(props => ({
 })).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, props => props.textColor, get('fonts.mono'), get('fontSizes.0'), props => props.backgroundHover, Text, props => props.textColorHover, props => props.backgroundPressed, get('shadows.shadow.medium'), Text, 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, props => props.textColor, get('fonts.mono'), get('fontSizes.0'), props => props.backgroundHover, Text, props => props.textColorHover, props => props.backgroundPressed, get('shadows.shadow.medium'), Text, props => props.textColorPressed);
 export const Day = ({
   date,
   onAction

package/lib-esm/DatePicker/Month.js

@@ -5,6 +5,7 @@ import Box from '../Box';
 import Text from '../Text';
 import { get } from '../constants';
 import { BlankDay, Day } from './Day';
+import useDatePicker from './useDatePicker';
 const MonthComponent = styled(Box).withConfig({
   displayName: "Month__MonthComponent",
   componentId: "l6j7o0-0"
@@ -21,17 +22,23 @@ export const Month = ({
   month,
   year
 }) => {
+  const {
+    configuration
+  } = useDatePicker();
   const [selectedDay, setSelectedDay] = useState(null);
   const getTitle = useMemo(() => `${format(new Date(year, month), 'MMMM yyyy')}`, [month, year]);
   const weekdayHeaders = useMemo(() => {
     const now = new Date(year, month);
+    const weekOptions = {
+      weekStartsOn: configuration.weekStartsOn === 'Sunday' ? 0 : 1
+    };
     return eachDayOfInterval({
-      start: startOfWeek(now),
-      end: endOfWeek(now)
+      start: startOfWeek(now, weekOptions),
+      end: endOfWeek(now, weekOptions)
     }).map(d => /*#__PURE__*/React.createElement(WeekdayHeader, {
       key: `weekday-${d}-header`
     }, format(d, 'EEEEEE')));
-  }, [month, year]);
+  }, [configuration.weekStartsOn, month, year]);
 
   const dayAction = date => {
     setSelectedDay(date);
@@ -40,8 +47,9 @@ export const Month = ({
   const dayComponents = useMemo(() => {
     const components = [];
     const firstDay = new Date(year, month, 1);
+    const preBlanks = configuration.weekStartsOn === 'Sunday' ? firstDay.getDay() : (firstDay.getDay() + 6) % 7;
 
-    for (let i = 0; i < firstDay.getDay(); i++) {
+    for (let i = 0; i < preBlanks; i++) {
       components.push( /*#__PURE__*/React.createElement(BlankDay, {
         key: `month-pre-blank-${i}`
       }));
@@ -58,15 +66,16 @@ export const Month = ({
     }
 
     const lastDay = lastDayOfMonth(firstDay);
+    const postBlanks = configuration.weekStartsOn === 'Sunday' ? lastDay.getDay() : (lastDay.getDay() + 6) % 7;
 
-    for (let i = 6; i > lastDay.getDay(); i--) {
+    for (let i = 6; i > postBlanks; i--) {
       components.push( /*#__PURE__*/React.createElement(BlankDay, {
         key: `month-post-blank-${i}`
       }));
     }
 
     return components;
-  }, [month, selectedDay, year]);
+  }, [configuration.weekStartsOn, month, selectedDay, year]);
   return /*#__PURE__*/React.createElement(MonthComponent, {
     role: "grid"
   }, /*#__PURE__*/React.createElement(MonthTitle, null, getTitle), weekdayHeaders, dayComponents);

package/lib-esm/DatePicker/useDatePicker.d.ts

@@ -9,12 +9,14 @@ export interface DatePickerConfiguration {
     contiguousSelection?: boolean;
     dateFormat?: DateFormat;
     dimWeekends?: boolean;
+    iconPlacement?: 'start' | 'end' | 'none';
     minDate?: Date;
     maxDate?: Date;
     placeholder?: string;
     rangeIncrement?: number;
     selection?: SelectionVariant;
     view?: '1-month' | '2-month';
+    weekStartsOn?: 'Sunday' | 'Monday' | 'Tuesday' | 'Wednesday' | 'Thursday' | 'Friday' | 'Saturday';
 }
 export declare type RangeSelection = {
     from: Date;
@@ -27,14 +29,18 @@ 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;
 }
@@ -49,14 +55,18 @@ 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;
 };

package/lib-esm/DatePicker/useDatePicker.js

@@ -1,4 +1,4 @@
-import { format, isEqual, isAfter, isBefore } from 'date-fns';
+import { format, isEqual, isAfter, isBefore, addMonths, subMonths } from 'date-fns';
 import deepmerge from 'deepmerge';
 import React, { createContext, useCallback, useContext, useMemo, useEffect, useState } from 'react';
 const DatePickerContext = /*#__PURE__*/createContext(null);
@@ -139,9 +139,11 @@ const defaultConfiguration = {
   confirmation: false,
   contiguousSelection: false,
   dimWeekends: false,
+  iconPlacement: 'start',
   placeholder: 'Select a Date...',
   selection: 'single',
-  view: '2-month'
+  view: '2-month',
+  weekStartsOn: 'Sunday'
 };
 export const DatePickerProvider = ({
   configuration: externalConfig = {},
@@ -153,11 +155,21 @@ export const DatePickerProvider = ({
   const [previousSelection, setPreviousSelection] = useState(parseSelection(value, configuration.selection));
   const [selection, setSelection] = useState(parseSelection(value, configuration.selection));
   const [hoverRange, setHoverRange] = useState(null);
+  const [currentViewingDate, setCurrentViewingDate] = useState(new Date());
   useEffect(() => {
     setConfiguration(deepmerge(defaultConfiguration, 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 = useCallback(date => {
+    setCurrentViewingDate(new Date(new Date(date).toDateString()));
+  }, []);
+  const nextMonth = useCallback(() => {
+    setCurrentViewingDate(addMonths(currentViewingDate, 1));
+  }, [currentViewingDate]);
+  const previousMonth = useCallback(() => {
+    setCurrentViewingDate(subMonths(currentViewingDate, 1));
+  }, [currentViewingDate]);
   const getFormattedDate = useMemo(() => {
     if (!selection) {
       return configuration.placeholder;
@@ -165,7 +177,7 @@ export const DatePickerProvider = ({
 
     let template = 'MMM d';
 
-    if (configuration.dateFormat) {
+    if (configuration.anchorVariant !== 'input' && configuration.dateFormat) {
       switch (configuration.dateFormat) {
         case 'short':
           template = 'MMM d';
@@ -179,6 +191,8 @@ export const DatePickerProvider = ({
           template = configuration.dateFormat;
           break;
       }
+    } else {
+      template = 'MM/dd/yyyy';
     }
 
     switch (configuration.selection) {
@@ -236,7 +250,7 @@ export const DatePickerProvider = ({
           return 'Invalid Configuration';
         }
     }
-  }, [configuration.dateFormat, configuration.placeholder, configuration.selection, selection]);
+  }, [configuration.anchorVariant, configuration.dateFormat, configuration.placeholder, configuration.selection, selection]);
   const saveValue = useCallback(updatedSelection => {
     setPreviousSelection(updatedSelection !== null && updatedSelection !== void 0 ? updatedSelection : selection);
     closePicker === null || closePicker === void 0 ? void 0 : closePicker();
@@ -310,18 +324,22 @@ export const DatePickerProvider = ({
   const datePickerCtx = 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, hoverRange, revertValue, saveValue, selection, selectionHandler]);
+  }, [blurHnadler, configuration, currentViewingDate, focusHnadler, getFormattedDate, goToMonth, hoverRange, nextMonth, previousMonth, revertValue, saveValue, selection, selectionHandler]);
   return /*#__PURE__*/React.createElement(DatePickerContext.Provider, {
     value: datePickerCtx
   }, children);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "0.0.0-202192422618",
+  "version": "0.0.0-202192522854",
   "description": "Primer react components",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",