blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

feat(ActionSheet): update close icon style (#5574)

Browse Source
This commit is contained in:
neverland 2020-01-14 14:13:32 +08:00 committed by GitHub
parent 17d46a71ca
commit c4d6f94f1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/action-sheet/README.md
View File

@ -120,7 +120,7 @@ export default {
| description `v2.2.8` | Description above the options | *string* | - |
| overlay | Whether to show overlay | *boolean* | `true` |
| round `v2.0.9` | Whether to show round corner | *boolean* | `true` |
| close-icon `v2.2.13` | Close icon name | *string* | `close` |
| close-icon `v2.2.13` | Close icon name | *string* | `cross` |
| close-on-click-action | Whether to close when click action | *boolean* | `false` |
| close-on-click-overlay | Whether to close when click overlay | *boolean* | `true` |
| lazy-render | Whether to lazy render util appeared | *boolean* | `true` |

2
src/action-sheet/README.zh-CN.md
View File

@ -130,7 +130,7 @@ export default {
| description `v2.2.8` | 选项上方的描述信息 | *string* | - |
| overlay | 是否显示遮罩层 | *boolean* | `true` |
| round `v2.0.9` | 是否显示圆角 | *boolean* | `true` |
| close-icon `v2.2.13` | 关闭图标名称或图片链接 | *string* | `close` |
| close-icon `v2.2.13` | 关闭图标名称或图片链接 | *string* | `cross` |
| close-on-click-action | 是否在点击选项后关闭 | *boolean* | `false` |
| close-on-click-overlay | 是否在点击遮罩层后关闭 | *boolean* | `true` |
| lazy-render | 是否在显示弹层时才渲染节点 | *boolean* | `true` |

6
src/action-sheet/index.tsx
View File

@ -1,6 +1,6 @@
import { createNamespace } from '../utils';
import { emit, inherit } from '../utils/functional';
import { BORDER_TOP, BORDER_BOTTOM } from '../utils/constant';
import { BORDER_TOP } from '../utils/constant';
import { popupMixinProps } from '../mixins/popup';
import Icon from '../icon';
import Popup from '../popup';
@ -51,7 +51,7 @@ function ActionSheet(
function Header() {
if (title) {
return (
<div class={[bem('header'), BORDER_BOTTOM]}>
<div class={bem('header')}>
{title}
<Icon
name={props.closeIcon}
@ -166,7 +166,7 @@ ActionSheet.props = {
},
closeIcon: {
type: String,
default: 'close'
default: 'cross'
},
safeAreaInsetBottom: {
type: Boolean,

4
src/action-sheet/test/__snapshots__/index.spec.js.snap
View File

@ -8,7 +8,7 @@ exports[`callback events 1`] = `
exports[`close-icon prop 1`] = `
<div class="van-popup van-popup--round van-popup--bottom van-popup--safe-area-inset-bottom van-action-sheet" name="van-popup-slide-bottom">
<div class="van-action-sheet__header van-hairline--bottom">Title<i class="van-icon van-icon-cross van-action-sheet__close">
<div class="van-action-sheet__header">Title<i class="van-icon van-icon-cross van-action-sheet__close">
<!----></i></div>
</div>
`;
@ -25,7 +25,7 @@ exports[`disable lazy-render 1`] = `<div class="van-popup van-popup--round van-p
exports[`render title and default slot 1`] = `
<div class="van-popup van-popup--round van-popup--bottom van-popup--safe-area-inset-bottom van-action-sheet" name="van-popup-slide-bottom">
<div class="van-action-sheet__header van-hairline--bottom">Title<i class="van-icon van-icon-close van-action-sheet__close">
<div class="van-action-sheet__header">Title<i class="van-icon van-icon-cross van-action-sheet__close">
<!----></i></div>
<div class="van-action-sheet__content">Default</div>
</div>

2
src/style/var.less
View File

@ -72,7 +72,7 @@
@action-sheet-subname-font-size: @font-size-sm;
@action-sheet-close-icon-size: 18px;
@action-sheet-close-icon-color: @gray-6;
@action-sheet-close-icon-padding: 0 @padding-sm;
@action-sheet-close-icon-padding: 0 @padding-md;
@action-sheet-cancel-padding-top: @padding-xs;
@action-sheet-cancel-padding-color: @background-color;