From d02424ee2fcbfb32bfd89f8bfca87dc1978830bb Mon Sep 17 00:00:00 2001
From: inottn <inottn@outlook.com>
Date: Mon, 25 Aug 2025 03:23:49 +0000
Subject: [PATCH] fix: expand column not visible when expandable.fixed is true

---
 src/hooks/useColumns/index.tsx              |   9 +-
 tests/ExpandRow.spec.jsx                    |  24 +++-
 tests/__snapshots__/ExpandRow.spec.jsx.snap | 117 ++++++++++++++++++--
 3 files changed, 133 insertions(+), 17 deletions(-)

diff --git a/src/hooks/useColumns/index.tsx b/src/hooks/useColumns/index.tsx
index 64542696f..070aa3031 100644
--- a/src/hooks/useColumns/index.tsx
+++ b/src/hooks/useColumns/index.tsx
@@ -178,11 +178,10 @@ function useColumns<RecordType>(
       // >>> Insert expand column if not exist
       if (!cloneColumns.includes(EXPAND_COLUMN)) {
         const expandColIndex = expandIconColumnIndex || 0;
-        if (expandColIndex >= 0 && (expandColIndex || fixed === 'left' || !fixed)) {
-          cloneColumns.splice(expandColIndex, 0, EXPAND_COLUMN);
-        }
-        if (fixed === 'right') {
-          cloneColumns.splice(baseColumns.length, 0, EXPAND_COLUMN);
+        const insertIndex =
+          expandColIndex === 0 && fixed === 'right' ? baseColumns.length : expandColIndex;
+        if (insertIndex >= 0) {
+          cloneColumns.splice(insertIndex, 0, EXPAND_COLUMN);
         }
       }
 
diff --git a/tests/ExpandRow.spec.jsx b/tests/ExpandRow.spec.jsx
index 5a44fa1a0..058e057e2 100644
--- a/tests/ExpandRow.spec.jsx
+++ b/tests/ExpandRow.spec.jsx
@@ -219,6 +219,14 @@ describe('Table.Expand', () => {
       }),
     );
     const wrapper2 = mount(
+      createTable({
+        columns,
+        data,
+        scroll: { x: 903 },
+        expandable: { expandedRowRender, fixed: true, expandIconColumnIndex: 1 },
+      }),
+    );
+    const wrapper3 = mount(
       createTable({
         columns,
         data,
@@ -227,10 +235,11 @@ describe('Table.Expand', () => {
       }),
     );
     expect(wrapper.find('.rc-table-has-fix-left').length).toBe(0);
-    expect(wrapper2.find('.rc-table-has-fix-right').length).toBe(0);
+    expect(wrapper2.find('.rc-table-has-fix-left').length).toBe(0);
+    expect(wrapper3.find('.rc-table-has-fix-right').length).toBe(0);
   });
 
-  it('fixed in expandable Fixed in expandable', () => {
+  it('fixed in expandable', () => {
     const columns = [
       { title: 'Name', dataIndex: 'name', key: 'name' },
       { title: 'Age', dataIndex: 'age', key: 'age' },
@@ -249,6 +258,14 @@ describe('Table.Expand', () => {
       }),
     );
     const wrapper2 = mount(
+      createTable({
+        columns,
+        data,
+        scroll: { x: 903 },
+        expandable: { expandedRowRender, fixed: true },
+      }),
+    );
+    const wrapper3 = mount(
       createTable({
         columns,
         data,
@@ -257,7 +274,8 @@ describe('Table.Expand', () => {
       }),
     );
     expect(wrapper.find('.rc-table-has-fix-left').length).toBe(1);
-    expect(wrapper2.find('.rc-table-has-fix-right').length).toBe(1);
+    expect(wrapper2.find('.rc-table-has-fix-left').length).toBe(1);
+    expect(wrapper3.find('.rc-table-has-fix-right').length).toBe(1);
   });
 
   describe('config expand column index', () => {
diff --git a/tests/__snapshots__/ExpandRow.spec.jsx.snap b/tests/__snapshots__/ExpandRow.spec.jsx.snap
index 5a59716b0..9ee888bc2 100644
--- a/tests/__snapshots__/ExpandRow.spec.jsx.snap
+++ b/tests/__snapshots__/ExpandRow.spec.jsx.snap
@@ -138,7 +138,7 @@ LoadedCheerio {
 exports[`Table.Expand > does not crash if scroll is not set 1`] = `
 LoadedCheerio {
   "0": <div
-    class="rc-table rc-table-scroll-horizontal"
+    class="rc-table rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-left"
   >
     <div
       class="rc-table-container"
@@ -148,13 +148,21 @@ LoadedCheerio {
         style="overflow-x: auto; overflow-y: hidden;"
       >
         <table
-          style="min-width: 100%; table-layout: auto;"
+          style="min-width: 100%; table-layout: fixed;"
         >
-          <colgroup />
+          <colgroup>
+            <col
+              class="rc-table-expand-icon-col"
+            />
+          </colgroup>
           <thead
             class="rc-table-thead"
           >
             <tr>
+              <th
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              />
               <th
                 class="rc-table-cell"
                 scope="col"
@@ -210,11 +218,28 @@ LoadedCheerio {
                    
                 </div>
               </td>
+              <td
+                style="padding: 0px; border: 0px; height: 0px;"
+              >
+                <div
+                  style="height: 0px; overflow: hidden;"
+                >
+                   
+                </div>
+              </td>
             </tr>
             <tr
               class="rc-table-row rc-table-row-level-0"
               data-row-key="0"
             >
+              <td
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              >
+                <span
+                  class="rc-table-row-expand-icon rc-table-row-collapsed"
+                />
+              </td>
               <td
                 class="rc-table-cell"
               >
@@ -235,6 +260,14 @@ LoadedCheerio {
               class="rc-table-row rc-table-row-level-0"
               data-row-key="1"
             >
+              <td
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              >
+                <span
+                  class="rc-table-row-expand-icon rc-table-row-collapsed"
+                />
+              </td>
               <td
                 class="rc-table-cell"
               >
@@ -290,7 +323,7 @@ LoadedCheerio {
 exports[`Table.Expand > does not crash if scroll is not set 2`] = `
 LoadedCheerio {
   "0": <div
-    class="rc-table rc-table-scroll-horizontal"
+    class="rc-table rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-left"
   >
     <div
       class="rc-table-container"
@@ -300,13 +333,21 @@ LoadedCheerio {
         style="overflow-x: auto; overflow-y: hidden;"
       >
         <table
-          style="min-width: 100%; table-layout: auto;"
+          style="min-width: 100%; table-layout: fixed;"
         >
-          <colgroup />
+          <colgroup>
+            <col
+              class="rc-table-expand-icon-col"
+            />
+          </colgroup>
           <thead
             class="rc-table-thead"
           >
             <tr>
+              <th
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              />
               <th
                 class="rc-table-cell"
                 scope="col"
@@ -362,11 +403,28 @@ LoadedCheerio {
                    
                 </div>
               </td>
+              <td
+                style="padding: 0px; border: 0px; height: 0px;"
+              >
+                <div
+                  style="height: 0px; overflow: hidden;"
+                >
+                   
+                </div>
+              </td>
             </tr>
             <tr
               class="rc-table-row rc-table-row-level-0"
               data-row-key="0"
             >
+              <td
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              >
+                <span
+                  class="rc-table-row-expand-icon rc-table-row-collapsed"
+                />
+              </td>
               <td
                 class="rc-table-cell"
               >
@@ -387,6 +445,14 @@ LoadedCheerio {
               class="rc-table-row rc-table-row-level-0"
               data-row-key="1"
             >
+              <td
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              >
+                <span
+                  class="rc-table-row-expand-icon rc-table-row-collapsed"
+                />
+              </td>
               <td
                 class="rc-table-cell"
               >
@@ -1117,7 +1183,7 @@ LoadedCheerio {
 exports[`Table.Expand > work in expandable fix 1`] = `
 LoadedCheerio {
   "0": <div
-    class="rc-table rc-table-scroll-horizontal"
+    class="rc-table rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-left"
   >
     <div
       class="rc-table-container"
@@ -1127,13 +1193,21 @@ LoadedCheerio {
         style="overflow-x: auto; overflow-y: hidden;"
       >
         <table
-          style="width: 903px; min-width: 100%; table-layout: auto;"
+          style="width: 903px; min-width: 100%; table-layout: fixed;"
         >
-          <colgroup />
+          <colgroup>
+            <col
+              class="rc-table-expand-icon-col"
+            />
+          </colgroup>
           <thead
             class="rc-table-thead"
           >
             <tr>
+              <th
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              />
               <th
                 class="rc-table-cell"
                 scope="col"
@@ -1189,11 +1263,28 @@ LoadedCheerio {
                    
                 </div>
               </td>
+              <td
+                style="padding: 0px; border: 0px; height: 0px;"
+              >
+                <div
+                  style="height: 0px; overflow: hidden;"
+                >
+                   
+                </div>
+              </td>
             </tr>
             <tr
               class="rc-table-row rc-table-row-level-0"
               data-row-key="0"
             >
+              <td
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              >
+                <span
+                  class="rc-table-row-expand-icon rc-table-row-collapsed"
+                />
+              </td>
               <td
                 class="rc-table-cell"
               >
@@ -1214,6 +1305,14 @@ LoadedCheerio {
               class="rc-table-row rc-table-row-level-0"
               data-row-key="1"
             >
+              <td
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
+              >
+                <span
+                  class="rc-table-row-expand-icon rc-table-row-collapsed"
+                />
+              </td>
               <td
                 class="rc-table-cell"
               >