@pingux/astro 2.37.1-alpha.1 → 2.37.1-alpha.3

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

@@ -97,7 +97,7 @@ var InteractiveCard = function InteractiveCard() {
     height: '221px',
     justifyContent: 'center',
     textAlign: 'center',
-    width: '233px'
+    maxWidth: '233px'
   };
   return (0, _react2.jsx)(_index.Card, {
     onPress: function onPress() {
@@ -107,14 +107,9 @@ var InteractiveCard = function InteractiveCard() {
       return console.log('card hovered');
     },
     tabIndex: "0",
+    variant: "cards.interactive",
     sx: sx
-  }, "Interactive Card", (0, _react2.jsx)(_index.Button, {
-    variant: "inline",
-    mt: "md",
-    onPress: function onPress() {
-      return console.log('button pressed');
-    }
-  }, "Explore"));
+  }, "Interactive Card");
 };
 exports.InteractiveCard = InteractiveCard;
 InteractiveCard.parameters = {

package/lib/cjs/components/Card/Card.styles.js

@@ -1,10 +1,22 @@
 "use strict";
 
+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 _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+var _Buttons = require("../Button/Buttons.styles");
+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 container = {
   display: 'flex',
   boxShadow: '0px 1px 14px rgba(37, 55, 70, 0.15)',
@@ -15,7 +27,29 @@ var container = {
   flex: '1 1 0',
   p: 'lg'
 };
+var interactive = _objectSpread(_objectSpread({}, container), {}, {
+  boxShadow: '0px 1px 14px 0px rgba(37, 55, 70, 0.15)',
+  '&.is-hovered': {
+    bg: 'accent.99',
+    cursor: 'pointer'
+  },
+  '&.is-focused': _objectSpread({
+    bg: 'white'
+  }, _Buttons.defaultFocus),
+  '&.is-pressed': {
+    border: '1px solid',
+    borderColor: 'active',
+    boxShadow: '0 0 0 0 !important',
+    outline: 'none'
+  },
+  ':focus-visible:not(.is-focused)': {
+    outline: 'none',
+    border: '1px solid',
+    borderColor: 'active'
+  }
+});
 var _default = {
-  container: container
+  container: container,
+  interactive: interactive
 };
 exports["default"] = _default;

package/lib/cjs/components/NumberField/NumberField.js

@@ -106,6 +106,10 @@ var NumberField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var helperTextId = (0, _uuid.v4)();
   var updatedLabelProps = _objectSpread({}, (0, _reactAria.mergeProps)(fieldLabelProps, labelProps));
   var inputPropsValue = inputProps.value || 0;
+
+  // extract numeric value in case input value use units like '4 inches' or 'USD 45.00'
+  // aria-valuenow accept only number value type
+  var inputPropsNumericValue = typeof inputPropsValue === 'string' ? inputPropsValue.match(/[-]{0,1}[\d]*[.]{0,1}[\d]+/g)[0] : inputPropsValue;
   return (0, _react2.jsx)(_.Box, fieldContainerProps, (0, _react2.jsx)(_.Label, updatedLabelProps), (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
     variant: "forms.numberField.noDefaultArrows"
   }, groupProps), (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
@@ -113,7 +117,7 @@ var NumberField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, fieldControlWrapperProps, {
     role: "spinbutton",
     "aria-valuetext": inputPropsValue,
-    "aria-valuenow": inputPropsValue,
+    "aria-valuenow": inputPropsNumericValue,
     "aria-labelledby": updatedLabelProps.id
   }), (0, _react2.jsx)(_.Input, (0, _extends2["default"])({
     variant: "forms.input.numberField",

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

@@ -151,4 +151,29 @@ test('passing helper text should display it and correct aria attributes on input
   expect(helper).toHaveClass("is-".concat(_statuses["default"].ERROR));
   var helperTextID = helper.getAttribute('id');
   expect(_testWrapper.screen.getByRole('textbox')).toHaveAttribute('aria-describedby', helperTextID);
+});
+test('should extract numeric value from unit format and pass it to aria-valuenow', function () {
+  var numericValue = 45;
+  getComponent({
+    defaultValue: numericValue,
+    formatOptions: {
+      style: 'unit',
+      unit: 'kilogram',
+      unitDisplay: 'long'
+    }
+  });
+  expect(_testWrapper.screen.getByRole('spinbutton')).toHaveAttribute('aria-valuenow', String(numericValue));
+});
+test('should extract numeric value from currency format and pass it to aria-valuenow', function () {
+  var numericValue = 45;
+  getComponent({
+    defaultValue: numericValue,
+    formatOptions: {
+      style: 'currency',
+      currency: 'EUR',
+      currencyDisplay: 'code',
+      currencySign: 'accounting'
+    }
+  });
+  expect(_testWrapper.screen.getByRole('spinbutton')).toHaveAttribute('aria-valuenow', String(numericValue.toFixed(2)));
 });

package/lib/components/Card/Card.stories.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import React from 'react';
 import { withDesign } from 'storybook-addon-designs';
 import DocsLayout from '../../../.storybook/storybookDocsLayout';
-import { Box, Button, Card } from '../../index';
+import { Box, Card } from '../../index';
 import { FIGMA_LINKS } from '../../utils/designUtils/figmaLinks.ts';
 import CardReadme from './Card.mdx';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -86,7 +86,7 @@ export var InteractiveCard = function InteractiveCard() {
     height: '221px',
     justifyContent: 'center',
     textAlign: 'center',
-    width: '233px'
+    maxWidth: '233px'
   };
   return ___EmotionJSX(Card, {
     onPress: function onPress() {
@@ -96,14 +96,9 @@ export var InteractiveCard = function InteractiveCard() {
       return console.log('card hovered');
     },
     tabIndex: "0",
+    variant: "cards.interactive",
     sx: sx
-  }, "Interactive Card", ___EmotionJSX(Button, {
-    variant: "inline",
-    mt: "md",
-    onPress: function onPress() {
-      return console.log('button pressed');
-    }
-  }, "Explore"));
+  }, "Interactive Card");
 };
 InteractiveCard.parameters = {
   design: {

package/lib/components/Card/Card.styles.js

@@ -1,3 +1,15 @@
+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 _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 { defaultFocus } from '../Button/Buttons.styles';
 var container = {
   display: 'flex',
   boxShadow: '0px 1px 14px rgba(37, 55, 70, 0.15)',
@@ -8,6 +20,28 @@ var container = {
   flex: '1 1 0',
   p: 'lg'
 };
+var interactive = _objectSpread(_objectSpread({}, container), {}, {
+  boxShadow: '0px 1px 14px 0px rgba(37, 55, 70, 0.15)',
+  '&.is-hovered': {
+    bg: 'accent.99',
+    cursor: 'pointer'
+  },
+  '&.is-focused': _objectSpread({
+    bg: 'white'
+  }, defaultFocus),
+  '&.is-pressed': {
+    border: '1px solid',
+    borderColor: 'active',
+    boxShadow: '0 0 0 0 !important',
+    outline: 'none'
+  },
+  ':focus-visible:not(.is-focused)': {
+    outline: 'none',
+    border: '1px solid',
+    borderColor: 'active'
+  }
+});
 export default {
-  container: container
+  container: container,
+  interactive: interactive
 };

package/lib/components/NumberField/NumberField.js

@@ -95,6 +95,10 @@ var NumberField = /*#__PURE__*/forwardRef(function (props, ref) {
   var helperTextId = uuid();
   var updatedLabelProps = _objectSpread({}, mergeProps(fieldLabelProps, labelProps));
   var inputPropsValue = inputProps.value || 0;
+
+  // extract numeric value in case input value use units like '4 inches' or 'USD 45.00'
+  // aria-valuenow accept only number value type
+  var inputPropsNumericValue = typeof inputPropsValue === 'string' ? inputPropsValue.match(/[-]{0,1}[\d]*[.]{0,1}[\d]+/g)[0] : inputPropsValue;
   return ___EmotionJSX(Box, fieldContainerProps, ___EmotionJSX(Label, updatedLabelProps), ___EmotionJSX(Box, _extends({
     variant: "forms.numberField.noDefaultArrows"
   }, groupProps), ___EmotionJSX(Box, _extends({
@@ -102,7 +106,7 @@ var NumberField = /*#__PURE__*/forwardRef(function (props, ref) {
   }, fieldControlWrapperProps, {
     role: "spinbutton",
     "aria-valuetext": inputPropsValue,
-    "aria-valuenow": inputPropsValue,
+    "aria-valuenow": inputPropsNumericValue,
     "aria-labelledby": updatedLabelProps.id
   }), ___EmotionJSX(Input, _extends({
     variant: "forms.input.numberField",

package/lib/components/NumberField/NumberField.test.js

@@ -148,4 +148,29 @@ test('passing helper text should display it and correct aria attributes on input
   expect(helper).toHaveClass("is-".concat(statuses.ERROR));
   var helperTextID = helper.getAttribute('id');
   expect(screen.getByRole('textbox')).toHaveAttribute('aria-describedby', helperTextID);
+});
+test('should extract numeric value from unit format and pass it to aria-valuenow', function () {
+  var numericValue = 45;
+  getComponent({
+    defaultValue: numericValue,
+    formatOptions: {
+      style: 'unit',
+      unit: 'kilogram',
+      unitDisplay: 'long'
+    }
+  });
+  expect(screen.getByRole('spinbutton')).toHaveAttribute('aria-valuenow', String(numericValue));
+});
+test('should extract numeric value from currency format and pass it to aria-valuenow', function () {
+  var numericValue = 45;
+  getComponent({
+    defaultValue: numericValue,
+    formatOptions: {
+      style: 'currency',
+      currency: 'EUR',
+      currencyDisplay: 'code',
+      currencySign: 'accounting'
+    }
+  });
+  expect(screen.getByRole('spinbutton')).toHaveAttribute('aria-valuenow', String(numericValue.toFixed(2)));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "2.37.1-alpha.1",
+  "version": "2.37.1-alpha.3",
   "description": "React component library for Ping Identity's design system",
   "repository": {
     "type": "git",