From 6941957895a68b38960dfb3f06c4cd3aef5b42bd Mon Sep 17 00:00:00 2001
From: Andrey Ignatovskiy <lazylahtak@yandex.ru>
Date: Tue, 28 Jan 2020 10:42:19 +0300
Subject: [PATCH 1/4] Add key to rerender by 'for' change in runtime

---
 packages/dx-react-grid/src/plugins/table-tree-column.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/dx-react-grid/src/plugins/table-tree-column.tsx b/packages/dx-react-grid/src/plugins/table-tree-column.tsx
index 981cb40ba7..5633c19b33 100644
--- a/packages/dx-react-grid/src/plugins/table-tree-column.tsx
+++ b/packages/dx-react-grid/src/plugins/table-tree-column.tsx
@@ -40,6 +40,7 @@ class TableTreeColumnBase extends React.PureComponent<TableTreeColumnProps> {
           { name: 'Table' },
           { name: 'TableHeaderRow', optional: true },
         ]}
+        key={forColumnName}
       >
         <Getter name="tableTreeColumnName" value={forColumnName} />
         <Template

From 8f716085e3058826f174c35594696339c821d140 Mon Sep 17 00:00:00 2001
From: Andrey Ignatovskiy <lazylahtak@yandex.ru>
Date: Tue, 28 Jan 2020 13:28:45 +0300
Subject: [PATCH 2/4] Add test

---
 .../src/plugins/table-tree-column.test.tsx    | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx b/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
index eae848c7fc..aea1a8af61 100644
--- a/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
+++ b/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
@@ -24,7 +24,7 @@ const defaultDeps = {
     tableCell: {
       tableRow: { type: 'undefined', rowId: 1, row: { value: 'value' } },
       tableColumn: { type: 'undefined', rowId: 1, column: { name: 'a' } },
-      style: {},
+      style: {},  
     },
   },
   plugins: ['TreeDataState', 'Table'],
@@ -224,4 +224,48 @@ describe('TableTreeColumn', () => {
         value: defaultDeps.template.tableCell.tableRow.row.value,
       });
   });
+
+  it('should change "for" property in runtime', () => {
+      class Test extends React.Component {
+        constructor(props) {
+          super(props);
+          this.state = {
+            columnName: props.columnName,
+          }
+        }
+
+        render() {
+          const { columnName } = this.state;
+          isTreeTableCell.mockImplementation(( _, tableColumn ) => tableColumn.column.name === columnName);
+
+          return(
+            <PluginHost>
+            {pluginDepsToComponents(defaultDeps)}
+              <TableTreeColumn
+                {...defaultProps}
+                for={columnName}
+              />
+            </PluginHost>
+          )
+        }
+      }
+      
+      const tree = mount((
+        <Test
+          columnName={'b'}
+        />
+      ))
+
+      expect(tree.find(defaultProps.cellComponent).exists())
+        .toBeFalsy();
+
+      tree.setState({
+        columnName: 'a',
+      })
+
+      expect(tree.find(defaultProps.cellComponent).exists())
+        .toBeTruthy();
+      expect(tree.find(defaultProps.cellComponent).props().column.name)
+        .toEqual('a');
+  });
 });

From fe7d677e5fb8933e67d7af367e6232c05997a95b Mon Sep 17 00:00:00 2001
From: Andrey Ignatovskiy <lazylahtak@yandex.ru>
Date: Tue, 28 Jan 2020 13:32:37 +0300
Subject: [PATCH 3/4] Refactor

---
 packages/dx-react-grid/src/plugins/table-tree-column.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx b/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
index aea1a8af61..cbcb7c544f 100644
--- a/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
+++ b/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
@@ -24,7 +24,7 @@ const defaultDeps = {
     tableCell: {
       tableRow: { type: 'undefined', rowId: 1, row: { value: 'value' } },
       tableColumn: { type: 'undefined', rowId: 1, column: { name: 'a' } },
-      style: {},  
+      style: {},
     },
   },
   plugins: ['TreeDataState', 'Table'],

From 3fd5f2d01e1af76acdb799256bff309b2e389ae1 Mon Sep 17 00:00:00 2001
From: Andrey Ignatovskiy <lazylahtak@yandex.ru>
Date: Tue, 28 Jan 2020 13:42:54 +0300
Subject: [PATCH 4/4] Fix lint errors

---
 .../src/plugins/table-tree-column.test.tsx    | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx b/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
index cbcb7c544f..5f0deb8e6d 100644
--- a/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
+++ b/packages/dx-react-grid/src/plugins/table-tree-column.test.tsx
@@ -226,46 +226,48 @@ describe('TableTreeColumn', () => {
   });
 
   it('should change "for" property in runtime', () => {
-      class Test extends React.Component {
-        constructor(props) {
-          super(props);
-          this.state = {
-            columnName: props.columnName,
-          }
-        }
+    class Test extends React.Component {
+      constructor(props) {
+        super(props);
+        this.state = {
+          columnName: props.columnName,
+        };
+      }
 
-        render() {
-          const { columnName } = this.state;
-          isTreeTableCell.mockImplementation(( _, tableColumn ) => tableColumn.column.name === columnName);
+      render() {
+        const { columnName } = this.state;
+        isTreeTableCell.mockImplementation((_, tableColumn) => (
+          tableColumn.column.name === columnName
+        ));
 
-          return(
-            <PluginHost>
-            {pluginDepsToComponents(defaultDeps)}
-              <TableTreeColumn
-                {...defaultProps}
-                for={columnName}
-              />
-            </PluginHost>
-          )
-        }
+        return(
+          <PluginHost>
+          {pluginDepsToComponents(defaultDeps)}
+            <TableTreeColumn
+              {...defaultProps}
+              for={columnName}
+            />
+          </PluginHost>
+        );
       }
-      
-      const tree = mount((
-        <Test
-          columnName={'b'}
-        />
-      ))
+    }
 
-      expect(tree.find(defaultProps.cellComponent).exists())
-        .toBeFalsy();
+    const tree = mount((
+      <Test
+        columnName={'b'}
+      />
+    ));
 
-      tree.setState({
-        columnName: 'a',
-      })
+    expect(tree.find(defaultProps.cellComponent).exists())
+      .toBeFalsy();
+
+    tree.setState({
+      columnName: 'a',
+    });
 
-      expect(tree.find(defaultProps.cellComponent).exists())
-        .toBeTruthy();
-      expect(tree.find(defaultProps.cellComponent).props().column.name)
-        .toEqual('a');
+    expect(tree.find(defaultProps.cellComponent).exists())
+      .toBeTruthy();
+    expect(tree.find(defaultProps.cellComponent).props().column.name)
+      .toEqual('a');
   });
 });