Skip to content

[refine] add spaced element #25

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
Dec 28, 2015
Merged

[refine] add spaced element #25

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
f8a551e
[refine] add spaced element for can't expand rows when data.i.childre…
jaredleechn Dec 28, 2015
a10f18e
filter => some
afc163 Dec 28, 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
8 changes: 7 additions & 1 deletion assets/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@
-webkit-user-select: none;
user-select: none;
}
&-spaced {
visibility: hidden;
}
&-spaced:after {
content: '.'
}

&-expanded:after {
content: '-'
Expand All @@ -72,4 +78,4 @@
content: '+'
}
}
}
}
3 changes: 3 additions & 0 deletions src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ const Table = React.createClass({
const keyFn = props.rowKey;
const rowClassName = props.rowClassName;
const expandedRowClassName = props.expandedRowClassName;
const needIndentSpaced = props.data.some(record =>
record[childrenColumnName] && record[childrenColumnName].length > 0);
for (let i = 0; i < data.length; i++) {
const record = data[i];
const key = keyFn ? keyFn(record, i) : undefined;
Expand All @@ -160,6 +162,7 @@ const Table = React.createClass({
rst.push(<TableRow
indent={indent}
indentSize={props.indentSize}
needIndentSpaced={needIndentSpaced}
className={className}
record={record}
expandIconAsCell={expandIconAsCell}
Expand Down
4 changes: 4 additions & 0 deletions src/TableRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const TableRow = React.createClass({
const expandIconAsCell = props.expandIconAsCell;
const indent = props.indent;
const indentSize = props.indentSize;
const needIndentSpaced = props.needIndentSpaced;

for (let i = 0; i < columns.length; i++) {
const col = columns[i];
Expand All @@ -41,6 +42,9 @@ const TableRow = React.createClass({
expandIcon = (<span
className={`${prefixCls}-expand-icon ${prefixCls}-${expanded ? 'expanded' : 'collapsed'}`}
onClick={props.onExpand.bind(null, !expanded, record)}/>);
} else if (i === 0 && needIndentSpaced) {
expandIcon = (<span
className={`${prefixCls}-expand-icon ${prefixCls}-spaced`} />);
}

if (expandIconAsCell && i === 0) {
Expand Down