@dxc-technology/halstack-react 12.1.0 → 12.2.0

package/contextual-menu/ContextualMenu.stories.tsx

@@ -7,6 +7,8 @@ import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DxcBadge from "../badge/Badge";
 import { disabledRules } from "../../test/accessibility/rules/specific/contextual-menu/disabledRules";
 import preview from "../../.storybook/preview";
+import { ThemeProvider } from "styled-components";
+import useTheme from "../useTheme";
 
 export default {
   title: "Contextual Menu",
@@ -76,7 +78,7 @@ const itemsWithIcon = [
   {
     label: "Item 1",
     icon: (
-      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24">
+      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24" fill="currentColor">
         <path d="M200-120v-640q0-33 23.5-56.5T280-840h400q33 0 56.5 23.5T760-760v640L480-240 200-120Zm80-122 200-86 200 86v-518H280v518Zm0-518h400-400Z" />
       </svg>
     ),
@@ -123,7 +125,7 @@ const itemsWithTruncatedText = [
     label: "Item with a very long label that should be truncated",
     badge: <DxcBadge color="green" label="New" />,
     icon: (
-      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24">
+      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24" fill="currentColor">
         <path d="M200-120v-640q0-33 23.5-56.5T280-840h400q33 0 56.5 23.5T760-760v640L480-240 200-120Zm80-122 200-86 200 86v-518H280v518Zm0-518h400-400Z" />
       </svg>
     ),
@@ -185,39 +187,45 @@ export const Chromatic = () => (
   </>
 );
 
-export const SingleItemStates = () => (
-  <DxcContainer width="300px">
-    <ContextualMenuContext.Provider value={{ selectedItemId: -1, setSelectedItemId: () => {} }}>
-      <Title title="Default" theme="light" level={3} />
-      <ExampleContainer>
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Focus" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-focus">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Hover" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-hover">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Active" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-active">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-    </ContextualMenuContext.Provider>
-    <ContextualMenuContext.Provider value={{ selectedItemId: 0, setSelectedItemId: () => {} }}>
-      <Title title="Selected" theme="light" level={3} />
-      <ExampleContainer>
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Selected hover" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-hover">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-      <Title title="Selected active" theme="light" level={3} />
-      <ExampleContainer pseudoState="pseudo-active">
-        <SingleItem {...items[0]} id={0} depthLevel={0} />
-      </ExampleContainer>
-    </ContextualMenuContext.Provider>
-  </DxcContainer>
-);
+export const SingleItemStates = () => {
+  const colorsTheme = useTheme();
+
+  return (
+    <ThemeProvider theme={colorsTheme.contextualMenu}>
+      <DxcContainer width="300px">
+        <ContextualMenuContext.Provider value={{ selectedItemId: -1, setSelectedItemId: () => {} }}>
+          <Title title="Default" theme="light" level={3} />
+          <ExampleContainer>
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Focus" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-focus">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Hover" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-hover">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Active" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-active">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+        </ContextualMenuContext.Provider>
+        <ContextualMenuContext.Provider value={{ selectedItemId: 0, setSelectedItemId: () => {} }}>
+          <Title title="Selected" theme="light" level={3} />
+          <ExampleContainer>
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Selected hover" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-hover">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+          <Title title="Selected active" theme="light" level={3} />
+          <ExampleContainer pseudoState="pseudo-active">
+            <SingleItem {...items[0]} id={0} depthLevel={0} />
+          </ExampleContainer>
+        </ContextualMenuContext.Provider>
+      </DxcContainer>
+    </ThemeProvider>
+  );
+};

package/contextual-menu/ItemAction.js

@@ -26,9 +26,10 @@ var ItemAction = function ItemAction(_ref) {
   });
   return /*#__PURE__*/_react["default"].createElement(Action, (0, _extends2["default"])({
     depthLevel: depthLevel
-  }, props), /*#__PURE__*/_react["default"].createElement(Label, null, collapseIcon, icon && depthLevel === 0 && /*#__PURE__*/_react["default"].createElement(Icon, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+  }, props), /*#__PURE__*/_react["default"].createElement(Label, null, collapseIcon && /*#__PURE__*/_react["default"].createElement(Icon, null, collapseIcon), icon && depthLevel === 0 && /*#__PURE__*/_react["default"].createElement(Icon, null, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
     icon: icon
   }) : icon), /*#__PURE__*/_react["default"].createElement(Text, {
+    selected: props.selected,
     onMouseEnter: function onMouseEnter(event) {
       var text = event.currentTarget;
       if (text.title === "" && text.scrollWidth > text.clientWidth) text.title = label;
@@ -37,14 +38,51 @@ var ItemAction = function ItemAction(_ref) {
 };
 var Action = _styledComponents["default"].button(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  border: none;\n  border-radius: 4px;\n  width: 100%;\n  padding: ", ";\n  box-shadow: inset 0 0 0 2px transparent;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  gap: ", ";\n  ", ";\n  cursor: pointer;\n  overflow: hidden;\n\n  &:hover {\n    ", ";\n  }\n  &:active {\n    ", ";\n  }\n  &:focus {\n    outline: 2px solid ", ";\n    outline-offset: -1px;\n  }\n"])), function (props) {
   return "".concat(_coreTokens["default"].spacing_4, " ").concat(_coreTokens["default"].spacing_8, " ").concat(_coreTokens["default"].spacing_4, " ", "\n    calc(".concat(_coreTokens["default"].spacing_8, " + (").concat(_coreTokens["default"].spacing_24, " * ").concat(props.depthLevel, "))\n  "), ";");
-}, _coreTokens["default"].spacing_16, function (props) {
-  return props.selected ? "background-color: ".concat(_coreTokens["default"].color_purple_100, "; font-weight: ").concat(_coreTokens["default"].type_semibold, ";") : "background-color: ".concat(_coreTokens["default"].color_transparent);
-}, function (props) {
-  return props.selected ? "background-color: ".concat(_coreTokens["default"].color_purple_200, ";") : "background-color: ".concat(_coreTokens["default"].color_grey_100, ";");
-}, function (props) {
-  return props.selected ? "background-color: ".concat(_coreTokens["default"].color_purple_200, ";") : "background-color: ".concat(_coreTokens["default"].color_grey_100, ";");
+}, _coreTokens["default"].spacing_16, function (_ref2) {
+  var selected = _ref2.selected,
+    theme = _ref2.theme;
+  return selected ? "background-color: ".concat(theme.selectedMenuItemBackgroundColor, ";") : "background-color: ".concat(_coreTokens["default"].color_transparent);
+}, function (_ref3) {
+  var selected = _ref3.selected,
+    theme = _ref3.theme;
+  return selected ? "background-color: ".concat(theme.hoverSelectedMenuItemBackgroundColor, ";") : "background-color: ".concat(theme.hoverMenuItemBackgroundColor, ";");
+}, function (_ref4) {
+  var selected = _ref4.selected,
+    theme = _ref4.theme;
+  return selected ? "background-color: ".concat(theme.activeSelectedMenuItemBackgroundColor, ";") : "background-color: ".concat(theme.activeMenuItemBackgroundColor, ";");
 }, _coreTokens["default"].color_blue_600);
-var Icon = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  font-size: 16px;\n\n  svg {\n    height: 16px;\n    width: 16px;\n  }\n"])));
+var Icon = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  font-size: ", ";\n  color: ", ";\n\n  svg {\n    height: ", ";\n    width: ", ";\n  }\n"])), function (_ref5) {
+  var theme = _ref5.theme;
+  return theme.iconSize;
+}, function (_ref6) {
+  var theme = _ref6.theme;
+  return theme.iconColor;
+}, function (_ref7) {
+  var theme = _ref7.theme;
+  return theme.iconSize;
+}, function (_ref8) {
+  var theme = _ref8.theme;
+  return theme.iconSize;
+});
 var Label = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  gap: ", ";\n  overflow: hidden;\n"])), _coreTokens["default"].spacing_8);
-var Text = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  line-height: 24px;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), _coreTokens["default"].color_grey_900, _coreTokens["default"].type_sans, _coreTokens["default"].type_scale_02);
+var Text = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), function (_ref9) {
+  var theme = _ref9.theme;
+  return theme.menuItemFontColor;
+}, function (_ref10) {
+  var theme = _ref10.theme;
+  return theme.fontFamily;
+}, function (_ref11) {
+  var theme = _ref11.theme;
+  return theme.menuItemFontSize;
+}, function (_ref12) {
+  var theme = _ref12.theme;
+  return theme.menuItemFontStyle;
+}, function (_ref13) {
+  var selected = _ref13.selected,
+    theme = _ref13.theme;
+  return selected ? theme.selectedMenuItemFontWeight : theme.menuItemFontWeight;
+}, function (_ref14) {
+  var theme = _ref14.theme;
+  return theme.menuItemLineHeight;
+});
 var _default = exports["default"] = ItemAction;

package/contextual-menu/types.d.ts

@@ -17,6 +17,10 @@ type Section = {
     title?: string;
 };
 type Props = {
+    /**
+     * Array of items to be displayed in the Contextual menu.
+     * Each item can be a single/simple item, a group item or a section.
+     */
     items: (Item | GroupItem)[] | Section[];
 };
 /**

package/divider/Divider.stories.tsx

@@ -1,7 +1,8 @@
 import React from "react";
 import Title from "../../.storybook/components/Title";
 import DxcDivider from "./Divider";
-import { DxcFlex, DxcParagraph } from "../main";
+import DxcFlex from "../flex/Flex";
+import DxcParagraph from "../paragraph/Paragraph";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 
 export default {

package/file-input/FileItem.js

@@ -100,7 +100,7 @@ var FileName = _styledComponents["default"].span(_templateObject5 || (_templateO
   return props.theme.fileItemLineHeight;
 });
 var ErrorIcon = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  padding: 3px;\n  height: 18px;\n  width: 18px;\n  font-size: 18px;\n  color: #d0011b;\n"])));
-var DeleteFileAction = _styledComponents["default"].button(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: 1px solid transparent;\n  border-radius: 2px;\n  background-color: transparent;\n  box-shadow: 0 0 0 2px transparent;\n  padding: 3px;\n  cursor: pointer;\n  color: ", ";\n  font-size: 18px;\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus,\n  &:focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
+var DeleteFileAction = _styledComponents["default"].button(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  justify-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: 1px solid transparent;\n  border-radius: 2px;\n  background-color: transparent;\n  box-shadow: 0 0 0 2px transparent;\n  padding: 3px;\n  cursor: pointer;\n  color: ", ";\n  font-size: 18px;\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus,\n  &:focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.deleteFileItemColor;

package/icon/Icon.stories.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import DxcIcon from "./Icon";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-import { DxcTypography } from "../main";
+import DxcTypography from "../typography/Typography";
 
 export default {
   title: "Icon",

package/number-input/NumberInput.js

@@ -59,7 +59,8 @@ var DxcNumberInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, r
       stepNumber: step
     }
   }, /*#__PURE__*/_react["default"].createElement(NumberInputContainer, {
-    ref: numberInputRef
+    ref: numberInputRef,
+    size: size
   }, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
     label: label,
     name: name,
@@ -82,5 +83,7 @@ var DxcNumberInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, r
     ref: ref
   })));
 });
-var NumberInputContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  // Chrome, Safari, Edge, Opera\n  input::-webkit-outer-spin-button,\n  input::-webkit-inner-spin-button {\n    -webkit-appearance: none;\n    margin: 0;\n  }\n\n  // Firefox\n  input[type=\"number\"] {\n    -moz-appearance: textfield;\n  }\n"])));
+var NumberInputContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  ", "\n  // Chrome, Safari, Edge, Opera\n  input::-webkit-outer-spin-button,\n  input::-webkit-inner-spin-button {\n    -webkit-appearance: none;\n    margin: 0;\n  }\n\n  // Firefox\n  input[type=\"number\"] {\n    -moz-appearance: textfield;\n  }\n"])), function (props) {
+  return props.size == "fillParent" && "width: 100%;";
+});
 var _default = exports["default"] = DxcNumberInput;

package/number-input/NumberInput.stories.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DxcNumberInput from "./NumberInput";
+import DxcFlex from "../flex/Flex";
 
 export default {
   title: "Number Input",
@@ -113,5 +114,13 @@ export const Chromatic = () => (
       <Title title="FillParent size" theme="light" level={4} />
       <DxcNumberInput label="FillParent" size="fillParent" />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Different sizes inside a flex" theme="light" level={4} />
+      <DxcFlex justifyContent="space-between" gap="1rem">
+        <DxcNumberInput label="fillParent" size="fillParent" />
+        <DxcNumberInput label="medium" size="medium" />
+        <DxcNumberInput label="large" size="large" />
+      </DxcFlex>
+    </ExampleContainer>
   </>
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxc-technology/halstack-react",
-  "version": "12.1.0",
+  "version": "12.2.0",
   "description": "DXC Halstack React components library",
   "repository": "dxc-technology/halstack-react",
   "homepage": "https://developer.dxc.com/halstack",
@@ -19,6 +19,7 @@
   },
   "dependencies": {
     "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-tooltip": "^1.0.7",
     "color": "^3.1.3",
     "dayjs": "^1.11.1",
     "slugify": "^1.6.5"
@@ -52,7 +53,7 @@
     "@storybook/builder-vite": "^8.0.8",
     "@storybook/react": "^8.0.8",
     "@storybook/react-vite": "^8.0.8",
-    "@storybook/test": "^8.0.8",
+    "@storybook/test": "^8.0.9",
     "@storybook/test-runner": "^0.17.0",
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "^13.0.0",
@@ -64,7 +65,7 @@
     "axe-playwright": "^2.0.1",
     "babel-jest": "^24.8.0",
     "babel-loader": "^8.0.6",
-    "chromatic": "^8.0.0",
+    "chromatic": "^11.3.0",
     "css-loader": "^7.1.1",
     "eslint": "^8.53.0",
     "eslint-config-airbnb": "^19.0.4",

package/password-input/PasswordInput.js

@@ -64,7 +64,8 @@ var DxcPasswordInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref,
   }, [isPasswordVisible, passwordInput]);
   return /*#__PURE__*/_react["default"].createElement(PasswordInput, {
     ref: ref,
-    role: "group"
+    role: "group",
+    size: size
   }, /*#__PURE__*/_react["default"].createElement(_TextInput["default"], {
     label: label,
     name: name,
@@ -76,7 +77,7 @@ var DxcPasswordInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref,
           return !isPasswordVisible;
         });
       },
-      icon: isPasswordVisible ? 'Visibility_Off' : 'Visibility',
+      icon: isPasswordVisible ? "Visibility_Off" : "Visibility",
       title: isPasswordVisible ? passwordInput.inputHidePasswordTitle : passwordInput.inputShowPasswordTitle
     },
     error: error,
@@ -93,5 +94,7 @@ var DxcPasswordInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref,
     tabIndex: tabIndex
   }));
 });
-var PasswordInput = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  & ::-ms-reveal {\n    display: none;\n  }\n"])));
+var PasswordInput = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  ", "\n  & ::-ms-reveal {\n    display: none;\n  }\n"])), function (props) {
+  return props.size == "fillParent" && "width: 100%;";
+});
 var _default = exports["default"] = DxcPasswordInput;

package/password-input/PasswordInput.stories.tsx

@@ -3,6 +3,7 @@ import { userEvent, within } from "@storybook/test";
 import DxcPasswordInput from "./PasswordInput";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import DxcFlex from "../flex/Flex";
 
 export default {
   title: "Password Input",
@@ -81,6 +82,14 @@ export const Chromatic = () => (
       <Title title="FillParent size" theme="light" level={4} />
       <DxcPasswordInput label="FillParent" size="fillParent" />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Without label" theme="light" level={4} />
+      <DxcFlex justifyContent="space-between" gap="1rem">
+        <DxcPasswordInput label="fillParent" size="fillParent" />
+        <DxcPasswordInput label="medium" size="medium" />
+        <DxcPasswordInput label="large" size="large" />
+      </DxcFlex>
+    </ExampleContainer>
   </>
 );
 

package/resultset-table/ResultsetTable.js

@@ -26,8 +26,8 @@ var normalizeSortValue = function normalizeSortValue(sortValue) {
 };
 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);
+    var sortValueA = normalizeSortValue(element1.cells[index].sortValue || element1[index].displayValue);
+    var sortValueB = normalizeSortValue(element2.cells[index].sortValue || element2[index].displayValue);
     var comparison = 0;
     if ((0, _typeof2["default"])(sortValueA) === "object") {
       comparison = -1;
@@ -47,6 +47,17 @@ var getMinItemsPerPageIndex = function getMinItemsPerPageIndex(currentPageIntern
 var getMaxItemsPerPageIndex = function getMaxItemsPerPageIndex(minItemsPerPageIndex, itemsPerPage, resultset, page) {
   return minItemsPerPageIndex + itemsPerPage > resultset.length ? resultset.length : itemsPerPage * page - 1;
 };
+var assignIdsToRows = function assignIdsToRows(resultset) {
+  if (resultset.length > 0) {
+    return resultset.map(function (row, index) {
+      return {
+        cells: row,
+        id: "row_".concat(index)
+      };
+    });
+  }
+  return [];
+};
 var DxcResultsetTable = function DxcResultsetTable(_ref) {
   var columns = _ref.columns,
     rows = _ref.rows,
@@ -76,6 +87,10 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     sortOrder = _useState6[0],
     changeSortOrder = _useState6[1];
+  var prevRowCountRef = (0, _react.useRef)(rows.length);
+  var rowsWithIds = (0, _react.useMemo)(function () {
+    return assignIdsToRows(rows);
+  }, [rows]);
   var minItemsPerPageIndex = (0, _react.useMemo)(function () {
     return getMinItemsPerPageIndex(page, itemsPerPage, page);
   }, [itemsPerPage, page]);
@@ -83,8 +98,8 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
     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]);
+    return sortColumnIndex !== -1 ? sortArray(sortColumnIndex, sortOrder, rowsWithIds) : rowsWithIds;
+  }, [sortColumnIndex, sortOrder, rowsWithIds]);
   var filteredResultset = (0, _react.useMemo)(function () {
     return sortedResultset && sortedResultset.slice(minItemsPerPageIndex, maxItemsPerPageIndex + 1);
   }, [sortedResultset, minItemsPerPageIndex, maxItemsPerPageIndex]);
@@ -98,9 +113,18 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
   };
   (0, _react.useEffect)(function () {
     if (!hidePaginator) {
-      rows.length > 0 ? changePage(1) : changePage(0);
+      if (rows.length === 0) {
+        changePage(0);
+      } else if (rows.length < prevRowCountRef.current) {
+        var lastPage = Math.ceil(rows.length / itemsPerPage);
+        var prevLastPage = Math.ceil(prevRowCountRef.current / itemsPerPage);
+        if (lastPage < prevLastPage) {
+          changePage(Math.min(lastPage, page));
+        }
+      }
+      prevRowCountRef.current = rows.length;
     }
-  }, [rows]);
+  }, [rows.length]);
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.table
   }, /*#__PURE__*/_react["default"].createElement(DxcResultsetTableContainer, {
@@ -122,10 +146,10 @@ var DxcResultsetTable = function DxcResultsetTable(_ref) {
       mode: mode,
       "aria-label": column.isSortable ? "Sort column" : undefined
     }, /*#__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, rowIndex) {
+  }))), /*#__PURE__*/_react["default"].createElement("tbody", null, filteredResultset.map(function (row) {
     return /*#__PURE__*/_react["default"].createElement("tr", {
-      key: "resultSetTableCell_".concat(page, "_").concat(rowIndex)
-    }, cells.map(function (cellContent, cellIndex) {
+      key: "resultSetTableCell_".concat(row.id)
+    }, row.cells.map(function (cellContent, cellIndex) {
       return /*#__PURE__*/_react["default"].createElement("td", {
         key: "resultSetTableCellContent_".concat(cellIndex)
       }, cellContent.displayValue);

package/resultset-table/ResultsetTable.stories.tsx

@@ -409,5 +409,5 @@ export const DropdownAction = ResultsetActionsCellDropdown.bind({});
 DropdownAction.play = async ({ canvasElement }) => {
   const canvas = within(canvasElement);
   const dropdown = canvas.getAllByRole("button")[5];
-  await userEvent.click(dropdown);
+  userEvent.click(dropdown);
 };