@patternfly/react-table 4.60.2 → 4.60.3

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.60.3 (2022-01-19)
+
+
+### Bug Fixes
+
+* **examples:** amend row index in tree table examples ([#6830](https://github.com/patternfly/patternfly-react/issues/6830)) ([e676fb1](https://github.com/patternfly/patternfly-react/commit/e676fb1171618e957a4564af31c15ca6e3800507)), closes [#6719](https://github.com/patternfly/patternfly-react/issues/6719)
+
+
+
+
+
 ## 4.60.2 (2022-01-19)
 
 **Note:** Version bump only for package @patternfly/react-table

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-table",
-  "version": "4.60.2",
+  "version": "4.60.3",
   "description": "This library provides a set of React table components for use with the PatternFly 4",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -31,10 +31,10 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@patternfly/react-core": "^4.191.2",
-    "@patternfly/react-icons": "^4.42.2",
-    "@patternfly/react-styles": "^4.41.2",
-    "@patternfly/react-tokens": "^4.43.2",
+    "@patternfly/react-core": "^4.191.3",
+    "@patternfly/react-icons": "^4.42.3",
+    "@patternfly/react-styles": "^4.41.3",
+    "@patternfly/react-tokens": "^4.43.3",
     "lodash": "^4.17.19",
     "tslib": "^2.0.0"
   },
@@ -46,5 +46,5 @@
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },
-  "gitHead": "346e73d12c36bf0c75c1208656efc85b4ceaac9a"
+  "gitHead": "f161ca861cb4f1a679ea090a0606c15bdd5e795b"
 }

package/src/components/Table/examples/LegacyTableTree.tsx

@@ -137,6 +137,12 @@ export const LegacyTableTree: React.FunctionComponent = () => {
       icon = isExpanded ? <FolderOpenIcon aria-hidden /> : <FolderIcon aria-hidden />;
     }
     flattenedNodes.push(node);
+
+    const childRows =
+      node.children && node.children.length
+        ? buildRows(node.children, level + 1, 1, rowIndex + 1, !isExpanded || isHidden)
+        : [];
+
     return [
       {
         cells: [node.name, node.branches, node.pullRequests, node.workspaces],
@@ -151,16 +157,8 @@ export const LegacyTableTree: React.FunctionComponent = () => {
           icon
         }
       },
-      ...(node.children && node.children.length
-        ? buildRows(node.children, level + 1, 1, rowIndex + 1, !isExpanded || isHidden)
-        : []),
-      ...buildRows(
-        remainingNodes,
-        level,
-        posinset + 1,
-        rowIndex + 1 + ((node.children && node.children.length) || 0),
-        isHidden
-      )
+      ...childRows,
+      ...buildRows(remainingNodes, level, posinset + 1, rowIndex + 1 + childRows.length, isHidden)
     ];
   };
 

package/src/components/TableComposable/examples/ComposableTableTree.tsx

@@ -163,6 +163,11 @@ export const ComposableTableTree: React.FunctionComponent = () => {
       }
     };
 
+    const childRows =
+      node.children && node.children.length
+        ? renderRows(node.children, level + 1, 1, rowIndex + 1, !isExpanded || isHidden)
+        : [];
+
     return [
       <TreeRowWrapper key={node.name} row={{ props: treeRow.props }}>
         <Td dataLabel={columnNames.name} treeRow={treeRow}>
@@ -172,16 +177,8 @@ export const ComposableTableTree: React.FunctionComponent = () => {
         <Td dataLabel={columnNames.prs}>{node.pullRequests}</Td>
         <Td dataLabel={columnNames.workspaces}>{node.workspaces}</Td>
       </TreeRowWrapper>,
-      ...(node.children && node.children.length
-        ? renderRows(node.children, level + 1, 1, rowIndex + 1, !isExpanded || isHidden)
-        : []),
-      ...renderRows(
-        remainingNodes,
-        level,
-        posinset + 1,
-        rowIndex + 1 + ((node.children && node.children.length) || 0),
-        isHidden
-      )
+      ...childRows,
+      ...renderRows(remainingNodes, level, posinset + 1, rowIndex + 1 + childRows.length, isHidden)
     ];
   };