@patternfly/react-core 4.202.18 → 4.202.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "4.202.18",
+  "version": "4.202.21",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -34,16 +34,16 @@
     "generate": "node scripts/copyStyles.js"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^4.53.18",
-    "@patternfly/react-styles": "^4.52.18",
-    "@patternfly/react-tokens": "^4.54.18",
+    "@patternfly/react-icons": "^4.53.21",
+    "@patternfly/react-styles": "^4.52.21",
+    "@patternfly/react-tokens": "^4.54.21",
     "focus-trap": "6.2.2",
     "react-dropzone": "9.0.0",
     "tippy.js": "5.1.2",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "4.185.1",
+    "@patternfly/patternfly": "4.185.2",
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@rollup/plugin-replace": "^3.0.0",
@@ -60,5 +60,5 @@
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },
-  "gitHead": "fd2bf430267635cb2473b40153f591fa853b47ad"
+  "gitHead": "15786a5112cf09f6bdbc95b067918cf24ec74ba0"
 }

package/src/components/CalendarMonth/CalendarMonth.tsx

@@ -113,7 +113,11 @@ export const CalendarMonth = ({
   // eslint-disable-next-line prefer-const
   let [focusedDate, setFocusedDate] = React.useState(new Date(dateProp));
   if (!isValidDate(focusedDate)) {
-    focusedDate = today;
+    if (isValidDate(rangeStart)) {
+      focusedDate = rangeStart;
+    } else {
+      focusedDate = today;
+    }
   }
   const [hoveredDate, setHoveredDate] = React.useState(new Date(focusedDate));
   const focusRef = React.useRef<HTMLButtonElement>();
@@ -279,13 +283,15 @@ export const CalendarMonth = ({
                 const isSelected = isValidDate(dateProp) && isSameDate(date, dateProp);
                 const isFocused = isSameDate(date, focusedDate);
                 const isAdjacentMonth = date.getMonth() !== focusedDate.getMonth();
+                const isRangeStart = isValidDate(rangeStart) && isSameDate(date, rangeStart);
                 let isInRange = false;
-                let isRangeStart = false;
                 let isRangeEnd = false;
-                if (isValidDate(rangeStart) && isHoveredDateValid) {
+                if (isValidDate(rangeStart) && isValidDate(dateProp)) {
+                  isInRange = date > rangeStart && date < dateProp;
+                  isRangeEnd = isSameDate(date, dateProp);
+                } else if (isValidDate(rangeStart) && isHoveredDateValid) {
                   if (hoveredDate > rangeStart || isSameDate(hoveredDate, rangeStart)) {
                     isInRange = date > rangeStart && date < hoveredDate;
-                    isRangeStart = isSameDate(date, rangeStart);
                     isRangeEnd = isSameDate(date, hoveredDate);
                   }
                   // Don't handle focused dates before start dates for now.

package/src/components/CalendarMonth/examples/CalendarMonth.md

@@ -17,3 +17,12 @@ beta: true
 
 ```ts file="./CalendarMonthSelectableDate.tsx"
 ```
+
+### Date range
+
+In this example, there are 2 dates selected: a range start date (via the `rangeStart` prop) and a range end date (via the `date` prop). Additionally, any dates prior to the range start date are disabled by passing in an array of functions to the `validators` prop. In this case a single function is passed in, which checks whether a date is greater than or equal to the range start date.
+
+For this example, these dates are static and cannot be updated. For an interactive demo, see our [Date picker demos](https://www.patternfly.org/v4/components/date-picker/react-demos).
+
+```ts file="./CalendarMonthDateRange.tsx"
+```

package/src/components/CalendarMonth/examples/CalendarMonthDateRange.tsx

@@ -0,0 +1,10 @@
+import React from 'react';
+import { CalendarMonth } from '@patternfly/react-core';
+
+export const CalendarMonthDateRange: React.FunctionComponent = () => {
+  const startDate = new Date(2020, 10, 11);
+  const endDate = new Date(2020, 10, 24);
+  const disablePreStartDates = (date: Date) => date >= startDate;
+
+  return <CalendarMonth validators={[disablePreStartDates]} date={endDate} rangeStart={startDate} />;
+};

package/src/components/DatePicker/examples/DatePicker.md

@@ -7,151 +7,38 @@ beta: true
 ---
 
 ## Examples
+
 ### Basic
-```js
-import React from 'react';
-import { DatePicker } from '@patternfly/react-core';
 
-<DatePicker
-  onBlur={(str, date) => console.log('onBlur', str, date)}
-  onChange={(str, date) => console.log('onChange', str, date)}
-/>
+```ts file="./DatePickerBasic.tsx"
 ```
 
 ### American format
-```js
-import React from 'react';
-import { DatePicker } from '@patternfly/react-core';
-
-AmericanFormat = () => {
-  const dateFormat = date => date.toLocaleDateString('en-US', { year: 'numeric', month: '2-digit', day: '2-digit' }).replace(/\//g,'-');
-  const dateParse = date => {
-    const split = date.split('-');
-    if (split.length !== 3) {
-      return new Date();
-    }
-    let month = split[0];
-    let day = split[1];
-    let year = split[2];
-    return new Date(`${year.padStart(4, '0')}-${month.padStart(2, '0')}-${day.padStart(2, '0')}T00:00:00`);
-  };
 
-  return (
-    <DatePicker
-      value="03-05-2020"
-      placeholder="MM-DD-YYYY"
-      dateFormat={dateFormat}
-      dateParse={dateParse}
-    />
-  );
-}
+```ts file="./DatePickerAmerican.tsx"
 ```
 
 ### Helper text
-```js
-import React from 'react';
-import { DatePicker } from '@patternfly/react-core';
 
-<DatePicker value="2020-03-05" helperText="Select a date." />
+```ts file="./DatePickerHelperText.tsx"
 ```
 
 ### Min and max date
-```js
-import React from 'react';
-import { DatePicker } from '@patternfly/react-core';
 
-MinMaxDate = () => {
-  const minDate = new Date(2020, 2, 16);
-  const maxDate = new Date(2020, 2, 20);
-  const rangeValidator = date => {
-    if (date < minDate) {
-      return 'Date is before the allowable range.';
-    }
-    else if (date > maxDate) {
-      return 'Date is after the allowable range.';
-    }
-
-    return '';
-  };
-  return <DatePicker value="2020-03-17" validators={[rangeValidator]} />;
-}
+```ts file="./DatePickerMinMax.tsx"
 ```
 
 ### French
 
-```js
-import React from 'react';
-import { DatePicker, Weekday } from '@patternfly/react-core';
-
-FrenchMinMaxDate = () => {
-  const minDate = new Date(2020, 2, 16);
-  const maxDate = new Date(2020, 2, 20);
-  const rangeValidator = date => {
-    if (date < minDate) {
-      return 'Cette date est antérieure à la première date valide.';
-    }
-    else if (date > maxDate) {
-      return 'Cette date est postérieure à la dernière date valide.';
-    }
-
-    return '';
-  };
-  return (
-    <DatePicker
-      value="2020-03-17"
-      validators={[rangeValidator]}
-      placeholder="aaaa-mm-jj"
-      invalidFormatText="Cette date est invalide."
-      locale="fr"
-      weekStart={Weekday.Monday}
-    />
-  );
-}
+```ts file="./DatePickerFrench.tsx"
 ```
 
 ### Controlled
 
-```js
-import React from 'react';
-import { Button, DatePicker } from '@patternfly/react-core';
-
-ControlledDate = () => {
-  const initialValue = '2020-03-17';
-  const [value, setValue] = React.useState(initialValue);
-  return (
-    <React.Fragment>
-      <Button onClick={() => setValue(initialValue)}>
-        Reset date
-      </Button>
-      <DatePicker
-        value={value}
-        onChange={value => setValue(value)}
-      />
-    </React.Fragment>
-  );
-}
+```ts file="./DatePickerControlled.tsx"
 ```
 
 ### Controlling the date picker calendar state
 
-```js
-import React from 'react';
-import { Button, DatePicker } from '@patternfly/react-core';
-
-ControllingDatePicker = () => {
-    const dateRef = React.useRef(null);
-    const onClick = () => {
-        if (dateRef.current) {
-            dateRef.current.toggleCalendar()
-        }
-    };
-    return (
-        <React.Fragment>
-            <Button onClick={onClick}>
-                Toggle calendar
-            </Button>
-            <DatePicker ref={ dateRef } />
-        </React.Fragment>
-    );
-}
+```ts file="./DatePickerControlledCalendar.tsx"
 ```

package/src/components/DatePicker/examples/DatePickerAmerican.tsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import { DatePicker } from '@patternfly/react-core';
+
+export const DatePickerAmerican: React.FunctionComponent = () => {
+  const dateFormat = (date: Date) =>
+    date.toLocaleDateString('en-US', { year: 'numeric', month: '2-digit', day: '2-digit' }).replace(/\//g, '-');
+  const dateParse = (date: string) => {
+    const split = date.split('-');
+    if (split.length !== 3) {
+      return new Date();
+    }
+    const month = split[0];
+    const day = split[1];
+    const year = split[2];
+    return new Date(`${year.padStart(4, '0')}-${month.padStart(2, '0')}-${day.padStart(2, '0')}T00:00:00`);
+  };
+
+  return <DatePicker value="03-05-2020" placeholder="MM-DD-YYYY" dateFormat={dateFormat} dateParse={dateParse} />;
+};

package/src/components/DatePicker/examples/DatePickerBasic.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { DatePicker } from '@patternfly/react-core';
+
+export const DatePickerBasic: React.FunctionComponent = () => (
+  <DatePicker
+    // eslint-disable-next-line no-console
+    onBlur={(str, date) => console.log('onBlur', str, date)}
+    // eslint-disable-next-line no-console
+    onChange={(str, date) => console.log('onChange', str, date)}
+  />
+);

package/src/components/DatePicker/examples/DatePickerControlled.tsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import { Button, DatePicker } from '@patternfly/react-core';
+
+export const DatePickerControlled: React.FunctionComponent = () => {
+  const initialValue = '2020-03-17';
+  const [value, setValue] = React.useState(initialValue);
+  return (
+    <React.Fragment>
+      <Button onClick={() => setValue(initialValue)}>Reset date</Button>
+      <DatePicker value={value} onChange={value => setValue(value)} />
+    </React.Fragment>
+  );
+};

package/src/components/DatePicker/examples/DatePickerControlledCalendar.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Button, DatePicker } from '@patternfly/react-core';
+
+export const DatePickerControlledCalendar: React.FunctionComponent = () => {
+  const dateRef = React.useRef(null);
+  const onClick = () => {
+    if (dateRef.current) {
+      dateRef.current.toggleCalendar();
+    }
+  };
+  return (
+    <React.Fragment>
+      <Button onClick={onClick}>Toggle calendar</Button>
+      <DatePicker ref={dateRef} />
+    </React.Fragment>
+  );
+};

package/src/components/DatePicker/examples/DatePickerFrench.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import { DatePicker, Weekday } from '@patternfly/react-core';
+
+export const DatePickerFrench: React.FunctionComponent = () => {
+  const minDate = new Date(2020, 2, 16);
+  const maxDate = new Date(2020, 2, 20);
+  const rangeValidator = (date: Date) => {
+    if (date < minDate) {
+      return 'Cette date est antérieure à la première date valide.';
+    } else if (date > maxDate) {
+      return 'Cette date est postérieure à la dernière date valide.';
+    }
+
+    return '';
+  };
+  return (
+    <DatePicker
+      value="2020-03-17"
+      validators={[rangeValidator]}
+      placeholder="aaaa-mm-jj"
+      invalidFormatText="Cette date est invalide."
+      locale="fr"
+      weekStart={Weekday.Monday}
+    />
+  );
+};

package/src/components/DatePicker/examples/DatePickerHelperText.tsx

@@ -0,0 +1,6 @@
+import React from 'react';
+import { DatePicker } from '@patternfly/react-core';
+
+export const DatePickerHelperText: React.FunctionComponent = () => (
+  <DatePicker value="2020-03-05" helperText="Select a date." />
+);

package/src/components/DatePicker/examples/DatePickerMinMax.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { DatePicker } from '@patternfly/react-core';
+
+export const DatePickerMinMax: React.FunctionComponent = () => {
+  const minDate = new Date(2020, 2, 16);
+  const maxDate = new Date(2020, 2, 20);
+  const rangeValidator = (date: Date) => {
+    if (date < minDate) {
+      return 'Date is before the allowable range.';
+    } else if (date > maxDate) {
+      return 'Date is after the allowable range.';
+    }
+
+    return '';
+  };
+  return <DatePicker value="2020-03-17" validators={[rangeValidator]} />;
+};