@primer/components 0.0.0-202192952423 → 0.0.0-2021931194355

package/lib-esm/DatePicker/useDatePicker.js

@@ -0,0 +1,408 @@
+import { CheckIcon, TrashIcon } from '@primer/octicons-react';
+import { isEqual, isAfter, isBefore, addMonths, subMonths, isToday, isWeekend, differenceInDays, addDays, subDays } from 'date-fns';
+import deepmerge from 'deepmerge';
+import React, { createContext, useCallback, useContext, useMemo, useEffect, useState } from 'react';
+import { Text, useConfirm } from '..';
+import { formatDate } from './dateParser';
+const DatePickerContext = /*#__PURE__*/createContext(null);
+
+const useDatePicker = date => {
+  const value = useContext(DatePickerContext);
+  const [selected, setSelected] = useState(false);
+  const today = date ? isToday(date) : false;
+
+  if (!value) {
+    throw new Error('useDatePicker must be used inside a DatePickerProvider');
+  }
+
+  useEffect(() => {
+    if (date) {
+      if (value.hoverRange) {
+        if (isRangeSelection(value.hoverRange)) {
+          if (isEqual(date, value.hoverRange.from)) {
+            setSelected('start');
+          } else if (value.hoverRange.to && isEqual(date, value.hoverRange.to)) {
+            setSelected('end');
+          } else if (isAfter(date, value.hoverRange.from) && value.hoverRange.to && isBefore(date, value.hoverRange.to)) {
+            setSelected('middle');
+          } else {
+            setSelected(false);
+          }
+        }
+      } else if (value.selection) {
+        if (isMultiSelection(value.selection)) {
+          setSelected(!!value.selection.find(d => isEqual(d, date)));
+        } else if (isRangeSelection(value.selection)) {
+          if (isEqual(date, value.selection.from)) {
+            setSelected('start');
+          } else if (value.selection.to && isEqual(date, value.selection.to)) {
+            setSelected('end');
+          } else if (isAfter(date, value.selection.from) && value.selection.to && isBefore(date, value.selection.to)) {
+            setSelected('middle');
+          } else {
+            setSelected(false);
+          }
+        } else {
+          setSelected(isEqual(date, value.selection));
+        }
+      }
+    }
+  }, [date, value.hoverRange, value.selection, today]);
+  let blocked,
+      disabled = false;
+
+  if (date) {
+    // Determine if date is blocked out
+    if (value.configuration.blockedDates) {
+      blocked = !!value.configuration.blockedDates.find(d => isEqual(d, date));
+    } // Determine if date is disabled
+
+
+    if (value.configuration.minDate || value.configuration.maxDate || value.configuration.disableWeekends) {
+      disabled = (value.configuration.minDate ? isBefore(date, value.configuration.minDate) : false) || (value.configuration.maxDate ? isAfter(date, value.configuration.maxDate) : false) || (value.configuration.disableWeekends ? isWeekend(date) : false);
+    }
+  }
+
+  return { ...value,
+    blocked,
+    disabled,
+    selected,
+    today
+  };
+};
+
+export default useDatePicker;
+export function isSingleSelection(selection) {
+  return selection instanceof Date;
+}
+export function isMultiSelection(selection) {
+  return Array.isArray(selection);
+}
+export function isRangeSelection(selection) {
+  return !!selection.from;
+}
+export function isStringRangeSelection(selection) {
+  return !!selection.from;
+}
+
+function parseSelection(selection, variant) {
+  if (!selection) return;
+
+  if (variant === 'multi') {
+    if (isMultiSelection(selection)) {
+      const parsedSelection = [];
+
+      for (const d of selection) {
+        parsedSelection.push(new Date(new Date(d).toDateString()));
+      }
+
+      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 {
+    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;
+    }
+  }
+}
+
+const defaultConfiguration = {
+  anchorVariant: 'button',
+  confirmation: false,
+  confirmUnsavedClose: false,
+  disableWeekends: false,
+  iconPlacement: 'start',
+  placeholder: 'Select a Date...',
+  showInputPrompt: false,
+  variant: 'single',
+  view: '2-month',
+  weekStartsOn: 'Sunday'
+};
+export const DatePickerProvider = ({
+  configuration: externalConfig = {},
+  children,
+  closePicker,
+  value
+}) => {
+  const [configuration, setConfiguration] = useState(deepmerge(defaultConfiguration, externalConfig));
+  const [previousSelection, setPreviousSelection] = useState(parseSelection(value, configuration.variant));
+  const [isDirty, setIsDirty] = useState(false);
+  const [selection, setSelection] = useState(parseSelection(value, configuration.variant));
+  const [hoverRange, setHoverRange] = useState(null);
+  const [currentViewingDate, setCurrentViewingDate] = useState(new Date());
+  const confirm = useConfirm();
+  useEffect(() => {
+    setConfiguration(deepmerge(defaultConfiguration, externalConfig));
+    setSelection(parseSelection(selection, configuration.variant)); // Don't want this to run every time selection gets updated
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [configuration.variant, 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(() => {
+    const {
+      anchorVariant,
+      dateFormat,
+      placeholder,
+      variant
+    } = configuration;
+    return formatDate({
+      selection,
+      anchorVariant,
+      dateFormat,
+      placeholder,
+      variant
+    });
+  }, [configuration, selection]);
+  const saveValue = useCallback(updatedSelection => {
+    setPreviousSelection(updatedSelection !== null && updatedSelection !== void 0 ? updatedSelection : selection);
+    setIsDirty(false);
+    closePicker === null || closePicker === void 0 ? void 0 : closePicker();
+  }, [closePicker, selection]);
+  const revertValue = useCallback(() => {
+    setSelection(previousSelection);
+    setIsDirty(false);
+  }, [previousSelection]);
+  const handleClose = useCallback(async () => {
+    if (configuration.confirmUnsavedClose) {
+      if (isDirty) {
+        const result = await confirm({
+          title: 'Save Changes?',
+          content: 'You have unsaved changes, would you like to save them?',
+          confirmButtonContent: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CheckIcon, null), /*#__PURE__*/React.createElement(Text, {
+            sx: {
+              ml: 1
+            }
+          }, "Save")),
+          cancelButtonContent: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TrashIcon, null), /*#__PURE__*/React.createElement(Text, {
+            sx: {
+              ml: 1
+            }
+          }, "Discard"))
+        });
+
+        if (result) {
+          saveValue();
+        } else {
+          revertValue();
+        }
+      }
+    } else if (isDirty) revertValue();
+  }, [configuration.confirmUnsavedClose, confirm, isDirty, revertValue, saveValue]);
+  const inputHandler = useCallback(updatedSelection => {
+    if (!updatedSelection) return;
+    const {
+      maxDate,
+      minDate,
+      variant,
+      maxSelections,
+      maxRangeSize
+    } = configuration;
+
+    switch (variant) {
+      case 'single':
+        {
+          if (updatedSelection instanceof Date) {
+            if (maxDate && isAfter(updatedSelection, maxDate)) {
+              setSelection(maxDate);
+            } else if (minDate && isBefore(minDate, updatedSelection)) {
+              setSelection(minDate);
+            } else {
+              setSelection(updatedSelection);
+            }
+          }
+
+          break;
+        }
+
+      case 'multi':
+        {
+          if (Array.isArray(updatedSelection)) {
+            let validSelections = updatedSelection.filter(d => (maxDate ? isBefore(d, maxDate) : true) && (minDate ? isAfter(d, minDate) : true));
+
+            if (maxSelections) {
+              validSelections = validSelections.slice(0, maxSelections);
+            }
+
+            setSelection(validSelections);
+          }
+
+          break;
+        }
+
+      case 'range':
+        {
+          if (isRangeSelection(updatedSelection)) {
+            const validRange = updatedSelection;
+
+            if (minDate) {
+              validRange.from = isAfter(updatedSelection.from, minDate) ? updatedSelection.from : minDate;
+
+              if (updatedSelection.to) {
+                validRange.to = isAfter(updatedSelection.to, minDate) ? updatedSelection.to : minDate;
+              }
+            }
+
+            if (maxDate) {
+              validRange.from = isBefore(updatedSelection.from, maxDate) ? updatedSelection.from : maxDate;
+
+              if (updatedSelection.to) {
+                validRange.to = isBefore(updatedSelection.to, maxDate) ? updatedSelection.to : maxDate;
+              }
+            }
+
+            if (maxRangeSize && validRange.to && Math.abs(differenceInDays(validRange.from, validRange.to)) >= maxRangeSize) {
+              validRange.to = addDays(validRange.from, maxRangeSize - 1);
+            }
+
+            setSelection(updatedSelection);
+          }
+
+          break;
+        }
+    }
+  }, [configuration]);
+  const selectionHandler = useCallback(date => {
+    setIsDirty(true);
+
+    if (configuration.variant === 'multi') {
+      const selections = [...selection];
+      const existingIndex = selections.findIndex(s => isEqual(s, date));
+
+      if (existingIndex > -1) {
+        selections.splice(existingIndex, 1);
+        setSelection(selections.sort((a, b) => a.getTime() - b.getTime()));
+      } else {
+        if (configuration.maxSelections && selections.length + 1 > configuration.maxSelections) return;
+        setSelection([...selections, date].sort((a, b) => a.getTime() - b.getTime()));
+      }
+    } else if (configuration.variant === 'range') {
+      if (selection && isRangeSelection(selection) && !selection.to) {
+        let toDate = date;
+
+        if (configuration.maxRangeSize && Math.abs(differenceInDays(selection.from, date)) >= configuration.maxRangeSize) {
+          toDate = isBefore(date, selection.from) ? subDays(selection.from, configuration.maxRangeSize - 1) : addDays(selection.from, configuration.maxRangeSize - 1);
+        }
+
+        const updatedSelection = isBefore(toDate, selection.from) ? {
+          from: toDate,
+          to: selection.from
+        } : {
+          from: selection.from,
+          to: toDate
+        };
+        setSelection(updatedSelection);
+        setHoverRange(null);
+
+        if (!configuration.confirmation) {
+          saveValue(updatedSelection);
+        }
+      } else {
+        setHoverRange({
+          from: date,
+          to: date
+        });
+        setSelection({
+          from: date,
+          to: null
+        });
+      }
+    } else {
+      setSelection(date);
+
+      if (!configuration.confirmation) {
+        saveValue(date);
+      }
+    }
+  }, [configuration.confirmation, configuration.maxRangeSize, configuration.maxSelections, configuration.variant, saveValue, selection]);
+  const focusHnadler = useCallback(date => {
+    if (!selection) return;
+    const {
+      minDate,
+      maxDate,
+      maxRangeSize,
+      variant
+    } = configuration;
+
+    if (variant === 'range' && isRangeSelection(selection) && hoverRange) {
+      let hoverDate = date;
+      if (minDate) hoverDate = isBefore(date, minDate) ? minDate : hoverDate;
+      if (maxDate) hoverDate = isAfter(date, maxDate) ? maxDate : hoverDate;
+
+      if (maxRangeSize && Math.abs(differenceInDays(selection.from, hoverDate)) >= maxRangeSize) {
+        hoverDate = isBefore(hoverDate, selection.from) ? subDays(selection.from, configuration.maxRangeSize - 1) : addDays(selection.from, configuration.maxRangeSize - 1);
+      }
+
+      setHoverRange(isBefore(hoverDate, selection.from) ? {
+        from: hoverDate,
+        to: selection.from
+      } : {
+        from: selection.from,
+        to: hoverDate
+      });
+    }
+  }, [configuration, hoverRange, selection]);
+  const datePickerCtx = useMemo(() => {
+    return {
+      configuration,
+      currentViewingDate,
+      disabled: false,
+      formattedDate: getFormattedDate,
+      goToMonth,
+      hoverRange,
+      nextMonth,
+      onClose: handleClose,
+      onDateInput: inputHandler,
+      onDayFocus: focusHnadler,
+      onSelection: selectionHandler,
+      previousMonth,
+      revertValue,
+      saveValue,
+      selectionActive: false,
+      selection
+    };
+  }, [configuration, currentViewingDate, focusHnadler, getFormattedDate, goToMonth, handleClose, hoverRange, inputHandler, nextMonth, previousMonth, revertValue, saveValue, selection, selectionHandler]);
+  return /*#__PURE__*/React.createElement(DatePickerContext.Provider, {
+    value: datePickerCtx
+  }, children);
+};
+DatePickerProvider.displayName = "DatePickerProvider";

package/lib-esm/Dialog/Dialog.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ButtonProps } from '../NewButton';
+import { ButtonProps } from '../Button';
 import { SxProp } from '../sx';
 /**
  * Props that characterize a button to be rendered into the footer of
@@ -9,7 +9,7 @@ export declare type DialogButtonProps = ButtonProps & {
     /**
      * The type of Button element to use
      */
-    buttonType?: 'default' | 'primary' | 'danger' | 'invisible';
+    buttonType?: 'normal' | 'primary' | 'danger';
     /**
      * The Button's inner text
      */
@@ -160,8 +160,8 @@ export declare const Dialog: React.ForwardRefExoticComponent<DialogProps & {
     Buttons: React.FC<{
         buttons: DialogButtonProps[];
     }>;
-    CloseButton: ({ onClose }: {
+    CloseButton: React.FC<{
         onClose: () => void;
-    }) => JSX.Element;
+    }>;
 };
 export {};

package/lib-esm/Dialog/Dialog.js

@@ -2,12 +2,13 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
-import Button from '../NewButton';
+import Button, { ButtonPrimary, ButtonDanger } from '../Button';
 import Box from '../Box';
 import { get, COMMON, POSITION } from '../constants';
 import { useOnEscapePress, useProvidedRefOrCreate } from '../hooks';
 import { useFocusTrap } from '../hooks/useFocusTrap';
 import sx from '../sx';
+import StyledOcticon from '../StyledOcticon';
 import { XIcon } from '@primer/octicons-react';
 import { useFocusZone } from '../hooks/useFocusZone';
 import { FocusKeys } from '../behaviors/focusZone';
@@ -183,6 +184,11 @@ const Footer = styled(Box).attrs({
   displayName: "Dialog__Footer",
   componentId: "sc-11pkgky-6"
 })(["box-shadow:0 -1px 0 ", ";padding:", ";display:flex;flex-flow:wrap;justify-content:flex-end;z-index:1;flex-shrink:0;button{margin-left:", ";&:first-child{margin-left:0;}}"], get('colors.border.default'), get('space.3'), get('space.1'));
+const buttonTypes = {
+  normal: Button,
+  primary: ButtonPrimary,
+  danger: ButtonDanger
+};
 
 const Buttons = ({
   buttons
@@ -205,30 +211,33 @@ const Buttons = ({
   return /*#__PURE__*/React.createElement(React.Fragment, null, buttons.map((dialogButtonProps, index) => {
     const {
       content,
-      buttonType = 'default',
+      buttonType = 'normal',
       autoFocus = false,
       ...buttonProps
     } = dialogButtonProps;
-    return /*#__PURE__*/React.createElement(Button, _extends({
+    const ButtonElement = buttonTypes[buttonType];
+    return /*#__PURE__*/React.createElement(ButtonElement, _extends({
       key: index
     }, buttonProps, {
-      variant: buttonType,
       ref: autoFocus && autoFocusCount === 0 ? (autoFocusCount++, autoFocusRef) : null
     }), content);
   }));
 };
 
+const DialogCloseButton = styled(Button).withConfig({
+  displayName: "Dialog__DialogCloseButton",
+  componentId: "sc-11pkgky-7"
+})(["border-radius:4px;background:transparent;border:0;vertical-align:middle;color:", ";padding:", ";align-self:flex-start;line-height:normal;box-shadow:none;"], get('colors.fg.muted'), get('space.2'));
+
 const CloseButton = ({
   onClose
 }) => {
-  return /*#__PURE__*/React.createElement(Button, {
-    onClick: onClose,
-    sx: {
-      alignSelf: 'flex-start'
-    },
-    variant: "invisible",
-    icon: () => /*#__PURE__*/React.createElement(XIcon, null)
-  });
+  return /*#__PURE__*/React.createElement(DialogCloseButton, {
+    "aria-label": "Close",
+    onClick: onClose
+  }, /*#__PURE__*/React.createElement(StyledOcticon, {
+    icon: XIcon
+  }));
 };
 
 CloseButton.displayName = "CloseButton";