@pingux/astro 1.42.2 → 2.0.0-alpha.4

package/lib/cjs/components/Button/Button.js

@@ -1,129 +1,82 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
-
 var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
-
 var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
-
 var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
-
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
-
 var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
-
 var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
-
 var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
-
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
-
 var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports["default"] = void 0;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
-
 var _react = _interopRequireWildcard(require("react"));
-
+var _reactAria = require("react-aria");
+var _interactions = require("@react-aria/interactions");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _themeUi = require("theme-ui");
-
-var _button = require("@react-aria/button");
-
-var _interactions = require("@react-aria/interactions");
-
-var _focus = require("@react-aria/focus");
-
-var _utils = require("@react-aria/utils");
-
 var _hooks = require("../../hooks");
-
 var _Loader = _interopRequireDefault(require("../Loader"));
-
 var _react2 = require("@emotion/react");
-
 var _excluded = ["className", "isDisabled", "isLoading", "onHoverStart", "onHoverChange", "onHoverEnd", "onPress", "onPressStart", "onPressEnd", "onPressChange", "onPressUp", "children", "variant", "tabIndex"];
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 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) { (0, _defineProperty2["default"])(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; }
-
 var Button = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var className = props.className,
-      isDisabled = props.isDisabled,
-      isLoading = props.isLoading,
-      onHoverStart = props.onHoverStart,
-      onHoverChange = props.onHoverChange,
-      onHoverEnd = props.onHoverEnd,
-      onPress = props.onPress,
-      onPressStart = props.onPressStart,
-      onPressEnd = props.onPressEnd,
-      onPressChange = props.onPressChange,
-      onPressUp = props.onPressUp,
-      children = props.children,
-      variant = props.variant,
-      tabIndex = props.tabIndex,
-      others = (0, _objectWithoutProperties2["default"])(props, _excluded);
+    isDisabled = props.isDisabled,
+    isLoading = props.isLoading,
+    onHoverStart = props.onHoverStart,
+    onHoverChange = props.onHoverChange,
+    onHoverEnd = props.onHoverEnd,
+    onPress = props.onPress,
+    onPressStart = props.onPressStart,
+    onPressEnd = props.onPressEnd,
+    onPressChange = props.onPressChange,
+    onPressUp = props.onPressUp,
+    children = props.children,
+    variant = props.variant,
+    tabIndex = props.tabIndex,
+    others = (0, _objectWithoutProperties2["default"])(props, _excluded);
   var buttonRef = (0, _react.useRef)();
   (0, _hooks.usePropWarning)(props, 'disabled', 'isDisabled');
   /* istanbul ignore next */
-
   (0, _react.useImperativeHandle)(ref, function () {
     return buttonRef.current;
   });
-
-  var _useFocusRing = (0, _focus.useFocusRing)(),
-      isFocusVisible = _useFocusRing.isFocusVisible,
-      focusProps = _useFocusRing.focusProps;
-
-  var _useButton = (0, _button.useButton)(_objectSpread({
-    elementType: 'button'
-  }, props), buttonRef),
-      buttonProps = _useButton.buttonProps,
-      isPressed = _useButton.isPressed;
-
+  var _useFocusRing = (0, _reactAria.useFocusRing)(),
+    isFocusVisible = _useFocusRing.isFocusVisible,
+    focusProps = _useFocusRing.focusProps;
+  var _useButton = (0, _reactAria.useButton)(_objectSpread({
+      elementType: 'button'
+    }, props), buttonRef),
+    buttonProps = _useButton.buttonProps,
+    isPressed = _useButton.isPressed;
   var _useHover = (0, _interactions.useHover)(props),
-      hoverProps = _useHover.hoverProps,
-      isHovered = _useHover.isHovered;
-
+    hoverProps = _useHover.hoverProps,
+    isHovered = _useHover.isHovered;
   var _useStatusClasses = (0, _hooks.useStatusClasses)(className, {
-    isHovered: isHovered,
-    isPressed: isPressed,
-    isFocused: isFocusVisible,
-    isDisabled: isDisabled
-  }),
-      classNames = _useStatusClasses.classNames;
-
-  (0, _hooks.useDeprecationWarning)('The "icon" variant for `Button` is deprecated in Astro-UI 1.0.0, use the `IconButton` component instead.', {
-    isActive: props.variant === 'icon'
-  });
-  (0, _hooks.useDeprecationWarning)('The "danger" variant for `Button` will be deprecated in Astro-UI 2.0.0, use the `critical` variant instead.', {
-    isActive: props.variant === 'danger'
-  });
-  (0, _hooks.useDeprecationWarning)('The "text" variant for `Button` will be deprecated in Astro-UI 2.0.0, use the `link` variant instead.', {
-    isActive: props.variant === 'text'
-  });
+      isHovered: isHovered,
+      isPressed: isPressed,
+      isFocused: isFocusVisible,
+      isDisabled: isDisabled
+    }),
+    classNames = _useStatusClasses.classNames;
   var ariaLabel = props['aria-label'];
   (0, _hooks.useAriaLabelWarning)('Button', ariaLabel, variant === 'filter');
-  return (0, _react2.jsx)(_themeUi.Button, (0, _extends2["default"])({
+  return (0, _react2.jsx)(_interactions.Pressable, {
+    ref: buttonRef
+  }, (0, _react2.jsx)(_themeUi.Button, (0, _extends2["default"])({
     "aria-label": ariaLabel,
-    ref: buttonRef,
     className: classNames,
     role: "button",
     tx: "buttons",
@@ -133,7 +86,7 @@ var Button = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       alignItems: 'center'
     },
     variant: variant
-  }, others, (0, _utils.mergeProps)(_objectSpread(_objectSpread({}, buttonProps), {}, {
+  }, others, (0, _reactAria.mergeProps)(_objectSpread(_objectSpread({}, buttonProps), {}, {
     tabIndex: tabIndex
   }), hoverProps, focusProps)), isLoading ? (0, _react2.jsx)("span", {
     style: {
@@ -144,71 +97,59 @@ var Button = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     sx: {
       position: 'absolute'
     }
-  }));
+  })));
 });
 Button.propTypes = {
   /** Defines a string value that labels the current element. */
   'aria-label': _propTypes["default"].string,
-
   /** Whether the button is disabled. */
   isDisabled: _propTypes["default"].bool,
-
   /** Shows loader instead of children */
   isLoading: _propTypes["default"].bool,
-
   /**
    * Handler that is called when a hover interaction starts.
    * (e: HoverEvent) => void
    */
   onHoverStart: _propTypes["default"].func,
-
   /**
    * Handler that is called when a hover interaction ends.
    * (e: HoverEvent) => void
    */
   onHoverEnd: _propTypes["default"].func,
-
   /**
    * Handler that is called when the hover state changes.
    * (isHovering: boolean) => void
    */
   onHoverChange: _propTypes["default"].func,
-
   /**
    * Handler that is called when the press is released over the target.
    * (e: PressEvent) => void
    */
   onPress: _propTypes["default"].func,
-
   /**
    * Handler that is called when a press interaction starts.
    * (e: PressEvent) => void
    */
   onPressStart: _propTypes["default"].func,
-
   /**
    * Handler that is called when a press interaction ends, either over the target or when the
    * pointer leaves the target.
    * (e: PressEvent) => void
    */
   onPressEnd: _propTypes["default"].func,
-
   /**
    * Handler that is called when the press state changes.
    * (isPressed: boolean) => void
    */
   onPressChange: _propTypes["default"].func,
-
   /**
    * Handler that is called when a press is released over the target, regardless of whether it
    * started on the target or not.
    * (e: PressEvent) => void
    */
   onPressUp: _propTypes["default"].func,
-
   /** The styling variation of the button. */
   variant: _propTypes["default"].string,
-
   /** The focus variation of the button. */
   tabIndex: _propTypes["default"].number
 };

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

@@ -1,45 +1,31 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports["default"] = exports.TextIconButton = exports.InlineButton = exports.FilterButton = exports.Disabled = exports.Default = exports.ColorBlockButton = void 0;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _AddCircleIcon = _interopRequireDefault(require("mdi-react/AddCircleIcon"));
-
 var _CreateIcon = _interopRequireDefault(require("mdi-react/CreateIcon"));
-
 var _FilterIcon = _interopRequireDefault(require("mdi-react/FilterIcon"));
-
-var _variants = require("../../utils/devUtils/constants/variants");
-
 var _storybookDocsLayout = _interopRequireDefault(require("../../../.storybook/storybookDocsLayout"));
-
 var _index = require("../../index");
-
+var _variants = require("../../utils/devUtils/constants/variants");
 var _Button = _interopRequireDefault(require("./Button.mdx"));
-
 var _react2 = require("@emotion/react");
-
 var _excluded = ["isConfigured"];
 // removing the iconButton variants from this story.
 var variants = _variants.buttonVariants;
 delete variants.ICON;
 delete variants.ICON_BUTTON;
-delete variants.INVERTED; // add designer approved variants for devs to use here
+delete variants.INVERTED;
 
-var variantOptions = ['critical', 'danger', 'default', 'inline', 'inlinePrimary', 'link', 'primary', 'success', 'text'];
+// add designer approved variants for devs to use here
+var variantOptions = ['critical', 'default', 'inline', 'inlinePrimary', 'link', 'primary', 'success'];
 var _default = {
   title: 'Components/Button',
   component: _index.Button,
@@ -76,21 +62,16 @@ var _default = {
   }
 };
 exports["default"] = _default;
-
 var Default = function Default(args) {
   return (0, _react2.jsx)(_index.Button, args);
 };
-
 exports.Default = Default;
-
 var Disabled = function Disabled() {
   return (0, _react2.jsx)(_index.Button, {
     isDisabled: true
   }, "Button Text");
 };
-
 exports.Disabled = Disabled;
-
 var TextIconButton = function TextIconButton() {
   return (0, _react2.jsx)(_index.Button, {
     mb: "sm"
@@ -104,9 +85,7 @@ var TextIconButton = function TextIconButton() {
     size: 20
   }), "Add a Form"));
 };
-
 exports.TextIconButton = TextIconButton;
-
 var InlineButton = function InlineButton() {
   return (0, _react2.jsx)(_index.Box, null, (0, _react2.jsx)(_index.Button, {
     mb: "sm",
@@ -118,13 +97,11 @@ var InlineButton = function InlineButton() {
     variant: "inlinePrimary"
   }, "Inline primary"));
 };
-
 exports.InlineButton = InlineButton;
-
 var ColorBlockButton = function ColorBlockButton(args) {
   // Change `isConfigured` property in storybook controls
   var isConfigured = args.isConfigured,
-      props = (0, _objectWithoutProperties2["default"])(args, _excluded);
+    props = (0, _objectWithoutProperties2["default"])(args, _excluded);
   return (0, _react2.jsx)(_index.Button, (0, _extends2["default"])({}, props, {
     variant: "colorBlock",
     className: isConfigured ? 'is-configured' : ''
@@ -136,7 +113,6 @@ var ColorBlockButton = function ColorBlockButton(args) {
     icon: _CreateIcon["default"]
   }));
 };
-
 exports.ColorBlockButton = ColorBlockButton;
 ColorBlockButton.argTypes = {
   isConfigured: {
@@ -146,7 +122,6 @@ ColorBlockButton.argTypes = {
     defaultValue: false
   }
 };
-
 var FilterButton = function FilterButton() {
   return (0, _react2.jsx)(_index.Box, {
     p: "xx",
@@ -161,5 +136,4 @@ var FilterButton = function FilterButton() {
     icon: _FilterIcon["default"]
   })));
 };
-
 exports.FilterButton = FilterButton;

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

@@ -1,56 +1,39 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
-
 var _testAxe = _interopRequireDefault(require("../../utils/testUtils/testAxe"));
-
 var _testWrapper = require("../../utils/testUtils/testWrapper");
-
 var _ = _interopRequireDefault(require("."));
-
 var _react2 = require("@emotion/react");
-
 var testId = 'test-button';
 var defaultProps = {
   'data-testid': testId,
   'aria-label': 'Test button'
 };
-
 var getComponent = function getComponent() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return (0, _testWrapper.render)((0, _react2.jsx)(_["default"], (0, _extends2["default"])({}, 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.
 (0, _testAxe["default"])(getComponent);
 test('default button', function () {
   getComponent();
-
   var button = _testWrapper.screen.getByRole('button');
-
   expect(button).toHaveAttribute('data-testid', testId);
   expect(button).toBeInstanceOf(HTMLButtonElement);
   expect(button).toBeInTheDocument();
 });
 test('button hover', function () {
   getComponent();
-
   var button = _testWrapper.screen.getByRole('button');
-
   expect(button).not.toHaveClass('is-hovered');
-
   _userEvent["default"].hover(button);
-
   expect(button).toHaveClass('is-hovered');
-
   _userEvent["default"].unhover(button);
-
   expect(button).not.toHaveClass('is-hovered');
 });
 test('icon button press', function () {
@@ -58,18 +41,16 @@ test('icon button press', function () {
   getComponent({
     onPress: onPress
   });
-
   var button = _testWrapper.screen.getByRole('button');
-
   expect(button).not.toHaveClass('is-pressed');
-  expect(onPress).not.toHaveBeenCalled(); // Hold down the button to see pressed styles
+  expect(onPress).not.toHaveBeenCalled();
 
+  // Hold down the button to see pressed styles
   _testWrapper.fireEvent.mouseDown(button);
+  expect(button).toHaveClass('is-pressed');
 
-  expect(button).toHaveClass('is-pressed'); // Finish the click to fire the event handler
-
+  // Finish the click to fire the event handler
   _testWrapper.fireEvent.mouseUp(button);
-
   expect(button).not.toHaveClass('is-pressed');
   expect(onPress).toHaveBeenCalledTimes(1);
 });
@@ -78,23 +59,17 @@ test('keyboard icon button press', function () {
   getComponent({
     onPress: onPress
   });
-
   var button = _testWrapper.screen.getByRole('button');
-
   expect(onPress).not.toHaveBeenCalled();
-
   _testWrapper.fireEvent.keyDown(button, {
     key: 'Enter',
     code: 13
   });
-
   expect(button).toHaveClass('is-pressed');
-
   _testWrapper.fireEvent.keyUp(button, {
     key: 'Enter',
     code: 13
   });
-
   expect(button).not.toHaveClass('is-pressed');
   expect(onPress).toHaveBeenCalledTimes(1);
 });
@@ -104,9 +79,7 @@ test('button loading hides children and shows loader', function () {
     isLoading: true,
     children: textContent
   });
-
   var childWrapper = _testWrapper.screen.getByText(textContent);
-
   expect(childWrapper).toBeInTheDocument();
   expect(childWrapper).not.toBeVisible();
   expect(_testWrapper.screen.getByRole('alert')).toBeInTheDocument();
@@ -116,9 +89,7 @@ test('button renders children when not loading', function () {
   getComponent({
     children: textContent
   });
-
   var childWrapper = _testWrapper.screen.getByText(textContent);
-
   expect(childWrapper).toBeInTheDocument();
   expect(childWrapper).toBeVisible();
   expect(_testWrapper.screen.queryByRole('progressbar')).not.toBeInTheDocument();
@@ -127,19 +98,13 @@ test('color block button renders in default state', function () {
   getComponent({
     variant: 'colorBlock'
   });
-
   var button = _testWrapper.screen.getByRole('button');
-
   expect(button).toBeInTheDocument();
   expect(button).not.toHaveClass('is-configured');
-
   _userEvent["default"].tab();
-
   expect(button).toHaveClass('is-focused');
   expect(button).toHaveFocus();
-
   _userEvent["default"].tab();
-
   expect(button).not.toHaveClass('is-focused');
   expect(button).not.toHaveFocus();
 });
@@ -148,9 +113,7 @@ test('color block button renders in configured state', function () {
     variant: 'colorBlock',
     className: 'is-configured'
   });
-
   var button = _testWrapper.screen.getByRole('button');
-
   expect(button).toBeInTheDocument();
   expect(button).toHaveClass('is-configured');
 });