Merge branch 'master' into feat-resizable

Author: li-jia-nan

.npmrc

@@ -0,0 +1 @@
+shamefully-hoist=true

README.md

@@ -1,11 +1,11 @@
-# rc-table
+# @rc-component/table
 
 React table component with useful functions.
 
 [![NPM version][npm-image]][npm-url] [![dumi](https://img.shields.io/badge/docs%20by-dumi-blue?style=flat-square)](https://github.com/umijs/dumi) [![build status][github-actions-image]][github-actions-url] [![Test coverage][codecov-image]][codecov-url] [![npm download][download-image]][download-url] [![bundle size][bundlephobia-image]][bundlephobia-url]
 
-[npm-image]: http://img.shields.io/npm/v/rc-table.svg?style=flat-square
-[npm-url]: http://npmjs.org/package/rc-table
+[npm-image]: http://img.shields.io/npm/v/@rc-component/table.svg?style=flat-square
+[npm-url]: http://npmjs.org/package/@rc-component/table
 [github-actions-image]: https://github.com/react-component/table/workflows/CI/badge.svg
 [github-actions-url]: https://github.com/react-component/table/actions
 [coveralls-image]: https://img.shields.io/coveralls/react-component/table.svg?style=flat-square
@@ -16,14 +16,14 @@ React table component with useful functions.
 [david-image]: https://david-dm.org/react-component/table/status.svg?style=flat-square
 [david-dev-url]: https://david-dm.org/react-component/table?type=dev
 [david-dev-image]: https://david-dm.org/react-component/table/dev-status.svg?style=flat-square
-[download-image]: https://img.shields.io/npm/dm/rc-table.svg?style=flat-square
-[download-url]: https://npmjs.org/package/rc-table
-[bundlephobia-url]: https://bundlephobia.com/result?p=rc-table
-[bundlephobia-image]: https://badgen.net/bundlephobia/minzip/rc-table
+[download-image]: https://img.shields.io/npm/dm/@rc-component/table.svg?style=flat-square
+[download-url]: https://npmjs.org/package/@rc-component/table
+[bundlephobia-url]: https://bundlephobia.com/result?p=@rc-component/table
+[bundlephobia-image]: https://badgen.net/bundlephobia/minzip/@rc-component/table
 
 ## install
 
-[![rc-table](https://nodei.co/npm/rc-table.png)](https://npmjs.org/package/rc-table)
+[![@rc-component/table](https://nodei.co/npm/@rc-component/table.png)](https://npmjs.org/package/@rc-component/table)
 
 ## Development
 
@@ -39,7 +39,7 @@ https://table-react-component.vercel.app/
 ## Usage
 
 ```js
-import Table from 'rc-table';
+import Table from '@rc-component/table';
 
 const columns = [
   {
@@ -83,7 +83,7 @@ React.render(<Table columns={columns} data={data} />, mountNode);
 | Name | Type | Default | Description |
 | --- | --- | --- | --- |
 | tableLayout | `auto` \| `fixed` | `auto` \| `fixed` for any columns is fixed or ellipsis or header is fixed | https://developer.mozilla.org/en-US/docs/Web/CSS/table-layout |
-| prefixCls | String | rc-table |  |
+| prefixCls | String | `rc-table` |  |
 | className | String |  | additional className |
 | id | String |  | identifier of the container div |
 | useFixedHeader | Boolean | false | whether use separator table for header. better set width for columns |
@@ -159,4 +159,4 @@ React.render(<Table columns={columns} data={data} />, mountNode);
 
 ## License
 
-rc-table is released under the MIT license.
+@rc-component/table is released under the MIT license.

assets/index.less

@@ -44,7 +44,6 @@
 
     padding: @cell-padding;
     white-space: normal;
-    word-break: break-word;
     border: @border;
     border-top: 0;
     border-left: 0;

docs/demo/measureRowRender.md

@@ -0,0 +1,8 @@
+---
+title: measureRowRender
+nav:
+  title: measureRowRender
+  path: /demo
+---
+
+<code src="../examples/measureRowRender.tsx"></code>

docs/examples/animation.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import CSSMotionList from 'rc-animate/lib/CSSMotionList';
-import classNames from 'classnames';
+import { clsx } from 'clsx';
 import toArray from '@rc-component/util/lib/Children/toArray';
 import type { TableProps } from 'rc-table';
 import Table from 'rc-table';
@@ -11,7 +11,7 @@ type MotionBodyProps = React.HTMLAttributes<HTMLTableSectionElement>;
 
 const MotionBody: React.FC<MotionBodyProps> = ({ children, ...props }) => {
   const nodeList = toArray(children);
-  const nodesRef = React.useRef<Record<string, React.ReactElement>>({});
+  const nodesRef = React.useRef<Record<string, React.ReactElement<any>>>({});
 
   // Better apply clean up logic to avoid OOM
   const keys: React.Key[] = [];
@@ -26,8 +26,8 @@ const MotionBody: React.FC<MotionBodyProps> = ({ children, ...props }) => {
       <CSSMotionList keys={keys} component={false} motionName="move">
         {({ key, className }) => {
           const node = nodesRef.current[key];
-          return React.cloneElement(node, {
-            className: classNames(node.props.className, className),
+          return React.cloneElement<any>(node, {
+            className: clsx(node.props.className, className),
           });
         }}
       </CSSMotionList>

docs/examples/fixedColumnsAndHeaderRtl.tsx

@@ -37,7 +37,7 @@ const useColumn = (
   ellipsis: boolean,
   percentage: boolean,
 ) => {
-  const columns: ColumnsType<RecordType> = React.useMemo(
+  const columns = React.useMemo<ColumnsType<RecordType>>(
     () => [
       {
         title: 'title1',

docs/examples/jsx.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-named-as-default-member */
 import React from 'react';
 import Table from 'rc-table';
 import '../../assets/index.less';

docs/examples/measureRowRender.tsx

@@ -0,0 +1,56 @@
+import React from 'react';
+import Table from 'rc-table';
+import type { TableProps } from 'rc-table';
+
+const columns = [
+  {
+    title: (
+      <div>
+        Name
+        <div className="filter-dropdown" style={{ display: 'none' }}>
+          Filter Content
+        </div>
+      </div>
+    ),
+    dataIndex: 'name',
+    key: 'name',
+    width: 100,
+  },
+  {
+    title: 'Age',
+    dataIndex: 'age',
+    key: 'age',
+    width: 80,
+  },
+];
+
+const data = [
+  { key: 1, name: 'John', age: 25 },
+  { key: 2, name: 'Jane', age: 30 },
+  { key: 3, name: 'Jime', age: 35 },
+];
+
+// 自定义 MeasureRow 渲染，隐藏弹层内容
+const measureRowRender: TableProps['measureRowRender'] = measureRow => {
+  if (React.isValidElement(measureRow)) {
+    return React.cloneElement<any>(measureRow, {
+      style: { ...(measureRow.props as any).style, display: 'none' },
+    });
+  }
+  return measureRow;
+};
+
+// 示例：使用 measureRowRender 来隐藏 MeasureRow 中的弹层
+const MeasureRowRenderExample: React.FC = () => {
+  return (
+    <Table
+      columns={columns}
+      data={data}
+      sticky
+      scroll={{ x: true }}
+      measureRowRender={measureRowRender}
+    />
+  );
+};
+
+export default MeasureRowRenderExample;

docs/examples/scrollY.tsx

@@ -13,7 +13,7 @@ for (let i = 0; i < 20; i += 1) {
 }
 
 const Test = () => {
-  const tblRef = React.useRef<Reference>();
+  const tblRef = React.useRef<Reference>(null);
   const [showBody, setShowBody] = React.useState(true);
 
   const toggleBody = () => {
@@ -94,8 +94,11 @@ const Test = () => {
         data={data}
         scroll={{ y: 300 }}
         rowKey={record => record.key}
-        onRow={(record, index) => ({ style: { backgroundColor: 'red' } })}
+        onRow={() => ({ style: { backgroundColor: 'red' } })}
       />
+      <h3>Column align issue</h3>
+      <p>https://github.com/ant-design/ant-design/issues/54889</p>
+      <Table columns={columns} data={data} sticky scroll={{ y: 300, x: 2000 }} />
     </div>
   );
 };

docs/examples/shadow.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import type { TableProps } from 'rc-table';
 import Table from 'rc-table';
 import '../../assets/index.less';
 import type { ColumnsType } from '@/interface';