@primer/components 0.0.0-202192602912 → 0.0.0-202192633419

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @primer/components
 
-## 0.0.0-202192602912
+## 0.0.0-202192633419
 
 ### Patch Changes
 

package/lib/DatePicker/DatePickerAnchor.js

@@ -25,6 +25,8 @@ var _TextInput = _interopRequireDefault(require("../TextInput"));
 
 var _Box = _interopRequireDefault(require("../Box"));
 
+var _dateFns = require("date-fns");
+
 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; }
@@ -35,6 +37,7 @@ const DatePickerAnchorButton = (0, _styledComponents.default)(_Button.default).w
   displayName: "DatePickerAnchor__DatePickerAnchorButton",
   componentId: "sc-8gpb9d-0"
 })(["align-items:center;display:flex;flex-direction:row;justify-content:space-between;max-width:350px;overflow:hidden;& ", "{margin-left:", ";}"], _Text.default, (0, _constants.get)('space.2'));
+const INVALID_DATE = 'Invalid Date';
 
 const DatePickerAnchor = /*#__PURE__*/_react.default.forwardRef(({
   onAction
@@ -46,8 +49,10 @@ const DatePickerAnchor = /*#__PURE__*/_react.default.forwardRef(({
       selection
     },
     disabled,
-    formattedDate
+    formattedDate,
+    onDateInput
   } = (0, _useDatePicker.default)();
+  const [inputValue, setInputValue] = (0, _react.useState)(formattedDate);
   const keyPressHandler = (0, _react.useCallback)(event => {
     if (disabled) {
       return;
@@ -69,14 +74,21 @@ const DatePickerAnchor = /*#__PURE__*/_react.default.forwardRef(({
     if (!value) return;
 
     if (selection === 'range') {
-      var _values$, _values$2;
+      var _values$, _values$2, _values$3, _values$4, _values$5, _values$6;
 
       const values = value.split(' - ');
-      const dates = {
-        from: new Date((_values$ = values[0]) === null || _values$ === void 0 ? void 0 : _values$.trim()),
-        to: new Date((_values$2 = values[1]) === null || _values$2 === void 0 ? void 0 : _values$2.trim())
+      const dates = (0, _dateFns.isBefore)(new Date((_values$ = values[0]) === null || _values$ === void 0 ? void 0 : _values$.trim()), new Date((_values$2 = values[1]) === null || _values$2 === void 0 ? void 0 : _values$2.trim())) ? {
+        from: new Date((_values$3 = values[0]) === null || _values$3 === void 0 ? void 0 : _values$3.trim()),
+        to: new Date((_values$4 = values[1]) === null || _values$4 === void 0 ? void 0 : _values$4.trim())
+      } : {
+        from: new Date((_values$5 = values[1]) === null || _values$5 === void 0 ? void 0 : _values$5.trim()),
+        to: new Date((_values$6 = values[0]) === null || _values$6 === void 0 ? void 0 : _values$6.trim())
       };
-      console.log(dates);
+      setInputValue(value);
+
+      if (dates.from.toString() !== INVALID_DATE && dates.to.toString() !== INVALID_DATE) {
+        onDateInput(dates);
+      }
     } else if (selection === 'multi') {
       const values = value.split(',');
       const dates = [];
@@ -85,12 +97,21 @@ const DatePickerAnchor = /*#__PURE__*/_react.default.forwardRef(({
         dates.push(new Date(date.trim()));
       }
 
-      console.log(dates);
+      setInputValue(value);
+
+      if (dates.every(d => d.toString() !== INVALID_DATE)) {
+        onDateInput(dates);
+      }
     } else {
       const date = new Date(value);
-      console.log(date);
+      setInputValue(value);
+      if (date.toString() !== INVALID_DATE) onDateInput(date);
     }
-  }, [selection]);
+  }, [onDateInput, selection]);
+
+  const onBlurHandler = () => {
+    setInputValue(formattedDate);
+  };
 
   if (anchorVariant === 'input') {
     const calendarButton = side => /*#__PURE__*/_react.default.createElement(_Button.ButtonInvisible, {
@@ -130,9 +151,10 @@ const DatePickerAnchor = /*#__PURE__*/_react.default.forwardRef(({
         flex: 1
       }
     }, iconPlacement === 'start' && calendarButton('left'), /*#__PURE__*/_react.default.createElement(_TextInput.default, {
-      defaultValue: formattedDate,
+      value: inputValue,
       onChange: onInputChangeHandler,
-      sx: inputSx()
+      sx: inputSx(),
+      onBlur: onBlurHandler
     }), iconPlacement === 'end' && calendarButton('right'));
   }
 

package/lib/DatePicker/Month.js

@@ -27,6 +27,15 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 weekdayEnum = {
+  Sunday: 0,
+  Monday: 1,
+  Tuesday: 2,
+  Wednesday: 3,
+  Thursday: 4,
+  Friday: 5,
+  Saturday: 6
+};
 const MonthComponent = (0, _styledComponents.default)(_Box.default).withConfig({
   displayName: "Month__MonthComponent",
   componentId: "l6j7o0-0"
@@ -50,9 +59,11 @@ const Month = ({
   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)(() => {
+    var _configuration$weekSt;
+
     const now = new Date(year, month);
     const weekOptions = {
-      weekStartsOn: configuration.weekStartsOn === 'Sunday' ? 0 : 1
+      weekStartsOn: weekdayEnum[(_configuration$weekSt = configuration.weekStartsOn) !== null && _configuration$weekSt !== void 0 ? _configuration$weekSt : 'Sunday']
     };
     return (0, _dateFns.eachDayOfInterval)({
       start: (0, _dateFns.startOfWeek)(now, weekOptions),

package/lib/DatePicker/useDatePicker.d.ts

@@ -37,9 +37,10 @@ export interface DatePickerContext {
     selectionActive?: boolean;
     formattedDate: string;
     nextMonth: () => void;
-    onSelection: (date: Date) => void;
+    onDateInput: (updatedSelection: Selection) => void;
     onDayFocus: (date: Date) => void;
     onDayBlur: (date: Date) => void;
+    onSelection: (date: Date) => void;
     previousMonth: () => void;
     revertValue: () => void;
     saveValue: (selection?: Selection) => void;
@@ -63,9 +64,10 @@ declare const useDatePicker: (date?: Date | undefined) => {
     selectionActive?: boolean | undefined;
     formattedDate: string;
     nextMonth: () => void;
-    onSelection: (date: Date) => void;
+    onDateInput: (updatedSelection: Selection) => void;
     onDayFocus: (date: Date) => void;
     onDayBlur: (date: Date) => void;
+    onSelection: (date: Date) => void;
     previousMonth: () => void;
     revertValue: () => void;
     saveValue: (selection?: Selection | undefined) => void;

package/lib/DatePicker/useDatePicker.js

@@ -281,6 +281,10 @@ const DatePickerProvider = ({
     setPreviousSelection(updatedSelection !== null && updatedSelection !== void 0 ? updatedSelection : selection);
     closePicker === null || closePicker === void 0 ? void 0 : closePicker();
   }, [closePicker, selection]);
+  const inputHandler = (0, _react.useCallback)(updatedSelection => {
+    // validate date falls within range
+    setSelection(updatedSelection);
+  }, []);
   const selectionHandler = (0, _react.useCallback)(date => {
     if (configuration.selection === 'multi') {
       const selections = [...selection];
@@ -356,6 +360,7 @@ const DatePickerProvider = ({
       goToMonth,
       hoverRange,
       nextMonth,
+      onDateInput: inputHandler,
       onDayBlur: blurHnadler,
       onDayFocus: focusHnadler,
       onSelection: selectionHandler,
@@ -365,7 +370,7 @@ const DatePickerProvider = ({
       selectionActive: false,
       selection
     };
-  }, [blurHnadler, configuration, currentViewingDate, focusHnadler, getFormattedDate, goToMonth, hoverRange, nextMonth, previousMonth, revertValue, saveValue, selection, selectionHandler]);
+  }, [blurHnadler, configuration, currentViewingDate, focusHnadler, getFormattedDate, goToMonth, hoverRange, inputHandler, nextMonth, previousMonth, revertValue, saveValue, selection, selectionHandler]);
   return /*#__PURE__*/_react.default.createElement(DatePickerContext.Provider, {
     value: datePickerCtx
   }, children);

package/lib-esm/DatePicker/DatePickerAnchor.js

@@ -1,6 +1,6 @@
 import { CalendarIcon } from '@primer/octicons-react';
 import styled from 'styled-components';
-import React, { useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 import Button, { ButtonInvisible } from '../Button';
 import Text from '../Text';
 import { get } from '../constants';
@@ -8,10 +8,12 @@ import StyledOcticon from '../StyledOcticon';
 import useDatePicker from './useDatePicker';
 import TextInput from '../TextInput';
 import Box from '../Box';
+import { isBefore } from 'date-fns';
 const DatePickerAnchorButton = styled(Button).withConfig({
   displayName: "DatePickerAnchor__DatePickerAnchorButton",
   componentId: "sc-8gpb9d-0"
 })(["align-items:center;display:flex;flex-direction:row;justify-content:space-between;max-width:350px;overflow:hidden;& ", "{margin-left:", ";}"], Text, get('space.2'));
+const INVALID_DATE = 'Invalid Date';
 export const DatePickerAnchor = /*#__PURE__*/React.forwardRef(({
   onAction
 }, ref) => {
@@ -22,8 +24,10 @@ export const DatePickerAnchor = /*#__PURE__*/React.forwardRef(({
       selection
     },
     disabled,
-    formattedDate
+    formattedDate,
+    onDateInput
   } = useDatePicker();
+  const [inputValue, setInputValue] = useState(formattedDate);
   const keyPressHandler = useCallback(event => {
     if (disabled) {
       return;
@@ -45,14 +49,21 @@ export const DatePickerAnchor = /*#__PURE__*/React.forwardRef(({
     if (!value) return;
 
     if (selection === 'range') {
-      var _values$, _values$2;
+      var _values$, _values$2, _values$3, _values$4, _values$5, _values$6;
 
       const values = value.split(' - ');
-      const dates = {
-        from: new Date((_values$ = values[0]) === null || _values$ === void 0 ? void 0 : _values$.trim()),
-        to: new Date((_values$2 = values[1]) === null || _values$2 === void 0 ? void 0 : _values$2.trim())
+      const dates = isBefore(new Date((_values$ = values[0]) === null || _values$ === void 0 ? void 0 : _values$.trim()), new Date((_values$2 = values[1]) === null || _values$2 === void 0 ? void 0 : _values$2.trim())) ? {
+        from: new Date((_values$3 = values[0]) === null || _values$3 === void 0 ? void 0 : _values$3.trim()),
+        to: new Date((_values$4 = values[1]) === null || _values$4 === void 0 ? void 0 : _values$4.trim())
+      } : {
+        from: new Date((_values$5 = values[1]) === null || _values$5 === void 0 ? void 0 : _values$5.trim()),
+        to: new Date((_values$6 = values[0]) === null || _values$6 === void 0 ? void 0 : _values$6.trim())
       };
-      console.log(dates);
+      setInputValue(value);
+
+      if (dates.from.toString() !== INVALID_DATE && dates.to.toString() !== INVALID_DATE) {
+        onDateInput(dates);
+      }
     } else if (selection === 'multi') {
       const values = value.split(',');
       const dates = [];
@@ -61,12 +72,21 @@ export const DatePickerAnchor = /*#__PURE__*/React.forwardRef(({
         dates.push(new Date(date.trim()));
       }
 
-      console.log(dates);
+      setInputValue(value);
+
+      if (dates.every(d => d.toString() !== INVALID_DATE)) {
+        onDateInput(dates);
+      }
     } else {
       const date = new Date(value);
-      console.log(date);
+      setInputValue(value);
+      if (date.toString() !== INVALID_DATE) onDateInput(date);
     }
-  }, [selection]);
+  }, [onDateInput, selection]);
+
+  const onBlurHandler = () => {
+    setInputValue(formattedDate);
+  };
 
   if (anchorVariant === 'input') {
     const calendarButton = side => /*#__PURE__*/React.createElement(ButtonInvisible, {
@@ -106,9 +126,10 @@ export const DatePickerAnchor = /*#__PURE__*/React.forwardRef(({
         flex: 1
       }
     }, iconPlacement === 'start' && calendarButton('left'), /*#__PURE__*/React.createElement(TextInput, {
-      defaultValue: formattedDate,
+      value: inputValue,
       onChange: onInputChangeHandler,
-      sx: inputSx()
+      sx: inputSx(),
+      onBlur: onBlurHandler
     }), iconPlacement === 'end' && calendarButton('right'));
   }
 

package/lib-esm/DatePicker/Month.js

@@ -6,6 +6,15 @@ import Text from '../Text';
 import { get } from '../constants';
 import { BlankDay, Day } from './Day';
 import useDatePicker from './useDatePicker';
+const weekdayEnum = {
+  Sunday: 0,
+  Monday: 1,
+  Tuesday: 2,
+  Wednesday: 3,
+  Thursday: 4,
+  Friday: 5,
+  Saturday: 6
+};
 const MonthComponent = styled(Box).withConfig({
   displayName: "Month__MonthComponent",
   componentId: "l6j7o0-0"
@@ -28,9 +37,11 @@ export const Month = ({
   const [selectedDay, setSelectedDay] = useState(null);
   const getTitle = useMemo(() => `${format(new Date(year, month), 'MMMM yyyy')}`, [month, year]);
   const weekdayHeaders = useMemo(() => {
+    var _configuration$weekSt;
+
     const now = new Date(year, month);
     const weekOptions = {
-      weekStartsOn: configuration.weekStartsOn === 'Sunday' ? 0 : 1
+      weekStartsOn: weekdayEnum[(_configuration$weekSt = configuration.weekStartsOn) !== null && _configuration$weekSt !== void 0 ? _configuration$weekSt : 'Sunday']
     };
     return eachDayOfInterval({
       start: startOfWeek(now, weekOptions),

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

@@ -37,9 +37,10 @@ export interface DatePickerContext {
     selectionActive?: boolean;
     formattedDate: string;
     nextMonth: () => void;
-    onSelection: (date: Date) => void;
+    onDateInput: (updatedSelection: Selection) => void;
     onDayFocus: (date: Date) => void;
     onDayBlur: (date: Date) => void;
+    onSelection: (date: Date) => void;
     previousMonth: () => void;
     revertValue: () => void;
     saveValue: (selection?: Selection) => void;
@@ -63,9 +64,10 @@ declare const useDatePicker: (date?: Date | undefined) => {
     selectionActive?: boolean | undefined;
     formattedDate: string;
     nextMonth: () => void;
-    onSelection: (date: Date) => void;
+    onDateInput: (updatedSelection: Selection) => void;
     onDayFocus: (date: Date) => void;
     onDayBlur: (date: Date) => void;
+    onSelection: (date: Date) => void;
     previousMonth: () => void;
     revertValue: () => void;
     saveValue: (selection?: Selection | undefined) => void;

package/lib-esm/DatePicker/useDatePicker.js

@@ -255,6 +255,10 @@ export const DatePickerProvider = ({
     setPreviousSelection(updatedSelection !== null && updatedSelection !== void 0 ? updatedSelection : selection);
     closePicker === null || closePicker === void 0 ? void 0 : closePicker();
   }, [closePicker, selection]);
+  const inputHandler = useCallback(updatedSelection => {
+    // validate date falls within range
+    setSelection(updatedSelection);
+  }, []);
   const selectionHandler = useCallback(date => {
     if (configuration.selection === 'multi') {
       const selections = [...selection];
@@ -330,6 +334,7 @@ export const DatePickerProvider = ({
       goToMonth,
       hoverRange,
       nextMonth,
+      onDateInput: inputHandler,
       onDayBlur: blurHnadler,
       onDayFocus: focusHnadler,
       onSelection: selectionHandler,
@@ -339,7 +344,7 @@ export const DatePickerProvider = ({
       selectionActive: false,
       selection
     };
-  }, [blurHnadler, configuration, currentViewingDate, focusHnadler, getFormattedDate, goToMonth, hoverRange, nextMonth, previousMonth, revertValue, saveValue, selection, selectionHandler]);
+  }, [blurHnadler, configuration, currentViewingDate, focusHnadler, getFormattedDate, goToMonth, hoverRange, inputHandler, 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-202192602912",
+  "version": "0.0.0-202192633419",
   "description": "Primer react components",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",