Skip to content

fix: Table column render with array #402

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 2 commits into from
Jan 7, 2020
Merged

fix: Table column render with array #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74f6d72
fix: Table column render with array
zombieJ Jan 7, 2020
f942988
fix now
zombieJ Jan 7, 2020
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
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"name": "rc-table",
"version": "7.0.0-alpha.21",
"description": "table ui component for react",
"engines": {
"node": "12.x"
},
"keywords": [
"react",
"react-table",
Expand Down
6 changes: 5 additions & 1 deletion src/Cell/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ function Cell<RecordType extends DefaultRecordType>(
}

// Not crash if final `childNode` is not validate ReactNode
if (typeof childNode === 'object' && !React.isValidElement(childNode)) {
if (
typeof childNode === 'object' &&
!Array.isArray(childNode) &&
!React.isValidElement(childNode)
) {
childNode = null;
}

Expand Down
10 changes: 10 additions & 0 deletions tests/Table.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,4 +719,14 @@ describe('Table.Basic', () => {
expect(internalRefs.body.current instanceof HTMLDivElement).toBeTruthy();
});
});

it('column render array', () => {
const wrapper = mount(
<Table
columns={[{ dataIndex: 'test', render: () => [<span className="test" key="test" />] }]}
data={[{ key: 1 }]}
/>,
);
expect(wrapper.find('.test')).toHaveLength(1);
});
});