@primer/components 0.0.0-202192515932 → 0.0.0-202192522854

package/lib-esm/DatePicker/useDatePicker.js

@@ -0,0 +1,347 @@
+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);
+
+const useDatePicker = date => {
+  const value = useContext(DatePickerContext);
+  const [selected, setSelected] = useState(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]);
+  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) {
+      disabled = (value.configuration.minDate ? isBefore(date, value.configuration.minDate) : false) || (value.configuration.maxDate ? isAfter(date, value.configuration.maxDate) : false);
+    }
+  }
+
+  return { ...value,
+    blocked,
+    disabled,
+    selected
+  };
+};
+
+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,
+  contiguousSelection: false,
+  dimWeekends: false,
+  iconPlacement: 'start',
+  placeholder: 'Select a Date...',
+  selection: '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.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;
+    }
+
+    let template = 'MMM d';
+
+    if (configuration.anchorVariant !== 'input' && configuration.dateFormat) {
+      switch (configuration.dateFormat) {
+        case 'short':
+          template = 'MMM d';
+          break;
+
+        case 'long':
+          template = 'MMM d, yyyy';
+          break;
+
+        default:
+          template = configuration.dateFormat;
+          break;
+      }
+    } else {
+      template = 'MM/dd/yyyy';
+    }
+
+    switch (configuration.selection) {
+      case 'single':
+        {
+          if (selection instanceof Date) {
+            return format(selection, template);
+          } else if (Array.isArray(selection)) {
+            return format(selection[0], template);
+          } else if (isRangeSelection(selection)) {
+            return format(selection.from, template);
+          } else {
+            return 'Invalid Selection';
+          }
+        }
+
+      case 'multi':
+        {
+          if (Array.isArray(selection)) {
+            if (selection.length > 3) return `${selection.length} Selected`;
+            const formatted = selection.map(d => format(d, template)).join(', ');
+            return formatted;
+          } else if (selection instanceof Date) {
+            return [selection].map(d => format(d, template)).join(', ');
+          } else if (isRangeSelection(selection)) {
+            return [selection.to, selection.from].map(d => d ? format(d, template) : '').join(', ');
+          } else {
+            return 'Invalid Selection';
+          }
+        }
+
+      case 'range':
+        {
+          if (isRangeSelection(selection)) {
+            return Object.entries(selection).map(([_, date]) => date ? format(date, template) : '').join(' - ');
+          } else if (selection instanceof Date) {
+            return Object.entries({
+              from: selection,
+              to: null
+            }).map(([_, date]) => date ? 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 ? format(date, template) : '').join(' - ');
+          } else {
+            return 'Invalid Selection';
+          }
+        }
+
+      default:
+        {
+          return 'Invalid Configuration';
+        }
+    }
+  }, [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();
+  }, [closePicker, selection]);
+  const selectionHandler = useCallback(date => {
+    if (configuration.selection === '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 {
+        setSelection([...selections, date].sort((a, b) => a.getTime() - b.getTime()));
+      }
+    } else if (configuration.selection === 'range') {
+      if (selection && isRangeSelection(selection) && !selection.to) {
+        const updatedSelection = isBefore(date, selection.from) ? {
+          from: date,
+          to: selection.from
+        } : {
+          from: selection.from,
+          to: date
+        };
+        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.selection, saveValue, selection]);
+  const focusHnadler = useCallback(date => {
+    if (!selection) return;
+
+    if (configuration.selection === 'range' && isRangeSelection(selection) && hoverRange) {
+      setHoverRange(isBefore(date, selection.from) ? {
+        from: date,
+        to: selection.from
+      } : {
+        from: selection.from,
+        to: date
+      });
+    }
+  }, [configuration.selection, hoverRange, selection]);
+  const blurHnadler = useCallback(date => {
+    if (!selection || !hoverRange) return;
+
+    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 = useCallback(() => {
+    setSelection(previousSelection);
+  }, [previousSelection]);
+  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, currentViewingDate, focusHnadler, getFormattedDate, goToMonth, hoverRange, nextMonth, previousMonth, revertValue, saveValue, selection, selectionHandler]);
+  return /*#__PURE__*/React.createElement(DatePickerContext.Provider, {
+    value: datePickerCtx
+  }, children);
+};
+DatePickerProvider.displayName = "DatePickerProvider";

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

@@ -32,12 +32,14 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
     Divider: import("styled-components").StyledComponent<"div", any, SystemCommonProps & SxProp, never>;
     Filter: React.ForwardRefExoticComponent<Pick<{
         value?: string | undefined;
-    } & Pick<Omit<Pick<{
+    } & Pick<Omit<Pick<({
         [x: string]: any;
         [x: number]: any;
     } & {
         theme?: any;
-    } & {
+    } & ({} | {
+        children?: React.ReactNode;
+    })) & {
         as?: string | React.ComponentType<any> | undefined;
         forwardedAs?: string | React.ComponentType<any> | undefined;
     }, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "theme" | "className" | "block" | "icon" | "sx" | "disabled" | "variant" | "contrast"> & {

package/lib-esm/TextInputWithTokens.d.ts

@@ -32,12 +32,14 @@ declare const TextInputWithTokens: React.ForwardRefExoticComponent<Pick<{
      * Whether the remove buttons should be rendered in the tokens
      */
     hideTokenRemoveButtons?: boolean | undefined;
-} & Pick<Omit<Pick<{
+} & Pick<Omit<Pick<({
     [x: string]: any;
     [x: number]: any;
 } & {
     theme?: any;
-} & {
+} & ({} | {
+    children?: React.ReactNode;
+})) & {
     as?: string | React.ComponentType<any> | undefined;
     forwardedAs?: string | React.ComponentType<any> | undefined;
 }, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "theme" | "className" | "block" | "icon" | "sx" | "disabled" | "variant" | "contrast"> & {

package/lib-esm/index.d.ts

@@ -22,7 +22,6 @@ export { useOnEscapePress } from './hooks/useOnEscapePress';
 export { useOverlay } from './hooks/useOverlay';
 export { useConfirm } from './Dialog/ConfirmationDialog';
 export { ActionList } from './ActionList';
-export { ActionList as ActionList2 } from './ActionList2';
 export { ActionMenu } from './ActionMenu';
 export type { ActionMenuProps } from './ActionMenu';
 export { default as Autocomplete } from './Autocomplete';

package/lib-esm/index.js

@@ -18,7 +18,6 @@ export { useOverlay } from './hooks/useOverlay';
 export { useConfirm } from './Dialog/ConfirmationDialog'; // Components
 
 export { ActionList } from './ActionList';
-export { ActionList as ActionList2 } from './ActionList2';
 export { ActionMenu } from './ActionMenu';
 export { default as Autocomplete } from './Autocomplete';
 export { default as Avatar } from './Avatar';

package/lib-esm/theme-preval.js

@@ -515,7 +515,7 @@ module.exports = {
           }
         }
       },
-      "light_protanopia": {
+      "light_colorblind": {
         "colors": {
           "canvasDefaultTransparent": "rgba(255,255,255,0)",
           "marketingIcon": {
@@ -2456,7 +2456,7 @@ module.exports = {
           }
         }
       },
-      "dark_protanopia": {
+      "dark_colorblind": {
         "colors": {
           "canvasDefaultTransparent": "rgba(13,17,23,0)",
           "marketingIcon": {

package/lib-esm/utils/testing.d.ts

@@ -53,7 +53,7 @@ export declare function render(component: React.ReactElement, theme?: {
         xlarge: string;
     };
     space: string[];
-    colorSchemes: Record<"light" | "light_protanopia" | "dark" | "dark_dimmed" | "dark_high_contrast" | "dark_protanopia", Record<"colors" | "shadows", Partial<{
+    colorSchemes: Record<"light" | "light_colorblind" | "dark" | "dark_dimmed" | "dark_high_contrast" | "dark_colorblind", Record<"colors" | "shadows", Partial<{
         canvasDefaultTransparent: string;
         marketingIcon: {
             primary: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "0.0.0-202192515932",
+  "version": "0.0.0-202192522854",
   "description": "Primer react components",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",
@@ -43,20 +43,16 @@
   "author": "GitHub, Inc.",
   "license": "MIT",
   "dependencies": {
-    "@primer/octicons-react": "^13.0.0",
-    "@primer/primitives": "5.1.0",
+    "@primer/octicons-react": "^16.1.0",
+    "@primer/primitives": "6.0.0",
     "@radix-ui/react-polymorphic": "0.0.14",
     "@react-aria/ssr": "3.1.0",
     "@styled-system/css": "5.1.5",
     "@styled-system/props": "5.1.5",
     "@styled-system/theme-get": "5.1.2",
-    "@types/history": "4.7.8",
-    "@types/styled-components": "5.1.11",
-    "@types/styled-system": "5.1.12",
-    "@types/styled-system__css": "5.0.16",
-    "@types/styled-system__theme-get": "5.0.1",
     "classnames": "2.3.1",
     "color2k": "1.2.4",
+    "date-fns": "2.25.0",
     "deepmerge": "4.2.2",
     "focus-visible": "5.2.0",
     "styled-system": "5.1.5"
@@ -85,6 +81,11 @@
     "@testing-library/react": "11.2.7",
     "@testing-library/react-hooks": "7.0.2",
     "@testing-library/user-event": "13.1.9",
+    "@types/history": "4.7.9",
+    "@types/styled-components": "5.1.15",
+    "@types/styled-system": "5.1.13",
+    "@types/styled-system__css": "5.0.16",
+    "@types/styled-system__theme-get": "5.0.1",
     "@types/chroma-js": "2.1.3",
     "@types/enzyme": "3.10.9",
     "@types/jest": "26.0.23",

package/lib/ActionList2/Description.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-import { SxProp } from '../sx';
-export declare type DescriptionProps = {
-    variant?: 'inline' | 'block';
-} & SxProp;
-export declare const Description: React.FC<DescriptionProps>;

package/lib/ActionList2/Description.js

@@ -1,53 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Description = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _Box = _interopRequireDefault(require("../Box"));
-
-var _Truncate = _interopRequireDefault(require("../Truncate"));
-
-var _Item = require("./Item");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const Description = ({
-  variant = 'inline',
-  sx = {},
-  ...props
-}) => {
-  const styles = {
-    color: 'fg.muted',
-    fontSize: 0,
-    lineHeight: '16px',
-    flexGrow: 1,
-    flexBasis: 0,
-    minWidth: 0,
-    marginLeft: variant === 'block' ? 0 : 2
-  };
-  return /*#__PURE__*/_react.default.createElement(_Item.Slot, {
-    name: variant === 'block' ? 'BlockDescription' : 'InlineDescription'
-  }, ({
-    blockDescriptionId,
-    inlineDescriptionId
-  }) => variant === 'block' ? /*#__PURE__*/_react.default.createElement(_Box.default, {
-    as: "span",
-    sx: { ...styles,
-      ...sx
-    },
-    id: blockDescriptionId
-  }, props.children) : /*#__PURE__*/_react.default.createElement(_Truncate.default, {
-    id: inlineDescriptionId,
-    sx: styles,
-    title: props.children,
-    inline: true,
-    maxWidth: "100%"
-  }, props.children));
-};
-
-exports.Description = Description;
-Description.displayName = "Description";

package/lib/ActionList2/Divider.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-/**
- * Visually separates `Item`s or `Group`s in an `ActionList`.
- */
-export declare function Divider(): JSX.Element;
-export declare namespace Divider {
-    var renderItem: typeof Divider;
-}

package/lib/ActionList2/Divider.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Divider = Divider;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _Box = _interopRequireDefault(require("../Box"));
-
-var _constants = require("../constants");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * Visually separates `Item`s or `Group`s in an `ActionList`.
- */
-function Divider() {
-  return /*#__PURE__*/_react.default.createElement(_Box.default, {
-    as: "hr",
-    sx: {
-      border: 'none',
-      // override browser styles
-      height: 1,
-      backgroundColor: 'border.muted',
-      marginTop: theme => `calc(${(0, _constants.get)('space.2')(theme)} - 1px)`,
-      marginBottom: 2
-    },
-    "data-component": "ActionList.Divider"
-  });
-}
-
-Divider.displayName = "Divider";
-
-/**
- * `Divider` fulfills the `ItemPropsWithCustomRenderer` contract,
- * so it can be used inline in an `ActionList`’s `items` prop.
- * In other words, `items={[ActionList.Divider]}` is supported as a concise
- * alternative to `items={[{renderItem: () => <ActionList.Divider />}]}`.
- */
-Divider.renderItem = Divider;

package/lib/ActionList2/Group.d.ts

@@ -1,8 +0,0 @@
-/**
- * show item dividers
- */
-/// <reference types="react" />
-import { SxProp } from '../sx';
-import { HeaderProps } from './Header';
-export declare type GroupProps = HeaderProps & SxProp;
-export declare function Group({ title, variant, auxiliaryText, sx, ...props }: GroupProps): JSX.Element;

package/lib/ActionList2/Group.js

@@ -1,39 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Group = Group;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _Box = _interopRequireDefault(require("../Box"));
-
-var _Header = require("./Header");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 Group({
-  title,
-  variant,
-  auxiliaryText,
-  sx = {},
-  ...props
-}) {
-  return /*#__PURE__*/_react.default.createElement(_Box.default, _extends({
-    sx: {
-      '&:not(:first-child)': {
-        marginTop: 2
-      },
-      ...sx
-    }
-  }, props), title && /*#__PURE__*/_react.default.createElement(_Header.Header, {
-    title: title,
-    variant: variant,
-    auxiliaryText: auxiliaryText
-  }), props.children);
-}
-
-Group.displayName = "Group";

package/lib/ActionList2/Header.d.ts

@@ -1,26 +0,0 @@
-import React from 'react';
-import { SxProp } from '../sx';
-/**
- * Contract for props passed to the `Header` component.
- */
-export interface HeaderProps extends React.ComponentPropsWithoutRef<'div'>, SxProp {
-    /**
-     * Style variations. Usage is discretionary.
-     *
-     * - `"filled"` - Superimposed on a background, offset from nearby content
-     * - `"subtle"` - Relatively less offset from nearby content
-     */
-    variant?: 'subtle' | 'filled';
-    /**
-     * Primary text which names a `Group`.
-     */
-    title?: string;
-    /**
-     * Secondary text which provides additional information about a `Group`.
-     */
-    auxiliaryText?: string;
-}
-/**
- * Displays the name and description of a `Group`.
- */
-export declare function Header({ variant, title, auxiliaryText, children: _children, sx, ...props }: HeaderProps): JSX.Element;