@dxc-technology/halstack-react 0.0.0-4e1277a → 0.0.0-4e3dbad

package/dropdown/Dropdown.accessibility.test.js

@@ -0,0 +1,183 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _Dropdown = _interopRequireDefault(require("./Dropdown"));
+var iconSVG = /*#__PURE__*/_react["default"].createElement("svg", {
+  viewBox: "0 0 24 24",
+  height: "24",
+  width: "24",
+  fill: "currentColor"
+}, /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M0 0h24v24H0z",
+  fill: "none"
+}), /*#__PURE__*/_react["default"].createElement("path", {
+  d: "M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
+}));
+var iconUrl = "https://iconape.com/wp-content/files/yd/367773/svg/logo-linkedin-logo-icon-png-svg.png";
+
+// Mocking DOMRect for Radix Primitive Popover
+global.globalThis = global;
+global.DOMRect = {
+  fromRect: function fromRect() {
+    return {
+      top: 0,
+      left: 0,
+      bottom: 0,
+      right: 0,
+      width: 0,
+      height: 0
+    };
+  }
+};
+global.ResizeObserver = /*#__PURE__*/function () {
+  function ResizeObserver() {
+    (0, _classCallCheck2["default"])(this, ResizeObserver);
+  }
+  return (0, _createClass2["default"])(ResizeObserver, [{
+    key: "observe",
+    value: function observe() {}
+  }, {
+    key: "unobserve",
+    value: function unobserve() {}
+  }, {
+    key: "disconnect",
+    value: function disconnect() {}
+  }]);
+}();
+var options = [{
+  value: "1",
+  label: "Amazon",
+  icon: iconUrl
+}, {
+  value: "2",
+  label: "Ebay",
+  icon: iconUrl
+}, {
+  value: "3",
+  label: "Wallapop",
+  icon: iconSVG
+}, {
+  value: "4",
+  label: "Aliexpress",
+  icon: iconSVG
+}];
+describe("Dropdown component accessibility tests", function () {
+  it("Should not have basic accessibility issues", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, baseElement, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dropdown["default"], {
+            options: options,
+            label: "dropdown-test",
+            icon: iconSVG,
+            iconPosition: "before",
+            margin: "medium",
+            size: "medium",
+            optionsIconPosition: "before",
+            onSelectOption: function onSelectOption() {}
+          })), baseElement = _render.baseElement;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for disabled mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, baseElement, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dropdown["default"], {
+            options: options,
+            label: "dropdown-test",
+            icon: iconSVG,
+            iconPosition: "before",
+            margin: "medium",
+            size: "medium",
+            optionsIconPosition: "before",
+            onSelectOption: function onSelectOption() {},
+            disabled: true
+          })), baseElement = _render2.baseElement;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it("Should not have basic accessibility issues for caret-hidden mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _render3, baseElement, results;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dropdown["default"], {
+            options: options,
+            label: "dropdown-test",
+            icon: iconSVG,
+            iconPosition: "after",
+            margin: "medium",
+            size: "medium",
+            optionsIconPosition: "after",
+            onSelectOption: function onSelectOption() {},
+            caretHidden: true
+          })), baseElement = _render3.baseElement;
+          _context3.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context3.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  it("Should not have basic accessibility issues for expand-on-hover mode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _render4, baseElement, results;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          // baseElement is needed when using React Portals
+          _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dropdown["default"], {
+            options: options,
+            label: "dropdown-test",
+            icon: iconSVG,
+            iconPosition: "after",
+            margin: "medium",
+            size: "medium",
+            optionsIconPosition: "after",
+            onSelectOption: function onSelectOption() {},
+            expandOnHover: true
+          })), baseElement = _render4.baseElement;
+          _context4.next = 3;
+          return (0, _axeHelper.axe)(baseElement);
+        case 3:
+          results = _context4.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
+});

package/dropdown/Dropdown.js

@@ -14,56 +14,13 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _variables = require("../common/variables");
 var _utils = require("../common/utils");
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-var _uuid = require("uuid");
 var Popover = _interopRequireWildcard(require("@radix-ui/react-popover"));
 var _DropdownMenu = _interopRequireDefault(require("./DropdownMenu"));
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _useWidth = _interopRequireDefault(require("../utils/useWidth"));
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var upArrowIcon = /*#__PURE__*/_react["default"].createElement("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  width: "24",
-  height: "24",
-  viewBox: "0 0 24 24",
-  fill: "currentColor"
-}, /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M7 14l5-5 5 5z"
-}), /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M0 0h24v24H0z",
-  fill: "none"
-}));
-var downArrowIcon = /*#__PURE__*/_react["default"].createElement("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  width: "24",
-  height: "24",
-  viewBox: "0 0 24 24",
-  fill: "currentColor"
-}, /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M7 10l5 5 5-5z"
-}), /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M0 0h24v24H0z",
-  fill: "none"
-}));
-var useWidth = function useWidth(target) {
-  var _useState = (0, _react.useState)(0),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    width = _useState2[0],
-    setWidth = _useState2[1];
-  (0, _react.useEffect)(function () {
-    if (target != null) {
-      setWidth(target.getBoundingClientRect().width);
-      var triggerObserver = new ResizeObserver(function (entries) {
-        var rect = entries[0].target.getBoundingClientRect();
-        setWidth(rect === null || rect === void 0 ? void 0 : rect.width);
-      });
-      triggerObserver.observe(target);
-      return function () {
-        triggerObserver.unobserve(target);
-      };
-    }
-  }, [target]);
-  return width;
-};
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var DxcDropdown = function DxcDropdown(_ref) {
   var options = _ref.options,
     _ref$optionsIconPosit = _ref.optionsIconPosition,
@@ -85,22 +42,21 @@ var DxcDropdown = function DxcDropdown(_ref) {
     size = _ref$size === void 0 ? "fitContent" : _ref$size,
     _ref$tabIndex = _ref.tabIndex,
     tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
-  var _useState3 = (0, _react.useState)("trigger-".concat((0, _uuid.v4)())),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
-    triggerId = _useState4[0];
-  var menuId = "menu-".concat(triggerId);
-  var _useState5 = (0, _react.useState)(false),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    isOpen = _useState6[0],
-    changeIsOpen = _useState6[1];
-  var _useState7 = (0, _react.useState)(0),
-    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    visualFocusIndex = _useState8[0],
-    setVisualFocusIndex = _useState8[1];
+  var id = (0, _react.useId)();
+  var triggerId = "trigger-".concat(id);
+  var menuId = "menu-".concat(id);
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    isOpen = _useState2[0],
+    changeIsOpen = _useState2[1];
+  var _useState3 = (0, _react.useState)(0),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    visualFocusIndex = _useState4[0],
+    setVisualFocusIndex = _useState4[1];
   var colorsTheme = (0, _useTheme["default"])();
   var triggerRef = (0, _react.useRef)(null);
   var menuRef = (0, _react.useRef)(null);
-  var width = useWidth(triggerRef.current);
+  var width = (0, _useWidth["default"])(triggerRef.current);
   var handleOnOpenMenu = function handleOnOpenMenu() {
     changeIsOpen(true);
   };
@@ -172,6 +128,7 @@ var DxcDropdown = function DxcDropdown(_ref) {
       case "Esc":
       case "Escape":
         event.preventDefault();
+        isOpen && event.stopPropagation();
         handleOnCloseMenu();
         (_triggerRef$current2 = triggerRef.current) === null || _triggerRef$current2 === void 0 ? void 0 : _triggerRef$current2.focus();
         break;
@@ -224,18 +181,22 @@ var DxcDropdown = function DxcDropdown(_ref) {
     size: size,
     id: triggerId,
     "aria-haspopup": "true",
-    "aria-controls": menuId,
+    "aria-controls": isOpen ? menuId : undefined,
     "aria-expanded": isOpen ? true : undefined,
+    "aria-label": "Show options",
     tabIndex: tabIndex,
     ref: triggerRef
   }, /*#__PURE__*/_react["default"].createElement(DropdownTriggerContent, null, label && iconPosition === "after" && /*#__PURE__*/_react["default"].createElement(DropdownTriggerLabel, null, label), icon && /*#__PURE__*/_react["default"].createElement(DropdownTriggerIcon, {
     disabled: disabled,
-    role: typeof icon === "string" ? undefined : "img"
-  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
-    src: icon
+    role: typeof icon === "string" ? undefined : "img",
+    "aria-hidden": true
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: icon
   }) : icon), label && iconPosition === "before" && /*#__PURE__*/_react["default"].createElement(DropdownTriggerLabel, null, label)), !caretHidden && /*#__PURE__*/_react["default"].createElement(CaretIcon, {
     disabled: disabled
-  }, isOpen ? upArrowIcon : downArrowIcon))), /*#__PURE__*/_react["default"].createElement(Popover.Portal, null, /*#__PURE__*/_react["default"].createElement(Popover.Content, {
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: isOpen ? "arrow_drop_up" : "arrow_drop_down"
+  }), " "))), /*#__PURE__*/_react["default"].createElement(Popover.Portal, null, /*#__PURE__*/_react["default"].createElement(Popover.Content, {
     asChild: true,
     sideOffset: 1
   }, /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
@@ -319,18 +280,22 @@ var DropdownTriggerLabel = _styledComponents["default"].span(_templateObject4 ||
 }, function (props) {
   return props.theme.buttonFontWeight;
 });
-var DropdownTriggerIcon = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  color: ", ";\n\n  img,\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
+var DropdownTriggerIcon = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  color: ", ";\n  font-size: ", ";\n\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.buttonIconColor;
 }, function (props) {
   return props.theme.buttonIconSize;
 }, function (props) {
   return props.theme.buttonIconSize;
+}, function (props) {
+  return props.theme.buttonIconSize;
 });
-var CaretIcon = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  color: ", ";\n\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
+var CaretIcon = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  color: ", ";\n  font-size: ", ";\n\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
   return props.disabled ? props.theme.disabledColor : props.theme.caretIconColor;
 }, function (props) {
   return props.theme.caretIconSize;
 }, function (props) {
   return props.theme.caretIconSize;
+}, function (props) {
+  return props.theme.caretIconSize;
 });
 var _default = exports["default"] = DxcDropdown;

package/dropdown/Dropdown.stories.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { userEvent, within } from "@storybook/testing-library";
+import { userEvent, within } from "@storybook/test";
 import DxcDropdown from "./Dropdown";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
@@ -15,11 +15,6 @@ export default {
   component: DxcDropdown,
 };
 
-const hamburguerIcon = (
-  <svg xmlns="http://www.w3.org/2000/svg" height="20" width="20">
-    <path d="M3 14.5V13h14v1.5Zm0-3.75v-1.5h14v1.5ZM3 7V5.5h14V7Z" />
-  </svg>
-);
 const iconSVG = (
   <svg viewBox="0 0 24 24" height="24" width="24" fill="currentColor">
     <path d="M0 0h24v24H0z" fill="none" />
@@ -31,8 +26,7 @@ const iconSVGLarge = (
     <path d="M11 44q-1.2 0-2.1-.9Q8 42.2 8 41V15q0-1.2.9-2.1.9-.9 2.1-.9h5.5v-.5q0-3.15 2.175-5.325Q20.85 4 24 4q3.15 0 5.325 2.175Q31.5 8.35 31.5 11.5v.5H37q1.2 0 2.1.9.9.9.9 2.1v26q0 1.2-.9 2.1-.9.9-2.1.9Zm0-3h26V15h-5.5v4.5q0 .65-.425 1.075Q30.65 21 30 21q-.65 0-1.075-.425-.425-.425-.425-1.075V15h-9v4.5q0 .65-.425 1.075Q18.65 21 18 21q-.65 0-1.075-.425-.425-.425-.425-1.075V15H11v26Zm8.5-29h9v-.5q0-1.9-1.3-3.2Q25.9 7 24 7q-1.9 0-3.2 1.3-1.3 1.3-1.3 3.2ZM11 41V15v26Z" />
   </svg>
 );
-const iconUrl = "https://iconape.com/wp-content/files/yd/367773/svg/logo-linkedin-logo-icon-png-svg.png";
-const icons = [iconSVG, iconSVGLarge, iconUrl];
+const icons = [iconSVG, iconSVGLarge, "nutrition"];
 
 const defaultOptions: Option[] = [
   {
@@ -86,7 +80,7 @@ const optionWithIcon: Option[] = [
   {
     value: "1",
     label: "Ebay",
-    icon: iconUrl,
+    icon: "shopping_cart",
   },
 ];
 
@@ -136,7 +130,7 @@ const Dropdown = () => (
         label="Icon after"
         options={options}
         onSelectOption={(value) => {}}
-        icon="https://iconape.com/wp-content/files/yd/367773/svg/logo-linkedin-logo-icon-png-svg.png"
+        icon="shopping_cart"
         iconPosition="after"
       />
     </ExampleContainer>
@@ -146,7 +140,7 @@ const Dropdown = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Only icon without caret" theme="light" level={4} />
-      <DxcDropdown options={options} onSelectOption={(value) => {}} icon={hamburguerIcon} caretHidden />
+      <DxcDropdown options={options} onSelectOption={(value) => {}} icon="menu" caretHidden />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large icon (SVG)" theme="light" level={4} />
@@ -154,12 +148,7 @@ const Dropdown = () => (
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large icon (image)" theme="light" level={4} />
-      <DxcDropdown
-        label="Large icon"
-        options={options}
-        onSelectOption={(value) => {}}
-        icon="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b2/Hamburger_icon.svg/2048px-Hamburger_icon.svg.png"
-      />
+      <DxcDropdown label="Large icon" options={options} onSelectOption={(value) => {}} icon="menu" />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled with icon" theme="light" level={4} />
@@ -292,8 +281,8 @@ const DropdownListStates = () => {
         <ExampleContainer pseudoState="pseudo-hover">
           <Title title="Hovered option" theme="light" level={4} />
           <DropdownMenu
-            id="x"
-            dropdownTriggerId="dtx"
+            id="x1"
+            dropdownTriggerId="dtx1"
             iconsPosition="before"
             visualFocusIndex={-1}
             menuItemOnClick={(value) => {}}
@@ -305,8 +294,8 @@ const DropdownListStates = () => {
         <ExampleContainer pseudoState="pseudo-active">
           <Title title="Active option" theme="light" level={4} />
           <DropdownMenu
-            id="x"
-            dropdownTriggerId="dtx"
+            id="x2"
+            dropdownTriggerId="dtx2"
             iconsPosition="before"
             visualFocusIndex={-1}
             menuItemOnClick={(value) => {}}
@@ -318,8 +307,8 @@ const DropdownListStates = () => {
         <ExampleContainer>
           <Title title="Focused option" theme="light" level={4} />
           <DropdownMenu
-            id="x"
-            dropdownTriggerId="dtx"
+            id="x3"
+            dropdownTriggerId="dtx3"
             iconsPosition="before"
             visualFocusIndex={0}
             menuItemOnClick={(value) => {}}
@@ -332,8 +321,8 @@ const DropdownListStates = () => {
         <ExampleContainer>
           <Title title="Before" theme="light" level={4} />
           <DropdownMenu
-            id="x"
-            dropdownTriggerId="dtx"
+            id="x4"
+            dropdownTriggerId="dtx4"
             iconsPosition="before"
             visualFocusIndex={-1}
             menuItemOnClick={(value) => {}}
@@ -343,8 +332,8 @@ const DropdownListStates = () => {
           />
           <Title title="After" theme="light" level={4} />
           <DropdownMenu
-            id="x"
-            dropdownTriggerId="dtx"
+            id="x5"
+            dropdownTriggerId="dtx5"
             iconsPosition="after"
             visualFocusIndex={-1}
             menuItemOnClick={(value) => {}}

package/dropdown/Dropdown.test.d.ts

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