[improvement] Icon: add custom-style prop (#677)

youzan · Sep 29, 2018 · 3e12b21 · 3e12b21
1 parent b08e90e
commit 3e12b21
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/packages/checkbox/index.wxml b/packages/checkbox/index.wxml
@@ -1,7 +1,13 @@
 <view class="van-checkbox custom-class">
   <view class="van-checkbox__icon-wrap" bindtap="toggle">
     <slot wx:if="{{ useIconSlot }}" name="icon" />
-    <van-icon class="{{ iconClass }}" custom-class="icon-class" wx:else name="success" />
+    <van-icon
+      wx:else
+      name="success"
+      class="{{ iconClass }}"
+      custom-class="icon-class"
+      custom-style="line-height: 20px;"
+    />
   </view>
   <view class="van-checkbox__label van-checkbox__label--{{ labelPosition }} label-class" bindtap="onClickLabel">
     <slot />

diff --git a/packages/icon/README.md b/packages/icon/README.md
@@ -27,6 +27,7 @@
 | info | 图标右上角文字提示 | `String | Number` | - |
 | color | 图标颜色 | `String` | `inherit` |
 | size | 图标大小，如 `20px`，`2em` | `String` | `inherit` |
+| custom-style | 自定义样式 | `String` | - |
 | class-prefix | 类名前缀 | `String` | `van-icon` |
 
 ### Event

diff --git a/packages/icon/index.ts b/packages/icon/index.ts
@@ -6,6 +6,7 @@ VantComponent({
     name: String,
     size: String,
     color: String,
+    customStyle: String,
     classPrefix: {
       type: String,
       value: 'van-icon'

diff --git a/packages/icon/index.wxml b/packages/icon/index.wxml
@@ -1,6 +1,6 @@
 <view
   class="custom-class {{ classPrefix }} {{ classPrefix }}-{{ name }}"
-  style="{{ color ? 'color: ' + color : '' }}; {{ size ? 'font-size: ' + size : '' }}"
+  style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + size + ';' : '' }}{{ customStyle }}"
   bind:tap="onClick"
 >
   <view wx:if="{{ info !== null }}" class="van-icon__info">{{ info }}</view>

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -31,7 +31,7 @@ export type CombinedComponentInstance<
   Weapp.Component &
   Weapp.FormField &
   ComponentInstance & {
-    data: Data & RecordToAny<Props> & RecordToReturn<Computed>;
+    data: Data & LooseObject & RecordToAny<Props> & RecordToReturn<Computed>;
   };
 
 export type VantComponentOptions<