Revert "refactor: remove maxContentScroll prop and related logic from FixedHo…" (#1320)

Author: afc163

src/FixedHolder/index.tsx

@@ -27,6 +27,7 @@ function useColumnWidth(colWidths: readonly number[], columCount: number) {
 export interface FixedHeaderProps<RecordType> extends HeaderProps<RecordType> {
   className: string;
   noData: boolean;
+  maxContentScroll: boolean;
   colWidths: readonly number[];
   columCount: number;
   direction: Direction;
@@ -57,6 +58,7 @@ const FixedHolder = React.forwardRef<HTMLDivElement, FixedHeaderProps<any>>((pro
     stickyBottomOffset,
     stickyClassName,
     onScroll,
+    maxContentScroll,
     children,
     ...restProps
   } = props;
@@ -96,6 +98,12 @@ const FixedHolder = React.forwardRef<HTMLDivElement, FixedHeaderProps<any>>((pro
     };
   }, []);
 
+  // Check if all flattenColumns has width
+  const allFlattenColumnsWithWidth = React.useMemo(
+    () => flattenColumns.every(column => column.width),
+    [flattenColumns],
+  );
+
   // Add scrollbar column
   const lastColumn = flattenColumns[flattenColumns.length - 1];
   const ScrollBarColumn: ColumnType<unknown> & { scrollbar: true } = {
@@ -148,11 +156,13 @@ const FixedHolder = React.forwardRef<HTMLDivElement, FixedHeaderProps<any>>((pro
           visibility: noData || mergedColumnWidth ? null : 'hidden',
         }}
       >
-        <ColGroup
-          colWidths={mergedColumnWidth ? [...mergedColumnWidth, combinationScrollBarSize] : []}
-          columCount={columCount + 1}
-          columns={flattenColumnsWithScrollbar}
-        />
+        {(!noData || !maxContentScroll || allFlattenColumnsWithWidth) && (
+          <ColGroup
+            colWidths={mergedColumnWidth ? [...mergedColumnWidth, combinationScrollBarSize] : []}
+            columCount={columCount + 1}
+            columns={flattenColumnsWithScrollbar}
+          />
+        )}
         {children({
           ...restProps,
           stickyOffsets: headerStickyOffsets,

src/Table.tsx

@@ -680,6 +680,7 @@ function Table<RecordType extends DefaultRecordType>(
     // Fixed holder share the props
     const fixedHolderProps = {
       noData: !mergedData.length,
+      maxContentScroll: horizonScroll && mergedScrollX === 'max-content',
       ...headerProps,
       ...columnContext,
       direction,