@primer/components 0.0.0-202111023322 → 0.0.0-2021111104725

package/lib-esm/Dropdown.js

@@ -1,17 +1,16 @@
 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); }
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import Button from './Button';
+import { get } from './constants';
 import Details from './Details';
-import { COMMON, get } from './constants';
 import getDirectionStyles from './DropdownStyles';
-import theme from './theme';
+import useDetails from './hooks/useDetails';
 import sx from './sx';
 const StyledDetails = styled(Details).withConfig({
   displayName: "Dropdown__StyledDetails",
-  componentId: "sc-3wysgd-0"
+  componentId: "sc-16yoecj-0"
 })(["position:relative;display:inline-block;"]);
 
 const Dropdown = ({
@@ -19,72 +18,53 @@ const Dropdown = ({
   className,
   ...rest
 }) => {
+  const {
+    getDetailsProps
+  } = useDetails({
+    closeOnOutsideClick: true
+  });
   return /*#__PURE__*/React.createElement(StyledDetails, _extends({
-    closeOnOutsideClick: true,
     className: className
-  }, rest), children);
+  }, getDetailsProps(), rest), children);
 };
 
 Dropdown.displayName = "Dropdown";
 
-Dropdown.Button = ({
+const DropdownButton = ({
   children,
   ...rest
 }) => {
   return /*#__PURE__*/React.createElement(Button, _extends({
     as: "summary",
     "aria-haspopup": "true"
-  }, rest), children, /*#__PURE__*/React.createElement(Dropdown.Caret, null));
+  }, rest), children, /*#__PURE__*/React.createElement(DropdownCaret, null));
 };
 
-Dropdown.Caret = styled.div.withConfig({
-  displayName: "Dropdown__Caret",
-  componentId: "sc-3wysgd-1"
-})(["border:4px solid transparent;margin-left:12px;border-top-color:currentcolor;border-bottom-width:0;content:'';display:inline-block;height:0;vertical-align:middle;width:0;", ";", ";"], COMMON, sx);
-Dropdown.Menu = styled.ul.withConfig({
-  displayName: "Dropdown__Menu",
-  componentId: "sc-3wysgd-2"
-})(["background-clip:padding-box;background-color:", ";border:1px solid rgba(27,31,35,0.15);border-radius:", ";box-shadow:0 3px 12px rgba(27,31,35,0.15);left:0;list-style:none;margin-top:2px;padding:5px 0 5px 0 !important;position:absolute;top:100%;width:160px;z-index:100;&::before{position:absolute;display:inline-block;content:'';}&::after{position:absolute;display:inline-block;content:'';}&::before{border:8px solid transparent;border-bottom-color:", ";}&::after{border:7px solid transparent;border-bottom-color:", ";}> ul{list-style:none;}", ";", ";", ";"], get('colors.white'), get('radii.2'), get('colors.blackfade15'), get('colors.white'), props => props.direction ? getDirectionStyles(props.theme, props.direction) : '', COMMON, sx);
-Dropdown.Item = styled.li.withConfig({
-  displayName: "Dropdown__Item",
-  componentId: "sc-3wysgd-3"
-})(["display:block;padding:", " 10px ", " 15px;overflow:hidden;color:", ";text-overflow:ellipsis;white-space:nowrap;a{color:", ";text-decoration:none;display:block;overflow:hidden;color:", ";text-overflow:ellipsis;white-space:nowrap;}&:focus,a:focus{color:", ";text-decoration:none;background-color:", ";}&:hover,&:hover a{color:", ";text-decoration:none;background-color:", ";outline:none;}", ";", ";"], get('space.1'), get('space.1'), get('colors.gray.9'), get('colors.gray.9'), get('colors.gray.9'), get('colors.white'), get('colors.blue.5'), get('colors.white'), get('colors.blue.5'), COMMON, sx);
-Dropdown.Menu.propTypes = {
-  direction: PropTypes.oneOf(['ne', 'e', 'se', 's', 'sw', 'w']),
-  ...COMMON.propTypes,
-  ...sx.propTypes
+DropdownButton.displayName = "DropdownButton";
+const DropdownCaret = styled.div.withConfig({
+  displayName: "Dropdown__DropdownCaret",
+  componentId: "sc-16yoecj-1"
+})(["border:4px solid transparent;margin-left:12px;border-top-color:currentcolor;border-bottom-width:0;content:'';display:inline-block;height:0;vertical-align:middle;width:0;", ";"], sx);
+const DropdownMenu = styled.ul.withConfig({
+  displayName: "Dropdown__DropdownMenu",
+  componentId: "sc-16yoecj-2"
+})(["background-clip:padding-box;background-color:", ";border:1px solid ", ";border-radius:", ";box-shadow:", ";left:0;list-style:none;margin-top:2px;padding:5px 0 5px 0 !important;position:absolute;top:100%;width:160px;z-index:100;&::before{position:absolute;display:inline-block;content:'';}&::after{position:absolute;display:inline-block;content:'';}&::before{border:8px solid transparent;border-bottom-color:", ";}&::after{border:7px solid transparent;border-bottom-color:", ";}> ul{list-style:none;}", ";", ";"], get('colors.canvas.overlay'), get('colors.border.default'), get('radii.2'), get('shadows.shadow.large'), get('colors.canvas.overlay'), get('colors.canvas.overlay'), props => props.direction ? getDirectionStyles(props.theme, props.direction) : '', sx);
+const DropdownItem = styled.li.withConfig({
+  displayName: "Dropdown__DropdownItem",
+  componentId: "sc-16yoecj-3"
+})(["display:block;padding:", " 10px ", " 15px;overflow:hidden;color:", ";text-overflow:ellipsis;white-space:nowrap;a{color:", ";text-decoration:none;display:block;overflow:hidden;color:", ";text-overflow:ellipsis;white-space:nowrap;}&:focus,a:focus{color:", ";text-decoration:none;background-color:", ";}&:hover,&:hover a{color:", ";text-decoration:none;background-color:", ";outline:none;}", ";"], get('space.1'), get('space.1'), get('colors.fg.default'), get('colors.fg.default'), get('colors.fg.default'), get('colors.fg.onEmphasis'), get('colors.accent.emphasis'), get('colors.fg.onEmphasis'), get('colors.accent.emphasis'), sx);
+DropdownMenu.defaultProps = {
+  direction: 'sw'
 };
-Dropdown.Menu.defaultProps = {
-  direction: 'sw',
-  theme
-};
-Dropdown.Menu.displayName = 'Dropdown.Menu';
-Dropdown.Item.defaultProps = {
-  theme
-};
-Dropdown.Item.propTypes = { ...COMMON.propTypes,
-  ...sx.propTypes
-};
-Dropdown.Item.displayName = 'Dropdown.Item';
-Dropdown.Button.defaultProps = {
-  theme,
-  ...Button.defaultProps
-};
-Dropdown.Button.propTypes = { ...Button.propTypes
-};
-Dropdown.Button.displayName = 'Dropdown.Button';
-Dropdown.Caret.defaultProps = {
-  theme
-};
-Dropdown.Caret.propTypes = { ...COMMON.propTypes,
-  ...sx.propTypes
-};
-Dropdown.Caret.displayName = 'Dropdown.Caret';
-Dropdown.defaultProps = {
-  theme,
-  ...Details.defaultProps
-};
-Dropdown.propTypes = { ...Details.propTypes,
-  ...COMMON.propTypes
-};
-export default Dropdown;
+DropdownMenu.displayName = 'Dropdown.Menu';
+DropdownItem.displayName = 'Dropdown.Item';
+DropdownButton.defaultProps = Button.defaultProps;
+DropdownButton.displayName = 'Dropdown.Button';
+DropdownCaret.displayName = 'Dropdown.Caret';
+Dropdown.defaultProps = Details.defaultProps;
+export default Object.assign(Dropdown, {
+  Caret: DropdownCaret,
+  Menu: DropdownMenu,
+  Item: DropdownItem,
+  Button: DropdownButton
+});

package/lib-esm/DropdownMenu/DropdownButton.js

@@ -0,0 +1,18 @@
+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); }
+
+import React from 'react';
+import { TriangleDownIcon } from '@primer/octicons-react';
+import Button from '../Button/Button';
+import StyledOcticon from '../StyledOcticon';
+export const DropdownButton = /*#__PURE__*/React.forwardRef(({
+  children,
+  ...props
+}, ref) => /*#__PURE__*/React.createElement(Button, _extends({
+  ref: ref,
+  type: "button"
+}, props), children, /*#__PURE__*/React.createElement(StyledOcticon, {
+  icon: TriangleDownIcon,
+  sx: {
+    ml: 1
+  }
+})));

package/lib-esm/DropdownMenu/DropdownMenu.js

@@ -0,0 +1,77 @@
+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); }
+
+import React, { useCallback, useMemo } from 'react';
+import { List } from '../ActionList/List';
+import { DropdownButton } from './DropdownButton';
+import { AnchoredOverlay } from '../AnchoredOverlay';
+import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate';
+import { useProvidedStateOrCreate } from '../hooks/useProvidedStateOrCreate';
+
+/**
+ * A `DropdownMenu` provides an anchor (button by default) that will open a floating menu of selectable items.  The menu can be
+ * opened and navigated using keyboard or mouse.  When an item is selected, the menu will close and the `onChange` callback will be called.
+ * If the default anchor button is used, the anchor contents will be updated with the selection.
+ */
+export function DropdownMenu({
+  renderAnchor = props => /*#__PURE__*/React.createElement(DropdownButton, props),
+  anchorRef: externalAnchorRef,
+  placeholder,
+  selectedItem,
+  onChange,
+  overlayProps,
+  items,
+  open,
+  onOpenChange,
+  ...listProps
+}) {
+  const [combinedOpenState, setCombinedOpenState] = useProvidedStateOrCreate(open, onOpenChange, false);
+  const onOpen = useCallback(() => setCombinedOpenState(true), [setCombinedOpenState]);
+  const onClose = useCallback(() => setCombinedOpenState(false), [setCombinedOpenState]);
+  const anchorRef = useProvidedRefOrCreate(externalAnchorRef);
+  const renderMenuAnchor = useMemo(() => {
+    if (renderAnchor === null) {
+      return null;
+    }
+
+    return props => {
+      var _selectedItem$text;
+
+      return renderAnchor({ ...props,
+        children: (_selectedItem$text = selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.text) !== null && _selectedItem$text !== void 0 ? _selectedItem$text : placeholder
+      });
+    };
+  }, [placeholder, renderAnchor, selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.text]);
+  const itemsToRender = useMemo(() => {
+    return items.map(item => {
+      return { ...item,
+        role: 'option',
+        selected: item === selectedItem,
+        onAction: (itemFromAction, event) => {
+          var _item$onAction;
+
+          (_item$onAction = item.onAction) === null || _item$onAction === void 0 ? void 0 : _item$onAction.call(item, itemFromAction, event);
+
+          if (event.defaultPrevented) {
+            return;
+          }
+
+          onClose();
+          onChange === null || onChange === void 0 ? void 0 : onChange(item === selectedItem ? undefined : item);
+        }
+      };
+    });
+  }, [items, onChange, onClose, selectedItem]);
+  return /*#__PURE__*/React.createElement(AnchoredOverlay, {
+    renderAnchor: renderMenuAnchor,
+    anchorRef: anchorRef,
+    open: combinedOpenState,
+    onOpen: onOpen,
+    onClose: onClose,
+    overlayProps: overlayProps
+  }, /*#__PURE__*/React.createElement(List, _extends({}, listProps, {
+    role: "listbox",
+    items: itemsToRender
+  })));
+}
+DropdownMenu.displayName = "DropdownMenu";
+DropdownMenu.displayName = 'DropdownMenu';

package/lib-esm/DropdownMenu/index.js

@@ -0,0 +1,2 @@
+export { DropdownMenu } from './DropdownMenu';
+export { DropdownButton } from './DropdownButton';

package/lib-esm/DropdownStyles.js

@@ -15,7 +15,7 @@ const getDirectionStyles = (theme, direction) => {
         right: -16px;
         left: auto;
         border-color: transparent;
-        border-left-color: ${get('colors.blackfade15')(theme)};
+        border-left-color: ${get('colors.border.default')(theme)};
       }
 
       &::after {
@@ -23,7 +23,7 @@ const getDirectionStyles = (theme, direction) => {
         right: -14px;
         left: auto;
         border-color: transparent;
-        border-left-color: ${get('colors.white')(theme)};
+        border-left-color: ${get('colors.border.default')(theme)};
       }
     `,
     e: `
@@ -37,14 +37,14 @@ const getDirectionStyles = (theme, direction) => {
         top: 10px;
         left: -16px;
         border-color: transparent;
-        border-right-color: ${get('colors.blackfade15')(theme)};
+        border-right-color: ${get('colors.border.default')(theme)};
       }
 
       &::after {
         top: 11px;
         left: -14px;
         border-color: transparent;
-        border-right-color: ${get('colors.white')(theme)};
+        border-right-color: ${get('colors.border.default')(theme)};
       }
     `,
     ne: `
@@ -62,7 +62,7 @@ const getDirectionStyles = (theme, direction) => {
       &::before {
         bottom: -8px;
         left: 9px;
-        border-top: 8px solid ${get('colors.blackfade15')(theme)};
+        border-top: 8px solid ${get('colors.border.default')(theme)};
         border-bottom: 0;
         border-left: 8px solid transparent;
       }
@@ -70,7 +70,7 @@ const getDirectionStyles = (theme, direction) => {
       &::after {
         bottom: -7px;
         left: 10px;
-        border-top: 7px solid ${get('colors.white')(theme)};
+        border-top: 7px solid ${get('colors.border.default')(theme)};
         border-right: 7px solid transparent;
         border-bottom: 0;
         border-left: 7px solid transparent;

package/lib-esm/FilterList.js

@@ -1,13 +1,11 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { COMMON, get } from './constants';
-import theme from './theme';
+import { get } from './constants';
 import sx from './sx';
 const FilterListBase = styled.ul.withConfig({
   displayName: "FilterList__FilterListBase",
   componentId: "sc-1l4pxmz-0"
-})(["list-style-type:none;", ";", ";"], COMMON, sx);
+})(["list-style-type:none;margin:0;padding:0;", ";"], sx);
 
 const FilterList = ({
   children,
@@ -23,7 +21,7 @@ FilterList.displayName = "FilterList";
 const FilterListItemBase = styled.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 ? `${get('space.1')(props)} 10px` : `${get('space.2')(props)} 11px`, props => props.small ? '0 0 2px' : '0 0 5px 0', get('fontSizes.1'), props => props.selected ? get('colors.white') : get('colors.gray.6'), props => props.selected ? get('colors.blue.5') : '', get('radii.1'), get('colors.filterList.hoverBg'), get('colors.white'), get('colors.blue.5'), get('fontWeights.bold'), COMMON, sx);
+})(["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 ? `${get('space.1')(props)} 10px` : `${get('space.2')(props)} 11px`, props => props.small ? '0 0 2px' : '0 0 5px 0', get('fontSizes.1'), props => props.selected ? get('colors.fg.onEmphasis') : get('colors.fg.muted'), props => props.selected ? get('colors.accent.emphasis') : '', get('radii.1'), get('colors.canvas.subtle'), get('colors.fg.onEmphasis'), get('colors.accent.emphasis'), get('fontWeights.bold'), sx);
 
 function FilterListItem({
   children,
@@ -37,30 +35,6 @@ function FilterListItem({
 }
 
 FilterListItem.displayName = "FilterListItem";
-FilterList.defaultProps = {
-  theme,
-  m: 0,
-  p: 0
-};
-FilterList.propTypes = {
-  children: PropTypes.node,
-  small: PropTypes.bool,
-  ...COMMON.propTypes,
-  ...sx.propTypes
-};
-FilterListItem.defaultProps = {
-  theme
-};
-FilterListItem.propTypes = {
-  as: PropTypes.oneOfType([PropTypes.string, PropTypes.elementType]),
-  children: PropTypes.node,
-  className: PropTypes.string,
-  count: PropTypes.string,
-  selected: PropTypes.bool,
-  theme: PropTypes.object,
-  ...COMMON.propTypes,
-  ...sx.propTypes
-};
 FilterListItem.displayName = 'FilterList.Item';
 export default Object.assign(FilterList, {
   Item: FilterListItem

package/lib-esm/FilteredActionList/FilteredActionList.js

@@ -0,0 +1,109 @@
+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); }
+
+import React, { useCallback, useEffect, useRef } from 'react';
+import { useSSRSafeId } from '@react-aria/ssr';
+import TextInput from '../TextInput';
+import Box from '../Box';
+import { ActionList } from '../ActionList';
+import Spinner from '../Spinner';
+import { useFocusZone } from '../hooks/useFocusZone';
+import { useProvidedStateOrCreate } from '../hooks/useProvidedStateOrCreate';
+import styled from 'styled-components';
+import { get } from '../constants';
+import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate';
+import useScrollFlash from '../hooks/useScrollFlash';
+import { scrollIntoViewingArea } from '../behaviors/scrollIntoViewingArea';
+const StyledHeader = styled.div.withConfig({
+  displayName: "FilteredActionList__StyledHeader",
+  componentId: "yg3jkv-0"
+})(["box-shadow:0 1px 0 ", ";z-index:1;"], get('colors.border.default'));
+export function FilteredActionList({
+  loading = false,
+  placeholderText,
+  filterValue: externalFilterValue,
+  onFilterChange,
+  items,
+  textInputProps,
+  inputRef: providedInputRef,
+  sx,
+  ...listProps
+}) {
+  const [filterValue, setInternalFilterValue] = useProvidedStateOrCreate(externalFilterValue, undefined, '');
+  const onInputChange = useCallback(e => {
+    const value = e.target.value;
+    onFilterChange(value, e);
+    setInternalFilterValue(value);
+  }, [onFilterChange, setInternalFilterValue]);
+  const scrollContainerRef = useRef(null);
+  const listContainerRef = useRef(null);
+  const inputRef = useProvidedRefOrCreate(providedInputRef);
+  const activeDescendantRef = useRef();
+  const listId = useSSRSafeId();
+  const onInputKeyPress = useCallback(event => {
+    if (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]);
+  useFocusZone({
+    containerRef: listContainerRef,
+    focusOutBehavior: 'wrap',
+    focusableElementFilter: element => {
+      return !(element instanceof HTMLInputElement);
+    },
+    activeDescendantFocus: inputRef,
+    onActiveDescendantChanged: (current, previous, directlyActivated) => {
+      activeDescendantRef.current = current;
+
+      if (current && scrollContainerRef.current && directlyActivated) {
+        scrollIntoViewingArea(current, scrollContainerRef.current);
+      }
+    }
+  }, [// List ref isn't set while loading.  Need to re-bind focus zone when it changes
+  loading]);
+  useEffect(() => {
+    // if items changed, we want to instantly move active descendant into view
+    if (activeDescendantRef.current && scrollContainerRef.current) {
+      scrollIntoViewingArea(activeDescendantRef.current, scrollContainerRef.current, 'vertical', undefined, undefined, 'auto');
+    }
+  }, [items]);
+  useScrollFlash(scrollContainerRef);
+  return /*#__PURE__*/React.createElement(Box, {
+    display: "flex",
+    flexDirection: "column",
+    overflow: "hidden",
+    sx: sx
+  }, /*#__PURE__*/React.createElement(StyledHeader, null, /*#__PURE__*/React.createElement(TextInput, _extends({
+    ref: inputRef,
+    block: true,
+    width: "auto",
+    color: "fg.default",
+    value: filterValue,
+    onChange: onInputChange,
+    onKeyPress: onInputKeyPress,
+    placeholder: placeholderText,
+    "aria-label": placeholderText,
+    "aria-controls": listId
+  }, textInputProps))), /*#__PURE__*/React.createElement(Box, {
+    ref: scrollContainerRef,
+    overflow: "auto"
+  }, loading ? /*#__PURE__*/React.createElement(Box, {
+    width: "100%",
+    display: "flex",
+    flexDirection: "row",
+    justifyContent: "center",
+    pt: 6,
+    pb: 7
+  }, /*#__PURE__*/React.createElement(Spinner, null)) : /*#__PURE__*/React.createElement(ActionList, _extends({
+    ref: listContainerRef,
+    items: items
+  }, listProps, {
+    role: "listbox",
+    id: listId
+  }))));
+}
+FilteredActionList.displayName = "FilteredActionList";
+FilteredActionList.displayName = 'FilteredActionList';

package/lib-esm/FilteredActionList/index.js

@@ -0,0 +1 @@
+export { FilteredActionList } from './FilteredActionList';

package/lib-esm/FilteredSearch.js

@@ -1,17 +1,8 @@
-import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { COMMON, get } from './constants';
-import theme from './theme';
+import { get } from './constants';
 import sx from './sx';
 const FilteredSearch = styled.div.withConfig({
   displayName: "FilteredSearch",
   componentId: "sc-15qfedq-0"
-})(["", ";display:flex;align-items:stretch;summary{border-radius:0;border-top-left-radius:", ";border-bottom-left-radius:", ";border-right:0;}.TextInput-wrapper{border-radius:0;border-top-right-radius:", ";border-bottom-right-radius:", ";z-index:1;}", ""], COMMON, get('radii.2'), get('radii.2'), get('radii.2'), get('radii.2'), sx);
-FilteredSearch.defaultProps = {
-  theme
-};
-FilteredSearch.propTypes = { ...COMMON.propTypes,
-  theme: PropTypes.object,
-  ...sx.propTypes
-};
+})(["display:flex;align-items:stretch;summary{border-radius:0;border-top-left-radius:", ";border-bottom-left-radius:", ";border-right:0;}.TextInput-wrapper{border-radius:0;border-top-right-radius:", ";border-bottom-right-radius:", ";z-index:1;}", ""], get('radii.2'), get('radii.2'), get('radii.2'), get('radii.2'), sx);
 export default FilteredSearch;

package/lib-esm/Flash.js

@@ -1,25 +1,48 @@
-import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import { variant } from 'styled-system';
-import { COMMON, get } from './constants';
-import theme from './theme';
+import { get } from './constants';
 import sx from './sx';
 const variants = variant({
-  scale: 'flash'
+  variants: {
+    default: {
+      color: 'fg.default',
+      backgroundColor: 'accent.subtle',
+      borderColor: 'accent.muted',
+      svg: {
+        color: 'accent.fg'
+      }
+    },
+    success: {
+      color: 'fg.default',
+      backgroundColor: 'success.subtle',
+      borderColor: 'success.muted',
+      svg: {
+        color: 'success.fg'
+      }
+    },
+    danger: {
+      color: 'fg.default',
+      backgroundColor: 'danger.subtle',
+      borderColor: 'danger.muted',
+      svg: {
+        color: 'danger.fg'
+      }
+    },
+    warning: {
+      color: 'fg.default',
+      backgroundColor: 'attention.subtle',
+      borderColor: 'attention.muted',
+      svg: {
+        color: 'attention.fg'
+      }
+    }
+  }
 });
 const Flash = styled.div.withConfig({
   displayName: "Flash",
   componentId: "sc-4y90bn-0"
-})(["position:relative;color:", ";padding:", ";border-style:solid;border-width:", ";border-radius:", ";margin-top:", ";p:last-child{margin-bottom:0;}svg{color:", ";margin-right:", ";}", ";", ";", ";"], get('colors.text.grayDark'), get('space.3'), props => props.full ? '1px 0px' : '1px', props => props.full ? '0' : get('radii.2'), props => props.full ? '-1px' : '0', props => get(`flashIcon.${props.variant}`)(props.theme), get('space.2'), COMMON, variants, sx);
+})(["position:relative;color:", ";padding:", ";border-style:solid;border-width:", ";border-radius:", ";margin-top:", ";p:last-child{margin-bottom:0;}svg{margin-right:", ";}", ";", ";"], get('colors.fg.default'), get('space.3'), props => props.full ? '1px 0px' : '1px', props => props.full ? '0' : get('radii.2'), props => props.full ? '-1px' : '0', get('space.2'), variants, sx);
 Flash.defaultProps = {
-  theme,
   variant: 'default'
 };
-Flash.propTypes = {
-  children: PropTypes.node,
-  full: PropTypes.bool,
-  variant: PropTypes.oneOf(['default', 'warning', 'success', 'danger']),
-  ...COMMON.propTypes,
-  ...sx.propTypes
-};
 export default Flash;

package/lib-esm/Flex.js

@@ -1,14 +1,14 @@
 import styled from 'styled-components';
 import Box from './Box';
-import theme from './theme';
+
+/**
+ * @deprecated Use the Box component instead (i.e. <Flex> → <Box display="flex">)
+ */
 const Flex = styled(Box).withConfig({
   displayName: "Flex",
   componentId: "arghxi-0"
 })([""]);
 Flex.defaultProps = {
-  theme,
   display: 'flex'
 };
-Flex.propTypes = { ...Box.propTypes
-};
 export default Flex;

package/lib-esm/FormGroup.js

@@ -1,32 +1,15 @@
-import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { COMMON, get, TYPOGRAPHY } from './constants';
-import theme from './theme';
+import { get } from './constants';
 import sx from './sx';
 const FormGroup = styled.div.withConfig({
   displayName: "FormGroup",
   componentId: "sc-14z6yax-0"
-})(["margin:", " 0;font-weight:", ";", ";", ";"], get('space.3'), get('fontWeights.normal'), COMMON, sx);
-FormGroup.defaultProps = {
-  theme
-};
-FormGroup.propTypes = {
-  children: PropTypes.node,
-  ...COMMON.propTypes,
-  ...sx.propTypes
-};
+})(["margin:", " 0;font-weight:", ";", ";"], get('space.3'), get('fontWeights.normal'), sx);
 const FormGroupLabel = styled.label.withConfig({
   displayName: "FormGroup__FormGroupLabel",
   componentId: "sc-14z6yax-1"
-})(["display:block;margin:0 0 ", ";font-size:", ";font-weight:", ";", ";", ";", ";"], get('space.2'), get('fontSizes.1'), get('fontWeights.bold'), TYPOGRAPHY, COMMON, sx);
+})(["display:block;margin:0 0 ", ";font-size:", ";font-weight:", ";", ";"], get('space.2'), get('fontSizes.1'), get('fontWeights.bold'), sx);
 FormGroupLabel.displayName = 'FormGroup.Label';
-FormGroupLabel.defaultProps = {
-  theme
-};
-FormGroupLabel.propTypes = { ...TYPOGRAPHY.propTypes,
-  ...COMMON.propTypes,
-  ...sx.propTypes
-};
 export default Object.assign(FormGroup, {
   Label: FormGroupLabel
 });

package/lib-esm/Grid.js

@@ -1,16 +1,14 @@
 import styled from 'styled-components';
 import Box from './Box';
-import { GRID } from './constants';
-import theme from './theme';
+
+/**
+ * @deprecated Use the Box component instead (i.e. <Grid> → <Box display="grid">)
+ */
 const Grid = styled(Box).withConfig({
   displayName: "Grid",
   componentId: "sc-1i6s5ye-0"
-})(["", ";"], GRID);
+})([""]);
 Grid.defaultProps = {
-  theme,
   display: 'grid'
 };
-Grid.propTypes = { ...Box.propTypes,
-  ...GRID.propTypes
-};
 export default Grid;