Skip to content
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

Jump to bottom

fix: checkbox & radio in flex align #30260

Merged
merged 5 commits into from
Apr 22, 2021
Merged

fix: checkbox & radio in flex align #30260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f648e8
fix: checkbox & radio in flex align
zombieJ Apr 22, 2021
7d1f990
rm only md
zombieJ Apr 22, 2021
dbafafb
Merge remote-tracking branch 'origin/master' into fix-align
zombieJ Apr 22, 2021
97ce70f
docs: Update doc
zombieJ Apr 22, 2021
af791c5
test: Update snapshot
zombieJ Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
203 changes: 203 additions & 0 deletions components/checkbox/__tests__/__snapshots__/demo.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,209 @@ Array [
]
`;

exports[`renders ./components/checkbox/demo/debug-line.md correctly 1`] = `
<div>
<div
class="ant-space ant-space-horizontal ant-space-align-center"
style="border:1px solid red;margin-bottom:16px"
>
<div
class="ant-space-item"
style="margin-right:8px"
>
<label
class="ant-checkbox-wrapper"
>
<span
class="ant-checkbox"
>
<input
class="ant-checkbox-input"
type="checkbox"
value="light"
/>
<span
class="ant-checkbox-inner"
/>
</span>
</label>
</div>
<div
class="ant-space-item"
style="margin-right:8px"
>
<div>
Bamboo
</div>
</div>
<div
class="ant-space-item"
>
<label
class="ant-checkbox-wrapper"
>
<span
class="ant-checkbox"
>
<input
class="ant-checkbox-input"
type="checkbox"
value="little"
/>
<span
class="ant-checkbox-inner"
/>
</span>
<span>
Little
</span>
</label>
</div>
</div>
<div
class="ant-space ant-space-horizontal ant-space-align-center"
style="border:1px solid red;margin-bottom:16px"
>
<div
class="ant-space-item"
style="margin-right:8px"
>
<label
class="ant-radio-wrapper"
>
<span
class="ant-radio"
>
<input
class="ant-radio-input"
type="radio"
value="light"
/>
<span
class="ant-radio-inner"
/>
</span>
</label>
</div>
<div
class="ant-space-item"
style="margin-right:8px"
>
<div>
Bamboo
</div>
</div>
<div
class="ant-space-item"
>
<label
class="ant-radio-wrapper"
>
<span
class="ant-radio"
>
<input
class="ant-radio-input"
type="radio"
value="little"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
Little
</span>
</label>
</div>
</div>
<div
style="border:1px solid red;margin-bottom:16px;display:flex;align-items:center"
>
<label
class="ant-checkbox-wrapper"
>
<span
class="ant-checkbox"
>
<input
class="ant-checkbox-input"
type="checkbox"
value="light"
/>
<span
class="ant-checkbox-inner"
/>
</span>
</label>
<div>
Bamboo
</div>
<label
class="ant-checkbox-wrapper"
>
<span
class="ant-checkbox"
>
<input
class="ant-checkbox-input"
type="checkbox"
value="little"
/>
<span
class="ant-checkbox-inner"
/>
</span>
<span>
Little
</span>
</label>
</div>
<div
style="border:1px solid red;margin-bottom:16px;display:flex;align-items:center"
>
<label
class="ant-radio-wrapper"
>
<span
class="ant-radio"
>
<input
class="ant-radio-input"
type="radio"
value="light"
/>
<span
class="ant-radio-inner"
/>
</span>
</label>
<div>
Bamboo
</div>
<label
class="ant-radio-wrapper"
>
<span
class="ant-radio"
>
<input
class="ant-radio-input"
type="radio"
value="little"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
Little
</span>
</label>
</div>
</div>
`;

exports[`renders ./components/checkbox/demo/disabled.md correctly 1`] = `
Array [
<label
Expand Down
65 changes: 65 additions & 0 deletions components/checkbox/demo/debug-line.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
order: 99
title:
zh-CN: 同行布局
en-US: Same line
debug: true
---

## zh-CN

同行布局

## en-US

Same line

```tsx
import { Checkbox, Radio, Space } from 'antd';

const sharedStyle: React.CSSProperties = {
border: '1px solid red',
marginBottom: 16,
};

ReactDOM.render(
<div>
<Space style={sharedStyle} align="center">
<Checkbox value="light" />
<div>Bamboo</div>
<Checkbox value="little">Little</Checkbox>
</Space>

<Space style={sharedStyle} align="center">
<Radio value="light" />
<div>Bamboo</div>
<Radio value="little">Little</Radio>
</Space>

<div
style={{
...sharedStyle,
display: 'flex',
alignItems: 'center',
}}
>
<Checkbox value="light" />
<div>Bamboo</div>
<Checkbox value="little">Little</Checkbox>
</div>

<div
style={{
...sharedStyle,
display: 'flex',
alignItems: 'center',
}}
>
<Radio value="light" />
<div>Bamboo</div>
<Radio value="little">Little</Radio>
</div>
</div>,
mountNode,
);
```
7 changes: 7 additions & 0 deletions components/checkbox/style/mixin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@
line-height: unset;
cursor: pointer;

&::after {
display: inline-block;
width: 0;
overflow: hidden;
content: '\a0';
}

&.@{checkbox-prefix-cls}-wrapper-disabled {
cursor: not-allowed;
}
Expand Down