@pingux/astro 1.2.0-alpha.6 → 1.2.1

package/lib/components/AccordionGridItem/AccordionGridItem.js

@@ -3,14 +3,15 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _toArray from "@babel/runtime-corejs3/helpers/esm/toArray";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-import React, { useContext, useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import { useGridRow } from '@react-aria/grid';
 import { mergeProps } from '@react-aria/utils';
-import { AccordionGridContext } from '../AccordionGridGroup/AccordionGridContext';
+import { useAccordionGridContext } from '../../context/AccordionGridContext';
 import Box from '../Box';
 import AccordionGridItemHeader from './AccordionGridItemHeader';
 import AccordionGridItemBody from './AccordionGridItemBody';
+import { useStatusClasses } from '../../hooks';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 
 var AccordionGridItem = function AccordionGridItem(props) {
@@ -20,7 +21,8 @@ var AccordionGridItem = function AccordionGridItem(props) {
       headerProps = props.headerProps,
       bodyProps = props.bodyProps,
       children = props.children,
-      others = _objectWithoutProperties(props, ["item", "headerProps", "bodyProps", "children"]);
+      className = props.className,
+      others = _objectWithoutProperties(props, ["item", "headerProps", "bodyProps", "children", "className"]);
 
   var _React$Children$toArr = React.Children.toArray(children),
       _React$Children$toArr2 = _toArray(_React$Children$toArr),
@@ -30,10 +32,18 @@ var AccordionGridItem = function AccordionGridItem(props) {
 
   var cellNode = _concatInstanceProperty(_context = []).call(_context, item.childNodes)[0];
 
-  var _useContext = useContext(AccordionGridContext),
-      state = _useContext.state;
+  var _useAccordionGridCont = useAccordionGridContext(),
+      state = _useAccordionGridCont.state; // Treat first cell as a row, fixes focus and keyboard interactions
 
-  var isDisabled = state.disabledKeys.has(item.key);
+
+  var isDisabled = state.disabledKeys.has(cellNode.key);
+  var isSelected = state.selectionManager.isSelected(cellNode.key); // Sync selection between the first cell and the row
+
+  useEffect(function () {
+    if (isSelected !== state.selectionManager.isSelected(item.key)) {
+      state.selectionManager.toggleSelection(item.key);
+    }
+  }, [isSelected, state.selectionManager, item.key]);
   var rowRef = useRef();
   var cellRef = useRef();
   var cellBodyRef = useRef();
@@ -43,20 +53,24 @@ var AccordionGridItem = function AccordionGridItem(props) {
   }, state, rowRef),
       rowProps = _useGridRow.rowProps;
 
-  var isSelected = state.selectionManager.isSelected(item.key);
-  return ___EmotionJSX(Box, _extends({
-    as: "div",
+  var _useStatusClasses = useStatusClasses(className, {
+    isSelected: isSelected,
     isDisabled: isDisabled
+  }),
+      classNames = _useStatusClasses.classNames;
+
+  return ___EmotionJSX(Box, _extends({
+    as: "div"
   }, mergeProps(rowProps, others), {
-    ref: rowRef,
-    role: "row"
+    "aria-selected": isSelected,
+    className: classNames,
+    ref: rowRef
   }), ___EmotionJSX(AccordionGridItemHeader, _extends({
     item: item,
-    cellNode: cellNode,
-    ref: cellRef
-  }, headerProps, {
+    ref: cellRef,
+    isDisabled: isDisabled,
     isSelected: isSelected
-  }), header), ___EmotionJSX(AccordionGridItemBody, _extends({
+  }, headerProps), header), ___EmotionJSX(AccordionGridItemBody, _extends({
     item: item,
     ref: cellBodyRef,
     isSelected: isSelected

package/lib/components/AccordionGridItem/AccordionGridItemBody.js

@@ -1,11 +1,11 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import React, { useContext, forwardRef } from 'react';
+import React, { forwardRef } from 'react';
 import { mergeProps } from '@react-aria/utils';
 import PropTypes from 'prop-types';
 import { useGridCell } from '@react-aria/grid';
 import { useHover } from '@react-aria/interactions';
-import { AccordionGridContext } from '../AccordionGridGroup/AccordionGridContext';
+import { useAccordionGridContext } from '../../context/AccordionGridContext';
 import Box from '../Box';
 import { useStatusClasses } from '../../hooks';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -17,8 +17,8 @@ var AccordionGridItemBody = /*#__PURE__*/forwardRef(function (props, ref) {
       children = props.children,
       isSelected = props.isSelected;
 
-  var _useContext = useContext(AccordionGridContext),
-      state = _useContext.state;
+  var _useAccordionGridCont = useAccordionGridContext(),
+      state = _useAccordionGridCont.state;
 
   var cellNode = _concatInstanceProperty(_context = []).call(_context, item.childNodes)[1];
 

package/lib/components/AccordionGridItem/AccordionGridItemHeader.js

@@ -1,15 +1,15 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-import React, { useContext, forwardRef } from 'react';
+import React, { forwardRef, useRef, useImperativeHandle } from 'react';
 import { mergeProps } from '@react-aria/utils';
 import { useFocusRing } from '@react-aria/focus';
 import PropTypes from 'prop-types';
 import { useGridCell } from '@react-aria/grid';
-import { useHover, usePress } from '@react-aria/interactions';
+import { useHover } from '@react-aria/interactions';
 import MenuDown from 'mdi-react/MenuDownIcon';
 import MenuUp from 'mdi-react/MenuUpIcon';
-import { AccordionGridContext } from '../AccordionGridGroup/AccordionGridContext';
+import { useAccordionGridContext } from '../../context/AccordionGridContext';
 import Box from '../Box';
 import Icon from '../Icon';
 import { useStatusClasses } from '../../hooks';
@@ -20,20 +20,27 @@ var AccordionGridItemHeader = /*#__PURE__*/forwardRef(function (props, ref) {
   var item = props.item,
       className = props.className,
       children = props.children,
-      key = props.key,
       isSelected = props.isSelected,
-      others = _objectWithoutProperties(props, ["item", "className", "children", "key", "isSelected"]);
+      others = _objectWithoutProperties(props, ["item", "className", "children", "isSelected"]);
 
-  var _useContext = useContext(AccordionGridContext),
-      state = _useContext.state;
+  var _useAccordionGridCont = useAccordionGridContext(),
+      state = _useAccordionGridCont.state;
+
+  var cellRef = useRef();
+  /* istanbul ignore next */
+
+  useImperativeHandle(ref, function () {
+    return cellRef.current;
+  });
 
   var cellNode = _concatInstanceProperty(_context = []).call(_context, item.childNodes)[0];
 
   var _useGridCell = useGridCell({
     node: cellNode,
     focusMode: 'cell'
-  }, state, ref),
-      gridCellProps = _useGridCell.gridCellProps;
+  }, state, cellRef),
+      gridCellProps = _useGridCell.gridCellProps,
+      isPressed = _useGridCell.isPressed;
 
   var _useHover = useHover({}),
       hoverProps = _useHover.hoverProps,
@@ -48,14 +55,7 @@ var AccordionGridItemHeader = /*#__PURE__*/forwardRef(function (props, ref) {
       focusProps = _useFocusRing2.focusProps,
       isFocusVisible = _useFocusRing2.isFocusVisible;
 
-  var _usePress = usePress({
-    ref: ref,
-    isPressed: item.props.isPressed
-  }),
-      pressProps = _usePress.pressProps,
-      isPressed = _usePress.isPressed;
-
-  var mergedProps = mergeProps(gridCellProps, hoverProps, focusWithinProps, focusProps, pressProps);
+  var mergedProps = mergeProps(gridCellProps, hoverProps, focusWithinProps, focusProps);
 
   var _useStatusClasses = useStatusClasses(className, {
     isPressed: isPressed,
@@ -68,9 +68,8 @@ var AccordionGridItemHeader = /*#__PURE__*/forwardRef(function (props, ref) {
   var ariaLabel = props['aria-label'];
   return ___EmotionJSX(Box, _extends({
     as: "div",
-    ref: ref
+    ref: cellRef
   }, mergedProps, {
-    role: "gridcell",
     variant: "accordion.accordionGridHeader",
     isFocused: isFocusVisible,
     isSelected: isSelected,
@@ -93,8 +92,8 @@ var AccordionGridItemHeader = /*#__PURE__*/forwardRef(function (props, ref) {
 AccordionGridItemHeader.propTypes = {
   'aria-label': PropTypes.string,
   isSelected: PropTypes.bool,
-  key: PropTypes.string,
   item: PropTypes.shape({
+    key: PropTypes.string,
     childNodes: PropTypes.arrayOf(PropTypes.shape({})),
     props: PropTypes.shape({
       isPressed: PropTypes.bool

package/lib/components/AccordionGroup/AccordionGroup.js

@@ -32,8 +32,9 @@ var AccordionGroup = /*#__PURE__*/forwardRef(function (props, ref) {
 
   var _useAccordion = useAccordion(props, state, accordionRef),
       accordionProps = _useAccordion.accordionProps;
-  /* istanbul ignore next */
 
+  delete accordionProps.onMouseDown;
+  /* istanbul ignore next */
 
   useImperativeHandle(ref, function () {
     return accordionRef.current;

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

@@ -7,7 +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 { OverlayPanel, TextField } from '../../index';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var testId = 'test-accordion';
 var defaultProps = {
@@ -31,7 +31,11 @@ var getComponent = function getComponent() {
     textValue: "Duplicate",
     "data-id": "third",
     label: "Accordion item"
-  }, ___EmotionJSX(Text, null, "Render me!"))));
+  }, ___EmotionJSX(TextField, {
+    role: "form",
+    label: "Example Label",
+    "data-testid": "testField"
+  }))));
 };
 
 var getComponentInOverlayPanel = function getComponentInOverlayPanel() {
@@ -214,6 +218,16 @@ test('expanded keys expands an accordion item', function () {
   var selectedItem = buttons[0];
   expect(selectedItem).toHaveAttribute('aria-expanded', 'true');
 });
+test('able to click a textfield that is the rendered child of an accordion', function () {
+  getComponent({
+    expandedKeys: ['third']
+  });
+  var field = screen.getByTestId('testField');
+  var input = screen.getByRole('form');
+  userEvent.click(input);
+  userEvent.type(input, 'banana');
+  expect(field).toHaveClass('has-focus-within');
+});
 test('Item accepts a data-id and the data-id can be found in the DOM', function () {
   getComponent();
   var buttons = screen.getAllByRole('button');

package/lib/components/Breadcrumbs/Breadcrumbs.stories.js

@@ -41,15 +41,15 @@ export var Default = function Default(args) {
     onAction: onAction
   }, args), ___EmotionJSX(Item, {
     key: "home",
-    variant: "text",
+    variant: "link",
     "data-id": "home"
   }, "Home"), ___EmotionJSX(Item, {
     key: "trendy",
-    variant: "text",
+    variant: "link",
     "data-id": "trendy"
   }, "Trendy"), ___EmotionJSX(Item, {
     key: "march 2020 assets",
-    variant: "text",
+    variant: "link",
     "data-id": "march"
   }, "March 2020 Assets"));
 };

package/lib/components/Button/Button.js

@@ -21,7 +21,7 @@ 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 { useStatusClasses, usePropWarning } from '../../hooks';
+import { useStatusClasses, usePropWarning, useAriaLabelWarning, useDeprecationWarning } from '../../hooks';
 import Loader from '../Loader';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var Button = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -37,7 +37,8 @@ var Button = /*#__PURE__*/forwardRef(function (props, ref) {
       onPressChange = props.onPressChange,
       onPressUp = props.onPressUp,
       children = props.children,
-      others = _objectWithoutProperties(props, ["className", "isDisabled", "isLoading", "onHoverStart", "onHoverChange", "onHoverEnd", "onPress", "onPressStart", "onPressEnd", "onPressChange", "onPressUp", "children"]);
+      variant = props.variant,
+      others = _objectWithoutProperties(props, ["className", "isDisabled", "isLoading", "onHoverStart", "onHoverChange", "onHoverEnd", "onPress", "onPressStart", "onPressEnd", "onPressChange", "onPressUp", "children", "variant"]);
 
   var buttonRef = useRef();
   usePropWarning(props, 'disabled', 'isDisabled');
@@ -69,7 +70,17 @@ var Button = /*#__PURE__*/forwardRef(function (props, ref) {
   }),
       classNames = _useStatusClasses.classNames;
 
+  useDeprecationWarning('The "icon" variant for `Button` is deprecated in Astro-UI 1.0.0, use the `IconButton` component instead.', {
+    isActive: props.variant === 'icon'
+  });
+  useDeprecationWarning('The "danger" variant for `Button` will be deprecated in Astro-UI 2.0.0, use the `critical` variant instead.', {
+    isActive: props.variant === 'danger'
+  });
+  useDeprecationWarning('The "text" variant for `Button` will be deprecated in Astro-UI 2.0.0, use the `link` variant instead.', {
+    isActive: props.variant === 'text'
+  });
   var ariaLabel = props['aria-label'];
+  useAriaLabelWarning('Button', ariaLabel, variant === 'filter');
   return ___EmotionJSX(ThemeUIButton, _extends({
     "aria-label": ariaLabel,
     ref: buttonRef,
@@ -80,7 +91,8 @@ var Button = /*#__PURE__*/forwardRef(function (props, ref) {
       display: 'flex',
       justifyContent: 'center',
       alignItems: 'center'
-    }
+    },
+    variant: variant
   }, others, mergeProps(hoverProps, focusProps, buttonProps)), isLoading ? ___EmotionJSX("span", {
     style: {
       visibility: 'hidden'

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

@@ -3,11 +3,9 @@ import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectW
 import React from 'react';
 import AddCircleIcon from 'mdi-react/AddCircleIcon';
 import CreateIcon from 'mdi-react/CreateIcon';
-import Box from '../Box';
-import Button from '.';
-import Icon from '../Icon';
-import Text from '../Text';
-import { buttonVariants } from '../../utils/devUtils/constants/variants'; // removing the iconButton variants from this story.
+import FilterIcon from 'mdi-react/FilterIcon';
+import { buttonVariants } from '../../utils/devUtils/constants/variants';
+import { Box, Button, Icon, SearchField, Text } from '../../index'; // removing the iconButton variants from this story.
 
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var variants = buttonVariants;
@@ -69,16 +67,6 @@ export var TextIconButton = function TextIconButton() {
     size: 20
   }), "Add a Form"));
 };
-export var TextButton = function TextButton() {
-  return ___EmotionJSX(Button, {
-    mb: "sm",
-    variant: "text",
-    "aria-label": "Add option"
-  }, ___EmotionJSX(Text, {
-    variant: "label",
-    color: "active"
-  }, " + Add Option"));
-};
 export var InlineButton = function InlineButton() {
   return ___EmotionJSX(Button, {
     mb: "sm",
@@ -110,4 +98,18 @@ ColorBlockButton.story = {
       defaultValue: false
     }
   }
+};
+export var FilterButton = function FilterButton() {
+  return ___EmotionJSX(Box, {
+    p: "xx",
+    isRow: true,
+    gap: "md"
+  }, ___EmotionJSX(SearchField, {
+    "aria-label": "search items"
+  }), ___EmotionJSX(Button, {
+    variant: "filter",
+    "aria-label": "filter button"
+  }, ___EmotionJSX(Icon, {
+    icon: FilterIcon
+  })));
 };

package/lib/components/EnvironmentBreadcrumb/EnvironmentBreadcrumb.js

@@ -271,9 +271,11 @@ EnvironmentBreadcrumb.propTypes = {
   /** The list of environments. */
   items: isIterableProp,
 
-  /** Filter function to generate a filtered list of nodes.
-   * (nodes: Iterable<Node>) => Iterable<Node>
-   * */
+  /**
+   * Filter function to generate a filtered list of nodes.
+   *
+   * `(nodes: Iterable<Node>) => Iterable<Node>`
+   */
   itemsFilter: PropTypes.func,
 
   /** Callback function that fires when the dropdown is opened. */

package/lib/components/Link/Link.js

@@ -12,7 +12,8 @@ import { jsx as ___EmotionJSX } from "@emotion/react";
 var Link = /*#__PURE__*/forwardRef(function (props, ref) {
   var className = props.className,
       isDisabled = props.isDisabled,
-      others = _objectWithoutProperties(props, ["className", "isDisabled"]);
+      onPress = props.onPress,
+      others = _objectWithoutProperties(props, ["className", "isDisabled", "onPress"]);
 
   var linkRef = useRef();
   usePropWarning(props, 'disabled', 'isDisabled');

package/lib/components/ListView/ListView.js

@@ -19,7 +19,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React, { useMemo, forwardRef, useRef, useImperativeHandle } from 'react';
 import { GridCollection, useGridState } from '@react-stately/grid';
 import { GridKeyboardDelegate, useGrid } from '@react-aria/grid';
-import { mergeProps } from '@react-aria/utils';
 import { ListLayout } from '@react-stately/layout';
 import { useListState } from '@react-stately/list';
 import PropTypes from 'prop-types';
@@ -58,12 +57,9 @@ export function useListLayout(state) {
   return layout;
 }
 var ListView = /*#__PURE__*/forwardRef(function (props, ref) {
-  var disabledKeys = props.disabledKeys,
-      loadingState = props.loadingState,
-      selectedKeys = props.selectedKeys,
+  var loadingState = props.loadingState,
       onLoadMore = props.onLoadMore,
-      onSelectionChange = props.onSelectionChange,
-      selectionMode = props.selectionMode;
+      selectionStyle = props.selectionStyle;
   var isLoading = loadingState === loadingStates.LOADING_MORE || loadingState === loadingStates.LOADING;
 
   var renderWrapper = function renderWrapper(parent, reusableView) {
@@ -115,11 +111,9 @@ var ListView = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   }, [collection]);
   var state = useGridState(_objectSpread(_objectSpread({}, props), {}, {
-    disabledKeys: disabledKeys,
-    selectedKeys: selectedKeys,
     collection: gridCollection,
-    selectionMode: selectionMode,
-    onSelectionChange: onSelectionChange
+    focusMode: 'cell',
+    selectionBehavior: selectionStyle === 'highlight' ? 'replace' : 'toggle'
   }));
   var layout = useListLayout(state);
   var keyboardDelegate = useMemo(function () {
@@ -154,7 +148,7 @@ var ListView = /*#__PURE__*/forwardRef(function (props, ref) {
       state: state,
       keyboardDelegate: keyboardDelegate
     }
-  }, ___EmotionJSX(Virtualizer, _extends({}, mergeProps(gridProps), {
+  }, ___EmotionJSX(Virtualizer, _extends({}, gridProps, {
     onLoadMore: onLoadMore,
     ref: listViewRef,
     focusedKey: focusedKey,
@@ -221,6 +215,9 @@ ListView.propTypes = {
   /** The type of selection that is allowed in the collection. */
   selectionMode: PropTypes.oneOf(['none', 'single', 'multiple']),
 
+  /** */
+  selectionStyle: PropTypes.oneOf(['highlight', undefined]),
+
   /** Callback function that fires when the selected key changes. */
   onSelectionChange: PropTypes.func,
 
@@ -233,6 +230,6 @@ ListView.propTypes = {
 };
 ListView.defaultProps = {
   'aria-label': 'listView',
-  'selectionMode': 'single'
+  selectionMode: 'single'
 };
 export default ListView;

package/lib/components/ListViewItem/ListViewItem.js

@@ -6,6 +6,7 @@ import { useFocusRing } from '@react-aria/focus';
 import PropTypes from 'prop-types';
 import { useGridCell, useGridRow } from '@react-aria/grid';
 import { useHover } from '@react-aria/interactions';
+import { useSelectableItem } from '@react-aria/selection';
 import { ListViewContext } from '../ListView/ListViewContext';
 import Box from '../Box';
 import { useStatusClasses } from '../../hooks';
@@ -15,7 +16,9 @@ var ListViewItem = function ListViewItem(props) {
   var _context;
 
   var item = props.item,
-      _props$item$props = props.item.props,
+      _props$item = props.item,
+      key = _props$item.key,
+      _props$item$props = _props$item.props,
       listItemProps = _props$item$props.listItemProps,
       rowProps = _props$item$props.rowProps,
       _props$item$props$has = _props$item$props.hasSeparator,
@@ -51,7 +54,7 @@ var ListViewItem = function ListViewItem(props) {
   }, state, rowRef),
       raRowProps = _useGridRow.rowProps;
 
-  var isSelected = raRowProps['aria-selected'];
+  var isSelected = state.selectionManager.isSelected(item.key);
 
   var _useGridCell = useGridCell({
     node: cellNode,
@@ -59,7 +62,15 @@ var ListViewItem = function ListViewItem(props) {
   }, state, cellRef),
       gridCellProps = _useGridCell.gridCellProps;
 
-  var mergedProps = mergeProps(gridCellProps, hoverProps, focusWithinProps, focusProps);
+  var _useSelectableItem = useSelectableItem({
+    isDisabled: isDisabled,
+    selectionManager: state.selectionManager,
+    key: key,
+    ref: cellRef
+  }),
+      selectableItemProps = _useSelectableItem.itemProps;
+
+  var mergedProps = mergeProps(gridCellProps, hoverProps, focusWithinProps, focusProps, selectableItemProps);
 
   var _useStatusClasses = useStatusClasses(className, {
     isHovered: isHovered,

package/lib/components/Modal/Modal.stories.js

@@ -138,7 +138,7 @@ export var DarkVariant = function DarkVariant() {
       onPress: state.close,
       "aria-label": "Yes"
     }, "Yes"), ___EmotionJSX(Button, {
-      variant: "text",
+      variant: "link",
       onPress: state.close,
       "aria-label": "Cancel"
     }, "Cancel"))))

package/lib/components/OverlayPanel/OverlayPanel.js

@@ -1,9 +1,8 @@
 import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
-import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-import React, { forwardRef, useRef, useImperativeHandle, useEffect, useState } from 'react';
+import React, { forwardRef, useRef, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
 import { FocusScope } from '@react-aria/focus';
 import Box from '../Box';
@@ -26,14 +25,8 @@ var OverlayPanel = /*#__PURE__*/forwardRef(function (props, ref) {
       onClose = _useOverlayPanelState.onClose;
 
   var overlayPanelRef = useRef();
-
-  var _useState = useState(true),
-      _useState2 = _slicedToArray(_useState, 2),
-      contain = _useState2[0],
-      setIsContained = _useState2[1];
   /* istanbul ignore next */
 
-
   useImperativeHandle(ref, function () {
     return overlayPanelRef.current;
   });
@@ -47,18 +40,12 @@ var OverlayPanel = /*#__PURE__*/forwardRef(function (props, ref) {
     e.stopPropagation();
 
     if (e.key === 'Escape') {
-      setIsContained(false);
+      onClose(state, triggerRef, onCloseProp);
     }
   };
 
-  useEffect(function () {
-    if (!contain && onClose) {
-      onClose(state, triggerRef, onCloseProp);
-    }
-  }, [contain]);
   return ___EmotionJSX(FocusScope, {
-    autoFocus: true,
-    contain: contain
+    autoFocus: true
   }, ___EmotionJSX(Box, _extends({
     variant: "overlayPanel.overlayPanel",
     ref: overlayPanelRef

package/lib/components/OverlayPanel/OverlayPanel.test.js

@@ -60,6 +60,13 @@ test('onClose callback fires when provided', function () {
   });
   expect(onClose).toHaveBeenCalled();
 });
+test('custom classname can be passed', function () {
+  getComponent({
+    className: 'testing-class'
+  });
+  var overlayPanel = screen.getByTestId(testId);
+  expect(overlayPanel).toHaveClass('testing-class');
+});
 test('neither callback fires when not provided', function () {
   var onClose = jest.fn();
   getComponent({
@@ -110,4 +117,35 @@ test('triggerRef.current.focus() fires when provided', function () {
     charCode: 27
   });
   expect(focusFunction).toHaveBeenCalled();
+});
+test('triggerRef.current.focus() does not fire when key other than esc is pressed', function () {
+  var onClose = jest.fn();
+  var focusFunction = jest.fn();
+  var state = {
+    close: onClose
+  };
+  var triggerRef = {
+    current: {
+      focus: focusFunction
+    }
+  };
+  getComponent({
+    state: state,
+    children: ___EmotionJSX("div", null, "Test"),
+    triggerRef: triggerRef
+  });
+  var overlayPanel = screen.getByTestId(testId);
+  fireEvent.keyDown(overlayPanel, {
+    key: 'KeyA',
+    code: 'KeyA',
+    keyCode: 65,
+    charCode: 65
+  });
+  fireEvent.keyUp(overlayPanel, {
+    key: 'KeyA',
+    code: 'KeyA',
+    keyCode: 65,
+    charCode: 65
+  });
+  expect(focusFunction).not.toHaveBeenCalled();
 });