From b6c7a22367689516e7dbe7d97679072362b7247a Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Mon, 1 Mar 2021 14:26:01 +0300
Subject: [PATCH] Refactor #1832 - For TreeTable

---
 src/components/treetable/TreeTableBody.js | 14 +++++++-------
 src/components/treetable/TreeTableRow.js  |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/treetable/TreeTableBody.js b/src/components/treetable/TreeTableBody.js
index a38d3be5f8..05918e3611 100644
--- a/src/components/treetable/TreeTableBody.js
+++ b/src/components/treetable/TreeTableBody.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { TreeTableRow } from './TreeTableRow'; 
+import { TreeTableRow } from './TreeTableRow';
 
 export class TreeTableBody extends Component {
 
@@ -60,10 +60,10 @@ export class TreeTableBody extends Component {
         onContextMenu: PropTypes.func
     }
 
-    createRow(node) {
+    createRow(node, index) {
         return (
-            <TreeTableRow key={node.key||JSON.stringify(node.data)} level={0}
-                            node={node} columns={this.props.columns} expandedKeys={this.props.expandedKeys} 
+            <TreeTableRow key={node.key||JSON.stringify(node.data)} level={0} rowIndex={index}
+                            node={node} columns={this.props.columns} expandedKeys={this.props.expandedKeys}
                             onToggle={this.props.onToggle} onExpand={this.props.onExpand} onCollapse={this.props.onCollapse}
                             selectionMode={this.props.selectionMode} selectionKeys={this.props.selectionKeys} onSelectionChange={this.props.onSelectionChange}
                             metaKeySelection={this.props.metaKeySelection} onRowClick={this.props.onRowClick} onSelect={this.props.onSelect} onUnselect={this.props.onUnselect}
@@ -91,8 +91,8 @@ export class TreeTableBody extends Component {
             return rows;
         }
         else {
-            return this.props.value.map(node => this.createRow(node));
-        } 
+            return this.props.value.map((node, index) => this.createRow(node, index));
+        }
     }
 
     renderEmptyMessage() {
@@ -118,4 +118,4 @@ export class TreeTableBody extends Component {
             </tbody>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/treetable/TreeTableRow.js b/src/components/treetable/TreeTableRow.js
index 30b23d26ec..7ec6777026 100644
--- a/src/components/treetable/TreeTableRow.js
+++ b/src/components/treetable/TreeTableRow.js
@@ -501,7 +501,7 @@ export class TreeTableRow extends Component {
         }
 
         return (
-            <TreeTableBodyCell key={column.props.columnKey||column.props.field} {...column.props} node={this.props.node}>
+            <TreeTableBodyCell key={column.props.columnKey||column.props.field} {...column.props} node={this.props.node} rowIndex={this.props.rowIndex}>
                 {toggler}
                 {checkbox}
             </TreeTableBodyCell>
@@ -510,9 +510,9 @@ export class TreeTableRow extends Component {
 
     renderChildren() {
         if (this.isExpanded() && this.props.node.children) {
-            return this.props.node.children.map(childNode => {
+            return this.props.node.children.map((childNode, index) => {
                 return (
-                    <TreeTableRow key={childNode.key||JSON.stringify(childNode.data)} level={this.props.level + 1}
+                    <TreeTableRow key={childNode.key||JSON.stringify(childNode.data)} level={this.props.level + 1} rowIndex={this.props.rowIndex + '_' + index}
                         node={childNode} columns={this.props.columns} expandedKeys={this.props.expandedKeys}
                         onToggle={this.props.onToggle} onExpand={this.props.onExpand} onCollapse={this.props.onCollapse}
                         selectionMode={this.props.selectionMode} selectionKeys={this.props.selectionKeys} onSelectionChange={this.props.onSelectionChange}