@primer/components 0.0.0-2021816151443 → 0.0.0-2021816212749

package/lib-esm/utils/uniqueId.js

@@ -1,3 +1,4 @@
+// Note: uniqueId may be unsafe in SSR contexts if it is used create DOM IDs or otherwise cause a hydration warning. Use useSSRSafeId instead.
 let idSeed = 10000;
 export function uniqueId() {
   return `__primer_id_${idSeed++}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "0.0.0-2021816151443",
+  "version": "0.0.0-2021816212749",
   "description": "Primer react components",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",
@@ -44,8 +44,8 @@
   "license": "MIT",
   "dependencies": {
     "@primer/octicons-react": "^13.0.0",
-    "@primer/primitives": "4.7.1",
-    "@radix-ui/react-polymorphic": "0.0.14",
+    "@primer/primitives": "4.6.4",
+    "@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",
@@ -57,8 +57,7 @@
     "classnames": "2.3.1",
     "deepmerge": "4.2.2",
     "focus-visible": "5.2.0",
-    "styled-system": "5.1.5",
-    "tinycolor2": "1.4.2"
+    "styled-system": "5.1.5"
   },
   "devDependencies": {
     "@babel/cli": "7.14.5",
@@ -90,7 +89,6 @@
     "@types/jest-axe": "3.5.1",
     "@types/lodash.isempty": "4.4.6",
     "@types/lodash.isobject": "3.0.6",
-    "@types/tinycolor2": "1.4.3",
     "@typescript-eslint/eslint-plugin": "4.26.1",
     "@typescript-eslint/parser": "4.26.1",
     "@wojtekmaj/enzyme-adapter-react-17": "0.6.3",
@@ -124,7 +122,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-test-renderer": "17.0.2",
-    "rollup": "2.51.2",
+    "rollup": "2.56.3",
     "rollup-plugin-babel": "4.4.0",
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-visualizer": "5.5.0",

package/lib/Autocomplete/Autocomplete.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-import { ItemInput } from '../ActionList/List';
-interface Props {
-    filterValue?: string;
-    filterFn?: (item: ItemInput, i: number) => boolean;
-}
-declare const Autocomplete: React.FC<Props>;
-export default Autocomplete;

package/lib/Autocomplete/Autocomplete.js

@@ -1,49 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _AutocompleteContext = require("./AutocompleteContext");
-
-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; }
-
-const defaultItemFilter = filterValue => (item, _i) => {
-  var _item$text;
-
-  return Boolean(item === null || item === void 0 ? void 0 : (_item$text = item.text) === null || _item$text === void 0 ? void 0 : _item$text.toLowerCase().startsWith(filterValue.toLowerCase()));
-};
-
-const Autocomplete = ({
-  children,
-  filterValue = '',
-  filterFn: externalFilterFn
-}) => {
-  const activeDescendantRef = (0, _react.useRef)(null);
-  const inputRef = (0, _react.useRef)(null);
-  const [inputValue, setInputValue] = (0, _react.useState)(filterValue);
-  const [showMenu, setShowMenu] = (0, _react.useState)(false);
-  const [autocompleteSuggestion, setAutocompleteSuggestion] = (0, _react.useState)('');
-  return /*#__PURE__*/_react.default.createElement(_AutocompleteContext.AutocompleteContext.Provider, {
-    value: {
-      activeDescendantRef,
-      autocompleteSuggestion,
-      filterFn: externalFilterFn ? externalFilterFn : defaultItemFilter(inputValue),
-      inputRef,
-      inputValue,
-      showMenu,
-      setAutocompleteSuggestion,
-      setInputValue,
-      setShowMenu
-    }
-  }, children);
-};
-
-Autocomplete.displayName = "Autocomplete";
-var _default = Autocomplete;
-exports.default = _default;

package/lib/Autocomplete/AutocompleteContext.d.ts

@@ -1,13 +0,0 @@
-/// <reference types="react" />
-import { ItemInput } from '../ActionList/List';
-export declare const AutocompleteContext: import("react").Context<{
-    activeDescendantRef?: import("react").MutableRefObject<HTMLElement | null> | undefined;
-    autocompleteSuggestion?: string | undefined;
-    filterFn?: ((item: ItemInput, i: number) => boolean) | undefined;
-    inputRef?: import("react").MutableRefObject<HTMLInputElement | null> | undefined;
-    inputValue?: string | undefined;
-    showMenu?: boolean | undefined;
-    setAutocompleteSuggestion?: import("react").Dispatch<import("react").SetStateAction<string>> | undefined;
-    setShowMenu?: import("react").Dispatch<import("react").SetStateAction<boolean>> | undefined;
-    setInputValue?: import("react").Dispatch<import("react").SetStateAction<string>> | undefined;
-}>;

package/lib/Autocomplete/AutocompleteContext.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.AutocompleteContext = void 0;
-
-var _react = require("react");
-
-const AutocompleteContext = /*#__PURE__*/(0, _react.createContext)({});
-exports.AutocompleteContext = AutocompleteContext;

package/lib/Autocomplete/AutocompleteInput.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import type * as Polymorphic from "@radix-ui/react-polymorphic";
-interface Props {
-    as?: React.ComponentType<any>;
-}
-declare const AutocompleteInput: Polymorphic.ForwardRefComponent<"input", Props>;
-export default AutocompleteInput;

package/lib/Autocomplete/AutocompleteInput.js

@@ -1,78 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _AutocompleteContext = require("./AutocompleteContext");
-
-var _TextInput = _interopRequireDefault(require("../TextInput"));
-
-var _useCombinedRefs = require("../hooks/useCombinedRefs");
-
-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 _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); }
-
-const AutocompleteInput = /*#__PURE__*/_react.default.forwardRef(({
-  as: Component = _TextInput.default,
-  onFocus,
-  onChange,
-  onKeyDown,
-  onKeyPress,
-  ...props
-}, forwardedRef) => {
-  const {
-    activeDescendantRef,
-    autocompleteSuggestion,
-    inputRef,
-    setInputValue,
-    setShowMenu
-  } = (0, _react.useContext)(_AutocompleteContext.AutocompleteContext);
-  const combinedInputRef = (0, _useCombinedRefs.useCombinedRefs)(inputRef, forwardedRef);
-
-  const handleInputFocus = () => {
-    if (setShowMenu) {
-      setShowMenu(true);
-    }
-  };
-
-  const handleInputChange = e => {
-    if (setInputValue) {
-      setInputValue(e.currentTarget.value);
-    }
-  };
-
-  const handleInputKeyDown = e => {
-    if (setInputValue && e.key === 'ArrowRight' && autocompleteSuggestion) {
-      setInputValue(autocompleteSuggestion);
-    }
-  };
-
-  const onInputKeyPress = (0, _react.useCallback)(event => {
-    if (activeDescendantRef && event.key === 'Enter' && activeDescendantRef.current) {
-      event.preventDefault();
-      event.nativeEvent.stopImmediatePropagation(); // Forward Enter key press to active descendant so that item gets activated
-
-      const activeDescendantEvent = new KeyboardEvent(event.type, event.nativeEvent);
-      activeDescendantRef.current.dispatchEvent(activeDescendantEvent);
-    }
-  }, [activeDescendantRef]);
-  return /*#__PURE__*/_react.default.createElement(Component, _extends({
-    onFocus: handleInputFocus,
-    onChange: handleInputChange,
-    onKeyDown: handleInputKeyDown,
-    onKeyPress: onInputKeyPress,
-    ref: combinedInputRef
-  }, props));
-});
-
-var _default = AutocompleteInput;
-exports.default = _default;

package/lib/Autocomplete/AutocompleteMenu.d.ts

@@ -1,19 +0,0 @@
-import React from 'react';
-import { ItemProps } from '../ActionList';
-import { ItemInput } from '../ActionList/List';
-import { ComponentProps } from '../utils/types';
-declare type AutocompleteMenuInternalProps = {
-    selectableItems: ItemInput[];
-    selectedItemIds: Array<string | number>;
-    selectedSortFn?: (itemIdA: string | number, itemIdB: string | number) => number;
-    onItemSelect: NonNullable<ItemProps['onAction']>;
-    onItemDeselect: NonNullable<ItemProps['onAction']>;
-    emptyStateText?: React.ReactNode | false;
-    addNewItem?: Omit<ItemInput, 'onAction'>;
-    onCloseOptionsList?: () => void;
-    maxHeight?: React.CSSProperties['maxHeight'];
-    loading?: boolean;
-};
-declare const AutocompleteMenu: React.ForwardRefExoticComponent<AutocompleteMenuInternalProps & React.RefAttributes<HTMLInputElement>>;
-export declare type AutocompleteMenuProps = ComponentProps<typeof AutocompleteMenu>;
-export default AutocompleteMenu;

package/lib/Autocomplete/AutocompleteMenu.js

@@ -1,226 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _ActionList = require("../ActionList");
-
-var _hooks = require("../hooks");
-
-var _useFocusZone = require("../hooks/useFocusZone");
-
-var _Overlay = _interopRequireDefault(require("../Overlay"));
-
-var _ = require("../");
-
-var _Portal = require("../Portal");
-
-var _AutocompleteContext = require("./AutocompleteContext");
-
-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; }
-
-const DROPDOWN_PORTAL_CONTAINER_NAME = '__listcontainerportal__';
-
-const getDefaultSortFn = isItemSelectedFn => (itemIdA, itemIdB) => isItemSelectedFn(itemIdA) === isItemSelectedFn(itemIdB) ? 0 : isItemSelectedFn(itemIdA) ? -1 : 1;
-
-function scrollIntoViewingArea(child, container, margin = 8, behavior = 'smooth') {
-  const {
-    top: childTop,
-    bottom: childBottom
-  } = child.getBoundingClientRect();
-  const {
-    top: containerTop,
-    bottom: containerBottom
-  } = container.getBoundingClientRect();
-  const isChildTopAboveViewingArea = childTop < containerTop + margin;
-  const isChildBottomBelowViewingArea = childBottom > containerBottom - margin;
-
-  if (isChildTopAboveViewingArea) {
-    const scrollHeightToChildTop = childTop - containerTop + container.scrollTop;
-    container.scrollTo({
-      behavior,
-      top: scrollHeightToChildTop - margin
-    });
-  } else if (isChildBottomBelowViewingArea) {
-    const scrollHeightToChildBottom = childBottom - containerBottom + container.scrollTop;
-    container.scrollTo({
-      behavior,
-      top: scrollHeightToChildBottom + margin
-    });
-  } // either completely in view or outside viewing area on both ends, don't scroll
-
-}
-
-// TODO:
-// insteaad of using `forwardRef`, just use a regular Functional Component
-// get rid of unused props
-const AutocompleteMenu = /*#__PURE__*/_react.default.forwardRef(({
-  selectableItems,
-  selectedItemIds,
-  selectedSortFn,
-  onItemSelect,
-  onItemDeselect,
-  emptyStateText,
-  addNewItem,
-  onCloseOptionsList,
-  loading
-}, ref) => {
-  const {
-    activeDescendantRef,
-    filterFn,
-    inputRef,
-    inputValue,
-    showMenu,
-    setAutocompleteSuggestion,
-    setShowMenu,
-    setInputValue
-  } = (0, _react.useContext)(_AutocompleteContext.AutocompleteContext);
-  const listContainerRef = (0, _react.useRef)(null);
-  const scrollContainerRef = (0, _react.useRef)(null);
-  const [highlightedItem, setHighlightedItem] = (0, _react.useState)(); // TODO: clean up this mess by making id required on ItemProps
-
-  const [sortedItemIds, setSortedItemIds] = (0, _react.useState)(selectableItems.map(({
-    id
-  }) => id || id === 0 ? id : ''));
-  const {
-    floatingElementRef,
-    position
-  } = (0, _hooks.useAnchoredPosition)({
-    side: 'outside-bottom',
-    align: 'start',
-    anchorElementRef: inputRef
-  }, [showMenu, selectedItemIds]); // TODO: replace this with the fn from the AutocompleteContext
-
-  const closeOptionList = () => {
-    if (setShowMenu) {
-      setShowMenu(false);
-    }
-
-    if (onCloseOptionsList) {
-      onCloseOptionsList();
-    }
-  };
-
-  const isItemSelected = itemId => {
-    var _selectableItems$find;
-
-    return ((_selectableItems$find = selectableItems.find(selectableItem => selectableItem.id === itemId)) === null || _selectableItems$find === void 0 ? void 0 : _selectableItems$find.selected) || selectedItemIds.includes(itemId);
-  };
-
-  const itemsToRender = [// selectable tokens
-  ...selectableItems.map(selectableItem => {
-    return { ...selectableItem,
-      //TODO: just make `id` required
-      selected: isItemSelected(selectableItem.id),
-      onAction: (item, e) => {
-        if (!item.selected) {
-          onItemSelect(item, e);
-
-          if (setInputValue) {
-            setInputValue('');
-          }
-
-          if (setAutocompleteSuggestion) {
-            setAutocompleteSuggestion('');
-          }
-        } else {
-          onItemDeselect(item, e);
-        }
-      }
-    };
-  }), // menu item used for creating a token from whatever is in the text input
-  ...(addNewItem ? [{ ...addNewItem,
-    onAction: (_item, e) => {
-      onItemSelect({
-        text: inputValue,
-        id: `randomlyGeneratedId-${inputValue}`
-      }, e);
-    }
-  }] : [])];
-  (0, _useFocusZone.useFocusZone)({
-    containerRef: listContainerRef,
-    focusOutBehavior: 'wrap',
-    focusableElementFilter: element => {
-      return !(element instanceof HTMLInputElement);
-    },
-    activeDescendantFocus: inputRef,
-    onActiveDescendantChanged: (current, _previous, directlyActivated) => {
-      if (activeDescendantRef && current) {
-        activeDescendantRef.current = current;
-      }
-
-      const selectedItem = itemsToRender.find(item => {
-        var _item$id;
-
-        return ((_item$id = item.id) === null || _item$id === void 0 ? void 0 : _item$id.toString()) === (current === null || current === void 0 ? void 0 : current.dataset.id);
-      });
-      setHighlightedItem(selectedItem);
-
-      if (current && scrollContainerRef.current && directlyActivated) {
-        scrollIntoViewingArea(current, scrollContainerRef.current);
-      }
-    }
-  });
-  (0, _react.useEffect)(() => {
-    var _highlightedItem$text;
-
-    if (!setAutocompleteSuggestion) {
-      return;
-    }
-
-    if (inputValue && highlightedItem !== null && highlightedItem !== void 0 && (_highlightedItem$text = highlightedItem.text) !== null && _highlightedItem$text !== void 0 && _highlightedItem$text.startsWith(inputValue)) {
-      setAutocompleteSuggestion(highlightedItem.text);
-    } else {
-      setAutocompleteSuggestion('');
-    }
-  }, [highlightedItem, inputValue]);
-  (0, _react.useEffect)(() => {
-    setSortedItemIds([...sortedItemIds].sort(selectedSortFn ? selectedSortFn : getDefaultSortFn(isItemSelected)));
-  }, [showMenu]);
-
-  if (listContainerRef.current) {
-    (0, _Portal.registerPortalRoot)(listContainerRef.current, DROPDOWN_PORTAL_CONTAINER_NAME);
-  }
-
-  const itemSortOrderData = sortedItemIds.reduce((acc, curr, i) => {
-    acc[curr] = i;
-    return acc;
-  }, {});
-  return /*#__PURE__*/_react.default.createElement("div", {
-    ref: listContainerRef
-  }, showMenu && emptyStateText ? /*#__PURE__*/_react.default.createElement(_Overlay.default, {
-    returnFocusRef: inputRef,
-    portalContainerName: DROPDOWN_PORTAL_CONTAINER_NAME,
-    preventFocusOnOpen: true,
-    onClickOutside: closeOptionList,
-    onEscape: closeOptionList,
-    ref: floatingElementRef,
-    top: position === null || position === void 0 ? void 0 : position.top,
-    left: position === null || position === void 0 ? void 0 : position.left
-  }, loading ? /*#__PURE__*/_react.default.createElement(_.Box, {
-    p: 3,
-    display: "flex",
-    justifyContent: "center"
-  }, /*#__PURE__*/_react.default.createElement(_.Spinner, null)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, itemsToRender.length ? /*#__PURE__*/_react.default.createElement(_ActionList.ActionList, {
-    selectionVariant: "multiple",
-    items: [...(filterFn ? itemsToRender.filter(filterFn) : itemsToRender)].sort((a, b) => itemSortOrderData[a.id] - itemSortOrderData[b.id]),
-    role: "listbox"
-  }) : /*#__PURE__*/_react.default.createElement(_.Box, {
-    p: 3
-  }, emptyStateText))) : null);
-});
-
-AutocompleteMenu.defaultProps = {
-  emptyStateText: 'No selectable options'
-};
-AutocompleteMenu.displayName = 'AutocompleteMenu';
-var _default = AutocompleteMenu;
-exports.default = _default;