Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(table): add class to identify expanded and folded row #3099

Merged
merged 7 commits into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/table/PrimaryTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ const PrimaryTable = forwardRef<PrimaryTableRef, TPrimaryTableProps>((originalPr
// 自定义列配置功能
const { tDisplayColumns, renderColumnController } = useColumnController(props, { onColumnReduce });
// 展开/收起行功能
const { showExpandedRow, showExpandIconColumn, getExpandColumn, renderExpandedRow, onInnerExpandRowClick } =
useRowExpand(props);
const {
showExpandedRow,
showExpandIconColumn,
getExpandColumn,
renderExpandedRow,
onInnerExpandRowClick,
getExpandedRowClass,
} = useRowExpand(props);
// 排序功能
const { renderSortIcon } = useSorter(props);
// 行选中功能
Expand Down Expand Up @@ -75,7 +81,7 @@ const PrimaryTable = forwardRef<PrimaryTableRef, TPrimaryTableProps>((originalPr

// 如果想给 TR 添加类名,请在这里补充,不要透传更多额外 Props 到 BaseTable
const tRowClassNames = (() => {
const tClassNames = [props.rowClassName, selectedRowClassNames];
const tClassNames = [props.rowClassName, selectedRowClassNames, getExpandedRowClass];
return tClassNames.filter((v) => v);
})();
uyarn marked this conversation as resolved.
Show resolved Hide resolved

Expand Down Expand Up @@ -264,7 +270,6 @@ const PrimaryTable = forwardRef<PrimaryTableRef, TPrimaryTableProps>((originalPr
if (props.expandOnRowClick || props.selectOnRowClick) {
baseTableProps.onRowClick = onInnerRowClick;
}

return (
<BaseTable
ref={primaryTableRef}
Expand Down
2 changes: 1 addition & 1 deletion src/table/TR.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default function TR(props: TrProps) {
);

const classes = useMemo(() => {
const customClasses = formatRowClassNames(rowClassName, { row, rowIndex, type: 'body' }, rowKey || 'id');
const customClasses = formatRowClassNames(rowClassName, { row, rowIndex, rowKey, type: 'body' }, rowKey || 'id');
return [trStyles?.classes, customClasses];
}, [row, rowClassName, rowIndex, rowKey, trStyles?.classes]);

Expand Down
2 changes: 2 additions & 0 deletions src/table/hooks/useClassName.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ export default function useClassName() {
tableExpandClasses: {
iconBox: `${classPrefix}-table__expand-box`,
iconCell: `${classPrefix}-table__expandable-icon-cell`,
rowExpanded: `${classPrefix}-table__row--expanded`,
rowFolded: `${classPrefix}-table__row--folded`,
row: `${classPrefix}-table__expanded-row`,
rowInner: `${classPrefix}-table__expanded-row-inner`,
expanded: `${classPrefix}-table__row--expanded`,
Expand Down
15 changes: 14 additions & 1 deletion src/table/hooks/useRowExpand.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { MouseEvent, ReactNode } from 'react';
import React, { MouseEvent, ReactNode, useCallback } from 'react';
import { ChevronRightCircleIcon as TdChevronRightCircleIcon } from 'tdesign-icons-react';
import get from 'lodash/get';
import isFunction from 'lodash/isFunction';
Expand All @@ -10,6 +10,7 @@ import {
PrimaryTableCellParams,
TableExpandedRowParams,
RowEventContext,
RowClassNameParams,
} from '../type';
import useClassName from './useClassName';
import useControlled from '../../hooks/useControlled';
Expand All @@ -31,6 +32,17 @@ export default function useRowExpand(props: TdPrimaryTableProps) {

const showExpandedRow = Boolean(expandedRow);

const getExpandedRowClass = useCallback(
(params: RowClassNameParams<TableRowData>) => {
// 如果没有配置展开行,则不需要增加展开收起相关的类名
if (!showExpandedRow) return null;
const { row, rowKey } = params;
const currentRowKey = get(row, rowKey || 'id');
return tableExpandClasses[tExpandedRowKeys?.includes(currentRowKey) ? 'rowExpanded' : 'rowFolded'];
},
[tExpandedRowKeys, tableExpandClasses, showExpandedRow],
);

const showExpandIconColumn = props.expandIcon !== false && showExpandedRow;

const isFirstColumnFixed = props.columns?.[0]?.fixed === 'left';
Expand Down Expand Up @@ -117,5 +129,6 @@ export default function useRowExpand(props: TdPrimaryTableProps) {
getExpandColumn,
renderExpandedRow,
onInnerExpandRowClick,
getExpandedRowClass,
};
}
1 change: 1 addition & 0 deletions src/table/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,7 @@ export type TableRowAttributes<T> =
export interface RowClassNameParams<T> {
row: T;
rowIndex: number;
rowKey?: string;
type?: 'body' | 'foot';
}

Expand Down
32 changes: 16 additions & 16 deletions test/snap/__snapshots__/csr.test.jsx.snap

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/snap/__snapshots__/ssr.test.jsx.snap

Large diffs are not rendered by default.

Loading