@dxc-technology/halstack-react 6.2.2 → 8.0.0

package/resultsetTable/ResultsetTable.js

@@ -27,17 +27,21 @@ var _Paginator = _interopRequireDefault(require("../paginator/Paginator"));
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+var _Icons = _interopRequireDefault(require("./Icons"));
+
+var _utils = require("../common/utils.js");
+
+var _templateObject, _templateObject2, _templateObject3;
 
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function normalizeSortValue(sortValue) {
+var normalizeSortValue = function normalizeSortValue(sortValue) {
   return typeof sortValue === "string" ? sortValue.toUpperCase() : sortValue;
-}
+};
 
-function sortArray(index, order, resultset) {
+var sortArray = function sortArray(index, order, resultset) {
   return resultset.slice().sort(function (element1, element2) {
     var sortValueA = normalizeSortValue(element1[index].sortValue || element1[index].displayValue);
     var sortValueB = normalizeSortValue(element2[index].sortValue || element2[index].displayValue);
@@ -53,9 +57,9 @@ function sortArray(index, order, resultset) {
       comparison = -1;
     }
 
-    return order === "desc" ? comparison * -1 : comparison;
+    return order === "descending" ? comparison * -1 : comparison;
   });
-}
+};
 
 var getMinItemsPerPageIndex = function getMinItemsPerPageIndex(currentPageInternal, itemsPerPage, page) {
   return currentPageInternal === 1 ? 0 : itemsPerPage * (page - 1);
@@ -65,51 +69,6 @@ var getMaxItemsPerPageIndex = function getMaxItemsPerPageIndex(minItemsPerPageIn
   return minItemsPerPageIndex + itemsPerPage > resultset.length ? resultset.length : itemsPerPage * page - 1;
 };
 
-var ArrowUp = function ArrowUp() {
-  return /*#__PURE__*/_react["default"].createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    height: "24",
-    viewBox: "0 0 24 24",
-    width: "24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0V0z",
-    fill: "none"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z"
-  }));
-};
-
-var ArrowDown = function ArrowDown() {
-  return /*#__PURE__*/_react["default"].createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    height: "24",
-    viewBox: "0 0 24 24",
-    width: "24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0V0z",
-    fill: "none"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
-  }));
-};
-
-var BothArrows = function BothArrows() {
-  return /*#__PURE__*/_react["default"].createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    height: "24",
-    viewBox: "0 0 24 24",
-    width: "24",
-    fill: "currentColor"
-  }, /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M0 0h24v24H0z",
-    fill: "none"
-  }), /*#__PURE__*/_react["default"].createElement("path", {
-    d: "M12 5.83L15.17 9l1.41-1.41L12 3 7.41 7.59 8.83 9 12 5.83zm0 12.34L8.83 15l-1.41 1.41L12 21l4.59-4.59L15.17 15 12 18.17z"
-  }));
-};
-
 var DxcResultsetTable = function DxcResultsetTable(_ref) {
   var columns = _ref.columns,
       rows = _ref.rows,
@@ -129,12 +88,12 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
       page = _useState2[0],
       changePage = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(""),
+  var _useState3 = (0, _react.useState)(-1),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
       sortColumnIndex = _useState4[0],
       changeSortColumnIndex = _useState4[1];
 
-  var _useState5 = (0, _react.useState)("asc"),
+  var _useState5 = (0, _react.useState)("ascending"),
       _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
       sortOrder = _useState6[0],
       changeSortOrder = _useState6[1];
@@ -145,6 +104,12 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
   var maxItemsPerPageIndex = (0, _react.useMemo)(function () {
     return getMaxItemsPerPageIndex(minItemsPerPageIndex, itemsPerPage, rows, page);
   }, [itemsPerPage, minItemsPerPageIndex, page, rows]);
+  var sortedResultset = (0, _react.useMemo)(function () {
+    return sortColumnIndex !== -1 ? sortArray(sortColumnIndex, sortOrder, rows) : rows;
+  }, [sortColumnIndex, sortOrder, rows]);
+  var filteredResultset = (0, _react.useMemo)(function () {
+    return sortedResultset && sortedResultset.slice(minItemsPerPageIndex, maxItemsPerPageIndex + 1);
+  }, [sortedResultset, minItemsPerPageIndex, maxItemsPerPageIndex]);
 
   var goToPage = function goToPage(newPage) {
     changePage(newPage);
@@ -153,44 +118,30 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
   var changeSorting = function changeSorting(columnIndex) {
     changePage(1);
     changeSortColumnIndex(columnIndex);
-    changeSortOrder(sortColumnIndex === "" || sortColumnIndex !== columnIndex ? "asc" : sortOrder === "asc" ? "desc" : "asc");
-  };
-
-  var getIconForSortableColumn = function getIconForSortableColumn(clickedColumnIndex) {
-    return sortColumnIndex === clickedColumnIndex ? sortOrder === "asc" ? /*#__PURE__*/_react["default"].createElement(ArrowUp, null) : /*#__PURE__*/_react["default"].createElement(ArrowDown, null) : /*#__PURE__*/_react["default"].createElement(BothArrows, null);
+    changeSortOrder(sortColumnIndex === -1 || sortColumnIndex !== columnIndex ? "ascending" : sortOrder === "ascending" ? "descending" : "ascending");
   };
 
   (0, _react.useEffect)(function () {
-    if (rows.length > 0) {
-      changePage(1);
-    } else {
-      changePage(0);
-    }
-  }, [rows.length, itemsPerPage]);
-  var sortedResultset = (0, _react.useMemo)(function () {
-    return sortColumnIndex !== "" ? sortArray(sortColumnIndex, sortOrder, rows) : rows;
-  }, [sortColumnIndex, sortOrder, rows]);
-  var filteredResultset = (0, _react.useMemo)(function () {
-    return sortedResultset && sortedResultset.slice(minItemsPerPageIndex, maxItemsPerPageIndex + 1);
-  }, [sortedResultset, minItemsPerPageIndex, maxItemsPerPageIndex]);
+    rows.length > 0 ? changePage(1) : changePage(0);
+  }, [rows]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.table
   }, /*#__PURE__*/_react["default"].createElement(DxcResultsetTableContainer, {
     margin: margin
-  }, /*#__PURE__*/_react["default"].createElement(TableContainer, null, /*#__PURE__*/_react["default"].createElement(_Table["default"], null, /*#__PURE__*/_react["default"].createElement(HeaderRow, null, /*#__PURE__*/_react["default"].createElement("tr", null, columns.map(function (column, index) {
-    return /*#__PURE__*/_react["default"].createElement(TableHeader, {
-      key: "tableHeader_".concat(index)
+  }, /*#__PURE__*/_react["default"].createElement(_Table["default"], null, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", null, columns.map(function (column, index) {
+    return /*#__PURE__*/_react["default"].createElement("th", {
+      key: "tableHeader_".concat(index),
+      "aria-sort": column.isSortable ? sortColumnIndex === index ? sortOrder : "none" : undefined
     }, /*#__PURE__*/_react["default"].createElement(HeaderContainer, {
+      role: column.isSortable ? "button" : undefined,
       key: "headerContainer_".concat(index),
       onClick: function onClick() {
-        return column.isSortable && changeSorting(index);
+        column.isSortable && changeSorting(index);
       },
       tabIndex: column.isSortable ? tabIndex : -1,
       isSortable: column.isSortable
-    }, /*#__PURE__*/_react["default"].createElement(TitleDiv, {
-      isSortable: column.isSortable
-    }, column.displayValue), column.isSortable && /*#__PURE__*/_react["default"].createElement(SortIcon, null, getIconForSortableColumn(index))));
-  }))), /*#__PURE__*/_react["default"].createElement(TableRowGroup, null, filteredResultset.map(function (cells, index) {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, column.displayValue), column.isSortable && /*#__PURE__*/_react["default"].createElement(SortIcon, null, sortColumnIndex === index ? sortOrder === "ascending" ? _Icons["default"].arrowUp : _Icons["default"].arrowDown : _Icons["default"].bothArrows)));
+  }))), /*#__PURE__*/_react["default"].createElement("tbody", null, filteredResultset.map(function (cells, index) {
     return /*#__PURE__*/_react["default"].createElement("tr", {
       key: "resultSetTableCell_".concat(index)
     }, cells.map(function (cellContent, index) {
@@ -198,7 +149,7 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
         key: "resultSetTableCellContent_".concat(index)
       }, cellContent.displayValue);
     }));
-  })))), /*#__PURE__*/_react["default"].createElement(PaginatorContainer, null, /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
+  }))), /*#__PURE__*/_react["default"].createElement(_Paginator["default"], {
     totalItems: rows.length,
     itemsPerPage: itemsPerPage,
     itemsPerPageOptions: itemsPerPageOptions,
@@ -207,37 +158,15 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
     showGoToPage: showGoToPage,
     onPageChange: goToPage,
     tabIndex: tabIndex
-  }))));
+  })));
 };
 
-var TableContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  & table {\n    table-layout: auto;\n  }\n"])));
-
-var PaginatorContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var TableRowGroup = _styledComponents["default"].tbody(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  > div:nth-child(1) {\n    position: absolute;\n    left: calc(50% - 68.5px);\n    bottom: calc(50% - 68.5px - 30px);\n  }\n  & tr {\n    height: ", ";\n  }\n"])), function (props) {
-  return props.theme.rowHeight || "70px";
-});
-
-var SortIcon = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  top: 409px;\n  left: 390px;\n  height: 14px;\n  cursor: pointer;\n  color: ", ";\n\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
-  return props.theme.sortIconColor;
-});
-
-var TitleDiv = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  cursor: ", ";\n"])), function (props) {
-  return props.isSortable && "pointer" || "default";
-});
-
-var TableHeader = _styledComponents["default"].th(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var HeaderContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: ", ";\n  width: fit-content;\n  :focus {\n    ", "\n  }\n"])), function (props) {
-  return props.theme.headerTextAlign === "center" ? "center" : props.theme.headerTextAlign === "right" ? "flex-end" : "flex-start";
-}, function (props) {
-  return props.isSortable && "outline: #0095ff solid 2px; \n        outline-offset: 4px;";
-});
-
-var HeaderRow = _styledComponents["default"].thead(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  height: 60px;\n"])));
+var calculateWidth = function calculateWidth(margin) {
+  return "calc(100% - ".concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
+};
 
-var DxcResultsetTableContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
-  return props.theme.fontSizeBase;
+var DxcResultsetTableContainer = _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);
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -250,5 +179,17 @@ var DxcResultsetTableContainer = _styledComponents["default"].div(_templateObjec
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
 
+var HeaderContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: ", ";\n  gap: 8px;\n  width: fit-content;\n  border: 1px solid transparent;\n  border-radius: 2px;\n  padding: 3px;\n  cursor: ", ";\n\n  ", "\n"])), function (props) {
+  return props.theme.headerTextAlign === "center" ? "center" : props.theme.headerTextAlign === "right" ? "flex-end" : "flex-start";
+}, function (props) {
+  return props.isSortable ? "pointer" : "default";
+}, function (props) {
+  return props.isSortable && "&:focus {\n      outline: #0095ff solid 2px;\n    }";
+});
+
+var SortIcon = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  height: 14px;\n  width: 14px;\n  color: ", ";\n\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
+  return props.theme.sortIconColor;
+});
+
 var _default = DxcResultsetTable;
 exports["default"] = _default;

package/resultsetTable/ResultsetTable.stories.tsx

@@ -4,6 +4,7 @@ import DxcButton from "../button/Button";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import { userEvent, within } from "@storybook/testing-library";
+import styled from "styled-components";
 
 export default {
   title: "Resultset Table",
@@ -48,6 +49,24 @@ const columnsSortable = [
   { displayValue: "City", isSortable: false },
 ];
 
+const longValues = [
+  [
+    { displayValue: "000000000000000001", sortValue: "000000000000000001" },
+    { displayValue: "Peter Larsson González", sortValue: "Peter" },
+    { displayValue: "Miami: The city that never sleeps", sortValue: "Miami" },
+  ],
+  [
+    { displayValue: "002", sortValue: "002" },
+    { displayValue: "Louis", sortValue: "Louis" },
+    { displayValue: "London", sortValue: "London" },
+  ],
+  [
+    { displayValue: "003", sortValue: "003" },
+    { displayValue: "Aida", sortValue: "Aida" },
+    { displayValue: "Wroclaw", sortValue: "Wroclaw" },
+  ],
+];
+
 const rowsSortable = [
   [
     { displayValue: "001", sortValue: "001" },
@@ -167,89 +186,95 @@ export const Chromatic = () => (
   <>
     <ExampleContainer>
       <Title title="Sortable table" theme="light" level={4} />
-      <DxcResultsetTable columns={columnsSortable} rows={rowsSortable}></DxcResultsetTable>
+      <DxcResultsetTable columns={columnsSortable} rows={rowsSortable} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With action" theme="light" level={4} />
-      <DxcResultsetTable columns={columns} rows={rowsIcon}></DxcResultsetTable>
+      <DxcResultsetTable columns={columns} rows={rowsIcon} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="With items per page option" theme="light" level={4} />
-      <DxcResultsetTable
-        columns={columns}
-        rows={rows}
-        itemsPerPage={2}
-        itemsPerPageOptions={[2, 3]}
-      ></DxcResultsetTable>
+      <DxcResultsetTable columns={columns} rows={rows} itemsPerPage={2} itemsPerPageOptions={[2, 3]} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Scroll resultset table" theme="light" level={4} />
-      <DxcResultsetTable columns={longColumns} rows={longRows}></DxcResultsetTable>
+      <DxcResultsetTable columns={longColumns} rows={longRows} />
+    </ExampleContainer>
+    <ExampleContainer>
+      <SmallContainer>
+        <Title title="Small container and text overflow" theme="light" level={4} />
+        <DxcResultsetTable columns={columnsSortable} rows={longValues} />
+      </SmallContainer>
     </ExampleContainer>
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall" theme="light" level={4} />
-      <DxcResultsetTable columns={columns} rows={rows} margin={"xxsmall"}></DxcResultsetTable>
+      <DxcResultsetTable columns={columns} rows={rows} margin={"xxsmall"} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Xsmall" theme="light" level={4} />
-      <DxcResultsetTable columns={columns} rows={rows} margin={"xsmall"}></DxcResultsetTable>
+      <DxcResultsetTable columns={columns} rows={rows} margin={"xsmall"} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Small" theme="light" level={4} />
-      <DxcResultsetTable columns={columns} rows={rows} margin={"small"}></DxcResultsetTable>
+      <DxcResultsetTable columns={columns} rows={rows} margin={"small"} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Medium" theme="light" level={4} />
-      <DxcResultsetTable columns={columns} rows={rows} margin={"medium"}></DxcResultsetTable>
+      <DxcResultsetTable columns={columns} rows={rows} margin={"medium"} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Large" theme="light" level={4} />
-      <DxcResultsetTable columns={columns} rows={rows} margin={"large"}></DxcResultsetTable>
+      <DxcResultsetTable columns={columns} rows={rows} margin={"large"} />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Xlarge" theme="light" level={4} />
-      <DxcResultsetTable columns={columns} rows={rows} margin={"xlarge"}></DxcResultsetTable>
+      <DxcResultsetTable columns={columns} rows={rows} margin={"xlarge"} />
     </ExampleContainer>
-    <ExampleContainer>
+    <ExampleContainer expanded>
       <Title title="Xxlarge" theme="light" level={4} />
-      <DxcResultsetTable columns={columns} rows={rows} margin={"xxlarge"}></DxcResultsetTable>
-      <hr />
+      <DxcResultsetTable columns={columns} rows={rows} margin={"xxlarge"} />
     </ExampleContainer>
   </>
 );
 
+const SmallContainer = styled.div`
+  width: 500px;
+`;
+
 const ResultsetTableAsc = () => (
   <ExampleContainer>
     <Title title="Ascendant sorting" theme="light" level={4} />
-    <DxcResultsetTable columns={columnsSortable} rows={rowsSortable}></DxcResultsetTable>
+    <DxcResultsetTable columns={columnsSortable} rows={rowsSortable} />
   </ExampleContainer>
 );
 
 export const AscendentSorting = ResultsetTableAsc.bind({});
 AscendentSorting.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  await userEvent.click(canvas.queryByText("Name"));
+  const idHeader = canvas.getAllByRole("button")[0];
+  await userEvent.click(idHeader);
 };
 
 const ResultsetTableDesc = () => (
   <ExampleContainer>
     <Title title="Descendant sorting" theme="light" level={4} />
-    <DxcResultsetTable columns={columnsSortable} rows={rowsSortable}></DxcResultsetTable>
+    <DxcResultsetTable columns={columnsSortable} rows={rowsSortable} />
   </ExampleContainer>
 );
 
 export const DescendantSorting = ResultsetTableDesc.bind({});
 DescendantSorting.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  await userEvent.click(canvas.queryByText("Name"));
-  await userEvent.click(canvas.queryByText("Name"));
+  const nameHeader = canvas.getAllByRole("button")[1];
+  await userEvent.click(nameHeader);
+  await userEvent.click(nameHeader);
 };
 
 const ResultsetTableMiddle = () => (
   <ExampleContainer>
     <Title title="Middle page" theme="light" level={4} />
-    <DxcResultsetTable columns={columns} rows={rows} itemsPerPage={2}></DxcResultsetTable>
+    <DxcResultsetTable columns={columns} rows={rows} itemsPerPage={2} />
   </ExampleContainer>
 );
 
@@ -263,7 +288,7 @@ MiddlePage.play = async ({ canvasElement }) => {
 const ResultsetTableLast = () => (
   <ExampleContainer>
     <Title title="Last page" theme="light" level={4} />
-    <DxcResultsetTable columns={columns} rows={rows} itemsPerPage={2}></DxcResultsetTable>
+    <DxcResultsetTable columns={columns} rows={rows} itemsPerPage={2} />
   </ExampleContainer>
 );
 

package/resultsetTable/ResultsetTable.test.js

@@ -80,8 +80,6 @@ var rows = [[{
 }, {
   displayValue: "Oviedo",
   sortValue: "Oviedo"
-}, {
-  displayValue: ""
 }], [{
   displayValue: "003",
   sortValue: "003"
@@ -118,8 +116,6 @@ var rows = [[{
 }, {
   displayValue: "Barcelona",
   sortValue: "Barcelona"
-}, {
-  displayValue: ""
 }], [{
   displayValue: "007",
   sortValue: "007"
@@ -147,8 +143,6 @@ var rows = [[{
 }, {
   displayValue: "Oviedo",
   sortValue: "Oviedo"
-}, {
-  displayValue: ""
 }], [{
   displayValue: "010",
   sortValue: "010"
@@ -158,8 +152,6 @@ var rows = [[{
 }, {
   displayValue: "Barcelona",
   sortValue: "Barcelona"
-}, {
-  displayValue: ""
 }]];
 var rows2 = [[{
   displayValue: "546",
@@ -191,8 +183,8 @@ var rows2 = [[{
   displayValue: "OtherValue",
   sortValue: "OtherValue"
 }]];
-describe("ResultsetTable component tests", function () {
-  test("ResultsetTable rendered correctly", function () {
+describe("Resultset table component tests", function () {
+  test("Resultset table rendered correctly", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
       columns: columns,
       rows: rows,
@@ -202,7 +194,7 @@ describe("ResultsetTable component tests", function () {
 
     expect(getByText("Peter")).toBeTruthy();
   });
-  test("Resultsettable shows as many rows as itemsPerPage", function () {
+  test("Resultset table shows as many rows as itemsPerPage", function () {
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
       columns: columns,
       rows: rows,
@@ -212,7 +204,7 @@ describe("ResultsetTable component tests", function () {
 
     expect(getAllByRole("row").length - 1).toEqual(3);
   });
-  test("Resultsettable shows rows on second page", function () {
+  test("Resultset table shows rows on second page", function () {
     var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
       columns: columns,
       rows: rows,
@@ -225,18 +217,17 @@ describe("ResultsetTable component tests", function () {
     expect(getByText("Louis")).toBeTruthy();
     expect(getByText("Lana")).toBeTruthy();
     expect(getAllByRole("row").length - 1).toEqual(3);
-    var nextButton = getAllByRole("button")[2];
+    var nextButton = getAllByRole("button")[3];
 
     _react2.fireEvent.click(nextButton);
 
-    expect(getByText("4 to 6 of 10")).toBeTruthy(); // expect(getByText("Page: 2 of 4")).toBeTruthy();
-
+    expect(getByText("4 to 6 of 10")).toBeTruthy();
     expect(getByText("Rick")).toBeTruthy();
     expect(getByText("Mark")).toBeTruthy();
     expect(getByText("Cris")).toBeTruthy();
     expect(getAllByRole("row").length - 1).toEqual(3);
   });
-  test("Resultsettable goToPage works as expected", function () {
+  test("Resultset table goToPage works as expected", function () {
     window.HTMLElement.prototype.scrollIntoView = function () {};
 
     window.HTMLElement.prototype.scrollTo = function () {};
@@ -248,28 +239,27 @@ describe("ResultsetTable component tests", function () {
       itemsPerPage: 3
     })),
         getByText = _render4.getByText,
-        getAllByRole = _render4.getAllByRole,
-        getByRole = _render4.getByRole;
+        getAllByRole = _render4.getAllByRole;
 
     expect(getByText("Peter")).toBeTruthy();
     expect(getByText("Louis")).toBeTruthy();
     expect(getByText("Lana")).toBeTruthy();
     expect(getAllByRole("row").length - 1).toEqual(3);
-    var goToPageSelect = getAllByRole("button")[2];
-    (0, _react2.act)(function () {
-      _userEvent["default"].click(goToPageSelect);
-    });
+    var goToPageSelect = getAllByRole("button")[3];
+
+    _userEvent["default"].click(goToPageSelect);
+
     var goToPageOption = getByText("2");
-    (0, _react2.act)(function () {
-      _userEvent["default"].click(goToPageOption);
-    });
+
+    _userEvent["default"].click(goToPageOption);
+
     expect(getByText("4 to 6 of 10")).toBeTruthy();
     expect(getByText("Rick")).toBeTruthy();
     expect(getByText("Mark")).toBeTruthy();
     expect(getByText("Cris")).toBeTruthy();
     expect(getAllByRole("row").length - 1).toEqual(3);
   });
-  test("Resultsettable going to the last page shows only one row", function () {
+  test("Resultset table going to the last page shows only one row", function () {
     var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
       columns: columns,
       rows: rows,
@@ -278,7 +268,7 @@ describe("ResultsetTable component tests", function () {
         getByText = _render5.getByText,
         getAllByRole = _render5.getAllByRole;
 
-    var lastButton = getAllByRole("button")[3];
+    var lastButton = getAllByRole("button")[4];
 
     _react2.fireEvent.click(lastButton);
 
@@ -286,7 +276,7 @@ describe("ResultsetTable component tests", function () {
     expect(getAllByRole("row")).toHaveLength(2);
     expect(getByText("Cosmin")).toBeTruthy();
   });
-  test("Resultsettable sort rows by column", function () {
+  test("Resultset table sort rows by column", function () {
     var component = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
       columns: columns,
       rows: rows,
@@ -304,7 +294,7 @@ describe("ResultsetTable component tests", function () {
     expect(component.queryByText("Tina")).toBeTruthy();
     expect(component.queryByText("Cosmin")).not.toBeTruthy();
   });
-  test("Resultsettable change rows should go to first page", function () {
+  test("Resultset table change rows should go to first page", function () {
     var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
       columns: columns,
       rows: rows,
@@ -321,28 +311,20 @@ describe("ResultsetTable component tests", function () {
     }));
     expect(queryByText("1 to 3 of 3")).toBeTruthy();
   });
-  test("Resultsettable change itemsPerPage should go to first page", function () {
+  test("Resultset table change itemsPerPage should go to first page", function () {
     var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
       columns: columns,
       rows: rows,
       itemsPerPage: 3,
       itemsPerPageOptions: [2, 3]
     })),
-        getAllByRole = _render7.getAllByRole,
-        queryByText = _render7.queryByText,
-        rerender = _render7.rerender;
+        getAllByRole = _render7.getAllByRole;
 
-    var lastButton = getAllByRole("button")[3];
+    var lastButton = getAllByRole("button")[4];
+    expect(getAllByRole("row").length - 1).toEqual(3);
 
     _react2.fireEvent.click(lastButton);
 
     expect(getAllByRole("row").length - 1).toEqual(1);
-    rerender( /*#__PURE__*/_react["default"].createElement(_ResultsetTable["default"], {
-      columns: columns,
-      rows: rows,
-      itemsPerPage: 6
-    }));
-    expect(getAllByRole("row").length - 1).toEqual(6);
-    expect(queryByText("Peter")).toBeTruthy();
   });
 });

package/resultsetTable/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+export declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+export declare type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;

package/select/Select.js

@@ -383,7 +383,8 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   }, helperText), /*#__PURE__*/_react["default"].createElement(Popover.Root, {
     open: isOpen
   }, /*#__PURE__*/_react["default"].createElement(Popover.Trigger, {
-    asChild: true
+    asChild: true,
+    type: undefined
   }, /*#__PURE__*/_react["default"].createElement(Select, {
     id: selectId,
     disabled: disabled,
@@ -418,6 +419,7 @@ var DxcSelect = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
     "aria-label": translatedLabels.select.actionClearSelectionTitle
   }, _Icons["default"].clear)), /*#__PURE__*/_react["default"].createElement(SearchableValueContainer, null, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     name: name,
+    disabled: disabled,
     value: multiple ? (value !== null && value !== void 0 ? value : innerValue).join(",") : value !== null && value !== void 0 ? value : innerValue,
     readOnly: true,
     "aria-hidden": "true"

package/select/Select.stories.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { userEvent, within, waitFor } from "@storybook/testing-library";
+import { userEvent, within } from "@storybook/testing-library";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DxcSelect from "./Select";
@@ -560,10 +560,7 @@ ListboxStates.play = async ({ canvasElement }) => {
 export const Searchable = SearchableSelect.bind({});
 Searchable.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
-  await userEvent.click(canvas.getByRole("combobox"));
-  await waitFor(async () => {
-    userEvent.type(canvas.getByRole("combobox"), "r");
-  });
+  await userEvent.type(canvas.getByRole("combobox"), "r");
 };
 
 export const SearchableWithValue = SearchValue.bind({});