@dxc-technology/halstack-react 0.0.0-509f1eb → 0.0.0-50acff4

package/dropdown/Dropdown.js

@@ -14,36 +14,12 @@ 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 _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"
-}));
+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 useWidth = function useWidth(target) {
   var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -85,18 +61,17 @@ 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),
+  var id = (0, _react.useId)();
+  var triggerId = "trigger-".concat(id);
+  var menuId = "menu-".concat(id);
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    isOpen = _useState4[0],
+    changeIsOpen = _useState4[1];
+  var _useState5 = (0, _react.useState)(0),
     _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];
+    visualFocusIndex = _useState6[0],
+    setVisualFocusIndex = _useState6[1];
   var colorsTheme = (0, _useTheme["default"])();
   var triggerRef = (0, _react.useRef)(null);
   var menuRef = (0, _react.useRef)(null);
@@ -172,6 +147,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 +200,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"], {
@@ -263,7 +243,7 @@ var sizes = {
 var calculateWidth = function calculateWidth(margin, size) {
   return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
-var DropdownContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-block;\n  width: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
+var DropdownContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
@@ -276,18 +256,20 @@ var DropdownContainer = _styledComponents["default"].div(_templateObject || (_te
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
-var DropdownTrigger = _styledComponents["default"].button(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  gap: ", ";\n  width: 100%;\n  min-height: 40px;\n  min-width: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  background-color: ", ";\n  color: ", ";\n  cursor: ", ";\n\n  ", ";\n"])), function (props) {
+var DropdownTrigger = _styledComponents["default"].button(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  gap: ", ";\n  width: 100%;\n  height: ", ";\n  min-width: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  background-color: ", ";\n  color: ", ";\n  cursor: ", ";\n\n  ", ";\n"])), function (props) {
   return props.theme.caretIconSpacing;
+}, function (props) {
+  return props.theme.buttonHeight;
 }, function (props) {
   return props.label === "" ? "0px" : calculateWidth(props.margin, props.size);
 }, function (props) {
-  return props.theme.borderRadius;
+  return props.theme.buttonBorderRadius;
 }, function (props) {
-  return props.theme.borderThickness;
+  return props.theme.buttonBorderThickness;
 }, function (props) {
-  return props.theme.borderStyle;
+  return props.theme.buttonBorderStyle;
 }, function (props) {
-  return props.disabled ? props.theme.disabledBorderColor : props.theme.borderColor;
+  return props.disabled ? props.theme.disabledButtonBorderColor : props.theme.buttonBorderColor;
 }, function (props) {
   return props.theme.buttonPaddingTop;
 }, function (props) {
@@ -303,7 +285,7 @@ var DropdownTrigger = _styledComponents["default"].button(_templateObject2 || (_
 }, function (props) {
   return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
-  return !props.disabled && "\n      &:focus {\n        outline: ".concat(props.theme.focusColor, " solid 2px;\n        outline-offset: -2px;\n      }\n      &:hover {\n        background-color: ").concat(props.theme.hoverButtonBackgroundColor, ";\n      }\n      &:active {\n        background-color: ").concat(props.theme.activeButtonBackgroundColor, ";\n      }\n  ");
+  return !props.disabled && "\n      &:focus {\n        outline: 2px solid ".concat(props.theme.focusColor, ";\n      }\n      &:hover {\n        background-color: ").concat(props.theme.hoverButtonBackgroundColor, ";\n      }\n      &:active {\n        background-color: ").concat(props.theme.activeButtonBackgroundColor, ";\n      }\n  ");
 });
 var DropdownTriggerContent = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  gap: ", ";\n  margin-left: 0px;\n  margin-right: 0px;\n  width: 100%;\n  overflow: hidden;\n  white-space: nowrap;\n"])), function (props) {
   return props.theme.buttonIconSpacing;
@@ -317,18 +299,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 {};