Skip to content

feat: shouldCellUpdate return prev value #493

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 12, 2020
Merged

feat: shouldCellUpdate return prev value #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/Cell/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export interface CellProps<RecordType extends DefaultRecordType> {
ellipsis?: CellEllipsisType;
align?: AlignType;

shouldCellUpdate?: (record: RecordType) => boolean;
shouldCellUpdate?: (record: RecordType, prevRecord: RecordType) => boolean;

// Fixed
fixLeft?: number | false;
Expand Down Expand Up @@ -207,9 +207,9 @@ function Cell<RecordType extends DefaultRecordType>(
const RefCell = React.forwardRef<any, CellProps<any>>(Cell);
RefCell.displayName = 'Cell';

const MemoCell = React.memo(RefCell, (_, next: CellProps<any>) => {
const MemoCell = React.memo(RefCell, (prev: CellProps<any>, next: CellProps<any>) => {
if (next.shouldCellUpdate) {
return !next.shouldCellUpdate(next.record);
return !next.shouldCellUpdate(next.record, prev.record);
}

return false;
Expand Down
2 changes: 1 addition & 1 deletion src/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export interface ColumnType<RecordType> extends ColumnSharedType<RecordType> {
record: RecordType,
index: number,
) => React.ReactNode | RenderedCell<RecordType>;
shouldCellUpdate?: (record: RecordType) => boolean;
shouldCellUpdate?: (record: RecordType, prevRecord: RecordType) => boolean;
rowSpan?: number;
width?: number | string;
onCell?: GetComponentProps<RecordType>;
Expand Down
21 changes: 17 additions & 4 deletions tests/Table.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,18 +965,24 @@ describe('Table.Basic', () => {
const record = { key: 1 };
let shouldUpdate = false;
let renderTimes = 0;
let prev;
let next;

const Demo = () => {
const Demo = ({ records }) => {
const [, forceUpdate] = React.useState({});

return (
<>
<Table
data={[record]}
data={records}
columns={[
{
dataIndex: 'key',
shouldCellUpdate: () => shouldUpdate,
shouldCellUpdate: (nextRecord, prevRecord) => {
next = nextRecord;
prev = prevRecord;
return shouldUpdate;
},
render() {
renderTimes += 1;
return null;
Expand All @@ -994,7 +1000,7 @@ describe('Table.Basic', () => {
);
};

const wrapper = mount(<Demo />);
const wrapper = mount(<Demo records={[record]} />);
renderTimes = 0;

wrapper.find('button').simulate('click');
Expand All @@ -1003,5 +1009,12 @@ describe('Table.Basic', () => {
shouldUpdate = true;
wrapper.find('button').simulate('click');
expect(renderTimes).toEqual(1);

// Should update match prev & next
const newRecord = { ...record, next: true };
wrapper.setProps({ records: [newRecord] });
// wrapper.update();
expect(prev).toBe(record);
expect(next).toBe(newRecord);
});
});