From 37b3b8f38ee24b46dcbf0a30587885dfcbc2b808 Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Wed, 22 Jul 2020 13:05:27 +0800
Subject: [PATCH] fix: Not render children when invalidate

---
 src/Table.tsx                              |  2 +-
 tests/ExpandRow.spec.js                    | 10 +++
 tests/__snapshots__/ExpandRow.spec.js.snap | 85 ++++++++++++++++++++++
 3 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/src/Table.tsx b/src/Table.tsx
index af680c27b..d9c005dac 100644
--- a/src/Table.tsx
+++ b/src/Table.tsx
@@ -286,7 +286,7 @@ function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordTyp
         internalHooks === INTERNAL_HOOKS &&
         (props.expandable as any).__PARENT_RENDER_ICON__) ||
       mergedData.some(
-        record => record && typeof record === 'object' && mergedChildrenColumnName in record,
+        record => record && typeof record === 'object' && record[mergedChildrenColumnName],
       )
     ) {
       return 'nest';
diff --git a/tests/ExpandRow.spec.js b/tests/ExpandRow.spec.js
index 6452bf933..66e50a2c4 100644
--- a/tests/ExpandRow.spec.js
+++ b/tests/ExpandRow.spec.js
@@ -71,6 +71,16 @@ describe('Table.Expand', () => {
     expect(wrapper.render()).toMatchSnapshot();
   });
 
+  it('not use nest when children is invalidate', () => {
+    const data = [
+      { key: 2, name: 'Jack', age: 28, children: null },
+      { key: 4, name: 'Jack', age: 28, children: undefined },
+      { key: 5, name: 'Jack', age: 28, children: false },
+    ];
+    const wrapper = mount(createTable({ data }));
+    expect(wrapper.render()).toMatchSnapshot();
+  });
+
   it('childrenColumnName', () => {
     const data = [
       {
diff --git a/tests/__snapshots__/ExpandRow.spec.js.snap b/tests/__snapshots__/ExpandRow.spec.js.snap
index 9b83f29a4..ffda7003b 100644
--- a/tests/__snapshots__/ExpandRow.spec.js.snap
+++ b/tests/__snapshots__/ExpandRow.spec.js.snap
@@ -103,6 +103,91 @@ exports[`Table.Expand childrenColumnName 1`] = `
 </div>
 `;
 
+exports[`Table.Expand not use nest when children is invalidate 1`] = `
+<div
+  class="rc-table"
+>
+  <div
+    class="rc-table-container"
+  >
+    <div
+      class="rc-table-content"
+    >
+      <table
+        style="table-layout: auto;"
+      >
+        <colgroup />
+        <thead
+          class="rc-table-thead"
+        >
+          <tr>
+            <th
+              class="rc-table-cell"
+            >
+              Name
+            </th>
+            <th
+              class="rc-table-cell"
+            >
+              Age
+            </th>
+          </tr>
+        </thead>
+        <tbody
+          class="rc-table-tbody"
+        >
+          <tr
+            class="rc-table-row rc-table-row-level-0"
+            data-row-key="2"
+          >
+            <td
+              class="rc-table-cell"
+            >
+              Jack
+            </td>
+            <td
+              class="rc-table-cell"
+            >
+              28
+            </td>
+          </tr>
+          <tr
+            class="rc-table-row rc-table-row-level-0"
+            data-row-key="4"
+          >
+            <td
+              class="rc-table-cell"
+            >
+              Jack
+            </td>
+            <td
+              class="rc-table-cell"
+            >
+              28
+            </td>
+          </tr>
+          <tr
+            class="rc-table-row rc-table-row-level-0"
+            data-row-key="5"
+          >
+            <td
+              class="rc-table-cell"
+            >
+              Jack
+            </td>
+            <td
+              class="rc-table-cell"
+            >
+              28
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`Table.Expand renders fixed column correctly work 1`] = `
 <div
   class="rc-table rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-left rc-table-has-fix-right"