@primer/components 0.0.0-20219151326 → 0.0.0-202191524113

package/lib/Autocomplete/AutocompleteMenu.js

@@ -0,0 +1,224 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _ActionList = require("../ActionList");
+
+var _useFocusZone = require("../hooks/useFocusZone");
+
+var _ = require("../");
+
+var _AutocompleteContext = require("./AutocompleteContext");
+
+var _octiconsReact = require("@primer/octicons-react");
+
+var _uniqueId = require("../utils/uniqueId");
+
+var _scrollIntoViewingArea = require("../behaviors/scrollIntoViewingArea");
+
+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 getDefaultSortFn = isItemSelectedFn => (itemIdA, itemIdB) => isItemSelectedFn(itemIdA) === isItemSelectedFn(itemIdB) ? 0 : isItemSelectedFn(itemIdA) ? -1 : 1;
+
+function getDefaultItemFilter(filterValue) {
+  return function (item, _i) {
+    var _item$text;
+
+    return Boolean((_item$text = item.text) === null || _item$text === void 0 ? void 0 : _item$text.toLowerCase().startsWith(filterValue.toLowerCase()));
+  };
+}
+
+function getDefaultOnSelectionChange(setInputValueFn) {
+  return function (itemOrItems) {
+    const {
+      text = ''
+    } = Array.isArray(itemOrItems) ? itemOrItems.slice(-1)[0] : itemOrItems;
+    setInputValueFn(text);
+  };
+}
+
+const isItemSelected = (itemId, selectedItemIds) => selectedItemIds.includes(itemId);
+
+function getItemById(itemId, items) {
+  return items.find(item => item.id === itemId);
+} // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+function AutocompleteMenu(props) {
+  const autocompleteContext = (0, _react.useContext)(_AutocompleteContext.AutocompleteContext);
+
+  if (autocompleteContext === null) {
+    throw new Error('AutocompleteContext returned null values');
+  }
+
+  const {
+    activeDescendantRef,
+    id,
+    inputRef,
+    inputValue = '',
+    scrollContainerRef,
+    setAutocompleteSuggestion,
+    setShowMenu,
+    setInputValue,
+    setIsMenuDirectlyActivated,
+    setSelectedItemLength,
+    showMenu
+  } = autocompleteContext;
+  const {
+    items,
+    selectedItemIds,
+    sortOnCloseFn,
+    emptyStateText,
+    addNewItem,
+    loading,
+    selectionVariant,
+    filterFn,
+    'aria-labelledby': ariaLabelledBy,
+    onOpenChange,
+    onSelectedChange,
+    customScrollContainerRef
+  } = props;
+  const listContainerRef = (0, _react.useRef)(null);
+  const [highlightedItem, setHighlightedItem] = (0, _react.useState)();
+  const [sortedItemIds, setSortedItemIds] = (0, _react.useState)(items.map(({
+    id: itemId
+  }) => itemId));
+  const selectableItems = (0, _react.useMemo)(() => items.map(selectableItem => {
+    return { ...selectableItem,
+      role: 'option',
+      id: selectableItem.id,
+      selected: selectionVariant === 'multiple' ? selectedItemIds.includes(selectableItem.id) : undefined,
+      onAction: item => {
+        const otherSelectedItemIds = selectedItemIds.filter(selectedItemId => selectedItemId !== item.id);
+        const newSelectedItemIds = selectedItemIds.includes(item.id) ? otherSelectedItemIds : [...otherSelectedItemIds, item.id];
+        const onSelectedChangeFn = onSelectedChange ? onSelectedChange : getDefaultOnSelectionChange(setInputValue);
+        onSelectedChangeFn(newSelectedItemIds.map(newSelectedItemId => getItemById(newSelectedItemId, items)));
+
+        if (selectionVariant === 'multiple') {
+          setInputValue('');
+          setAutocompleteSuggestion('');
+        } else {
+          var _inputRef$current;
+
+          setShowMenu(false);
+          (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.setSelectionRange(inputRef.current.value.length, inputRef.current.value.length);
+        }
+      }
+    };
+  }), [items, selectedItemIds, inputRef, onSelectedChange, selectionVariant, setAutocompleteSuggestion, setInputValue, setShowMenu]);
+  const itemSortOrderData = (0, _react.useMemo)(() => sortedItemIds.reduce((acc, curr, i) => {
+    acc[curr] = i;
+    return acc;
+  }, {}), [sortedItemIds]);
+  const sortedAndFilteredItemsToRender = (0, _react.useMemo)(() => selectableItems.filter(filterFn ? filterFn : getDefaultItemFilter(inputValue)).sort((a, b) => itemSortOrderData[a.id] - itemSortOrderData[b.id]), [selectableItems, itemSortOrderData, filterFn, inputValue]);
+  const allItemsToRender = (0, _react.useMemo)(() => [// sorted and filtered selectable items
+  ...sortedAndFilteredItemsToRender, // menu item used for creating a token from whatever is in the text input
+  ...(addNewItem ? [{ ...addNewItem,
+    leadingVisual: () => /*#__PURE__*/_react.default.createElement(_octiconsReact.PlusIcon, null),
+    onAction: item => {
+      // TODO: make it possible to pass a leadingVisual when using `addNewItem`
+      addNewItem.handleAddItem({ ...item,
+        id: item.id || (0, _uniqueId.uniqueId)(),
+        leadingVisual: undefined
+      });
+
+      if (selectionVariant === 'multiple') {
+        setInputValue('');
+        setAutocompleteSuggestion('');
+      }
+    }
+  }] : [])], [sortedAndFilteredItemsToRender, addNewItem, setAutocompleteSuggestion, selectionVariant, setInputValue]);
+  (0, _useFocusZone.useFocusZone)({
+    containerRef: listContainerRef,
+    focusOutBehavior: 'wrap',
+    focusableElementFilter: element => {
+      return !(element instanceof HTMLInputElement);
+    },
+    activeDescendantFocus: inputRef,
+    onActiveDescendantChanged: (current, _previous, directlyActivated) => {
+      activeDescendantRef.current = current || null;
+
+      if (current) {
+        const selectedItem = selectableItems.find(item => item.id.toString() === current.getAttribute('data-id'));
+        setHighlightedItem(selectedItem);
+        setIsMenuDirectlyActivated(directlyActivated);
+      }
+
+      if (current && customScrollContainerRef && customScrollContainerRef.current && directlyActivated) {
+        (0, _scrollIntoViewingArea.scrollIntoViewingArea)(current, customScrollContainerRef.current);
+      } else if (current && scrollContainerRef.current && directlyActivated) {
+        (0, _scrollIntoViewingArea.scrollIntoViewingArea)(current, scrollContainerRef.current);
+      }
+    }
+  }, [loading]);
+  (0, _react.useEffect)(() => {
+    var _highlightedItem$text;
+
+    if (highlightedItem !== null && highlightedItem !== void 0 && (_highlightedItem$text = highlightedItem.text) !== null && _highlightedItem$text !== void 0 && _highlightedItem$text.startsWith(inputValue) && !selectedItemIds.includes(highlightedItem.id)) {
+      setAutocompleteSuggestion(highlightedItem.text);
+    } else {
+      setAutocompleteSuggestion('');
+    }
+  }, [highlightedItem, inputValue, selectedItemIds, setAutocompleteSuggestion]);
+  (0, _react.useEffect)(() => {
+    const itemIdSortResult = [...sortedItemIds].sort(sortOnCloseFn ? sortOnCloseFn : getDefaultSortFn(itemId => isItemSelected(itemId, selectedItemIds)));
+    const sortResultMatchesState = itemIdSortResult.length === sortedItemIds.length && itemIdSortResult.every((element, index) => element === sortedItemIds[index]);
+
+    if (showMenu === false && !sortResultMatchesState) {
+      setSortedItemIds(itemIdSortResult);
+    }
+
+    onOpenChange && onOpenChange(Boolean(showMenu));
+  }, [showMenu, onOpenChange, selectedItemIds, sortOnCloseFn, sortedItemIds]);
+  (0, _react.useEffect)(() => {
+    if (selectedItemIds.length) {
+      setSelectedItemLength(selectedItemIds.length);
+    }
+  }, [selectedItemIds, setSelectedItemLength]);
+  return /*#__PURE__*/_react.default.createElement(_.Box, {
+    sx: !showMenu ? {
+      // visually hides this label for sighted users
+      position: 'absolute',
+      width: '1px',
+      height: '1px',
+      padding: '0',
+      margin: '-1px',
+      overflow: 'hidden',
+      clip: 'rect(0, 0, 0, 0)',
+      whiteSpace: 'nowrap',
+      borderWidth: '0'
+    } : {}
+  }, loading ? /*#__PURE__*/_react.default.createElement(_.Box, {
+    p: 3,
+    display: "flex",
+    justifyContent: "center"
+  }, /*#__PURE__*/_react.default.createElement(_.Spinner, null)) : /*#__PURE__*/_react.default.createElement("div", {
+    ref: listContainerRef
+  }, allItemsToRender.length ? /*#__PURE__*/_react.default.createElement(_ActionList.ActionList, {
+    selectionVariant: "multiple" // have to typecast to `ItemProps` because we have an extra property
+    // on `items` for Autocomplete: `metadata`
+    ,
+    items: allItemsToRender,
+    role: "listbox",
+    id: `${id}-listbox`,
+    "aria-labelledby": ariaLabelledBy
+  }) : /*#__PURE__*/_react.default.createElement(_.Box, {
+    p: 3
+  }, emptyStateText)));
+}
+
+AutocompleteMenu.displayName = "AutocompleteMenu";
+AutocompleteMenu.defaultProps = {
+  emptyStateText: 'No selectable options',
+  selectionVariant: 'single'
+};
+AutocompleteMenu.displayName = 'AutocompleteMenu';
+var _default = AutocompleteMenu;
+exports.default = _default;

package/lib/Autocomplete/AutocompleteOverlay.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+import { OverlayProps } from '../Overlay';
+import { ComponentProps } from '../utils/types';
+declare type AutocompleteOverlayInternalProps = {
+    /**
+     * The ref of the element that the position of the menu is based on. By default, the menu is positioned based on the text input
+     */
+    menuAnchorRef?: React.RefObject<HTMLElement>;
+    /**
+     * Props to be spread on the internal `Overlay` component.
+     */
+    overlayProps?: Partial<OverlayProps>;
+    children?: React.ReactNode;
+} & Pick<React.AriaAttributes, 'aria-labelledby'>;
+declare function AutocompleteOverlay({ menuAnchorRef, overlayProps, children }: AutocompleteOverlayInternalProps): JSX.Element | null;
+declare namespace AutocompleteOverlay {
+    var displayName: string;
+}
+export declare type AutocompleteOverlayProps = ComponentProps<typeof AutocompleteOverlay>;
+export default AutocompleteOverlay;

package/lib/Autocomplete/AutocompleteOverlay.js

@@ -0,0 +1,80 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _hooks = require("../hooks");
+
+var _Overlay = _interopRequireDefault(require("../Overlay"));
+
+var _AutocompleteContext = require("./AutocompleteContext");
+
+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); }
+
+// TODO: consider making 'aria-labelledby' required
+function AutocompleteOverlay({
+  menuAnchorRef,
+  overlayProps,
+  children
+}) {
+  const autocompleteContext = (0, _react.useContext)(_AutocompleteContext.AutocompleteContext);
+
+  if (autocompleteContext === null) {
+    throw new Error('AutocompleteContext returned null values');
+  }
+
+  const {
+    inputRef,
+    scrollContainerRef,
+    selectedItemLength,
+    setShowMenu,
+    showMenu = false
+  } = autocompleteContext;
+  const {
+    floatingElementRef,
+    position
+  } = (0, _hooks.useAnchoredPosition)({
+    side: 'outside-bottom',
+    align: 'start',
+    anchorElementRef: menuAnchorRef ? menuAnchorRef : inputRef
+  }, [showMenu, selectedItemLength]);
+  const combinedOverlayRef = (0, _useCombinedRefs.useCombinedRefs)(scrollContainerRef, floatingElementRef);
+  const closeOptionList = (0, _react.useCallback)(() => {
+    setShowMenu(false);
+  }, [setShowMenu]);
+
+  if (typeof window === 'undefined') {
+    return null;
+  }
+
+  return /*#__PURE__*/_react.default.createElement(_Overlay.default, _extends({
+    returnFocusRef: inputRef,
+    preventFocusOnOpen: true,
+    onClickOutside: closeOptionList,
+    onEscape: closeOptionList,
+    ref: combinedOverlayRef,
+    top: position === null || position === void 0 ? void 0 : position.top,
+    left: position === null || position === void 0 ? void 0 : position.left,
+    visibility: showMenu ? 'visible' : 'hidden',
+    sx: {
+      overflow: 'auto'
+    }
+  }, overlayProps), children);
+}
+
+AutocompleteOverlay.displayName = "AutocompleteOverlay";
+AutocompleteOverlay.displayName = 'AutocompleteOverlay';
+var _default = AutocompleteOverlay;
+exports.default = _default;

package/lib/Autocomplete/index.d.ts

@@ -0,0 +1,2 @@
+export { default } from './Autocomplete';
+export type { AutocompleteMenuProps, AutocompleteInputProps, AutocompleteOverlayProps } from './Autocomplete';

package/lib/Autocomplete/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _Autocomplete.default;
+  }
+});
+
+var _Autocomplete = _interopRequireDefault(require("./Autocomplete"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/BaseStyles.js

@@ -59,7 +59,7 @@ function BaseStyles(props) {
 
 BaseStyles.displayName = "BaseStyles";
 BaseStyles.defaultProps = {
-  color: 'text.primary',
+  color: 'fg.default',
   fontFamily: 'normal',
   lineHeight: 'default'
 };

package/lib/BorderBox.js

@@ -21,7 +21,7 @@ const BorderBox = (0, _styledComponents.default)(_Box.default).withConfig({
 BorderBox.defaultProps = {
   borderWidth: '1px',
   borderStyle: 'solid',
-  borderColor: 'border.primary',
+  borderColor: 'border.default',
   borderRadius: 2
 };
 var _default = BorderBox;

package/lib/BranchName.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const BranchName = _styledComponents.default.a.withConfig({
   displayName: "BranchName",
   componentId: "sc-167ouzm-0"
-})(["display:inline-block;padding:2px 6px;font-size:", ";font-family:", ";color:", ";background-color:", ";border-radius:", ";", ";", ";"], (0, _constants.get)('fontSizes.0'), (0, _constants.get)('fonts.mono'), (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('colors.accent.subtle'), (0, _constants.get)('radii.2'), _constants.COMMON, _sx.default);
+})(["display:inline-block;padding:2px 6px;font-size:", ";font-family:", ";color:", ";background-color:", ";border-radius:", ";", ";", ";"], (0, _constants.get)('fontSizes.0'), (0, _constants.get)('fonts.mono'), (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('colors.accent.subtle'), (0, _constants.get)('radii.2'), _constants.COMMON, _sx.default);
 
 var _default = BranchName;
 exports.default = _default;

package/lib/Breadcrumbs.js

@@ -26,7 +26,7 @@ const SELECTED_CLASS = 'selected';
 const Wrapper = _styledComponents.default.li.withConfig({
   displayName: "Breadcrumbs__Wrapper",
   componentId: "hwwoo0-0"
-})(["display:inline-block;white-space:nowrap;list-style:none;&::after{padding-right:0.5em;padding-left:0.5em;color:", ";font-size:", ";content:'/';}&:first-child{margin-left:0;}&:last-child{&::after{content:none;}}"], (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('fontSizes.1'));
+})(["display:inline-block;white-space:nowrap;list-style:none;&::after{padding-right:0.5em;padding-left:0.5em;color:", ";font-size:", ";content:'/';}&:first-child{margin-left:0;}&:last-child{&::after{content:none;}}"], (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('fontSizes.1'));
 
 const BreadcrumbsBase = _styledComponents.default.nav.withConfig({
   displayName: "Breadcrumbs__BreadcrumbsBase",

package/lib/Button/Button.js

@@ -22,6 +22,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const Button = (0, _styledComponents.default)(_ButtonBase.default).withConfig({
   displayName: "Button",
   componentId: "xjtz72-0"
-})(["color:", ";background-color:", ";border:1px solid ", ";box-shadow:", ",", "};&:hover{background-color:", ";border-color:", ";}&:focus{border-color:", ";box-shadow:", ";}&:active{background-color:", ";box-shadow:", ";}&:disabled{color:", ";background-color:", ";border-color:", ";}", ";", ";"], (0, _constants.get)('colors.btn.text'), (0, _constants.get)('colors.btn.bg'), (0, _constants.get)('colors.btn.border'), (0, _constants.get)('shadows.btn.shadow'), (0, _constants.get)('shadows.btn.insetShadow'), (0, _constants.get)('colors.btn.hoverBg'), (0, _constants.get)('colors.btn.hoverBorder'), (0, _constants.get)('colors.btn.focusBorder'), (0, _constants.get)('shadows.btn.focusShadow'), (0, _constants.get)('colors.btn.selectedBg'), (0, _constants.get)('shadows.btn.shadowActive'), (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('colors.btn.bg'), (0, _constants.get)('colors.btn.border'), _ButtonBase.buttonSystemProps, _sx.default);
+})(["color:", ";background-color:", ";border:1px solid ", ";box-shadow:", ",", "};&:hover{background-color:", ";border-color:", ";}&:focus{border-color:", ";box-shadow:", ";}&:active{background-color:", ";box-shadow:", ";}&:disabled{color:", ";background-color:", ";border-color:", ";}", ";", ";"], (0, _constants.get)('colors.btn.text'), (0, _constants.get)('colors.btn.bg'), (0, _constants.get)('colors.btn.border'), (0, _constants.get)('shadows.btn.shadow'), (0, _constants.get)('shadows.btn.insetShadow'), (0, _constants.get)('colors.btn.hoverBg'), (0, _constants.get)('colors.btn.hoverBorder'), (0, _constants.get)('colors.btn.focusBorder'), (0, _constants.get)('shadows.btn.focusShadow'), (0, _constants.get)('colors.btn.selectedBg'), (0, _constants.get)('shadows.btn.shadowActive'), (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('colors.btn.bg'), (0, _constants.get)('colors.btn.border'), _ButtonBase.buttonSystemProps, _sx.default);
 var _default = Button;
 exports.default = _default;

package/lib/Button/ButtonClose.js

@@ -26,7 +26,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 const StyledButton = _styledComponents.default.button.withConfig({
   displayName: "ButtonClose__StyledButton",
   componentId: "sc-13mzqph-0"
-})(["border:none;padding:0;background:transparent;outline:none;cursor:pointer;border-radius:", ";color:", ";&:focus{box-shadow:", ";}&:hover{color:", ";}", ";", ";", ";"], (0, _constants.get)('radii.2'), (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('shadows.btn.focusShadow'), (0, _constants.get)('colors.accent.fg'), _constants.COMMON, _constants.LAYOUT, _sx.default);
+})(["border:none;padding:0;background:transparent;outline:none;cursor:pointer;border-radius:", ";color:", ";&:focus{box-shadow:", ";}&:hover{color:", ";}", ";", ";", ";"], (0, _constants.get)('radii.2'), (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('shadows.btn.focusShadow'), (0, _constants.get)('colors.accent.fg'), _constants.COMMON, _constants.LAYOUT, _sx.default);
 
 const ButtonClose = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
   return /*#__PURE__*/_react.default.createElement(StyledButton, _extends({

package/lib/Button/ButtonInvisible.js

@@ -22,6 +22,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const ButtonInvisible = (0, _styledComponents.default)(_ButtonBase.default).withConfig({
   displayName: "ButtonInvisible",
   componentId: "sc-1195tpn-0"
-})(["color:", ";background-color:transparent;border:0;border-radius:", ";box-shadow:none;&:disabled{color:", ";}&:focus{box-shadow:", ";}", ";", ""], (0, _constants.get)('colors.accent.fg'), (0, _constants.get)('radii.2'), (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('shadows.btn.focusShadow'), _ButtonBase.buttonSystemProps, _sx.default);
+})(["color:", ";background-color:transparent;border:0;border-radius:", ";box-shadow:none;&:disabled{color:", ";}&:focus{box-shadow:", ";}", ";", ""], (0, _constants.get)('colors.accent.fg'), (0, _constants.get)('radii.2'), (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('shadows.btn.focusShadow'), _ButtonBase.buttonSystemProps, _sx.default);
 var _default = ButtonInvisible;
 exports.default = _default;

package/lib/Button/ButtonTableList.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const ButtonTableList = _styledComponents.default.summary.withConfig({
   displayName: "ButtonTableList",
   componentId: "sc-1m4q8ia-0"
-})(["display:inline-block;padding:0;font-size:", ";color:", ";text-decoration:none;white-space:nowrap;cursor:pointer;user-select:none;background-color:transparent;border:0;appearance:none;&:hover{text-decoration:underline;}&:disabled{&,&:hover{color:rgba(", ",0.5);cursor:default;}}&:after{display:inline-block;margin-left:", ";width:0;height:0;vertical-align:-2px;content:'';border:4px solid transparent;border-top-color:currentcolor;}", " ", " ", " ", ";"], (0, _constants.get)('fontSizes.1'), (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('space.1'), _constants.COMMON, _constants.TYPOGRAPHY, _constants.LAYOUT, _sx.default);
+})(["display:inline-block;padding:0;font-size:", ";color:", ";text-decoration:none;white-space:nowrap;cursor:pointer;user-select:none;background-color:transparent;border:0;appearance:none;&:hover{text-decoration:underline;}&:disabled{&,&:hover{color:rgba(", ",0.5);cursor:default;}}&:after{display:inline-block;margin-left:", ";width:0;height:0;vertical-align:-2px;content:'';border:4px solid transparent;border-top-color:currentcolor;}", " ", " ", " ", ";"], (0, _constants.get)('fontSizes.1'), (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('space.1'), _constants.COMMON, _constants.TYPOGRAPHY, _constants.LAYOUT, _sx.default);
 
 var _default = ButtonTableList;
 exports.default = _default;

package/lib/Caret.js

@@ -119,8 +119,8 @@ function Caret(props) {
 Caret.displayName = "Caret";
 Caret.locations = ['top', 'top-left', 'top-right', 'right', 'right-top', 'right-bottom', 'bottom', 'bottom-left', 'bottom-right', 'left', 'left-top', 'left-bottom'];
 Caret.defaultProps = {
-  bg: 'bg.canvas',
-  borderColor: 'border.primary',
+  bg: 'canvas.default',
+  borderColor: 'border.default',
   borderWidth: 1
 };
 var _default = Caret;

package/lib/Dialog/ConfirmationDialog.js

@@ -61,7 +61,7 @@ ConfirmationHeader.displayName = "ConfirmationHeader";
 const StyledConfirmationBody = (0, _styledComponents.default)(_Box.default).withConfig({
   displayName: "ConfirmationDialog__StyledConfirmationBody",
   componentId: "sc-1ub32x2-2"
-})(["font-size:", ";padding:0 ", " ", " ", ";color:", ";flex-grow:1;"], (0, _constants.get)('fontSizes.1'), (0, _constants.get)('space.3'), (0, _constants.get)('space.3'), (0, _constants.get)('space.3'), (0, _constants.get)('colors.fg.muted'));
+})(["font-size:", ";padding:0 ", " ", " ", ";color:", ";flex-grow:1;"], (0, _constants.get)('fontSizes.1'), (0, _constants.get)('space.3'), (0, _constants.get)('space.3'), (0, _constants.get)('space.3'), (0, _constants.get)('colors.primer.fg.disabled'));
 
 const ConfirmationBody = ({
   children

package/lib/Dialog/Dialog.js

@@ -202,7 +202,7 @@ const Title = (0, _styledComponents.default)(_Box.default).withConfig({
 const Subtitle = (0, _styledComponents.default)(_Box.default).withConfig({
   displayName: "Dialog__Subtitle",
   componentId: "sc-11pkgky-4"
-})(["font-size:", ";margin-top:", ";color:", ";"], (0, _constants.get)('fontSizes.0'), (0, _constants.get)('space.1'), (0, _constants.get)('colors.fg.muted'));
+})(["font-size:", ";margin-top:", ";color:", ";"], (0, _constants.get)('fontSizes.0'), (0, _constants.get)('space.1'), (0, _constants.get)('colors.primer.fg.disabled'));
 const Body = (0, _styledComponents.default)(_Box.default).withConfig({
   displayName: "Dialog__Body",
   componentId: "sc-11pkgky-5"
@@ -256,7 +256,7 @@ const Buttons = ({
 const DialogCloseButton = (0, _styledComponents.default)(_Button.default).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;"], (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('space.2'));
+})(["border-radius:4px;background:transparent;border:0;vertical-align:middle;color:", ";padding:", ";align-self:flex-start;line-height:normal;box-shadow:none;"], (0, _constants.get)('colors.primer.fg.disabled'), (0, _constants.get)('space.2'));
 
 const CloseButton = ({
   onClose

package/lib/Dialog.js

@@ -122,7 +122,7 @@ const Dialog = /*#__PURE__*/(0, _react.forwardRef)(({
   }), children)) : null;
 });
 DialogHeader.defaultProps = {
-  backgroundColor: 'bg.tertiary'
+  backgroundColor: 'canvas.subtle'
 };
 DialogHeader.propTypes = { ..._Box.default.propTypes
 };

package/lib/FilterList.js

@@ -36,7 +36,7 @@ FilterList.displayName = "FilterList";
 const FilterListItemBase = _styledComponents.default.a.withConfig({
   displayName: "FilterList__FilterListItemBase",
   componentId: "sc-1l4pxmz-1"
-})(["position:relative;display:block;padding:", ";margin:", ";overflow:hidden;font-size:", ";color:", ";background-color:", "!important;text-decoration:none;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;border-radius:", ";&:hover{text-decoration:none;background-color:", ";}&:active{color:", ";background-color:", ";}.count{float:right;font-weight:", ";}", ";", ";"], props => props.small ? `${(0, _constants.get)('space.1')(props)} 10px` : `${(0, _constants.get)('space.2')(props)} 11px`, props => props.small ? '0 0 2px' : '0 0 5px 0', (0, _constants.get)('fontSizes.1'), props => props.selected ? (0, _constants.get)('colors.fg.onEmphasis') : (0, _constants.get)('colors.fg.muted'), props => props.selected ? (0, _constants.get)('colors.accent.emphasis') : '', (0, _constants.get)('radii.1'), (0, _constants.get)('colors.canvas.subtle'), (0, _constants.get)('colors.fg.onEmphasis'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('fontWeights.bold'), _constants.COMMON, _sx.default);
+})(["position:relative;display:block;padding:", ";margin:", ";overflow:hidden;font-size:", ";color:", ";background-color:", "!important;text-decoration:none;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;border-radius:", ";&:hover{text-decoration:none;background-color:", ";}&:active{color:", ";background-color:", ";}.count{float:right;font-weight:", ";}", ";", ";"], props => props.small ? `${(0, _constants.get)('space.1')(props)} 10px` : `${(0, _constants.get)('space.2')(props)} 11px`, props => props.small ? '0 0 2px' : '0 0 5px 0', (0, _constants.get)('fontSizes.1'), props => props.selected ? (0, _constants.get)('colors.fg.onEmphasis') : (0, _constants.get)('colors.primer.fg.disabled'), props => props.selected ? (0, _constants.get)('colors.accent.emphasis') : '', (0, _constants.get)('radii.1'), (0, _constants.get)('colors.canvas.subtle'), (0, _constants.get)('colors.fg.onEmphasis'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('fontWeights.bold'), _constants.COMMON, _sx.default);
 
 function FilterListItem({
   children,

package/lib/FilteredActionList/FilteredActionList.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
 import { GroupedListProps, ListPropsBase } from '../ActionList/List';
 import { TextInputProps } from '../TextInput';
-export interface FilteredActionListProps extends Partial<Omit<GroupedListProps, keyof ListPropsBase>>, ListPropsBase {
+import { SxProp } from '../sx';
+export interface FilteredActionListProps extends Partial<Omit<GroupedListProps, keyof ListPropsBase>>, ListPropsBase, SxProp {
     loading?: boolean;
     placeholderText: string;
     filterValue?: string;
@@ -9,7 +10,7 @@ export interface FilteredActionListProps extends Partial<Omit<GroupedListProps,
     textInputProps?: Partial<Omit<TextInputProps, 'onChange'>>;
     inputRef?: React.RefObject<HTMLInputElement>;
 }
-export declare function FilteredActionList({ loading, placeholderText, filterValue: externalFilterValue, onFilterChange, items, textInputProps, inputRef: providedInputRef, ...listProps }: FilteredActionListProps): JSX.Element;
+export declare function FilteredActionList({ loading, placeholderText, filterValue: externalFilterValue, onFilterChange, items, textInputProps, inputRef: providedInputRef, sx, ...listProps }: FilteredActionListProps): JSX.Element;
 export declare namespace FilteredActionList {
     var displayName: string;
 }

package/lib/FilteredActionList/FilteredActionList.js

@@ -7,6 +7,8 @@ exports.FilteredActionList = FilteredActionList;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _ssr = require("@react-aria/ssr");
+
 var _TextInput = _interopRequireDefault(require("../TextInput"));
 
 var _Box = _interopRequireDefault(require("../Box"));
@@ -27,7 +29,7 @@ var _useProvidedRefOrCreate = require("../hooks/useProvidedRefOrCreate");
 
 var _useScrollFlash = _interopRequireDefault(require("../hooks/useScrollFlash"));
 
-var _ssr = require("@react-aria/ssr");
+var _scrollIntoViewingArea = require("../behaviors/scrollIntoViewingArea");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -37,34 +39,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && 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 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
-
-}
-
 const StyledHeader = _styledComponents.default.div.withConfig({
   displayName: "FilteredActionList__StyledHeader",
   componentId: "yg3jkv-0"
@@ -78,6 +52,7 @@ function FilteredActionList({
   items,
   textInputProps,
   inputRef: providedInputRef,
+  sx,
   ...listProps
 }) {
   const [filterValue, setInternalFilterValue] = (0, _useProvidedStateOrCreate.useProvidedStateOrCreate)(externalFilterValue, undefined, '');
@@ -111,7 +86,7 @@ function FilteredActionList({
       activeDescendantRef.current = current;
 
       if (current && scrollContainerRef.current && directlyActivated) {
-        scrollIntoViewingArea(current, scrollContainerRef.current);
+        (0, _scrollIntoViewingArea.scrollIntoViewingArea)(current, scrollContainerRef.current);
       }
     }
   }, [// List ref isn't set while loading.  Need to re-bind focus zone when it changes
@@ -119,14 +94,15 @@ function FilteredActionList({
   (0, _react.useEffect)(() => {
     // if items changed, we want to instantly move active descendant into view
     if (activeDescendantRef.current && scrollContainerRef.current) {
-      scrollIntoViewingArea(activeDescendantRef.current, scrollContainerRef.current, undefined, 'auto');
+      (0, _scrollIntoViewingArea.scrollIntoViewingArea)(activeDescendantRef.current, scrollContainerRef.current, 'vertical', undefined, undefined, 'auto');
     }
   }, [items]);
   (0, _useScrollFlash.default)(scrollContainerRef);
   return /*#__PURE__*/_react.default.createElement(_Box.default, {
     display: "flex",
     flexDirection: "column",
-    overflow: "hidden"
+    overflow: "hidden",
+    sx: sx
   }, /*#__PURE__*/_react.default.createElement(StyledHeader, null, /*#__PURE__*/_react.default.createElement(_TextInput.default, _extends({
     ref: inputRef,
     block: true,