@pingux/astro 1.42.2 → 2.0.0-alpha.4

package/lib/components/SwitchField/SwitchField.js

@@ -11,172 +11,133 @@ import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectW
 var _excluded = ["label", "helperText", "isDefaultSelected", "isSelected", "onChange", "value", "name", "id", "isDisabled", "isReadOnly", "isRequired", "hasAutoFocus", "onFocus", "onBlur", "onFocusChange", "onKeyDown", "onKeyUp", "status", "controlProps"];
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
-
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-import React, { forwardRef, useRef, useImperativeHandle } from 'react';
-import PropTypes from 'prop-types';
-import omit from 'lodash/omit';
-import { useToggleState } from '@react-stately/toggle';
-import { useSwitch } from '@react-aria/switch';
+import React, { forwardRef, useImperativeHandle, useRef } from 'react';
+import { useSwitch } from 'react-aria';
+import { useToggleState } from 'react-stately';
 import { usePress } from '@react-aria/interactions';
-import { Box, FieldHelperText, Label, Switch } from '../../';
-import { ariaAttributesBasePropTypes } from '../../utils/devUtils/props/ariaAttributes';
+import omit from 'lodash/omit';
+import PropTypes from 'prop-types';
+import { Box, FieldHelperText, Label, Switch } from '../..';
 import { useField, usePropWarning } from '../../hooks';
 import statuses from '../../utils/devUtils/constants/statuses';
+import { ariaAttributesBasePropTypes } from '../../utils/devUtils/props/ariaAttributes';
+import { inputFieldAttributesBasePropTypes } from '../../utils/devUtils/props/fieldAttributes';
+
 /**
  * Combines a switch, label, and helper text for a complete, form-ready solution.
  *
  * Utilizes [useSwitch](https://react-spectrum.adobe.com/react-aria/useSwitch.html) from React Aria and
  * [useToggleState](https://react-spectrum.adobe.com/react-stately/useToggleState.html) from React Stately.
  */
-
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var SwitchField = /*#__PURE__*/forwardRef(function (props, ref) {
   var label = props.label,
-      helperText = props.helperText,
-      isDefaultSelected = props.isDefaultSelected,
-      isSelected = props.isSelected,
-      onChange = props.onChange,
-      value = props.value,
-      name = props.name,
-      id = props.id,
-      isDisabled = props.isDisabled,
-      isReadOnly = props.isReadOnly,
-      isRequired = props.isRequired,
-      hasAutoFocus = props.hasAutoFocus,
-      onFocus = props.onFocus,
-      onBlur = props.onBlur,
-      onFocusChange = props.onFocusChange,
-      onKeyDown = props.onKeyDown,
-      onKeyUp = props.onKeyUp,
-      status = props.status,
-      controlProps = props.controlProps,
-      others = _objectWithoutProperties(props, _excluded);
-
+    helperText = props.helperText,
+    isDefaultSelected = props.isDefaultSelected,
+    isSelected = props.isSelected,
+    onChange = props.onChange,
+    value = props.value,
+    name = props.name,
+    id = props.id,
+    isDisabled = props.isDisabled,
+    isReadOnly = props.isReadOnly,
+    isRequired = props.isRequired,
+    hasAutoFocus = props.hasAutoFocus,
+    onFocus = props.onFocus,
+    onBlur = props.onBlur,
+    onFocusChange = props.onFocusChange,
+    onKeyDown = props.onKeyDown,
+    onKeyUp = props.onKeyUp,
+    status = props.status,
+    controlProps = props.controlProps,
+    others = _objectWithoutProperties(props, _excluded);
   var switchRef = useRef();
   usePropWarning(props, 'disabled', 'isDisabled');
   /* istanbul ignore next */
-
   useImperativeHandle(ref, function () {
     return switchRef.current;
   });
   var state = useToggleState(_objectSpread({
     defaultSelected: isDefaultSelected
   }, props));
-
   var _usePress = usePress({
-    isDisabled: isDisabled
-  }),
-      containerPressProps = _usePress.pressProps;
-
+      isDisabled: isDisabled
+    }),
+    pressProps = _usePress.pressProps;
   var whitelistedProps = omit(props, _Object$keys(others));
-
-  var _useSwitch = useSwitch(_objectSpread(_objectSpread({
-    children: label
-  }, whitelistedProps), {}, {
-    'aria-label': 'switch-field'
-  }), state, switchRef),
-      inputProps = _useSwitch.inputProps;
-
+  var _useSwitch = useSwitch(_objectSpread({
+      children: label
+    }, whitelistedProps), state, switchRef),
+    inputProps = _useSwitch.inputProps;
   var statusClasses = {
     isSelected: inputProps.checked
   };
-
   var _useField = useField(_objectSpread(_objectSpread(_objectSpread({
-    statusClasses: statusClasses
-  }, containerPressProps), props), {}, {
-    controlProps: _objectSpread(_objectSpread({}, controlProps), inputProps)
-  })),
-      fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlProps = _useField.fieldControlProps,
-      fieldLabelProps = _useField.fieldLabelProps;
-
+      statusClasses: statusClasses
+    }, pressProps), props), {}, {
+      controlProps: _objectSpread(_objectSpread({}, controlProps), inputProps)
+    })),
+    fieldContainerProps = _useField.fieldContainerProps,
+    fieldControlInputProps = _useField.fieldControlInputProps,
+    fieldControlWrapperProps = _useField.fieldControlWrapperProps,
+    fieldLabelProps = _useField.fieldLabelProps;
   var unhandledAriaProps = {
     'aria-controls': others['aria-controls'],
     'aria-errormessage': others['aria-errormessage']
   };
   return ___EmotionJSX(Box, fieldContainerProps, ___EmotionJSX(Label, _extends({
     variant: "forms.switch.label"
-  }, fieldLabelProps), ___EmotionJSX(Switch, _extends({
+  }, fieldLabelProps), ___EmotionJSX(Box, fieldControlWrapperProps, ___EmotionJSX(Switch, _extends({
     ref: switchRef,
-    inputProps: fieldControlProps
-  }, unhandledAriaProps)), label), helperText && ___EmotionJSX(FieldHelperText, {
+    inputProps: fieldControlInputProps
+  }, unhandledAriaProps))), label), helperText && ___EmotionJSX(FieldHelperText, {
     status: status
   }, helperText));
 });
-SwitchField.propTypes = _objectSpread({
+SwitchField.propTypes = _objectSpread(_objectSpread({
   /** A list of class names to apply to the input element. */
   className: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
-
-  /** Props object that is spread directly into the root (top-level) element. */
-  containerProps: PropTypes.shape({}),
-
-  /** Props object that is spread directly into the input element. */
-  controlProps: PropTypes.shape({}),
-
   /** Whether the element should receive focus on render. */
   hasAutoFocus: PropTypes.bool,
-
   /** Text rendered below the input. */
   helperText: PropTypes.node,
-
   /** If present this prop will cause a help hint to render in the label of the field. */
   hintText: PropTypes.string,
-
   /** The element's unique identifier. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/id). */
   id: PropTypes.string,
-
   /** Whether the element should be selected (uncontrolled). */
   isDefaultSelected: PropTypes.bool,
-
   /** Whether the field is disabled. */
   isDisabled: PropTypes.bool,
-
   /** Whether the input can be selected, but not changed by the user. */
   isReadOnly: PropTypes.bool,
-
   /** Whether user input is required on the input before form submission. */
   isRequired: PropTypes.bool,
-
   /** Whether the element should be selected (controlled). */
   isSelected: PropTypes.bool,
-
   /** The rendered label for the field. */
   label: PropTypes.node,
-
-  /** Props object that is spread directly into the label element. */
-  labelProps: PropTypes.shape({}),
-
   /** The name of the input element, used when submitting an HTML form. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefname). */
   name: PropTypes.string,
-
   /** Handler that is called when the element loses focus. */
   onBlur: PropTypes.func,
-
   /** Handler that is called when the element's selection state changes. */
   onChange: PropTypes.func,
-
   /** Handler that is called when the element receives focus. */
   onFocus: PropTypes.func,
-
   /** Handler that is called when the element's focus status changes. */
   onFocusChange: PropTypes.func,
-
   /** Handler that is called when a key is pressed. */
   onKeyDown: PropTypes.func,
-
   /** Handler that is called when a key is released. */
   onKeyUp: PropTypes.func,
-
   /** Determines the textarea status indicator and helper text styling. */
   status: PropTypes.oneOf(_Object$values(statuses)),
-
   /** The value of the input element, used when submitting an HTML form. See [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#htmlattrdefvalue). */
   value: PropTypes.string
-}, ariaAttributesBasePropTypes);
+}, ariaAttributesBasePropTypes), inputFieldAttributesBasePropTypes);
 SwitchField.defaultProps = {
   isDisabled: false,
   isReadOnly: false,

package/lib/components/SwitchField/SwitchField.stories.js

@@ -8,17 +8,15 @@ import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/obje
 import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
-
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import React, { useState } from 'react';
 import { Pressable } from '@react-aria/interactions';
-import SwitchField from '.';
-import { ariaAttributeBaseArgTypes } from '../../utils/devUtils/props/ariaAttributes';
 import { Tooltip, TooltipTrigger } from '../../index';
 import statuses from '../../utils/devUtils/constants/statuses';
+import { ariaAttributeBaseArgTypes } from '../../utils/devUtils/props/ariaAttributes';
+import { inputFieldAttributeBaseArgTypes } from '../../utils/devUtils/props/fieldAttributes';
+import SwitchField from '.';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export default {
   title: 'Form/SwitchField',
@@ -30,7 +28,7 @@ export default {
       }
     }
   },
-  argTypes: _objectSpread({
+  argTypes: _objectSpread(_objectSpread({
     label: {
       control: {
         type: 'text'
@@ -64,26 +62,22 @@ export default {
     isReadOnly: {},
     isDefaultSelected: {},
     hasAutoFocus: {},
-    containerProps: {},
-    labelProps: {},
-    controlProps: {},
     id: {},
     isSelected: {
       control: {
         type: 'none'
       }
     }
-  }, ariaAttributeBaseArgTypes)
+  }, ariaAttributeBaseArgTypes), inputFieldAttributeBaseArgTypes)
 };
 export var Default = function Default(args) {
   return ___EmotionJSX(SwitchField, args);
 };
 export var Controlled = function Controlled() {
   var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      isSelected = _useState2[0],
-      setIsSelected = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    isSelected = _useState2[0],
+    setIsSelected = _useState2[1];
   return ___EmotionJSX(SwitchField, {
     isSelected: isSelected,
     label: "Controlled",

package/lib/components/SwitchField/SwitchField.test.js

@@ -10,13 +10,12 @@ var defaultProps = {
   label: 'Example label',
   'data-testid': testId
 };
-
 var getComponent = function getComponent() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return render(___EmotionJSX(SwitchField, _extends({}, defaultProps, props)));
-}; // Need to be added to each test file to test accessibility using axe.
-
+};
 
+// Need to be added to each test file to test accessibility using axe.
 axeTest(getComponent);
 test('renders Switch component', function () {
   getComponent({

package/lib/components/Tab/Tab.js

@@ -2,81 +2,70 @@ import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
 var _excluded = ["icon", "isDisabled", "separator", "tabLabelProps", "tabLineProps", "content", "titleAttr", "title"];
 import React, { forwardRef, useContext, useImperativeHandle, useRef } from 'react';
-import PropTypes from 'prop-types';
-import { useTab } from '@react-aria/tabs';
-import { useFocusRing } from '@react-aria/focus';
+import { mergeProps, useFocusRing, useTab } from 'react-aria';
+import { Item as Tab } from 'react-stately';
 import { Pressable, useHover } from '@react-aria/interactions';
-import { mergeProps } from '@react-aria/utils';
-import { Item as Tab } from '@react-stately/collections';
-import { TabsContext } from '../Tabs';
-import { useStatusClasses, usePropWarning } from '../../hooks';
+import PropTypes from 'prop-types';
+import { Box, Text, Tooltip, TooltipTrigger } from '../..';
+import { usePropWarning, useStatusClasses } from '../../hooks';
 import ORIENTATION from '../../utils/devUtils/constants/orientation';
 import TabPicker from '../TabPicker';
-import { Box, Text, TooltipTrigger, Tooltip } from '../..';
+import { TabsContext } from '../Tabs';
+
 /**
  * Tab control for dividing up closely-related content.
  * Typically used as a child of the Tabs component.
  */
-
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var CollectionTab = /*#__PURE__*/forwardRef(function (props, ref) {
   var className = props.className,
-      item = props.item,
-      tabsDisabled = props.isDisabled,
-      orientation = props.orientation,
-      mode = props.mode,
-      slots = props.slots,
-      tooltipTriggerProps = props.tooltipTriggerProps;
+    item = props.item,
+    tabsDisabled = props.isDisabled,
+    orientation = props.orientation,
+    mode = props.mode,
+    slots = props.slots,
+    tooltipTriggerProps = props.tooltipTriggerProps;
   var key = item.key,
-      rendered = item.rendered,
-      itemProps = item.props;
-
+    rendered = item.rendered,
+    itemProps = item.props;
   var icon = itemProps.icon,
-      tabDisabled = itemProps.isDisabled,
-      separator = itemProps.separator,
-      tabLabelProps = itemProps.tabLabelProps,
-      tabLineProps = itemProps.tabLineProps,
-      content = itemProps.content,
-      titleAttr = itemProps.titleAttr,
-      title = itemProps.title,
-      otherItemProps = _objectWithoutProperties(itemProps, _excluded);
-
+    tabDisabled = itemProps.isDisabled,
+    separator = itemProps.separator,
+    tabLabelProps = itemProps.tabLabelProps,
+    tabLineProps = itemProps.tabLineProps,
+    content = itemProps.content,
+    titleAttr = itemProps.titleAttr,
+    title = itemProps.title,
+    otherItemProps = _objectWithoutProperties(itemProps, _excluded);
   var state = useContext(TabsContext);
   var isDisabled = tabsDisabled || tabDisabled || state.disabledKeys.has(key);
   var isSelected = state.selectedKey === key;
-
   var _useFocusRing = useFocusRing(),
-      isFocusVisible = _useFocusRing.isFocusVisible,
-      focusProps = _useFocusRing.focusProps;
-
+    isFocusVisible = _useFocusRing.isFocusVisible,
+    focusProps = _useFocusRing.focusProps;
   var _useHover = useHover({}),
-      hoverProps = _useHover.hoverProps,
-      isHovered = _useHover.isHovered;
-
+    hoverProps = _useHover.hoverProps,
+    isHovered = _useHover.isHovered;
   var _useStatusClasses = useStatusClasses(className, {
-    'is-focused': isFocusVisible,
-    'is-vertical': orientation === ORIENTATION.VERTICAL,
-    'is-horizontal': orientation === ORIENTATION.HORIZONTAL,
-    isDisabled: isDisabled,
-    isHovered: isHovered,
-    isSelected: isSelected
-  }),
-      classNames = _useStatusClasses.classNames;
-
+      'is-focused': isFocusVisible,
+      'is-vertical': orientation === ORIENTATION.VERTICAL,
+      'is-horizontal': orientation === ORIENTATION.HORIZONTAL,
+      isDisabled: isDisabled,
+      isHovered: isHovered,
+      isSelected: isSelected
+    }),
+    classNames = _useStatusClasses.classNames;
   var tabRef = useRef();
   usePropWarning(props, 'disabled', 'isDisabled');
   /* istanbul ignore next */
-
   useImperativeHandle(ref, function () {
     return tabRef.current;
   });
-
   var _useTab = useTab({
-    key: key,
-    isDisabled: isDisabled
-  }, state, tabRef),
-      tabProps = _useTab.tabProps;
-
+      key: key,
+      isDisabled: isDisabled
+    }, state, tabRef),
+    tabProps = _useTab.tabProps;
   var tab = ___EmotionJSX(Box, {
     isRow: true
   }, slots === null || slots === void 0 ? void 0 : slots.beforeTab, ___EmotionJSX(Box, _extends({
@@ -88,7 +77,6 @@ export var CollectionTab = /*#__PURE__*/forwardRef(function (props, ref) {
   }), icon, ___EmotionJSX(Text, _extends({
     variant: "tabLabel"
   }, tabLabelProps), rendered), isSelected && !isDisabled && ___EmotionJSX(TabLine, tabLineProps)), slots === null || slots === void 0 ? void 0 : slots.afterTab);
-
   if (mode === 'list' && itemProps.list) {
     return ___EmotionJSX(TabPicker, _extends({
       ref: tabRef,
@@ -98,7 +86,6 @@ export var CollectionTab = /*#__PURE__*/forwardRef(function (props, ref) {
       item: item
     }, mergeProps(focusProps, hoverProps, tabProps), otherItemProps));
   }
-
   if (mode === 'tooltip') {
     return ___EmotionJSX(React.Fragment, null, separator, ___EmotionJSX(TooltipTrigger, _extends({}, tooltipTriggerProps, {
       isOpen: isHovered || isFocusVisible
@@ -106,7 +93,6 @@ export var CollectionTab = /*#__PURE__*/forwardRef(function (props, ref) {
       variant: "quiet"
     }, tab)), ___EmotionJSX(Tooltip, null, itemProps.textValue || itemProps.title)));
   }
-
   return tab;
 });
 CollectionTab.displayName = 'CollectionTab';
@@ -141,6 +127,7 @@ export var TabLine = function TabLine(props) {
     role: "presentation",
     variant: "tabLine"
   }, props));
-}; // Export Item as default Tab for simplicity, convert to CollectionTab within Tabs component
+};
 
+// Export Item as default Tab for simplicity, convert to CollectionTab within Tabs component
 export default Tab;

package/lib/components/TabPicker/TabPicker.js

@@ -10,87 +10,72 @@ import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instanc
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import React, { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
-import PropTypes from 'prop-types';
-import { Item as Tab } from '@react-stately/collections';
-import ArrowDropUpIcon from 'mdi-react/ArrowDropUpIcon';
-import ArrowDropDownIcon from 'mdi-react/ArrowDropDownIcon';
+import { Item as Tab } from 'react-stately';
 import { Pressable } from '@react-aria/interactions';
+import ArrowDropDownIcon from 'mdi-react/ArrowDropDownIcon';
+import ArrowDropUpIcon from 'mdi-react/ArrowDropUpIcon';
+import PropTypes from 'prop-types';
+import { Box, Icon, Menu, PopoverMenu, Text } from '../..';
 import { useStatusClasses } from '../../hooks';
-import { Box, Text, PopoverMenu, Icon, Menu } from '../..';
 import { TabLine } from '../Tab';
-/* istanbul ignore next */
 
+/* istanbul ignore next */
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var TabPicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var className = _ref.className,
-      items = _ref.items,
-      state = _ref.state,
-      item = _ref.item,
-      others = _objectWithoutProperties(_ref, _excluded);
-
+    items = _ref.items,
+    state = _ref.state,
+    item = _ref.item,
+    others = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      isOpen = _useState2[0],
-      setIsOpen = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    isOpen = _useState2[0],
+    setIsOpen = _useState2[1];
   var _useState3 = useState(state.selectedKey),
-      _useState4 = _slicedToArray(_useState3, 2),
-      selectedItem = _useState4[0],
-      setSelectedItem = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedItem = _useState4[0],
+    setSelectedItem = _useState4[1];
   var selectionManager = state.selectionManager;
-
   var _useState5 = useState(selectionManager.focusedKey),
-      _useState6 = _slicedToArray(_useState5, 2),
-      focusedItem = _useState6[0],
-      setFocusedItem = _useState6[1];
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    focusedItem = _useState6[0],
+    setFocusedItem = _useState6[1];
   var isTabFocused = selectionManager.focusedKey === item.key;
   var isTabSelected = state.selectedKey === item.key;
-
   var isListItemFocused = _someInstanceProperty(items).call(items, function (el) {
     return el.key === selectionManager.focusedKey;
   });
-
   var isListItemSelected = _someInstanceProperty(items).call(items, function (el) {
     return el.key === state.selectedKey;
   });
-
   var _useMemo = useMemo(function () {
-    var _context, _tabs$prevIndex, _tabs$nextIndex;
-
-    var tabs = _filterInstanceProperty(_context = _Array$from(state.collection)).call(_context, function (tab) {
-      var _tab$value;
-
-      return !(tab !== null && tab !== void 0 && (_tab$value = tab.value) !== null && _tab$value !== void 0 && _tab$value.isListItem);
-    });
-
-    var prevIndex = _findIndexInstanceProperty(tabs).call(tabs, function (tab) {
-      return tab.key === item.key;
-    }) - 1;
-    var nextIndex = _findIndexInstanceProperty(tabs).call(tabs, function (tab) {
-      return tab.key === item.key;
-    }) + 1;
-    return {
-      prevKey: ((_tabs$prevIndex = tabs[prevIndex]) === null || _tabs$prevIndex === void 0 ? void 0 : _tabs$prevIndex.key) || tabs[tabs.length].key,
-      nextKey: ((_tabs$nextIndex = tabs[nextIndex]) === null || _tabs$nextIndex === void 0 ? void 0 : _tabs$nextIndex.key) || tabs[0].key
-    };
-  }, []),
-      prevKey = _useMemo.prevKey,
-      nextKey = _useMemo.nextKey;
-
+      var _context, _tabs$prevIndex, _tabs$nextIndex;
+      var tabs = _filterInstanceProperty(_context = _Array$from(state.collection)).call(_context, function (tab) {
+        var _tab$value;
+        return !(tab !== null && tab !== void 0 && (_tab$value = tab.value) !== null && _tab$value !== void 0 && _tab$value.isListItem);
+      });
+      var prevIndex = _findIndexInstanceProperty(tabs).call(tabs, function (tab) {
+        return tab.key === item.key;
+      }) - 1;
+      var nextIndex = _findIndexInstanceProperty(tabs).call(tabs, function (tab) {
+        return tab.key === item.key;
+      }) + 1;
+      return {
+        prevKey: ((_tabs$prevIndex = tabs[prevIndex]) === null || _tabs$prevIndex === void 0 ? void 0 : _tabs$prevIndex.key) || tabs[tabs.length].key,
+        nextKey: ((_tabs$nextIndex = tabs[nextIndex]) === null || _tabs$nextIndex === void 0 ? void 0 : _tabs$nextIndex.key) || tabs[0].key
+      };
+    }, []),
+    prevKey = _useMemo.prevKey,
+    nextKey = _useMemo.nextKey;
   var _useStatusClasses = useStatusClasses(className, {
-    isSelected: isListItemSelected
-  }),
-      classNames = _useStatusClasses.classNames;
-
+      isSelected: isListItemSelected
+    }),
+    classNames = _useStatusClasses.classNames;
   var menuRef = useRef();
-
   var handleSelectedItem = function handleSelectedItem(currentItem) {
     state.setSelectedKey(currentItem);
     setFocusedItem(currentItem);
   };
-
   useEffect(function () {
     if (selectedItem) {
       handleSelectedItem(selectedItem);
@@ -105,7 +90,6 @@ var TabPicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (isOpen && (isTabFocused || isListItemSelected) && menuRef.current) {
       if (focusedItem) {
         var _context2;
-
         _findInstanceProperty(_context2 = _Array$from(menuRef.current.children)).call(_context2, function (el) {
           return el.dataset.key === focusedItem;
         }).focus();
@@ -113,7 +97,6 @@ var TabPicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
         menuRef.current.firstChild.focus();
       }
     }
-
     if (!isOpen && isTabSelected && !selectedItem) {
       setSelectedItem(selectionManager.focusedKey);
     }
@@ -140,7 +123,6 @@ var TabPicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
       setFocusedItem(null);
     }
   }, [isTabSelected, isListItemSelected]);
-
   var handleKeyNavigation = function handleKeyNavigation(e) {
     switch (e.key) {
       case 'ArrowRight':
@@ -148,18 +130,15 @@ var TabPicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
           selectionManager.setFocusedKey(nextKey);
           break;
         }
-
       case 'ArrowLeft':
         {
           selectionManager.setFocusedKey(prevKey);
           break;
         }
-
       default:
         break;
     }
   };
-
   var tabProps = others;
   delete tabProps.onPointerDown;
   delete tabProps.onKeyDown;

package/lib/components/Table/Table.js

@@ -3,6 +3,7 @@ import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectW
 var _excluded = ["children"];
 import React from 'react';
 import Box from '../Box';
+
 /**
  * Basic Table parent component.
  *
@@ -11,17 +12,13 @@ import Box from '../Box';
  * Accepts the `<TableBody>` component and/or the `<TableHead>` as children.
  *
  */
-
 import { jsx as ___EmotionJSX } from "@emotion/react";
-
 var Table = function Table(props) {
   var children = props.children,
-      others = _objectWithoutProperties(props, _excluded);
-
+    others = _objectWithoutProperties(props, _excluded);
   return ___EmotionJSX(Box, _extends({
     as: "table",
-    variant: "table.table"
+    variant: "table.container"
   }, others), children);
 };
-
 export default Table;