@pingux/astro 1.0.0-alpha.9 → 1.1.0-alpha.10

package/lib/cjs/styles/variants/accordion.js

@@ -27,20 +27,20 @@ var accordion = {
   alignItems: 'flex-start'
 };
 var accordionBody = {
-  display: 'none !important',
+  display: 'none',
   pt: 'md',
   width: '100%',
   '.is-open &': {
-    display: 'flex !important'
+    display: 'flex'
   }
 };
 var accordionGridHeader = {
   cursor: 'pointer',
   lineHeight: '30px',
-  px: 'md',
+  pl: 'sm',
   outline: 'none',
   display: 'flex',
-  justifyContent: 'flex-start',
+  justifyContent: 'center',
   flexShrink: 0,
   wordBreak: 'inherit',
   whiteSpace: 'nowrap',
@@ -54,12 +54,9 @@ var accordionGridHeader = {
     WebkitBoxShadow: 'focus',
     MozBoxShadow: 'focus'
   },
-  padding: '0px',
+  minHeight: '64px',
   '&.is-hovered': {
-    color: 'active',
-    '& div > div > div > span': {
-      color: 'active'
-    }
+    backgroundColor: 'accent.99'
   },
   '&.is-pressed': {
     color: 'accent.20',
@@ -70,6 +67,7 @@ var accordionGridHeader = {
 };
 var accordionGridBody = {
   display: 'none !important',
+  pl: 'sm',
   width: '100%',
   '&.is-selected': {
     display: 'flex !important'

package/lib/cjs/styles/variants/boxes.js

@@ -8,7 +8,7 @@ _Object$defineProperty2(exports, "__esModule", {
   value: true
 });
 
-exports["default"] = void 0;
+exports["default"] = exports.chip = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
 
@@ -37,20 +37,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var base = {
   display: 'flex'
 };
-var panel = {
-  outline: 'none',
-  position: 'relative',
-  bg: 'white',
-  borderLeft: 'separator',
-  transition: 'margin 0.25s ease-in',
-  visibility: 'hidden',
-  '&.is-focused': {
-    boxShadow: 'focus'
-  },
-  '&.is-visible': {
-    visibility: 'visible'
-  }
-};
 var card = {
   boxShadow: 'standard',
   p: 'lg',
@@ -106,6 +92,10 @@ var listViewItem = _objectSpread(_objectSpread({}, base), {}, {
   },
   '&.is-focused': {
     boxShadow: 'inset 0 0 5px #5873bdbf'
+  },
+  '&.has-separator': {
+    borderBottom: '1px solid',
+    borderBottomColor: 'line.hairline'
   }
 });
 
@@ -119,15 +109,29 @@ var listBoxSectionTitle = {
 };
 var chip = {
   cursor: 'pointer',
-  height: '15px',
-  p: '10px',
+  p: '3px 5px 4px 5px',
   alignItems: 'center',
   justifyContent: 'center',
   minWidth: '50px',
   alignSelf: 'flex-start',
   display: 'inline-flex !important',
-  borderRadius: '5px'
+  borderRadius: '5px',
+  fontWeight: 1,
+  '& button': {
+    backgroundColor: 'transparent',
+    marginLeft: 'xs',
+    marginTop: '1px',
+    padding: '0',
+    '&.is-hovered': {
+      backgroundColor: 'white'
+    },
+    '& .mdi-icon': {
+      marginLeft: '0',
+      padding: '2px'
+    }
+  }
 };
+exports.chip = chip;
 var inputInContainerSlot = {
   position: 'absolute',
   bg: 'transparent',
@@ -284,7 +288,6 @@ var _default = {
   listItem: listItem,
   listBoxSectionTitle: listBoxSectionTitle,
   listViewItem: listViewItem,
-  panel: panel,
   radioCheckedContent: radioCheckedContent,
   radioContainer: radioContainer,
   scrollbox: scrollbox,

package/lib/cjs/styles/variants/buttons.js

@@ -32,6 +32,8 @@ var _text = require("./text");
 
 var _colors = require("../colors");
 
+var _boxes = require("./boxes");
+
 function ownKeys(object, enumerableOnly) { var keys = (0, _keys["default"])(object); if (_getOwnPropertySymbols["default"]) { var symbols = (0, _getOwnPropertySymbols["default"])(object); if (enumerableOnly) symbols = (0, _filter["default"])(symbols).call(symbols, function (sym) { return (0, _getOwnPropertyDescriptor["default"])(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context; (0, _forEach["default"])(_context = ownKeys(Object(source), true)).call(_context, function (key) { (0, _defineProperty3["default"])(target, key, source[key]); }); } else if (_getOwnPropertyDescriptors["default"]) { (0, _defineProperties["default"])(target, (0, _getOwnPropertyDescriptors["default"])(source)); } else { var _context2; (0, _forEach["default"])(_context2 = ownKeys(Object(source))).call(_context2, function (key) { (0, _defineProperty2["default"])(target, key, (0, _getOwnPropertyDescriptor["default"])(source, key)); }); } } return target; }
@@ -102,6 +104,10 @@ var iconButton = {
   }
 };
 
+var square = _objectSpread(_objectSpread({}, iconButton), {}, {
+  borderRadius: '2px'
+});
+
 var modalCloseButton = _objectSpread(_objectSpread({}, iconButton), {}, {
   position: 'absolute',
   top: 14,
@@ -179,32 +185,7 @@ var accordionHeader = _objectSpread(_objectSpread({}, base), {}, {
     color: 'accent.20'
   },
   '&.is-focused': _objectSpread({}, defaultFocus)
-}); // TODO: Remove this variant in Astro-UI 1.0.0
-
-
-var icon = {
-  p: '3px',
-  alignSelf: 'flex-start',
-  flexGrow: 0,
-  borderRadius: '100%',
-  cursor: 'pointer',
-  bg: 'transparent',
-  'path': {
-    fill: 'text.secondary'
-  },
-  outline: 'none',
-  color: 'white',
-  '&.is-hovered': {
-    bg: 'accent.90'
-  },
-  '&.is-pressed': {
-    'path': {
-      fill: 'white'
-    },
-    bg: 'active'
-  },
-  '&.is-focused': _objectSpread({}, defaultFocus)
-};
+});
 
 var primary = _objectSpread(_objectSpread({}, base), {}, {
   display: 'inline-flex',
@@ -264,6 +245,10 @@ var inverted = _objectSpread(_objectSpread({}, iconButton), {}, {
   }
 });
 
+var invertedSquare = _objectSpread(_objectSpread({}, inverted), {}, {
+  borderRadius: '2px'
+});
+
 var applicationPortal = _objectSpread(_objectSpread({}, iconButton), {}, {
   background: 'transparent',
   '&.is-focused': _objectSpread({}, defaultFocus),
@@ -330,7 +315,7 @@ var inline = _objectSpread(_objectSpread({}, base), {}, {
   bg: 'white',
   height: '22px',
   lineHeight: 1,
-  fontSize: '14px',
+  fontSize: 'sm',
   borderRadius: '15px',
   border: '1px solid',
   borderColor: 'active',
@@ -492,6 +477,36 @@ var fileInputField = {
     boxShadow: 'focus'
   }
 };
+
+var tooltipChip = _objectSpread(_objectSpread({}, _boxes.chip), {}, {
+  cursor: 'default',
+  '&.is-hovered, &.is-pressed': {
+    cursor: 'default',
+    outline: 'none'
+  }
+});
+
+var tooltipIconButton = _objectSpread(_objectSpread({}, iconButton), {}, {
+  cursor: 'default',
+  '&.is-hovered, &.is-pressed': {
+    backgroundColor: 'inherit',
+    cursor: 'default',
+    path: {
+      fill: 'neutral.20'
+    }
+  }
+});
+
+var tooltipInline = _objectSpread(_objectSpread({}, text), {}, {
+  cursor: 'default',
+  alignSelf: 'flex-start',
+  '&.is-hovered, &.is-pressed': {
+    backgroundColor: 'inherit',
+    cursor: 'default',
+    textDecoration: 'inherit'
+  }
+});
+
 var _default = {
   accordionHeader: accordionHeader,
   chipDeleteButton: chipDeleteButton,
@@ -512,7 +527,6 @@ var _default = {
   expandableRow: expandableRow,
   fileInputField: fileInputField,
   iconButton: iconButton,
-  icon: icon,
   imageUpload: imageUpload,
   inline: inline,
   inverted: inverted,
@@ -525,6 +539,11 @@ var _default = {
   helpHint: helpHint,
   modalCloseButton: modalCloseButton,
   applicationPortalPinned: applicationPortalPinned,
-  applicationPortal: applicationPortal
+  applicationPortal: applicationPortal,
+  square: square,
+  invertedSquare: invertedSquare,
+  tooltipChip: tooltipChip,
+  tooltipIconButton: tooltipIconButton,
+  tooltipInline: tooltipInline
 };
 exports["default"] = _default;

package/lib/cjs/styles/variants/variants.js

@@ -54,8 +54,6 @@ var _messages = _interopRequireDefault(require("./messages"));
 
 var _numberField = _interopRequireDefault(require("./numberField"));
 
-var _popover = _interopRequireDefault(require("./popover"));
-
 var _overlayPanel = _interopRequireDefault(require("./overlayPanel"));
 
 var _popoverMenu = _interopRequireDefault(require("./popoverMenu"));
@@ -90,7 +88,6 @@ var _default = _objectSpread(_objectSpread({
   modal: _modal["default"],
   numberField: _numberField["default"],
   overlayPanel: _overlayPanel["default"],
-  popover: _popover["default"],
   popoverMenu: _popoverMenu["default"],
   rockerbutton: _rockerbutton["default"],
   separator: _separator["default"],

package/lib/components/AccordionGridGroup/AccordionGridGroup.stories.js

@@ -83,8 +83,6 @@ export var Default = function Default() {
     return ___EmotionJSX(Box, {
       isRow: true,
       sx: {
-        pt: '12px',
-        pb: '12px',
         flexGrow: 1
       }
     }, ___EmotionJSX(Box, {
@@ -129,20 +127,14 @@ export var Default = function Default() {
       sx: {
         mr: '4px',
         height: '26px',
-        width: '26px',
-        'path': {
-          fill: 'active'
-        }
+        width: '26px'
       }
     }, ___EmotionJSX(CreateIcon, null)), ___EmotionJSX(IconButton, {
       "aria-label": "vertical-lines-icon",
       sx: {
         mr: '4px',
         height: '26px',
-        width: '26px',
-        'path': {
-          fill: 'active'
-        }
+        width: '26px'
       }
     }, ___EmotionJSX(MoreVertIcon, null)))));
   };
@@ -285,7 +277,8 @@ export var Default = function Default() {
         item: item
       }), item.key !== 'Organization' ? ___EmotionJSX(Separator, {
         sx: {
-          m: 0
+          m: 0,
+          bg: 'neutral.90'
         }
       }) : null);
     }))

package/lib/components/AccordionGridGroup/AccordionGridGroup.test.js

@@ -4,7 +4,7 @@ import { Item } from '@react-stately/collections';
 import userEvent from '@testing-library/user-event';
 import axeTest from '../../utils/testUtils/testAxe';
 import { act, fireEvent, render, screen } from '../../utils/testUtils/testWrapper';
-import { Link, Box } from '../../index';
+import { Link, Box, OverlayPanel } from '../../index';
 import AccordionGridGroup from '../AccordionGridGroup';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var testId = 'test-accordion';
@@ -26,6 +26,22 @@ var getComponent = function getComponent() {
   }, ___EmotionJSX(Box, null, ___EmotionJSX(Link, null, "Header Button"), ___EmotionJSX(Link, null, "Second Header Button")), ___EmotionJSX(Box, null, ___EmotionJSX(Link, null, "Body Button"), ___EmotionJSX(Link, null, "Second Body Button")))));
 };
 
+var getComponentInOverlayPanel = function getComponentInOverlayPanel() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return render(___EmotionJSX(OverlayPanel, {
+    isOpen: true
+  }, ___EmotionJSX(AccordionGridGroup, _extends({}, defaultProps, props), ___EmotionJSX(Item, {
+    key: "first",
+    textValue: "Duplicate"
+  }, ___EmotionJSX(Box, null, ___EmotionJSX(Link, null, "Header Button"), ___EmotionJSX(Link, null, "Second Header Button")), ___EmotionJSX(Box, null, ___EmotionJSX(Link, null, "Body Button"), ___EmotionJSX(Link, null, "Second Body Button"))), ___EmotionJSX(Item, {
+    key: "second",
+    textValue: "Duplicate"
+  }, ___EmotionJSX(Box, null, ___EmotionJSX(Link, null, "Header Button"), ___EmotionJSX(Link, null, "Second Header Button")), ___EmotionJSX(Box, null, ___EmotionJSX(Link, null, "Body Button"), ___EmotionJSX(Link, null, "Second Body Button"))), ___EmotionJSX(Item, {
+    key: "third",
+    textValue: "Duplicate"
+  }, ___EmotionJSX(Box, null, ___EmotionJSX(Link, null, "Header Button"), ___EmotionJSX(Link, null, "Second Header Button")), ___EmotionJSX(Box, null, ___EmotionJSX(Link, null, "Body Button"), ___EmotionJSX(Link, null, "Second Body Button"))))));
+};
+
 axeTest(getComponent, {
   // landmark-unique rule conflicts with react-aria role definition
   rules: {
@@ -166,4 +182,10 @@ test('default expanded keys expands an accordion item', function () {
   var row = screen.getAllByRole('row');
   var selectedRow = row[0];
   expect(selectedRow).toHaveAttribute('aria-selected', 'true');
+});
+test('items do not automatically expand if wrapped in an open OverlayPanel', function () {
+  getComponentInOverlayPanel();
+  var row = screen.getAllByRole('row');
+  var selectedRow = row[0];
+  expect(selectedRow).not.toHaveAttribute('aria-selected', 'true');
 });

package/lib/components/AccordionGridItem/AccordionGridItemBody.js

@@ -52,7 +52,7 @@ var AccordionGridItemBody = /*#__PURE__*/forwardRef(function (props, ref) {
   }, mergedProps, {
     isSelected: isSelected,
     className: classNames,
-    "aria-label": ariaLabel || 'Grid Cell'
+    "aria-label": ariaLabel
   }), children);
 });
 AccordionGridItemBody.propTypes = {

package/lib/components/AccordionGridItem/AccordionGridItemHeader.js

@@ -76,7 +76,7 @@ var AccordionGridItemHeader = /*#__PURE__*/forwardRef(function (props, ref) {
     isSelected: isSelected,
     className: classNames
   }, others, {
-    "aria-label": ariaLabel || 'Grid Cell'
+    "aria-label": ariaLabel
   }), ___EmotionJSX(Box, {
     isRow: true
   }, children, ___EmotionJSX(Box, {

package/lib/components/AccordionGroup/AccordionGroup.test.js

@@ -7,6 +7,7 @@ import axeTest from '../../utils/testUtils/testAxe';
 import { act, fireEvent, render, screen } from '../../utils/testUtils/testWrapper';
 import Text from '../Text';
 import AccordionGroup from '../AccordionGroup';
+import { OverlayPanel } from '../../index';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var testId = 'test-accordion';
 var defaultProps = {
@@ -16,6 +17,28 @@ var defaultProps = {
 var getComponent = function getComponent() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return render(___EmotionJSX(AccordionGroup, _extends({}, defaultProps, props), ___EmotionJSX(Item, {
+    key: "first",
+    textValue: "Duplicate",
+    "data-id": "first",
+    label: "Accordion item"
+  }, ___EmotionJSX(Text, null, "Render me!")), ___EmotionJSX(Item, {
+    key: "second",
+    textValue: "Duplicate",
+    "data-id": "second",
+    label: "Accordion item"
+  }, ___EmotionJSX(Text, null, "Render me!")), ___EmotionJSX(Item, {
+    key: "third",
+    textValue: "Duplicate",
+    "data-id": "third",
+    label: "Accordion item"
+  }, ___EmotionJSX(Text, null, "Render me!"))));
+};
+
+var getComponentInOverlayPanel = function getComponentInOverlayPanel() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return render(___EmotionJSX(OverlayPanel, {
+    isOpen: true
+  }, ___EmotionJSX(AccordionGroup, _extends({}, defaultProps, props), ___EmotionJSX(Item, {
     key: "first",
     textValue: "Duplicate",
     "data-id": "first"
@@ -27,7 +50,7 @@ var getComponent = function getComponent() {
     key: "third",
     textValue: "Duplicate",
     "data-id": "third"
-  }, ___EmotionJSX(Text, null, "Render me!"))));
+  }, ___EmotionJSX(Text, null, "Render me!")))));
 }; // Need to be added to each test file to test accessibility using axe.
 
 
@@ -197,4 +220,10 @@ test('Item accepts a data-id and the data-id can be found in the DOM', function
   var selectedItem = buttons[0];
   var parentElement = selectedItem.parentElement;
   expect(parentElement).toHaveAttribute('data-id', 'first');
+});
+test('items do not automatically expand if wrapped in an open OverlayPanel', function () {
+  getComponentInOverlayPanel();
+  var buttons = screen.getAllByRole('button');
+  var selectedItem = buttons[0];
+  expect(selectedItem).not.toHaveAttribute('aria-expanded', 'true');
 });

package/lib/components/AccordionItem/AccordionItem.js

@@ -11,7 +11,7 @@ import { useAccordionItem } from '@react-aria/accordion';
 import { useButton } from '@react-aria/button';
 import { useFocusRing } from '@react-aria/focus';
 import { Text, Icon, Box } from '../../index';
-import { useAriaLabelWarning, useStatusClasses } from '../../hooks';
+import { useStatusClasses } from '../../hooks';
 import { AccordionContext } from '../../context/AccordionContext';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var AccordionItem = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -72,12 +72,11 @@ var AccordionItem = /*#__PURE__*/forwardRef(function (props, ref) {
       buttonClasses = _useStatusClasses2.classNames;
 
   var ariaLabel = props['aria-label'] || item.props.label;
-  useAriaLabelWarning('AccordionItem', ariaLabel);
   return ___EmotionJSX(Box, _extends({
     variant: "accordion.accordion",
     className: itemClasses
   }, others, containerProps), ___EmotionJSX(ThemeUIButton, _extends({
-    "aria-label": ariaLabel || 'Accordion',
+    "aria-label": ariaLabel,
     ref: buttonRef,
     sx: {
       display: 'flex',
@@ -94,9 +93,11 @@ var AccordionItem = /*#__PURE__*/forwardRef(function (props, ref) {
     ml: "5px"
   }, ___EmotionJSX(Icon, {
     icon: isOpen ? MenuUp : MenuDown
-  }))), ___EmotionJSX(Box, _extends({
+  }))), isOpen && ___EmotionJSX(Box, _extends({
     variant: "accordion.accordionBody"
-  }, accordionRegionProps, regionProps), item.rendered));
+  }, accordionRegionProps, regionProps, {
+    className: itemClasses
+  }), item.rendered));
 });
 AccordionItem.propTypes = {
   'aria-label': PropTypes.string,

package/lib/components/Button/Button.js

@@ -14,17 +14,15 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context; _forEachInstanceProperty(_context = ownKeys(Object(source), true)).call(_context, function (key) { _defineProperty(target, key, source[key]); }); } else if (_Object$getOwnPropertyDescriptors) { _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)); } else { var _context2; _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-import React, { forwardRef, useRef, useImperativeHandle, useMemo } from 'react';
+import React, { forwardRef, useRef, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
 import { Button as ThemeUIButton } from 'theme-ui';
 import { useButton } from '@react-aria/button';
 import { useHover } from '@react-aria/interactions';
 import { useFocusRing } from '@react-aria/focus';
 import { mergeProps } from '@react-aria/utils';
-import { modes } from './constants';
-import { useAriaLabelWarning, useStatusClasses, useDeprecationWarning, usePropWarning } from '../../hooks';
+import { useStatusClasses, usePropWarning } from '../../hooks';
 import Loader from '../Loader';
-import Box from '../Box';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var Button = /*#__PURE__*/forwardRef(function (props, ref) {
   var className = props.className,
@@ -39,8 +37,7 @@ var Button = /*#__PURE__*/forwardRef(function (props, ref) {
       onPressChange = props.onPressChange,
       onPressUp = props.onPressUp,
       children = props.children,
-      mode = props.mode,
-      others = _objectWithoutProperties(props, ["className", "isDisabled", "isLoading", "onHoverStart", "onHoverChange", "onHoverEnd", "onPress", "onPressStart", "onPressEnd", "onPressChange", "onPressUp", "children", "mode"]);
+      others = _objectWithoutProperties(props, ["className", "isDisabled", "isLoading", "onHoverStart", "onHoverChange", "onHoverEnd", "onPress", "onPressStart", "onPressEnd", "onPressChange", "onPressUp", "children"]);
 
   var buttonRef = useRef();
   usePropWarning(props, 'disabled', 'isDisabled');
@@ -49,20 +46,13 @@ var Button = /*#__PURE__*/forwardRef(function (props, ref) {
   useImperativeHandle(ref, function () {
     return buttonRef.current;
   });
-  var ButtonBase = useMemo(function () {
-    return mode === modes.ICON ? Box : ThemeUIButton;
-  }, [mode]);
-  var elementType = useMemo(function () {
-    if (mode === modes.ICON) return 'div';
-    return 'button';
-  }, [mode]);
 
   var _useFocusRing = useFocusRing(),
       isFocusVisible = _useFocusRing.isFocusVisible,
       focusProps = _useFocusRing.focusProps;
 
   var _useButton = useButton(_objectSpread({
-    elementType: elementType
+    elementType: 'button'
   }, props), buttonRef),
       buttonProps = _useButton.buttonProps,
       isPressed = _useButton.isPressed;
@@ -79,13 +69,9 @@ var Button = /*#__PURE__*/forwardRef(function (props, ref) {
   }),
       classNames = _useStatusClasses.classNames;
 
-  useDeprecationWarning('The "icon" variant for `Button` will be deprecated in Astro-UI 1.0.0, use the `IconButton` component instead.', {
-    isActive: props.variant === 'icon'
-  });
   var ariaLabel = props['aria-label'];
-  useAriaLabelWarning('Button', ariaLabel);
-  return ___EmotionJSX(ButtonBase, _extends({
-    "aria-label": ariaLabel || 'Button',
+  return ___EmotionJSX(ThemeUIButton, _extends({
+    "aria-label": ariaLabel,
     ref: buttonRef,
     className: classNames,
     role: "button",
@@ -167,15 +153,11 @@ Button.propTypes = {
   onPressUp: PropTypes.func,
 
   /** The styling variation of the button. */
-  variant: PropTypes.string,
-
-  /** The behavioral pattern to apply to the button. */
-  mode: PropTypes.oneOf(['default', 'icon'])
+  variant: PropTypes.string
 };
 Button.defaultProps = {
   isDisabled: false,
-  variant: 'default',
-  mode: 'default'
+  variant: 'default'
 };
 Button.displayName = 'Button';
 export default Button;

package/lib/components/Button/Button.stories.js

@@ -1,8 +1,3 @@
-import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
-import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
-
-var _context;
-
 import React from 'react';
 import AddCircleIcon from 'mdi-react/AddCircleIcon';
 import Box from '../Box';
@@ -15,7 +10,9 @@ import { jsx as ___EmotionJSX } from "@emotion/react";
 var variants = buttonVariants;
 delete variants.ICON;
 delete variants.ICON_BUTTON;
-delete variants.INVERTED;
+delete variants.INVERTED; // add designer approved variants for devs to use here
+
+var variantOptions = ['critical', 'danger', 'default', 'inline', 'link', 'primary', 'success', 'text'];
 export default {
   title: 'Button',
   component: Button,
@@ -23,11 +20,9 @@ export default {
     variant: {
       control: {
         type: 'select',
-        options: _Object$values(variants)
+        options: variantOptions
       },
-      defaultValue: _findInstanceProperty(_context = _Object$values(variants)).call(_context, function (value) {
-        return value === 'default';
-      })
+      defaultValue: 'default'
     },
     children: {
       description: 'Button text.',
@@ -67,7 +62,8 @@ export var TextIconButton = function TextIconButton() {
 export var TextButton = function TextButton() {
   return ___EmotionJSX(Button, {
     mb: "sm",
-    variant: "text"
+    variant: "text",
+    "aria-label": "Add option"
   }, ___EmotionJSX(Text, {
     variant: "label",
     color: "active"

package/lib/components/Button/Button.test.js

@@ -1,29 +1,19 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import React from 'react';
 import userEvent from '@testing-library/user-event';
-import AddCircleIcon from 'mdi-react/AddCircleIcon';
 import axeTest from '../../utils/testUtils/testAxe';
 import { fireEvent, render, screen } from '../../utils/testUtils/testWrapper';
 import Button from '.';
-import Icon from '../Icon';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var testId = 'test-button';
 var defaultProps = {
-  'data-testid': testId
+  'data-testid': testId,
+  'aria-label': 'Test button'
 };
 
 var getComponent = function getComponent() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return render(___EmotionJSX(Button, _extends({}, defaultProps, props)));
-};
-
-var getIconButton = function getIconButton() {
-  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return render(___EmotionJSX(Button, _extends({}, defaultProps, props, {
-    variant: "icon"
-  }), ___EmotionJSX(Icon, {
-    icon: AddCircleIcon
-  })));
 }; // Need to be added to each test file to test accessibility using axe.
 
 
@@ -99,13 +89,4 @@ test('button renders children when not loading', function () {
   expect(childWrapper).toBeInTheDocument();
   expect(childWrapper).toBeVisible();
   expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
-});
-test('passing in an icon makes the button parent a div', function () {
-  getIconButton({
-    mode: 'icon'
-  });
-  var button = screen.getByRole('button');
-  expect(button).toBeInTheDocument();
-  expect(button).toBeVisible();
-  expect(button).toBeInstanceOf(HTMLDivElement);
 });