Skip to content

Commit 591f1f7

Browse files
committed
fix(blockheader): change spaceBottom default value to 0
1 parent ab9a930 commit 591f1f7

4 files changed

Lines changed: 8 additions & 10 deletions

File tree

src/blockHeader/__tests__/__snapshots__/blockHeader.test.tsx.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ exports[`test BlockHeader render should render BlockHeader success render 1`] =
77
<div>
88
<div
99
class="dtc-block-header"
10-
style="margin-bottom: 16px;"
1110
>
1211
<div
1312
class="dtc-block-header__title dtc-block-header__title--middle dtc-block-header__title--background"
@@ -35,7 +34,6 @@ exports[`test BlockHeader render should render BlockHeader success render 1`] =
3534
"container": <div>
3635
<div
3736
class="dtc-block-header"
38-
style="margin-bottom: 16px;"
3937
>
4038
<div
4139
class="dtc-block-header__title dtc-block-header__title--middle dtc-block-header__title--background"

src/blockHeader/__tests__/blockHeader.test.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe('test BlockHeader render', () => {
8888
const { container, getByText } = render(<BlockHeader {...props2} />);
8989
const wrap = container.firstChild;
9090
expect(wrap).toHaveClass(`${prefixCls} test__className`);
91-
expect(wrap).toHaveStyle({ height: '100px', marginBottom: '16px' });
91+
expect(wrap).toHaveStyle({ height: '100px' });
9292
expect(getByText('标题2')).toHaveClass('title__text');
9393
expect(getByText('说明文字')).toHaveClass('title__description');
9494
expect(getByText('Icon')).toBeTruthy();
@@ -138,12 +138,12 @@ describe('test BlockHeader render', () => {
138138
});
139139

140140
test('should render BlockHeader correct margin-bottom', () => {
141-
const { container: haveStyle } = render(<BlockHeader title="分类级别" addonBefore="" />);
142-
expect(haveStyle.querySelector('.dtc-block-header')).toHaveAttribute('style');
143-
const { container: defaultBottom } = render(
144-
<BlockHeader title="分类级别" addonBefore="" />
141+
const { container: noStyle } = render(<BlockHeader title="分类级别" addonBefore="" />);
142+
expect(noStyle.querySelector('.dtc-block-header')).not.toHaveAttribute('style');
143+
const { container: hasBottom } = render(
144+
<BlockHeader title="分类级别" addonBefore="" spaceBottom={16} />
145145
);
146-
expect(defaultBottom.querySelector('.dtc-block-header')).toHaveStyle({ marginBottom: 16 });
146+
expect(hasBottom.querySelector('.dtc-block-header')).toHaveStyle({ marginBottom: 16 });
147147
const { container: customizeBottom } = render(
148148
<BlockHeader title="分类级别" addonBefore="" spaceBottom={10} />
149149
);

src/blockHeader/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ demo:
4141
| background | 是否显示背景 | `boolean` | `true` |
4242
| defaultExpand | 是否默认展开内容 | `boolean` | `-` |
4343
| expand | 当前展开状态 | `boolean` | |
44-
| spaceBottom | 自定义下边距,优先级高于 hasBottom | `number` | `16` |
44+
| spaceBottom | 自定义下边距,优先级高于 hasBottom | `number` | `0` |
4545
| children | 展开/收起的内容 | `React.ReactNode` | - |
4646
| onExpand | 展开/收起时的回调 | `(expand: boolean) => void` | - |

src/blockHeader/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const BlockHeader: React.FC<IBlockHeaderProps> = function (props) {
6262
description = '',
6363
tooltip,
6464
size = 'middle',
65-
spaceBottom = 16,
65+
spaceBottom = 0,
6666
className = '',
6767
contentClassName = '',
6868
style = {},

0 commit comments

Comments
 (0)