Skip to content

Commit 75a07d3

Browse files
committed
fix(Table): expand icon can be configurable
1 parent 0299695 commit 75a07d3

File tree

5 files changed

+37
-5
lines changed

5 files changed

+37
-5
lines changed

docs/table/theme/index.jsx

+3
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@ class TableFunctionDemo extends React.Component {
389389
<DemoGroup label="Selected & Expanded">
390390
<Table rowSelection={rowSelection} expandedRowRender={(record) => record.price} dataSource={listDataSource} hasHeader={hasHeader} isZebra={isZebra}>{cols}</Table>
391391
</DemoGroup>
392+
<DemoGroup label="Tree">
393+
<Table rowSelection={rowSelection} dataSource={listDataSource} hasHeader={hasHeader} isZebra={isZebra} isTree>{cols.slice(1)}</Table>
394+
</DemoGroup>
392395
<DemoGroup label="No Data">
393396
<Table rowSelection={rowSelection} dataSource={[]} hasHeader={hasHeader} isZebra={isZebra}>{cols}</Table>
394397
</DemoGroup>

src/balloon/index.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import ConfigProvider from '../config-provider';
22
import Balloon from './balloon';
33
import Tooltip from './tooltip';
44
import Inner from './inner';
5-
import { log } from '../util';
65

76
Balloon.Tooltip = ConfigProvider.config(Tooltip, {
87
transform: /* istanbul ignore next */ (props, deprecated) => {

src/table/expanded.jsx

+10-2
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,17 @@ export default function expanded(BaseComponent) {
111111
{ primaryKey } = this.props,
112112
hasExpanded = openRowKeys.indexOf(record[primaryKey]) > -1,
113113
switchNode = hasExpanded ? (
114-
<Icon type="minus" size="xs" />
114+
<Icon
115+
type="minus"
116+
size="xs"
117+
className={`${prefix}table-expand-unfold`}
118+
/>
115119
) : (
116-
<Icon type="add" size="xs" />
120+
<Icon
121+
type="add"
122+
size="xs"
123+
className={`${prefix}table-expand-fold`}
124+
/>
117125
),
118126
attrs = getExpandedColProps(record, index) || {};
119127
const cls = classnames({

src/table/main.scss

+14-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222

2323
#{$table-prefix}-prerow #{$table-prefix}-cell-wrapper {
24-
padding: $s-3 $s-4;
24+
padding: $s-2 $s-2;
2525
}
2626
}
2727

@@ -103,6 +103,7 @@
103103
padding: $s-3 $s-4;
104104
}
105105
}
106+
106107
#{$table-prefix}-expanded,
107108
#{$table-prefix}-selection {
108109
#{$table-prefix}-cell-wrapper {
@@ -396,8 +397,19 @@
396397
&.disabled {
397398
color: $table-expanded-ctrl-disabled-color;
398399
}
399-
.#{$css-prefix}icon {
400+
401+
.#{$css-prefix}table-expand-unfold {
400402
@include icon-size($table-expanded-icon-size);
403+
&::before {
404+
content: $table-expand-unfold-icon-content;
405+
}
406+
}
407+
408+
.#{$css-prefix}table-expand-fold {
409+
@include icon-size($table-expanded-icon-size);
410+
&::before {
411+
content: $table-expand-fold-icon-content;
412+
}
401413
}
402414
}
403415

src/table/scss/variable.scss

+10
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,13 @@ $table-tree-fold-icon-content: $icon-content-arrow-right !default;
150150
/// @namespace statement/normal
151151
/// @type icon
152152
$table-tree-unfold-icon-content: $icon-content-arrow-down !default;
153+
154+
/// expand fold icon
155+
/// @namespace statement/normal
156+
/// @type icon
157+
$table-expand-fold-icon-content: $icon-content-add !default;
158+
159+
/// expand unfold icon
160+
/// @namespace statement/normal
161+
/// @type icon
162+
$table-expand-unfold-icon-content: $icon-content-minus !default;

0 commit comments

Comments
 (0)