Skip to content

Ability to remove expand icon column header and merge it with second … #26

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

Closed
wants to merge 3 commits into from
Closed

Ability to remove expand icon column header and merge it with second … #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d00aa75
Ability to remove expand icon column header and merge it with second …
alexkvak Dec 30, 2015
aa7c412
Ability to remove expand icon column header and merge it with second …
alexkvak Dec 30, 2015
f7cb852
Merge
alexkvak Dec 30, 2015
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: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ var table = React.render(
<th>false</th>
<td>whether render expandIcon as a cell</td>
</tr>
<tr>
<td>expandIconColumnHeader</td>
<td>Boolean</td>
<th>true</th>
<td>whether render expandIcon column header. If not and expandIconAsCell is true, second column header will span first column header.</td>
</tr>
<tr>
<td>rowKey</td>
<td>Function(recode,index):string</td>
Expand Down
16 changes: 12 additions & 4 deletions src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const Table = React.createClass({
propTypes: {
data: React.PropTypes.array,
expandIconAsCell: React.PropTypes.bool,
expandIconColumnHeader: React.PropTypes.bool,
expandedRowKeys: React.PropTypes.array,
defaultExpandedRowKeys: React.PropTypes.array,
useFixedHeader: React.PropTypes.bool,
Expand All @@ -25,6 +26,7 @@ const Table = React.createClass({
data: [],
useFixedHeader: false,
expandIconAsCell: false,
expandIconColumnHeader: true,
columns: [],
defaultExpandedRowKeys: [],
rowKey(o) {
Expand Down Expand Up @@ -108,17 +110,23 @@ const Table = React.createClass({

getThs() {
let ths = [];
if (this.props.expandIconAsCell) {
if (this.props.expandIconAsCell && this.props.expandIconColumnHeader) {
ths.push({
key: 'rc-table-expandIconAsCell',
className: `${this.props.prefixCls}-expand-icon-th`,
title: '',
});
}
ths = ths.concat(this.props.columns);
return ths.map((c)=> {
if (c.colSpan !== 0) {
return <th key={c.key} colSpan={c.colSpan} className={c.className || ''}>{c.title}</th>;
return ths.map((c, index) => {
let colSpan = c.colSpan;
if (colSpan !== 0) {
if (this.props.expandIconAsCell && !this.props.expandIconColumnHeader && index === 0) {
// if expand icon is rendered as icon and expandIconColumnHeader is false, we need to span second column header
colSpan = colSpan || 1;
colSpan += 1;
}
return <th key={c.key} colSpan={colSpan} className={c.className || ''}>{c.title}</th>;
}
});
},
Expand Down