@dxc-technology/halstack-react 12.0.0 → 12.0.2

package/date-input/DateInput.test.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@testing-library/react");
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var _DateInput = _interopRequireDefault(require("./DateInput.tsx"));
+var _DateInput = _interopRequireDefault(require("./DateInput"));
 // Mocking DOMRect for Radix Primitive Popover
 global.globalThis = global;
 global.DOMRect = {
@@ -214,7 +214,7 @@ describe("DateInput component tests", function () {
           _context6.next = 5;
           return _userEvent["default"].click(calendarAction);
         case 5:
-          expect(document.activeElement === getAllByText(d.get("date")).length === 2 && +d.get("date") > 20 ? getAllByText(d.get("date"))[1] : getAllByText(d.get("date"))[0]).toBeTruthy();
+          expect(document.activeElement === (getAllByText(d.get("date")).length === 2 && +d.get("date") > 20 ? getAllByText(d.get("date"))[1] : getAllByText(d.get("date"))[0])).toBeTruthy();
           expect(getByText(d.format("MMMM YYYY"))).toBeTruthy();
         case 7:
         case "end":
@@ -286,7 +286,7 @@ describe("DateInput component tests", function () {
           _context9.next = 11;
           return _userEvent["default"].click(calendarAction);
         case 11:
-          expect(document.activeElement === getAllByText(d.get("date")).length === 2 && +d.get("date") > 20 ? getAllByText(d.get("date"))[1] : getAllByText(d.get("date"))[0]).toBeTruthy();
+          expect(document.activeElement === (getAllByText(d.get("date")).length === 2 && +d.get("date") > 20 ? getAllByText(d.get("date"))[1] : getAllByText(d.get("date"))[0])).toBeTruthy();
           expect(getByText(d.format("MMMM YYYY"))).toBeTruthy();
         case 13:
         case "end":
@@ -687,7 +687,7 @@ describe("DateInput component tests", function () {
     });
   });
   test("Disabled date input (calendar action must be shown but not clickable)", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16() {
-    var _render22, getByRole, queryByText, calendarAction, d, options;
+    var _render22, getByRole, queryByText, calendarAction, d, options, input;
     return _regenerator["default"].wrap(function _callee16$(_context16) {
       while (1) switch (_context16.prev = _context16.next) {
         case 0:
@@ -701,12 +701,13 @@ describe("DateInput component tests", function () {
             month: "short",
             day: "numeric"
           };
-          expect(getByRole("textbox").disabled).toBeTruthy();
-          _context16.next = 7;
+          input = getByRole("textbox");
+          expect(input.disabled).toBeTruthy();
+          _context16.next = 8;
           return _userEvent["default"].click(calendarAction);
-        case 7:
-          expect(queryByText(d.toLocaleString("en-US", options))).toBeFalsy();
         case 8:
+          expect(queryByText(d.toLocaleString("en-US", options))).toBeFalsy();
+        case 9:
         case "end":
           return _context16.stop();
       }

package/dialog/Dialog.accessibility.test.d.ts

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

package/dialog/Dialog.accessibility.test.js

@@ -6,7 +6,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@testing-library/react");
 var _axeHelper = require("../../test/accessibility/axe-helper.js");
-var _Dialog = _interopRequireDefault(require("./Dialog.tsx"));
+var _Dialog = _interopRequireDefault(require("./Dialog"));
 describe("Dialog 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;

package/dialog/Dialog.stories.tsx

@@ -11,7 +11,7 @@ import DxcHeading from "../heading/Heading";
 import DxcParagraph from "../paragraph/Paragraph";
 import DxcAlert from "../alert/Alert";
 import { userEvent, within } from "@storybook/testing-library";
-import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport';
+import { INITIAL_VIEWPORTS } from "@storybook/addon-viewport";
 
 export default {
   title: "Dialog",
@@ -368,4 +368,3 @@ ScrollDialog.play = async ({ canvasElement }) => {
   await userEvent.tab();
   await userEvent.tab();
 };
-

package/dialog/Dialog.test.d.ts

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

package/dialog/Dialog.test.js

@@ -1,20 +1,55 @@
 "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 _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
-var _Dialog = _interopRequireDefault(require("./Dialog.tsx"));
-var _TextInput = _interopRequireDefault(require("../text-input/TextInput.tsx"));
-var _Textarea = _interopRequireDefault(require("../textarea/Textarea.tsx"));
-var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox.tsx"));
-var _Select = _interopRequireDefault(require("../select/Select.tsx"));
-var _Button = _interopRequireDefault(require("../button/Button.tsx"));
-var _Link = _interopRequireDefault(require("../link/Link.tsx"));
-var _Card = _interopRequireDefault(require("../card/Card.tsx"));
-var _RadioGroup = _interopRequireDefault(require("../radio-group/RadioGroup.tsx"));
-var _Slider = _interopRequireDefault(require("../slider/Slider.tsx"));
-var _Switch = _interopRequireDefault(require("../switch/Switch.tsx"));
+var _Dialog = _interopRequireDefault(require("./Dialog"));
+var _TextInput = _interopRequireDefault(require("../text-input/TextInput"));
+var _Textarea = _interopRequireDefault(require("../textarea/Textarea"));
+var _Checkbox = _interopRequireDefault(require("../checkbox/Checkbox"));
+var _Select = _interopRequireDefault(require("../select/Select"));
+var _Button = _interopRequireDefault(require("../button/Button"));
+var _Link = _interopRequireDefault(require("../link/Link"));
+var _Card = _interopRequireDefault(require("../card/Card"));
+var _RadioGroup = _interopRequireDefault(require("../radio-group/RadioGroup"));
+var _Slider = _interopRequireDefault(require("../slider/Slider"));
+var _Switch = _interopRequireDefault(require("../switch/Switch"));
+var _DateInput = _interopRequireDefault(require("../date-input/DateInput"));
+// 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);
+  }
+  (0, _createClass2["default"])(ResizeObserver, [{
+    key: "observe",
+    value: function observe() {}
+  }, {
+    key: "unobserve",
+    value: function unobserve() {}
+  }, {
+    key: "disconnect",
+    value: function disconnect() {}
+  }]);
+  return ResizeObserver;
+}();
 var options = [{
   label: "Female",
   value: "female"
@@ -77,11 +112,40 @@ describe("Dialog component tests", function () {
     });
     expect(onCloseClick).toHaveBeenCalled();
   });
+  test("Does not call function onCloseClick when 'Escape' key is pressed while a child popover is opened", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var onCloseClick, _render6, getByRole, calendarAction;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          onCloseClick = jest.fn();
+          _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+            onCloseClick: onCloseClick
+          }, /*#__PURE__*/_react["default"].createElement(_DateInput["default"], {
+            label: "With format M-dd-yyyy",
+            format: "M-dd-yyyy"
+          }))), getByRole = _render6.getByRole;
+          calendarAction = getByRole("combobox");
+          _context.next = 5;
+          return _userEvent["default"].click(calendarAction);
+        case 5:
+          _react2.fireEvent.keyDown(document.activeElement, {
+            key: "Escape",
+            code: "Escape",
+            keyCode: 27,
+            charCode: 27
+          });
+          expect(onCloseClick).not.toHaveBeenCalled();
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
 });
 describe("Dialog component: Focus lock tests", function () {
   test("Close action: when there's no focusable content, the focus never leaves the close action (unless you click outside)", function () {
-    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, "example-dialog")),
-      getByRole = _render6.getByRole;
+    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, "example-dialog")),
+      getByRole = _render7.getByRole;
     var button = getByRole("button");
     var dialog = getByRole("dialog");
     expect(document.activeElement).toEqual(button);
@@ -95,100 +159,100 @@ describe("Dialog component: Focus lock tests", function () {
     expect(document.activeElement).toEqual(button);
   });
   test("Autofocus with Button component", function () {
-    var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
         label: "Accept"
       }))),
-      getAllByRole = _render7.getAllByRole;
+      getAllByRole = _render8.getAllByRole;
     var button = getAllByRole("button")[0];
     expect(document.activeElement).toEqual(button);
     expect(button.getAttribute("aria-label")).not.toBe("Close dialog");
   });
   test("Autofocus with Card component", function () {
-    var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Card["default"], {
+    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Card["default"], {
         linkHref: "https://developer.dxc.com/halstack/next/components/card/"
       }, "example-card"))),
-      getByRole = _render8.getByRole;
+      getByRole = _render9.getByRole;
     var card = getByRole("link");
     expect(document.activeElement).toEqual(card);
   });
   test("Autofocus with Checkbox component", function () {
-    var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
         label: "Name"
       }))),
-      getByRole = _render9.getByRole;
+      getByRole = _render10.getByRole;
     var checkbox = getByRole("checkbox");
     expect(document.activeElement).toEqual(checkbox);
   });
   test("Autofocus with Link component", function () {
-    var _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, "This is a text with a ", /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+    var _render11 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, "This is a text with a ", /*#__PURE__*/_react["default"].createElement(_Link["default"], {
         href: "#"
       }, "Link"), " to another page.")),
-      getByRole = _render10.getByRole;
+      getByRole = _render11.getByRole;
     var link = getByRole("link");
     expect(document.activeElement).toEqual(link);
   });
   test("Autofocus with RadioGroup component", function () {
-    var _render11 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_RadioGroup["default"], {
+    var _render12 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_RadioGroup["default"], {
         label: "Example",
         options: options
       }))),
-      getAllByRole = _render11.getAllByRole;
+      getAllByRole = _render12.getAllByRole;
     var checkedRadio = getAllByRole("radio")[0];
     expect(document.activeElement).toEqual(checkedRadio);
   });
   test("Autofocus with Select component", function () {
-    var _render12 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+    var _render13 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
         label: "Country",
         options: options
       }))),
-      getByRole = _render12.getByRole;
+      getByRole = _render13.getByRole;
     var select = getByRole("combobox");
     expect(document.activeElement).toEqual(select);
   });
   test("Autofocus with Slider component", function () {
-    var _render13 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
+    var _render14 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Slider["default"], {
         label: "label",
         minValue: 0,
         maxValue: 100,
         showLimitsValues: true
       }))),
-      getByRole = _render13.getByRole;
+      getByRole = _render14.getByRole;
     var slider = getByRole("slider");
     expect(document.activeElement).toEqual(slider);
   });
   test("Autofocus with Switch component", function () {
-    var _render14 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
+    var _render15 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
         label: "Example"
       }))),
-      getByRole = _render14.getByRole;
+      getByRole = _render15.getByRole;
     var switchButton = getByRole("switch");
     expect(document.activeElement).toEqual(switchButton);
   });
   test("Autofocus with Text Input component", function () {
-    var _render15 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+    var _render16 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
         label: "Name"
       }))),
-      getByRole = _render15.getByRole;
+      getByRole = _render16.getByRole;
     var input = getByRole("textbox");
     expect(document.activeElement).toEqual(input);
   });
   test("Autofocus with Textarea component", function () {
-    var _render16 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
+    var _render17 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
         label: "Name"
       }))),
-      getByRole = _render16.getByRole;
+      getByRole = _render17.getByRole;
     var textarea = getByRole("textbox");
     expect(document.activeElement).toEqual(textarea);
   });
   test("Negative tabindex elements are not automatically focused, even if it is enabled and a valid focusable item (programatically and by click)", function () {
-    var _render17 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement("input", {
-        label: "Name",
+    var _render18 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement("input", {
+        title: "Name",
         tabIndex: -1
       }), /*#__PURE__*/_react["default"].createElement("input", {
-        label: "Name"
+        title: "Name"
       }))),
-      getAllByRole = _render17.getAllByRole,
-      getByRole = _render17.getByRole;
+      getAllByRole = _render18.getAllByRole,
+      getByRole = _render18.getByRole;
     var inputs = getAllByRole("textbox");
     var button = getByRole("button");
     expect(document.activeElement).toEqual(inputs[1]);
@@ -198,7 +262,7 @@ describe("Dialog component: Focus lock tests", function () {
     expect(document.activeElement).toEqual(inputs[1]);
   });
   test("Focus jumps disabled components and negative tabIndexes when autofocusing first item", function () {
-    var _render18 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    var _render19 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
         label: "Accept",
         disabled: true
       }), /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
@@ -235,12 +299,12 @@ describe("Dialog component: Focus lock tests", function () {
       }), /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
         label: "Description"
       }))),
-      getAllByRole = _render18.getAllByRole;
+      getAllByRole = _render19.getAllByRole;
     var textarea = getAllByRole("textbox")[2];
     expect(document.activeElement).toEqual(textarea);
   });
   test("Focus jumps from last element to the first", function () {
-    var _render19 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    var _render20 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
         label: "Accept",
         disabled: true
       }), /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
@@ -249,7 +313,7 @@ describe("Dialog component: Focus lock tests", function () {
         label: "Name",
         options: options
       }))),
-      getByRole = _render19.getByRole;
+      getByRole = _render20.getByRole;
     var closeAction = getByRole("button");
     var textarea = getByRole("textbox");
     expect(document.activeElement).toEqual(textarea);
@@ -260,13 +324,13 @@ describe("Dialog component: Focus lock tests", function () {
     expect(document.activeElement).toEqual(textarea);
   });
   test("'display: none;', 'visibility: hidden;' and 'type = 'hidden'' elements are never autofocused", function () {
-    var _render20 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement("input", {
-        label: "Name",
+    var _render21 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Dialog["default"], null, /*#__PURE__*/_react["default"].createElement("input", {
+        title: "Name",
         style: {
           display: "none"
         }
       }), /*#__PURE__*/_react["default"].createElement("input", {
-        label: "Name",
+        title: "Name",
         style: {
           visibility: "hidden"
         }
@@ -274,21 +338,21 @@ describe("Dialog component: Focus lock tests", function () {
         type: "hidden",
         name: "example"
       }))),
-      getByRole = _render20.getByRole;
+      getByRole = _render21.getByRole;
     var closeAction = getByRole("button");
     expect(document.activeElement).toEqual(closeAction);
     _userEvent["default"].tab();
     expect(document.activeElement).toEqual(closeAction);
   });
   test("Focus gets trapped in the Dialog when there are not focusable elements inside until it is closed", function () {
-    var _render21 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
+    var _render22 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
         label: "Name"
       }), /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
         isCloseVisible: false
       }, /*#__PURE__*/_react["default"].createElement("h2", null, "Policy agreement"), /*#__PURE__*/_react["default"].createElement("p", null, "Sample text.")), /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
         label: "Surname"
       }))),
-      getAllByRole = _render21.getAllByRole;
+      getAllByRole = _render22.getAllByRole;
     var inputs = getAllByRole("textbox");
     var dialog = getAllByRole("dialog")[0];
     _userEvent["default"].tab();

package/divider/Divider.accessibility.test.d.ts

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

package/divider/Divider.test.d.ts

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

package/dropdown/Dropdown.accessibility.test.d.ts

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

package/dropdown/Dropdown.accessibility.test.js

@@ -8,7 +8,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@testing-library/react");
 var _axeHelper = require("../../test/accessibility/axe-helper.js");
-var _Dropdown = _interopRequireDefault(require("./Dropdown.tsx"));
+var _Dropdown = _interopRequireDefault(require("./Dropdown"));
 var iconSVG = /*#__PURE__*/_react["default"].createElement("svg", {
   viewBox: "0 0 24 24",
   height: "24",
@@ -83,7 +83,8 @@ describe("Dropdown component accessibility tests", function () {
             iconPosition: "before",
             margin: "medium",
             size: "medium",
-            optionsIconPosition: "before"
+            optionsIconPosition: "before",
+            onSelectOption: function onSelectOption() {}
           })), baseElement = _render.baseElement;
           _context.next = 3;
           return (0, _axeHelper.axe)(baseElement);
@@ -110,6 +111,7 @@ describe("Dropdown component accessibility tests", function () {
             margin: "medium",
             size: "medium",
             optionsIconPosition: "before",
+            onSelectOption: function onSelectOption() {},
             disabled: true
           })), baseElement = _render2.baseElement;
           _context2.next = 3;
@@ -137,6 +139,7 @@ describe("Dropdown component accessibility tests", function () {
             margin: "medium",
             size: "medium",
             optionsIconPosition: "after",
+            onSelectOption: function onSelectOption() {},
             caretHidden: true
           })), baseElement = _render3.baseElement;
           _context3.next = 3;
@@ -164,6 +167,7 @@ describe("Dropdown component accessibility tests", function () {
             margin: "medium",
             size: "medium",
             optionsIconPosition: "after",
+            onSelectOption: function onSelectOption() {},
             expandOnHover: true
           })), baseElement = _render4.baseElement;
           _context4.next = 3;

package/dropdown/Dropdown.js

@@ -14,7 +14,6 @@ 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"));
@@ -62,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);
@@ -149,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;

package/dropdown/Dropdown.test.d.ts

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