@pingux/astro 1.25.1-alpha.9 → 1.25.1

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

@@ -280,5 +280,24 @@ test('adds focus to inputs', function () {
   _userEvent["default"].click(secondInput);
 
   expect(firstInput).not.toHaveFocus();
+  expect(secondInput).toHaveFocus();
+});
+test('adds focus to input on a single click after onBlur', function () {
+  getComponentWithTextFields();
+
+  var firstInput = _testWrapper.screen.getAllByRole('gridcell')[0];
+
+  var secondInput = _testWrapper.screen.getAllByRole('gridcell')[1];
+
+  expect(secondInput).not.toHaveFocus();
+
+  _userEvent["default"].click(firstInput);
+
+  _userEvent["default"].click(secondInput);
+
+  secondInput.blur();
+
+  _userEvent["default"].click(secondInput);
+
   expect(secondInput).toHaveFocus();
 });

package/lib/cjs/components/AccordionGridItem/AccordionGridItemBody.js

@@ -90,7 +90,6 @@ var AccordionGridItemBody = /*#__PURE__*/(0, _react.forwardRef)(function (props,
   var ariaLabel = props['aria-label'];
   delete mergedProps.onMouseDown;
   delete mergedProps.onPointerDown;
-  delete mergedProps.onClick;
   return (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
     as: "div",
     variant: "accordion.accordionGridBody",

package/lib/cjs/components/PasswordField/PasswordField.js

@@ -56,33 +56,29 @@ var _overlays = require("@react-aria/overlays");
 
 var _utils = require("@react-aria/utils");
 
-var _useField2 = _interopRequireDefault(require("../../hooks/useField"));
-
-var _useProgressiveState3 = _interopRequireDefault(require("../../hooks/useProgressiveState"));
+var hooks = _interopRequireWildcard(require("../../hooks"));
 
 var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
 
-var _hooks = require("../../hooks");
-
 var _Box = _interopRequireDefault(require("../Box"));
 
 var _FieldHelperText = _interopRequireDefault(require("../FieldHelperText"));
 
-var _Input = _interopRequireDefault(require("../Input"));
-
-var _Label = _interopRequireDefault(require("../Label"));
-
 var _Icon = _interopRequireDefault(require("../Icon"));
 
 var _IconButton = _interopRequireDefault(require("../IconButton"));
 
+var _Input = _interopRequireDefault(require("../Input"));
+
+var _Label = _interopRequireDefault(require("../Label"));
+
 var _PopoverContainer = _interopRequireDefault(require("../PopoverContainer"));
 
 var _RequirementsList = _interopRequireDefault(require("../RequirementsList"));
 
 var _react2 = require("@emotion/react");
 
-var _excluded = ["helperText", "isVisible", "onVisibleChange", "slots", "status", "viewHiddenIconTestId", "viewIconTestId", "requirements"];
+var _excluded = ["helperText", "isVisible", "onVisibleChange", "requirements", "slots", "status", "viewHiddenIconTestId", "viewIconTestId"];
 
 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); }
 
@@ -92,18 +88,23 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+var ARIA_LABELS_FOR_SHOW_PASSWORD_TOGGLE = {
+  HIDE: 'hide password',
+  SHOW: 'show password'
+};
 /**
   * Combines a text input, label, IconButton and helper text for a complete, form-ready solution.
  */
+
 var PasswordField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var helperText = props.helperText,
       isVisibleProp = props.isVisible,
       onVisibleChangeProp = props.onVisibleChange,
+      requirements = props.requirements,
       slots = props.slots,
       status = props.status,
       viewHiddenIconTestId = props.viewHiddenIconTestId,
       viewIconTestId = props.viewIconTestId,
-      requirements = props.requirements,
       others = (0, _objectWithoutProperties2["default"])(props, _excluded);
 
   var checkRequirements = function checkRequirements() {
@@ -112,41 +113,27 @@ var PasswordField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }).length > 0;
   };
 
-  var _useField = (0, _useField2["default"])(_objectSpread({
+  var _hooks$useField = hooks.useField(_objectSpread({
     status: status
   }, others)),
-      fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlProps = _useField.fieldControlProps,
-      fieldLabelProps = _useField.fieldLabelProps;
+      fieldContainerProps = _hooks$useField.fieldContainerProps,
+      fieldControlProps = _hooks$useField.fieldControlProps,
+      fieldLabelProps = _hooks$useField.fieldLabelProps;
 
   var isFocused = fieldControlProps.isFocused;
   var inputRef = (0, _react.useRef)();
   var popoverRef = (0, _react.useRef)();
-  (0, _hooks.usePropWarning)(props, 'disabled', 'isDisabled');
+  hooks.usePropWarning(props, 'disabled', 'isDisabled');
   /* istanbul ignore next */
 
   (0, _react.useImperativeHandle)(ref, function () {
     return inputRef.current;
   });
 
-  var _useProgressiveState = (0, _useProgressiveState3["default"])(isVisibleProp, onVisibleChangeProp),
-      _useProgressiveState2 = (0, _slicedToArray2["default"])(_useProgressiveState, 2),
-      isVisible = _useProgressiveState2[0],
-      setIsShown = _useProgressiveState2[1];
-
-  var onVisibleChange = function onVisibleChange() {
-    setIsShown(!isVisible);
-
-    if (onVisibleChangeProp) {
-      var _context;
-
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-
-      onVisibleChangeProp.apply(void 0, (0, _concat["default"])(_context = [!isVisible]).call(_context, args));
-    }
-  }; // Measure the width of the input to inform the width of the menu (below).
+  var _hooks$useProgressive = hooks.useProgressiveState(isVisibleProp, onVisibleChangeProp),
+      _hooks$useProgressive2 = (0, _slicedToArray2["default"])(_hooks$useProgressive, 2),
+      isVisible = _hooks$useProgressive2[0],
+      setIsShown = _hooks$useProgressive2[1]; // Measure the width of the input to inform the width of the menu (below).
 
 
   var _useState = (0, _react.useState)(null),
@@ -167,10 +154,10 @@ var PasswordField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _utils.useLayoutEffect)(onResize, [onResize]);
 
   var _useOverlayPosition = (0, _overlays.useOverlayPosition)({
-    targetRef: inputRef,
+    isOpen: true,
     overlayRef: popoverRef,
     placement: 'bottom end',
-    isOpen: true
+    targetRef: inputRef
   }),
       overlayProps = _useOverlayPosition.overlayProps,
       placement = _useOverlayPosition.placement,
@@ -184,15 +171,31 @@ var PasswordField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, [isFocused, updatePosition]);
 
-  var style = _objectSpread(_objectSpread({}, overlayProps.style), {}, {
-    width: menuWidth,
-    minWidth: menuWidth
-  });
+  var style = _objectSpread({
+    minWidth: menuWidth,
+    width: menuWidth
+  }, overlayProps.style);
 
-  var _useStatusClasses = (0, _hooks.useStatusClasses)(fieldControlProps.className, {
+  var _hooks$useStatusClass = hooks.useStatusClasses(fieldControlProps.className, {
     'is-success': status === _statuses["default"].SUCCESS || checkRequirements() && requirements.length > 0
   }),
-      classNames = _useStatusClasses.classNames;
+      classNames = _hooks$useStatusClass.classNames;
+
+  var toggleShowPasswordAriaLabel = isVisible ? ARIA_LABELS_FOR_SHOW_PASSWORD_TOGGLE.HIDE : ARIA_LABELS_FOR_SHOW_PASSWORD_TOGGLE.SHOW;
+
+  var handleToggleShowPassword = function handleToggleShowPassword() {
+    setIsShown(!isVisible);
+
+    if (onVisibleChangeProp) {
+      var _context;
+
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+
+      onVisibleChangeProp.apply(void 0, (0, _concat["default"])(_context = [!isVisible]).call(_context, args));
+    }
+  };
 
   return (0, _react2.jsx)(_react["default"].Fragment, null, (0, _react2.jsx)(_Box["default"], (0, _extends2["default"])({
     variant: "forms.input.wrapper"
@@ -211,23 +214,23 @@ var PasswordField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   })), (0, _react2.jsx)(_Box["default"], {
     variant: "forms.input.containedIcon"
   }, (0, _react2.jsx)(_IconButton["default"], {
-    "aria-label": "visible-icon",
+    "aria-label": toggleShowPasswordAriaLabel,
     isDisabled: fieldControlProps.disabled,
-    size: 28,
-    onPress: onVisibleChange
+    onPress: handleToggleShowPassword,
+    size: 28
   }, (0, _react2.jsx)(_Icon["default"], {
     "data-testid": isVisible ? viewIconTestId : viewHiddenIconTestId,
     icon: isVisible ? _EyeOutlineIcon["default"] : _EyeOffOutlineIcon["default"]
   }))), slots === null || slots === void 0 ? void 0 : slots.inContainer), helperText && (0, _react2.jsx)(_FieldHelperText["default"], {
     status: status
   }, helperText)), (0, _react2.jsx)(_PopoverContainer["default"], {
-    isOpen: isFocused && requirements && (0, _isArray["default"])(requirements) && !checkRequirements(),
-    ref: popoverRef,
-    placement: placement,
-    style: style,
     hasNoArrow: true,
+    isDismissable: false,
     isNonModal: true,
-    isDismissable: false
+    isOpen: isFocused && requirements && (0, _isArray["default"])(requirements) && !checkRequirements(),
+    placement: placement,
+    ref: popoverRef,
+    style: style
   }, (0, _react2.jsx)(_RequirementsList["default"], {
     requirements: requirements
   })));
@@ -340,9 +343,9 @@ PasswordField.defaultProps = {
   isDisabled: false,
   isReadOnly: false,
   isRequired: false,
-  type: 'password',
+  requirements: [],
   status: _statuses["default"].DEFAULT,
-  requirements: []
+  type: 'password'
 };
 PasswordField.displayName = 'PasswordField';
 var _default = PasswordField;

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

@@ -212,4 +212,15 @@ test('adds focus to inputs', function () {
   userEvent.click(secondInput);
   expect(firstInput).not.toHaveFocus();
   expect(secondInput).toHaveFocus();
+});
+test('adds focus to input on a single click after onBlur', function () {
+  getComponentWithTextFields();
+  var firstInput = screen.getAllByRole('gridcell')[0];
+  var secondInput = screen.getAllByRole('gridcell')[1];
+  expect(secondInput).not.toHaveFocus();
+  userEvent.click(firstInput);
+  userEvent.click(secondInput);
+  secondInput.blur();
+  userEvent.click(secondInput);
+  expect(secondInput).toHaveFocus();
 });

package/lib/components/AccordionGridItem/AccordionGridItemBody.js

@@ -55,7 +55,6 @@ var AccordionGridItemBody = /*#__PURE__*/forwardRef(function (props, ref) {
   var ariaLabel = props['aria-label'];
   delete mergedProps.onMouseDown;
   delete mergedProps.onPointerDown;
-  delete mergedProps.onClick;
   return ___EmotionJSX(Box, _extends({
     as: "div",
     variant: "accordion.accordionGridBody",

package/lib/components/PasswordField/PasswordField.js

@@ -13,7 +13,7 @@ import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-var _excluded = ["helperText", "isVisible", "onVisibleChange", "slots", "status", "viewHiddenIconTestId", "viewIconTestId", "requirements"];
+var _excluded = ["helperText", "isVisible", "onVisibleChange", "requirements", "slots", "status", "viewHiddenIconTestId", "viewIconTestId"];
 
 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; }
 
@@ -25,32 +25,34 @@ import EyeIcon from 'mdi-react/EyeOutlineIcon';
 import EyeOffIcon from 'mdi-react/EyeOffOutlineIcon';
 import { useOverlayPosition } from '@react-aria/overlays';
 import { useLayoutEffect, useResizeObserver } from '@react-aria/utils';
-import useField from '../../hooks/useField';
-import useProgressiveState from '../../hooks/useProgressiveState';
+import * as hooks from '../../hooks';
 import statuses from '../../utils/devUtils/constants/statuses';
-import { usePropWarning, useStatusClasses } from '../../hooks';
 import Box from '../Box';
 import FieldHelperText from '../FieldHelperText';
-import Input from '../Input';
-import Label from '../Label';
 import Icon from '../Icon';
 import IconButton from '../IconButton';
+import Input from '../Input';
+import Label from '../Label';
 import PopoverContainer from '../PopoverContainer';
 import RequirementsList from '../RequirementsList';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+var ARIA_LABELS_FOR_SHOW_PASSWORD_TOGGLE = {
+  HIDE: 'hide password',
+  SHOW: 'show password'
+};
 /**
   * Combines a text input, label, IconButton and helper text for a complete, form-ready solution.
  */
 
-import { jsx as ___EmotionJSX } from "@emotion/react";
 var PasswordField = /*#__PURE__*/forwardRef(function (props, ref) {
   var helperText = props.helperText,
       isVisibleProp = props.isVisible,
       onVisibleChangeProp = props.onVisibleChange,
+      requirements = props.requirements,
       slots = props.slots,
       status = props.status,
       viewHiddenIconTestId = props.viewHiddenIconTestId,
       viewIconTestId = props.viewIconTestId,
-      requirements = props.requirements,
       others = _objectWithoutProperties(props, _excluded);
 
   var checkRequirements = function checkRequirements() {
@@ -59,41 +61,27 @@ var PasswordField = /*#__PURE__*/forwardRef(function (props, ref) {
     }).length > 0;
   };
 
-  var _useField = useField(_objectSpread({
+  var _hooks$useField = hooks.useField(_objectSpread({
     status: status
   }, others)),
-      fieldContainerProps = _useField.fieldContainerProps,
-      fieldControlProps = _useField.fieldControlProps,
-      fieldLabelProps = _useField.fieldLabelProps;
+      fieldContainerProps = _hooks$useField.fieldContainerProps,
+      fieldControlProps = _hooks$useField.fieldControlProps,
+      fieldLabelProps = _hooks$useField.fieldLabelProps;
 
   var isFocused = fieldControlProps.isFocused;
   var inputRef = useRef();
   var popoverRef = useRef();
-  usePropWarning(props, 'disabled', 'isDisabled');
+  hooks.usePropWarning(props, 'disabled', 'isDisabled');
   /* istanbul ignore next */
 
   useImperativeHandle(ref, function () {
     return inputRef.current;
   });
 
-  var _useProgressiveState = useProgressiveState(isVisibleProp, onVisibleChangeProp),
-      _useProgressiveState2 = _slicedToArray(_useProgressiveState, 2),
-      isVisible = _useProgressiveState2[0],
-      setIsShown = _useProgressiveState2[1];
-
-  var onVisibleChange = function onVisibleChange() {
-    setIsShown(!isVisible);
-
-    if (onVisibleChangeProp) {
-      var _context;
-
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-
-      onVisibleChangeProp.apply(void 0, _concatInstanceProperty(_context = [!isVisible]).call(_context, args));
-    }
-  }; // Measure the width of the input to inform the width of the menu (below).
+  var _hooks$useProgressive = hooks.useProgressiveState(isVisibleProp, onVisibleChangeProp),
+      _hooks$useProgressive2 = _slicedToArray(_hooks$useProgressive, 2),
+      isVisible = _hooks$useProgressive2[0],
+      setIsShown = _hooks$useProgressive2[1]; // Measure the width of the input to inform the width of the menu (below).
 
 
   var _useState = useState(null),
@@ -114,10 +102,10 @@ var PasswordField = /*#__PURE__*/forwardRef(function (props, ref) {
   useLayoutEffect(onResize, [onResize]);
 
   var _useOverlayPosition = useOverlayPosition({
-    targetRef: inputRef,
+    isOpen: true,
     overlayRef: popoverRef,
     placement: 'bottom end',
-    isOpen: true
+    targetRef: inputRef
   }),
       overlayProps = _useOverlayPosition.overlayProps,
       placement = _useOverlayPosition.placement,
@@ -131,15 +119,31 @@ var PasswordField = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, [isFocused, updatePosition]);
 
-  var style = _objectSpread(_objectSpread({}, overlayProps.style), {}, {
-    width: menuWidth,
-    minWidth: menuWidth
-  });
+  var style = _objectSpread({
+    minWidth: menuWidth,
+    width: menuWidth
+  }, overlayProps.style);
 
-  var _useStatusClasses = useStatusClasses(fieldControlProps.className, {
+  var _hooks$useStatusClass = hooks.useStatusClasses(fieldControlProps.className, {
     'is-success': status === statuses.SUCCESS || checkRequirements() && requirements.length > 0
   }),
-      classNames = _useStatusClasses.classNames;
+      classNames = _hooks$useStatusClass.classNames;
+
+  var toggleShowPasswordAriaLabel = isVisible ? ARIA_LABELS_FOR_SHOW_PASSWORD_TOGGLE.HIDE : ARIA_LABELS_FOR_SHOW_PASSWORD_TOGGLE.SHOW;
+
+  var handleToggleShowPassword = function handleToggleShowPassword() {
+    setIsShown(!isVisible);
+
+    if (onVisibleChangeProp) {
+      var _context;
+
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+
+      onVisibleChangeProp.apply(void 0, _concatInstanceProperty(_context = [!isVisible]).call(_context, args));
+    }
+  };
 
   return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(Box, _extends({
     variant: "forms.input.wrapper"
@@ -158,23 +162,23 @@ var PasswordField = /*#__PURE__*/forwardRef(function (props, ref) {
   })), ___EmotionJSX(Box, {
     variant: "forms.input.containedIcon"
   }, ___EmotionJSX(IconButton, {
-    "aria-label": "visible-icon",
+    "aria-label": toggleShowPasswordAriaLabel,
     isDisabled: fieldControlProps.disabled,
-    size: 28,
-    onPress: onVisibleChange
+    onPress: handleToggleShowPassword,
+    size: 28
   }, ___EmotionJSX(Icon, {
     "data-testid": isVisible ? viewIconTestId : viewHiddenIconTestId,
     icon: isVisible ? EyeIcon : EyeOffIcon
   }))), slots === null || slots === void 0 ? void 0 : slots.inContainer), helperText && ___EmotionJSX(FieldHelperText, {
     status: status
   }, helperText)), ___EmotionJSX(PopoverContainer, {
-    isOpen: isFocused && requirements && _Array$isArray(requirements) && !checkRequirements(),
-    ref: popoverRef,
-    placement: placement,
-    style: style,
     hasNoArrow: true,
+    isDismissable: false,
     isNonModal: true,
-    isDismissable: false
+    isOpen: isFocused && requirements && _Array$isArray(requirements) && !checkRequirements(),
+    placement: placement,
+    ref: popoverRef,
+    style: style
   }, ___EmotionJSX(RequirementsList, {
     requirements: requirements
   })));
@@ -287,9 +291,9 @@ PasswordField.defaultProps = {
   isDisabled: false,
   isReadOnly: false,
   isRequired: false,
-  type: 'password',
+  requirements: [],
   status: statuses.DEFAULT,
-  requirements: []
+  type: 'password'
 };
 PasswordField.displayName = 'PasswordField';
 export default PasswordField;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "1.25.1-alpha.9",
+  "version": "1.25.1",
   "description": "PingUX themeable React component library",
   "author": "ux-development@pingidentity.com",
   "license": "Apache-2.0",