@pingux/astro 2.130.2-alpha.3 → 2.130.3-alpha.0

package/lib/cjs/styles/themes/astro/customProperties/index.js

@@ -18,6 +18,7 @@ var astroThemeValues = {
   icons: _icons["default"],
   styles: _styles["default"],
   tShirtSizes: _tShirtSizes["default"],
-  iconWrapperSizes: _tShirtSizes.iconWrapperSizes
+  iconWrapperSizes: _tShirtSizes.iconWrapperSizes,
+  rockerButtonGap: '3px'
 };
 exports.astroThemeValues = astroThemeValues;

package/lib/cjs/styles/themes/next-gen/customProperties/index.d.ts

@@ -30,4 +30,5 @@ export declare const nextGenThemeValues: {
         md: number;
         lg: number;
     };
+    rockerButtonGap: string;
 };

package/lib/cjs/styles/themes/next-gen/customProperties/index.js

@@ -18,6 +18,7 @@ var nextGenThemeValues = {
   styles: _styles["default"],
   icons: _icons["default"],
   tShirtSizes: _tShirtSizes["default"],
-  iconWrapperSizes: _tShirtSizes.iconWrapperSizes
+  iconWrapperSizes: _tShirtSizes.iconWrapperSizes,
+  rockerButtonGap: '0px'
 };
 exports.nextGenThemeValues = nextGenThemeValues;

package/lib/cjs/styles/themes/next-gen/next-gen.d.ts

@@ -3667,6 +3667,8 @@ declare const _default: {
                         outline: string;
                         outlineColor: string;
                         outlineOffset: string;
+                        position: string;
+                        zIndex: string;
                     };
                 };
                 'button:not(:first-child)': {

package/lib/cjs/styles/themes/next-gen/variants/variants.d.ts

@@ -1266,6 +1266,8 @@ declare const _default: {
                     outline: string;
                     outlineColor: string;
                     outlineOffset: string;
+                    position: string;
+                    zIndex: string;
                 };
             };
             'button:not(:first-child)': {

package/lib/cjs/styles/themes/next-gen/variants/variants.js

@@ -337,7 +337,9 @@ var rockerButton = {
       '&.is-focused': {
         outline: '2px solid',
         outlineColor: 'focus',
-        outlineOffset: '2px'
+        outlineOffset: '2px',
+        position: 'relative',
+        zIndex: '1000'
       }
     },
     'button:not(:first-child)': {

package/lib/cjs/types/rockerButton.d.ts

@@ -0,0 +1,13 @@
+import type { AriaToggleButtonProps } from '@react-types/button';
+import { StylePropertyValue } from 'theme-ui';
+type SelectedStyles = {
+    bg?: StylePropertyValue<string | undefined>;
+};
+export interface RockerButtonProps extends AriaToggleButtonProps {
+    className?: string;
+    name: string;
+    title?: string;
+    key: string;
+    selectedStyles?: SelectedStyles;
+}
+export {};

package/lib/cjs/types/rockerButton.js

@@ -0,0 +1,6 @@
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/cjs/types/rockerButtonGroup.d.ts

@@ -2,13 +2,17 @@ import { TabListProps } from '@react-stately/tabs';
 import { TestingAttributes } from './shared/test';
 import { BoxProps } from './box';
 export interface RockerButtonGroupProps extends BoxProps, TestingAttributes {
-    /** The default button key to be selected. (uncontrolled) */
+    /** The default button key to be selected. (uncontrolled) (deprecated) */
     defaultSelectedKey?: string;
-    /** The button key that is currently selected. (controlled) */
+    /** The default button keys to be selected. (uncontrolled) */
+    defaultSelectedKeys?: string[];
+    /** The button key that is currently selected. (controlled) (deprecated) */
     selectedKey?: string;
+    /** The button key that is currently selected. (controlled) */
+    selectedKeys?: string[];
     /** Which keys should be disabled. */
     disabledKeys?: string[];
     /** Handler that is called when the selected button has changed. */
-    onSelectionChange?: (key: string) => void;
+    onSelectionChange?: (key: string | string[]) => void;
     tabListProps?: TabListProps<object>;
 }

package/lib/components/RockerButton/RockerButton.js

@@ -8,55 +8,51 @@ 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 _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 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, useContext, useImperativeHandle, useRef } from 'react';
+import React, { forwardRef, useContext } from 'react';
 import { FocusRing } from 'react-aria';
-import { Item } from 'react-stately';
-import { useHover, usePress } from '@react-aria/interactions';
+import { useToggleButtonGroupItem } from '@react-aria/button';
+import { useHover } from '@react-aria/interactions';
 import { mergeProps } from '@react-aria/utils';
-import PropTypes from 'prop-types';
 import { RockerContext } from '../../context/RockerButtonGroupContext';
-import { usePropWarning, useRockerButton, useStatusClasses } from '../../hooks';
+import { useLocalOrForwardRef, usePropWarning, useStatusClasses } from '../../hooks';
 import { Box } from '../../index';
 import { accent, getBaseHexColor, getDarkerColor } from '../../styles/colors';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-export var CollectionRockerButton = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _itemProps$selectedSt, _itemProps$selectedSt2;
+export var RockerButton = /*#__PURE__*/forwardRef(function (props, ref) {
   var className = props.className,
-    item = props.item;
-  var key = item.key,
-    rendered = item.rendered,
-    itemProps = item.props;
-  var state = useContext(RockerContext);
-  var isDisabled = state.disabledKeys.has(key);
-  var isSelected = state.selectedKey === key;
-  var rockerButtonRef = useRef();
+    children = props.children,
+    isDisabled = props.isDisabled,
+    name = props.name,
+    selectedStyles = props.selectedStyles;
+  var _useContext = useContext(RockerContext),
+    state = _useContext.state,
+    disabledKeys = _useContext.disabledKeys;
+  var rockerButtonRef = useLocalOrForwardRef(ref);
   var _useHover = useHover({}),
     hoverProps = _useHover.hoverProps,
     isHovered = _useHover.isHovered;
-  var _usePress = usePress(rockerButtonRef),
-    pressProps = _usePress.pressProps,
-    isPressed = _usePress.isPressed;
+  var backgroundHexColor = selectedStyles !== null && selectedStyles !== void 0 && selectedStyles.bg ? getBaseHexColor(selectedStyles === null || selectedStyles === void 0 ? void 0 : selectedStyles.bg) : accent[20];
+  usePropWarning(props, 'disabled', 'isDisabled');
+  var id = name;
+  var _useToggleButtonGroup = useToggleButtonGroupItem(_objectSpread(_objectSpread({
+      id: id
+    }, props), {}, {
+      isDisabled: isDisabled || (disabledKeys === null || disabledKeys === void 0 ? void 0 : _includesInstanceProperty(disabledKeys).call(disabledKeys, id))
+    }), state, rockerButtonRef),
+    rockerButtonProps = _useToggleButtonGroup.buttonProps,
+    isSelected = _useToggleButtonGroup.isSelected,
+    raIsDisabled = _useToggleButtonGroup.isDisabled,
+    isPressed = _useToggleButtonGroup.isPressed;
   var _useStatusClasses = useStatusClasses(className, {
       isHovered: isHovered,
       isPressed: isPressed,
-      isSelected: isSelected,
-      isDisabled: isDisabled
+      isDisabled: raIsDisabled,
+      isSelected: isSelected
     }),
     classNames = _useStatusClasses.classNames;
-  var backgroundHexColor = (_itemProps$selectedSt = itemProps.selectedStyles) !== null && _itemProps$selectedSt !== void 0 && _itemProps$selectedSt.bg ? getBaseHexColor((_itemProps$selectedSt2 = itemProps.selectedStyles) === null || _itemProps$selectedSt2 === void 0 ? void 0 : _itemProps$selectedSt2.bg) : accent[20];
-  usePropWarning(props, 'disabled', 'isDisabled');
-  /* istanbul ignore next */
-  useImperativeHandle(ref, function () {
-    return rockerButtonRef.current;
-  });
-  var _useRockerButton = useRockerButton({
-      item: item,
-      isDisabled: isDisabled,
-      isSelected: isSelected
-    }, state, rockerButtonRef),
-    rockerButtonProps = _useRockerButton.rockerButtonProps;
   return ___EmotionJSX(FocusRing, {
     focusRingClass: "is-focused"
   }, ___EmotionJSX(Box, _extends({
@@ -65,46 +61,14 @@ export var CollectionRockerButton = /*#__PURE__*/forwardRef(function (props, ref
     variant: "variants.rockerButton.thumbSwitch",
     ref: rockerButtonRef,
     sx: {
-      '&.is-selected': _objectSpread({}, itemProps.selectedStyles),
+      '&.is-selected': _objectSpread({}, selectedStyles),
       '&.is-selected.is-hovered': {
         bg: getDarkerColor(backgroundHexColor, 0.2)
       },
-      '&.is-selected.is-pressed': {
+      '&.is-pressed': {
         bg: getDarkerColor(backgroundHexColor, 0.4)
       }
     }
-  }, mergeProps(hoverProps, pressProps, itemProps, rockerButtonProps)), rendered));
+  }, mergeProps(hoverProps, rockerButtonProps)), children || name));
 });
-CollectionRockerButton.displayName = 'CollectionRockerButton';
-CollectionRockerButton.propTypes = {
-  /** Allows custom styles to be passed to button. */
-  selectedStyles: PropTypes.shape({
-    bg: PropTypes.string
-  }),
-  // adding to surface in props table
-  /** @ignore */
-  item: PropTypes.shape({
-    key: PropTypes.string,
-    props: PropTypes.shape({
-      selectedStyles: PropTypes.shape({
-        bg: PropTypes.string
-      })
-    }),
-    rendered: PropTypes.node
-  })
-};
-CollectionRockerButton.defaultProps = {
-  selectedStyles: {
-    bg: 'active'
-  },
-  item: {
-    props: {
-      selectedStyles: {
-        bg: 'active'
-      }
-    }
-  }
-};
-// Export Item as default for simplicity, convert to CollectionRockerButton within
-// RockerButtonGroup component.
-export default Item;
+export default RockerButton;

package/lib/components/RockerButton/RockerButton.styles.js

@@ -33,6 +33,7 @@ var thumbSwitch = _objectSpread(_objectSpread({}, base), {}, {
   paddingBottom: '0px',
   textTransform: 'uppercase',
   bg: 'accent.95',
+  pl: '15px',
   '&.is-selected': {
     bg: 'accent.20',
     color: 'white',
@@ -41,6 +42,9 @@ var thumbSwitch = _objectSpread(_objectSpread({}, base), {}, {
   '&.is-focused': _objectSpread({}, defaultFocus),
   '&.is-hovered': {
     bg: 'white'
+  },
+  '&.is-pressed': {
+    color: 'white'
   }
 });
 export default {

package/lib/components/RockerButton/index.js

@@ -1,2 +1 @@
-export { default } from './RockerButton';
-export * from './RockerButton';
+export { default } from './RockerButton';

package/lib/components/RockerButtonGroup/RockerButtonGroup.js

@@ -1,29 +1,56 @@
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
+import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
+import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
+import _Object$getOwnPropertyDescriptor from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor";
+import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
+import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors";
+import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
+import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
+import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-var _excluded = ["tabListProps"];
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
-import React, { forwardRef } from 'react';
-import { useTabList } from 'react-aria';
-import { useTabListState } from 'react-stately';
+var _excluded = ["defaultSelectedKey", "defaultSelectedKeys", "disabledKeys", "selectedKey", "selectedKeys", "tabListProps"];
+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, useMemo } from 'react';
+import { useToggleButtonGroup } from '@react-aria/button';
+import { useToggleGroupState } from '@react-stately/toggle';
 import { RockerContext } from '../../context/RockerButtonGroupContext';
-import { useLocalOrForwardRef, usePropWarning } from '../../hooks';
+import { useGetTheme, useLocalOrForwardRef, usePropWarning } from '../../hooks';
 import Box from '../Box';
-import { CollectionRockerButton } from '../RockerButton';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var RockerButtonGroup = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context;
-  var tabListProps = props.tabListProps,
+  var defaultSelectedKeyProp = props.defaultSelectedKey,
+    defaultSelectedKeysProp = props.defaultSelectedKeys,
+    disabledKeys = props.disabledKeys,
+    selectedKeyProp = props.selectedKey,
+    selectedKeysProp = props.selectedKeys,
+    tabListProps = props.tabListProps,
     others = _objectWithoutProperties(props, _excluded);
   var buttonGroupRef = useLocalOrForwardRef(ref);
   usePropWarning(props, 'disabled', 'isDisabled');
-  var state = useTabListState(props);
-  var _useTabList = useTabList(props, state, buttonGroupRef),
-    raTabListProps = _useTabList.tabListProps;
-  // removed tabList role for now as this isn't really the role we are looking for
+  var selectedKeys = selectedKeysProp || (selectedKeyProp ? [selectedKeyProp] : null);
+  var defaultSelectedKeys = defaultSelectedKeysProp || (defaultSelectedKeyProp ? [defaultSelectedKeyProp] : null);
+  var theseProps = _objectSpread(_objectSpread(_objectSpread({}, others), defaultSelectedKeys && {
+    defaultSelectedKeys: defaultSelectedKeys
+  }), selectedKeys && {
+    selectedKeys: selectedKeys
+  });
+  var state = useToggleGroupState(theseProps);
+  var _useToggleButtonGroup = useToggleButtonGroup(theseProps, state, buttonGroupRef),
+    raTabListProps = _useToggleButtonGroup.groupProps;
   delete raTabListProps.role;
+  delete raTabListProps['data-testid'];
+  var contextValue = useMemo(function () {
+    return {
+      state: state,
+      disabledKeys: disabledKeys
+    };
+  }, [state, disabledKeys]);
+  var _useGetTheme = useGetTheme(),
+    rockerButtonGap = _useGetTheme.rockerButtonGap;
   return ___EmotionJSX(RockerContext.Provider, {
-    value: state
+    value: contextValue
   }, ___EmotionJSX(Box, _extends({
     variant: "rockerButton.container"
   }, others), ___EmotionJSX(Box, _extends({
@@ -31,13 +58,9 @@ var RockerButtonGroup = /*#__PURE__*/forwardRef(function (props, ref) {
     isRow: true
   }, tabListProps, raTabListProps, {
     ref: buttonGroupRef,
-    role: "toolbar"
-  }), _mapInstanceProperty(_context = _Array$from(state.collection)).call(_context, function (item) {
-    return ___EmotionJSX(CollectionRockerButton, {
-      key: item.key,
-      item: item
-    });
-  }))));
+    role: "toolbar",
+    gap: rockerButtonGap
+  }), props.children)));
 });
 RockerButtonGroup.displayName = 'RockerButtonGroup';
 export default RockerButtonGroup;

package/lib/components/RockerButtonGroup/RockerButtonGroup.stories.js

@@ -36,7 +36,9 @@ export default {
 };
 export var Default = function Default(_ref) {
   var args = _extends({}, (_objectDestructuringEmpty(_ref), _ref));
-  return ___EmotionJSX(RockerButtonGroup, args, ___EmotionJSX(RockerButton, {
+  return ___EmotionJSX(RockerButtonGroup, _extends({}, args, {
+    defaultSelectedKeys: ['and']
+  }), ___EmotionJSX(RockerButton, {
     name: "and",
     key: "and"
   }, "And"), ___EmotionJSX(RockerButton, {
@@ -63,13 +65,16 @@ Uncontrolled.parameters = {
   codesandbox: false
 };
 export var Controlled = function Controlled() {
-  var _useState = useState('and'),
+  var _useState = useState(['and']),
     _useState2 = _slicedToArray(_useState, 2),
     currentTab = _useState2[0],
     setCurrentTab = _useState2[1];
+  var onSelectionChange = function onSelectionChange(e) {
+    setCurrentTab(e);
+  };
   return ___EmotionJSX(RockerButtonGroup, {
-    selectedKey: currentTab,
-    onSelectionChange: setCurrentTab
+    selectedKeys: currentTab,
+    onSelectionChange: onSelectionChange
   }, ___EmotionJSX(RockerButton, {
     name: "and",
     key: "and"

package/lib/components/RockerButtonGroup/RockerButtonGroup.test.js

@@ -1,6 +1,17 @@
+import _typeof from "@babel/runtime-corejs3/helpers/esm/typeof";
+import _asyncToGenerator from "@babel/runtime-corejs3/helpers/esm/asyncToGenerator";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = _Object$defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof _Symbol ? _Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return _Object$defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = _Object$create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = _Object$getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = _Object$create(IteratorPrototype); function defineIteratorMethods(prototype) { var _context2; _forEachInstanceProperty(_context2 = ["next", "throw", "return"]).call(_context2, function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], _forEachInstanceProperty(tryLocsList).call(tryLocsList, pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return _Object$setPrototypeOf ? _Object$setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = _Object$create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = _Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return _reverseInstanceProperty(keys).call(keys), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { var _context3; if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, _forEachInstanceProperty(_context3 = this.tryEntries).call(_context3, resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+_sliceInstanceProperty(name).call(name, 1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
+import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
+import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
+import _Object$create from "@babel/runtime-corejs3/core-js-stable/object/create";
+import _Object$getPrototypeOf from "@babel/runtime-corejs3/core-js-stable/object/get-prototype-of";
+import _Object$setPrototypeOf from "@babel/runtime-corejs3/core-js-stable/object/set-prototype-of";
+import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
+import _reverseInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reverse";
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { RockerButton, RockerButtonGroup } from '../../index';
@@ -39,7 +50,7 @@ var getComponent = function getComponent() {
     "data-id": "test-container"
   }), _mapInstanceProperty(buttons).call(buttons, function (button) {
     return ___EmotionJSX(RockerButton, {
-      title: button.name,
+      name: button.name,
       key: button.key,
       selectedStyles: button.selectedStyles
     });
@@ -50,7 +61,7 @@ var getComponent = function getComponent() {
 universalComponentTests({
   renderComponent: function renderComponent(props) {
     return ___EmotionJSX(RockerButtonGroup, props, ___EmotionJSX(RockerButton, {
-      title: testButtons[0].name,
+      name: testButtons[0].name,
       key: testButtons[0].key,
       selectedStyles: testButtons[0].selectedStyles
     }));
@@ -60,7 +71,7 @@ test('renders rocker container with buttons', function () {
   getComponent();
   var rockerContainer = screen.getByTestId(testId);
   expect(rockerContainer).toBeInTheDocument();
-  var buttons = screen.getAllByRole('button');
+  var buttons = screen.getAllByRole('radio');
   expect(buttons).toHaveLength(3);
 });
 test('buttonGroup is not disabled by default', function () {
@@ -88,20 +99,45 @@ test('rockerButton renders selectedStyles prop when selected', function () {
   var buttonColorKey = screen.getByText(testButtons[0].key);
   expect(buttonColorKey).toHaveClass('is-selected');
 });
-test('selected button can be changed by keyboard interaction', function () {
-  getComponent();
-  userEvent.tab();
-  var button0 = screen.getByText(testButtons[0].key);
-  expect(button0).toHaveClass('is-selected');
-  var button1 = screen.getByText(testButtons[1].key);
-  expect(button1).not.toHaveClass('is-selected');
-  fireEvent.keyDown(screen.getByText(testButtons[0].key), {
-    key: 'ArrowRight',
-    code: 'ArrowRight'
-  });
-  expect(screen.getByText(testButtons[1].key)).toHaveClass('is-selected');
-  expect(screen.getByText(testButtons[0].key)).not.toHaveClass('is-selected');
-});
+test('selected button can be changed by keyboard interaction', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var button0, button1, updatedButton0, updatedButton1;
+  return _regeneratorRuntime().wrap(function _callee$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+        getComponent();
+        userEvent.tab();
+        button0 = screen.getByText(testButtons[0].key);
+        expect(button0).toHaveClass('is-selected');
+        button1 = screen.getByText(testButtons[1].key);
+        expect(button1).not.toHaveClass('is-selected');
+        fireEvent.keyDown(screen.getByText(testButtons[0].key), {
+          key: 'ArrowRight',
+          code: 'ArrowRight'
+        });
+        fireEvent.keyDown(screen.getByText(testButtons[1].key), {
+          key: 'Enter',
+          code: 'Enter'
+        });
+        fireEvent.keyUp(screen.getByText(testButtons[1].key), {
+          key: 'Enter',
+          code: 'Enter'
+        });
+        _context.next = 11;
+        return screen.findByText(testButtons[0].key);
+      case 11:
+        updatedButton0 = _context.sent;
+        _context.next = 14;
+        return screen.findByText(testButtons[1].key);
+      case 14:
+        updatedButton1 = _context.sent;
+        expect(updatedButton1).toHaveClass('is-selected');
+        expect(updatedButton0).not.toHaveClass('is-selected');
+      case 17:
+      case "end":
+        return _context.stop();
+    }
+  }, _callee);
+})));
 test('rockerButton renders correct darker bg when selectedStyles prop is passed', function () {
   getComponent();
   var button0 = screen.getByText(testButtons[0].key);
@@ -126,6 +162,14 @@ test('rockerButton renders correct bg when selectedStyles prop is css variable',
     key: 'ArrowRight',
     code: 'ArrowRight'
   });
+  fireEvent.keyDown(screen.getByText(testButtons[1].key), {
+    key: 'Enter',
+    code: 'Enter'
+  });
+  fireEvent.keyUp(screen.getByText(testButtons[1].key), {
+    key: 'Enter',
+    code: 'Enter'
+  });
   userEvent.hover(button1);
   expect(button1).toHaveClass('is-selected');
   expect(button1).toHaveClass('is-hovered');

package/lib/hooks/index.js

@@ -20,7 +20,6 @@ export { default as usePagination } from './usePagination';
 export { default as usePaginationState } from './usePaginationState';
 export { default as useProgressiveState } from './useProgressiveState';
 export { default as usePropWarning } from './usePropWarning';
-export { default as useRockerButton } from './useRockerButton';
 export { default as useSelectField } from './useSelectField';
 export { default as useSliderField } from './useSliderField';
 export { default as useStatusClasses } from './useStatusClasses';

package/lib/styles/themeOverrides/nextGenDarkMode/variants/variants.js

@@ -65,13 +65,13 @@ var rockerButton = {
       backgroundColor: 'gray-900',
       color: 'blue-400',
       '&.is-selected': {
-        color: 'gray-900'
+        color: 'black'
       },
       '&.is-hovered': {
-        color: 'gray-900'
+        color: 'black'
       },
       '&.is-pressed': {
-        color: 'gray-900'
+        color: 'black'
       }
     }
   }

package/lib/styles/themes/astro/customProperties/index.js

@@ -5,5 +5,6 @@ export var astroThemeValues = {
   icons: icons,
   styles: styles,
   tShirtSizes: tShirtSizes,
-  iconWrapperSizes: iconWrapperSizes
+  iconWrapperSizes: iconWrapperSizes,
+  rockerButtonGap: '3px'
 };

package/lib/styles/themes/next-gen/customProperties/index.js

@@ -5,5 +5,6 @@ export var nextGenThemeValues = {
   styles: styles,
   icons: icons,
   tShirtSizes: tShirtSizes,
-  iconWrapperSizes: iconWrapperSizes
+  iconWrapperSizes: iconWrapperSizes,
+  rockerButtonGap: '0px'
 };

package/lib/styles/themes/next-gen/variants/variants.js

@@ -328,7 +328,9 @@ var rockerButton = {
       '&.is-focused': {
         outline: '2px solid',
         outlineColor: 'focus',
-        outlineOffset: '2px'
+        outlineOffset: '2px',
+        position: 'relative',
+        zIndex: '1000'
       }
     },
     'button:not(:first-child)': {

package/lib/types/rockerButton.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "2.130.2-alpha.3",
+  "version": "2.130.3-alpha.0",
   "description": "React component library for Ping Identity's design system",
   "repository": {
     "type": "git",
@@ -53,7 +53,7 @@
     "@pingux/mdi-react": "^1.2.0",
     "@react-aria/accordion": "~3.0.0-alpha.11",
     "@react-aria/breadcrumbs": "^3.1.4",
-    "@react-aria/button": "^3.2.1",
+    "@react-aria/button": "^3.13.2",
     "@react-aria/calendar": "^3.5.7",
     "@react-aria/checkbox": "^3.2.0",
     "@react-aria/color": "~3.0.0",
@@ -77,6 +77,7 @@
     "@react-aria/selection": "~3.10.1",
     "@react-aria/table": "^3.9.0",
     "@react-aria/tabs": "^3.8.3",
+    "@react-aria/toggle": "^3.11.5",
     "@react-aria/utils": "^3.16.0",
     "@react-aria/virtualizer": "~3.8.0",
     "@react-aria/visually-hidden": "~3.6.0",
@@ -94,7 +95,7 @@
     "@react-stately/selection": "^3.15.0",
     "@react-stately/table": "^3.9.0",
     "@react-stately/tabs": "^3.6.3",
-    "@react-stately/toggle": "^3.7.3",
+    "@react-stately/toggle": "^3.8.5",
     "@react-stately/tree": "^3.7.4",
     "@react-stately/virtualizer": "~3.6.5",
     "@react-types/slider": "^3.7.9",

package/lib/cjs/hooks/useRockerButton/index.d.ts

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