blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-25 10:56:35 +08:00
Code Issues Projects Releases Wiki Activity

feat(Switch): support number type of size prop (#4913)

Browse Source
This commit is contained in:
neverland 2019-11-04 17:29:56 +08:00 committed by GitHub
parent 7948b59063
commit 9ace3320b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/switch/README.md
View File

@ -103,7 +103,7 @@ export default {
| v-model | Check status of Switch | *any* | `false` | - | | v-model | Check status of Switch | *any* | `false` | - |
| loading | Whether to show loading icon | *boolean* | `false` | - | | loading | Whether to show loading icon | *boolean* | `false` | - |
| disabled | Whether to disable switch | *boolean* | `false` | - | | disabled | Whether to disable switch | *boolean* | `false` | - |
| size | Size of switch | *string* | `30px` | - | | size | Size of switch | *string \| number* | `30px` | 2.2.11 |
| active-color | Background color when active | *string* | `#1989fa` | - | | active-color | Background color when active | *string* | `#1989fa` | - |
| inactive-color | Background color when inactive | *string* | `#fff` | - | | inactive-color | Background color when inactive | *string* | `#fff` | - |
| active-value | Value when active | *any* | `true` | - | | active-value | Value when active | *any* | `true` | - |

2
src/switch/README.zh-CN.md
View File

@ -103,7 +103,7 @@ export default {
| v-model | 开关选中状态 | *any* | `false` | - | | v-model | 开关选中状态 | *any* | `false` | - |
| loading | 是否为加载状态 | *boolean* | `false` | - | | loading | 是否为加载状态 | *boolean* | `false` | - |
| disabled | 是否为禁用状态 | *boolean* | `false` | - | | disabled | 是否为禁用状态 | *boolean* | `false` | - |
| size | 开关尺寸 | *string* | `30px` | - | | size | 开关尺寸，默认单位为`px` | *string \| number* | `30px` | 2.2.11 |
| active-color | 打开时的背景色 | *string* | `#1989fa` | - | | active-color | 打开时的背景色 | *string* | `#1989fa` | - |
| inactive-color | 关闭时的背景色 | *string* | `#fff` | - | | inactive-color | 关闭时的背景色 | *string* | `#fff` | - |
| active-value | 打开时的值 | *any* | `true` | - | | active-value | 打开时的值 | *any* | `true` | - |

4
src/switch/index.tsx
View File

@ -1,4 +1,4 @@
import { createNamespace } from '../utils'; import { createNamespace, addUnit } from '../utils';
import { BLUE, GRAY_DARK } from '../utils/constant'; import { BLUE, GRAY_DARK } from '../utils/constant';
import { switchProps, SharedSwitchProps } from './shared'; import { switchProps, SharedSwitchProps } from './shared';
import { emit, inherit } from '../utils/functional'; import { emit, inherit } from '../utils/functional';
@ -34,7 +34,7 @@ function Switch(
const checked = value === activeValue; const checked = value === activeValue;
const switchStyle = { const switchStyle = {
fontSize: size, fontSize: addUnit(size),
backgroundColor: checked ? activeColor : inactiveColor backgroundColor: checked ? activeColor : inactiveColor
}; };

6
src/switch/test/__snapshots__/index.spec.js.snap
View File

@ -5,3 +5,9 @@ exports[`inactive-color prop 1`] = `
<div class="van-switch__node"></div> <div class="van-switch__node"></div>
</div> </div>
`; `;
exports[`size prop 1`] = `
<div role="switch" aria-checked="false" class="van-switch" style="font-size: 20px;">
<div class="van-switch__node"></div>
</div>
`;

10
src/switch/test/index.spec.js
View File

@ -72,3 +72,13 @@ test('inactive-color prop', () => {
expect(wrapper).toMatchSnapshot(); expect(wrapper).toMatchSnapshot();
}); });
test('size prop', () => {
const wrapper = mount(Switch, {
propsData: {
size: 20
}
});
expect(wrapper).toMatchSnapshot();
});