From 1572c2c95a0195f7cab7e81a930c2a59586ab37a Mon Sep 17 00:00:00 2001
From: linxianxi <904492381@qq.com>
Date: Thu, 16 May 2024 11:28:36 +0800
Subject: [PATCH 1/2] feat: column minWidth

---
 README.md               |  1 +
 src/ColGroup.tsx        | 13 +++++++++----
 src/interface.ts        |  7 ++++++-
 tests/Colgroup.spec.jsx | 25 +++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ad889ead2..5adb71f89 100644
--- a/README.md
+++ b/README.md
@@ -129,6 +129,7 @@ React.render(<Table columns={columns} data={data} />, mountNode);
 | title | React Node |  | title of this column |
 | dataIndex | String |  | display field of the data record |
 | width | String \| Number |  | width of the specific proportion calculation according to the width of the columns |
+| minWidth | Number |  | the minimum width of the column, only worked when tableLayout is auto |
 | fixed | String \| Boolean |  | this column will be fixed when table scroll horizontally: true or 'left' or 'right' |
 | align | String |  | specify how cell content is aligned |
 | ellipsis | Boolean |  | specify whether cell content be ellipsized |
diff --git a/src/ColGroup.tsx b/src/ColGroup.tsx
index 656e33551..d8f11bc64 100644
--- a/src/ColGroup.tsx
+++ b/src/ColGroup.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import type { ColumnType } from './interface';
 import { INTERNAL_COL_DEFINE } from './utils/legacyUtil';
+import { useContext } from '@rc-component/context';
+import TableContext from './context/TableContext';
 
 export interface ColGroupProps<RecordType> {
   colWidths: readonly (number | string)[];
@@ -9,6 +11,8 @@ export interface ColGroupProps<RecordType> {
 }
 
 function ColGroup<RecordType>({ colWidths, columns, columCount }: ColGroupProps<RecordType>) {
+  const { tableLayout } = useContext(TableContext, ['tableLayout']);
+
   const cols: React.ReactElement[] = [];
   const len = columCount || columns.length;
 
@@ -17,12 +21,13 @@ function ColGroup<RecordType>({ colWidths, columns, columCount }: ColGroupProps<
   let mustInsert = false;
   for (let i = len - 1; i >= 0; i -= 1) {
     const width = colWidths[i];
-    const column = columns && columns[i];
-    const additionalProps = column && column[INTERNAL_COL_DEFINE];
+    const column = columns?.[i];
+    const minWidth = tableLayout === 'auto' && column?.minWidth;
+    const additionalProps = column?.[INTERNAL_COL_DEFINE];
 
-    if (width || additionalProps || mustInsert) {
+    if (width || minWidth || additionalProps || mustInsert) {
       const { columnType, ...restAdditionalProps } = additionalProps || {};
-      cols.unshift(<col key={i} style={{ width }} {...restAdditionalProps} />);
+      cols.unshift(<col key={i} style={{ width, minWidth }} {...restAdditionalProps} />);
       mustInsert = true;
     }
   }
diff --git a/src/interface.ts b/src/interface.ts
index 06213c043..051ac57ae 100644
--- a/src/interface.ts
+++ b/src/interface.ts
@@ -70,7 +70,11 @@ export type Direction = 'ltr' | 'rtl';
 // SpecialString will be removed in antd@6
 export type SpecialString<T> = T | (string & {});
 
-export type DataIndex<T = any> = DeepNamePath<T> | SpecialString<T> | number | (SpecialString<T> | number)[];
+export type DataIndex<T = any> =
+  | DeepNamePath<T>
+  | SpecialString<T>
+  | number
+  | (SpecialString<T> | number)[];
 
 export type CellEllipsisType = { showTitle?: boolean } | boolean;
 
@@ -109,6 +113,7 @@ export interface ColumnType<RecordType> extends ColumnSharedType<RecordType> {
   shouldCellUpdate?: (record: RecordType, prevRecord: RecordType) => boolean;
   rowSpan?: number;
   width?: number | string;
+  minWidth?: number;
   onCell?: GetComponentProps<RecordType>;
   /** @deprecated Please use `onCell` instead */
   onCellClick?: (record: RecordType, e: React.MouseEvent<HTMLElement>) => void;
diff --git a/tests/Colgroup.spec.jsx b/tests/Colgroup.spec.jsx
index e112721a6..802044da0 100644
--- a/tests/Colgroup.spec.jsx
+++ b/tests/Colgroup.spec.jsx
@@ -26,4 +26,29 @@ describe('Table.ColGroup', () => {
     const wrapper = mount(<Table columns={columns} />);
     expect(String(wrapper.find('colgroup col').key())).toEqual('0');
   });
+
+  it('minWidth should be worked', () => {
+    const columns = [
+      {
+        key: 0,
+        minWidth: 100,
+      },
+    ];
+
+    const wrapper = mount(<Table columns={columns} />);
+    expect(wrapper.find('colgroup col').at(0).props().style.minWidth).toEqual(100);
+  });
+
+  it('should not have minWidth when tableLayout is fixed', () => {
+    const columns = [
+      {
+        key: 0,
+        width: 100,
+        minWidth: 100,
+      },
+    ];
+
+    const wrapper = mount(<Table columns={columns} tableLayout="fixed" />);
+    expect(wrapper.find('colgroup col').at(0).props().style.minWidth).toBeFalsy();
+  });
 });

From 608eb575caee45b3e5b7799d124dd2f6ca43c9fa Mon Sep 17 00:00:00 2001
From: linxianxi <904492381@qq.com>
Date: Thu, 6 Jun 2024 15:29:50 +0800
Subject: [PATCH 2/2] chore: simplify code

---
 src/ColGroup.tsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/ColGroup.tsx b/src/ColGroup.tsx
index d8f11bc64..a20e58c28 100644
--- a/src/ColGroup.tsx
+++ b/src/ColGroup.tsx
@@ -21,9 +21,17 @@ function ColGroup<RecordType>({ colWidths, columns, columCount }: ColGroupProps<
   let mustInsert = false;
   for (let i = len - 1; i >= 0; i -= 1) {
     const width = colWidths[i];
-    const column = columns?.[i];
-    const minWidth = tableLayout === 'auto' && column?.minWidth;
-    const additionalProps = column?.[INTERNAL_COL_DEFINE];
+    const column = columns && columns[i];
+    let additionalProps;
+    let minWidth: number;
+    if (column) {
+      additionalProps = column[INTERNAL_COL_DEFINE];
+
+      // fixed will cause layout problems
+      if (tableLayout === 'auto') {
+        minWidth = column.minWidth;
+      }
+    }
 
     if (width || minWidth || additionalProps || mustInsert) {
       const { columnType, ...restAdditionalProps } = additionalProps || {};