From 339df6c0e67b4a1b572ccb74f2b03638d1894902 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 11 Dec 2018 15:51:57 +0800
Subject: [PATCH] [improvement] use wxs.bem instead of computed classNames
 (#1051)

---
 packages/checkbox/index.ts        | 12 ------------
 packages/checkbox/index.wxml      |  4 +++-
 packages/col/index.ts             | 10 ----------
 packages/col/index.wxml           |  4 +++-
 packages/collapse-item/index.ts   | 16 +++-------------
 packages/collapse-item/index.wxml |  4 +++-
 packages/common/class-names.ts    | 29 -----------------------------
 packages/field/index.less         |  8 ++++----
 packages/field/index.ts           | 12 ------------
 packages/field/index.wxml         | 10 ++++++----
 packages/goods-action/index.ts    |  9 ---------
 packages/goods-action/index.wxml  |  4 +++-
 packages/mixins/basic.ts          |  4 ----
 packages/popup/index.ts           | 10 ----------
 packages/popup/index.wxml         |  4 +++-
 packages/radio/index.ts           | 11 -----------
 packages/radio/index.wxml         |  4 +++-
 packages/submit-bar/index.ts      |  7 -------
 packages/submit-bar/index.wxml    |  4 +++-
 packages/switch/index.ts          |  7 -------
 packages/switch/index.wxml        |  4 +++-
 packages/tabbar/index.ts          | 10 ----------
 packages/tabbar/index.wxml        |  4 +++-
 packages/tag/index.ts             | 11 -----------
 packages/tag/index.wxml           |  4 +++-
 packages/wxs/bem.wxs              |  2 +-
 26 files changed, 44 insertions(+), 164 deletions(-)
 delete mode 100644 packages/common/class-names.ts

diff --git a/packages/checkbox/index.ts b/packages/checkbox/index.ts
index 397a9097..defb21df 100644
--- a/packages/checkbox/index.ts
+++ b/packages/checkbox/index.ts
@@ -24,18 +24,6 @@ VantComponent({
   },
 
   computed: {
-    iconClass(): string {
-      const { disabled, value, shape } = this.data;
-      return this.classNames(
-        'van-checkbox__icon',
-        `van-checkbox__icon--${shape}`,
-        {
-          'van-checkbox__icon--disabled': disabled,
-          'van-checkbox__icon--checked': value
-        }
-      );
-    },
-
     iconStyle(): string {
       const { value, disabled, checkedColor } = this.data;
       if (checkedColor && value && !disabled) {
diff --git a/packages/checkbox/index.wxml b/packages/checkbox/index.wxml
index ab5637a9..da96d043 100644
--- a/packages/checkbox/index.wxml
+++ b/packages/checkbox/index.wxml
@@ -1,10 +1,12 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-checkbox custom-class">
   <view class="van-checkbox__icon-wrap" bindtap="toggle">
     <slot wx:if="{{ useIconSlot }}" name="icon" />
     <van-icon
       wx:else
       name="success"
-      class="{{ iconClass }}"
+      class="{{ utils.bem('checkbox__icon', [shape, { disabled, checked: value }]) }}"
       style="{{ iconStyle }}"
       custom-class="icon-class"
       custom-style="line-height: 20px;"
diff --git a/packages/col/index.ts b/packages/col/index.ts
index e8577da2..cc5bb20a 100644
--- a/packages/col/index.ts
+++ b/packages/col/index.ts
@@ -15,16 +15,6 @@ VantComponent({
     style: ''
   },
 
-  computed: {
-    classes(): string {
-      const { span, offset } = this.data;
-      return this.classNames('van-col', {
-        [`van-col--${span}`]: span,
-        [`van-col--offset-${offset}`]: offset
-      });
-    }
-  },
-
   methods: {
     setGutter(gutter: number) {
       const padding = `${gutter / 2}px`;
diff --git a/packages/col/index.wxml b/packages/col/index.wxml
index 69e74b16..a759aac5 100644
--- a/packages/col/index.wxml
+++ b/packages/col/index.wxml
@@ -1,5 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
-  class="custom-class {{ classes }}"
+  class="custom-class {{ utils.bem('col', [span]) }} {{ offset ? 'van-col--offset-' + offset : '' }}"
   style="{{ style }}"
 >
   <slot />
diff --git a/packages/collapse-item/index.ts b/packages/collapse-item/index.ts
index 85393c6c..af70c961 100644
--- a/packages/collapse-item/index.ts
+++ b/packages/collapse-item/index.ts
@@ -12,11 +12,11 @@ VantComponent({
   },
 
   props: {
-    name: [String, Number],
+    name: null,
+    title: null,
+    value: null,
     icon: String,
     label: String,
-    title: [String, Number],
-    value: [String, Number],
     disabled: Boolean,
     border: {
       type: Boolean,
@@ -33,16 +33,6 @@ VantComponent({
     expanded: false
   },
 
-  computed: {
-    titleClass() {
-      const { disabled, expanded } = this.data;
-      return this.classNames('van-collapse-item__title', {
-        'van-collapse-item__title--disabled': disabled,
-        'van-collapse-item__title--expanded': expanded
-      });
-    }
-  },
-
   methods: {
     updateExpanded() {
       if (!this.parent) {
diff --git a/packages/collapse-item/index.wxml b/packages/collapse-item/index.wxml
index 6bf5ff10..4f51da13 100644
--- a/packages/collapse-item/index.wxml
+++ b/packages/collapse-item/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-collapse-item van-hairline--top custom-class">
   <van-cell
     title="{{ title }}"
@@ -6,7 +8,7 @@
     value="{{ value }}"
     label="{{ label }}"
     border="{{ border && expanded }}"
-    class="{{ titleClass }}"
+    class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}"
     right-icon-class="van-cell__right-icon"
     custom-class="van-cell"
     bind:click="onClick"
diff --git a/packages/common/class-names.ts b/packages/common/class-names.ts
deleted file mode 100644
index 5c8e65d0..00000000
--- a/packages/common/class-names.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-const hasOwn = {}.hasOwnProperty;
-
-export function classNames(): string {
-  const classes = [];
-
-  for (let i = 0; i < arguments.length; i++) {
-    const arg = arguments[i];
-    if (!arg) continue;
-
-    const argType = typeof arg;
-
-    if (argType === 'string' || argType === 'number') {
-      classes.push(arg);
-    } else if (Array.isArray(arg) && arg.length) {
-      const inner = classNames.apply(null, arg);
-      if (inner) {
-        classes.push(inner);
-      }
-    } else if (argType === 'object') {
-      for (const key in arg) {
-        if (hasOwn.call(arg, key) && arg[key]) {
-          classes.push(key);
-        }
-      }
-    }
-  }
-
-  return classes.join(' ');
-};
diff --git a/packages/field/index.less b/packages/field/index.less
index 5c225f81..2bb7876c 100644
--- a/packages/field/index.less
+++ b/packages/field/index.less
@@ -37,6 +37,10 @@
     &--right {
       text-align: right;
     }
+
+    &--error {
+      color: @red;
+    }
   }
 
   &__clear-root {
@@ -78,8 +82,4 @@
     font-size: 12px;
     text-align: left;
   }
-
-  &--error {
-    color: @red;
-  }
 }
diff --git a/packages/field/index.ts b/packages/field/index.ts
index 8837d5f1..f25bad44 100644
--- a/packages/field/index.ts
+++ b/packages/field/index.ts
@@ -64,18 +64,6 @@ VantComponent({
     showClear: false
   },
 
-  computed: {
-    inputClass(): string {
-      const { data } = this;
-      return this.classNames('input-class', 'van-field__input', {
-        'van-field--error': data.error,
-        'van-field__textarea': data.type === 'textarea',
-        'van-field__input--disabled': data.disabled,
-        [`van-field__input--${data.inputAlign}`]: data.inputAlign
-      });
-    }
-  },
-
   beforeCreate() {
     this.focused = false;
   },
diff --git a/packages/field/index.wxml b/packages/field/index.wxml
index ba369a1b..e1205906 100644
--- a/packages/field/index.wxml
+++ b/packages/field/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <van-cell
   icon="{{ leftIcon }}"
   title="{{ label }}"
@@ -14,7 +16,7 @@
   <view class="van-field__body {{ type === 'textarea' ? 'van-field__body--textarea' : '' }}">
     <textarea
       wx:if="{{ type === 'textarea' }}"
-      class="{{ inputClass }}"
+      class="input-class {{ utils.bem('field__input', [inputAlign, { disabled, error }]) }}"
       fixed="{{ fixed }}"
       focus="{{ focus }}"
       value="{{ value }}"
@@ -23,7 +25,7 @@
       auto-height="{{ autosize }}"
       placeholder="{{ placeholder }}"
       placeholder-style="{{ placeholderStyle }}"
-      placeholder-class="{{ error ? 'van-field--error' : '' }}"
+      placeholder-class="{{ error ? 'van-field__input--error' : '' }}"
       cursor-spacing="{{ cursorSpacing }}"
       adjust-position="{{ adjustPosition }}"
       show-confirm-bar="{{ showConfirmBar }}"
@@ -34,7 +36,7 @@
     />
     <input
       wx:else
-      class="{{ inputClass }}"
+      class="input-class {{ utils.bem('field__input', [inputAlign, { disabled, error }]) }}"
       type="{{ type }}"
       focus="{{ focus }}"
       value="{{ value }}"
@@ -42,7 +44,7 @@
       maxlength="{{ maxlength }}"
       placeholder="{{ placeholder }}"
       placeholder-style="{{ placeholderStyle }}"
-      placeholder-class="{{ error ? 'van-field--error' : '' }}"
+      placeholder-class="{{ error ? 'van-field__input--error' : '' }}"
       confirm-type="{{ confirmType }}"
       confirm-hold="{{ confirmHold }}"
       cursor-spacing="{{ cursorSpacing }}"
diff --git a/packages/goods-action/index.ts b/packages/goods-action/index.ts
index 4dac3734..f6b5b374 100644
--- a/packages/goods-action/index.ts
+++ b/packages/goods-action/index.ts
@@ -9,14 +9,5 @@ VantComponent({
       type: Boolean,
       value: true
     }
-  },
-
-  computed: {
-    rootClass() {
-      const { safeAreaInsetBottom, isIPhoneX } = this.data;
-      return this.classNames('van-goods-action', 'custom-class', {
-        [`van-goods-action--safe`]: isIPhoneX && safeAreaInsetBottom
-      });
-    }
   }
 });
diff --git a/packages/goods-action/index.wxml b/packages/goods-action/index.wxml
index cfc009c7..6e61cc9e 100644
--- a/packages/goods-action/index.wxml
+++ b/packages/goods-action/index.wxml
@@ -1,3 +1,5 @@
-<view class="{{ rootClass }}">
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class {{ utils.bem('goods-action', { safe: isIPhoneX && safeAreaInsetBottom }) }}">
   <slot />
 </view>
diff --git a/packages/mixins/basic.ts b/packages/mixins/basic.ts
index 50ede2fc..7de3fbfa 100644
--- a/packages/mixins/basic.ts
+++ b/packages/mixins/basic.ts
@@ -1,9 +1,5 @@
-import { classNames } from '../common/class-names';
-
 export const basic = Behavior({
   methods: {
-    classNames,
-
     $emit() {
       this.triggerEvent.apply(this, arguments);
     },
diff --git a/packages/popup/index.ts b/packages/popup/index.ts
index 0db4abb8..545d6811 100644
--- a/packages/popup/index.ts
+++ b/packages/popup/index.ts
@@ -31,16 +31,6 @@ VantComponent({
     }
   },
 
-  computed: {
-    popupClass() {
-      const { position, safeAreaInsetBottom, isIPhoneX } = this.data;
-      return this.classNames('custom-class', 'van-popup', {
-        [`van-popup--${position}`]: position,
-        [`van-popup--safe`]: isIPhoneX && safeAreaInsetBottom && position === 'bottom'
-      });
-    }
-  },
-
   methods: {
     onClickOverlay() {
       this.$emit('click-overlay');
diff --git a/packages/popup/index.wxml b/packages/popup/index.wxml
index 07bd1ae1..bafbfecb 100644
--- a/packages/popup/index.wxml
+++ b/packages/popup/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <van-overlay
   wx:if="{{ inited && overlay }}"
   mask
@@ -8,7 +10,7 @@
 />
 <view
   wx:if="{{ inited }}"
-  class="{{ popupClass }}"
+  class="custom-class {{ utils.bem('popup', [position, { safe: isIPhoneX && safeAreaInsetBottom && position === 'bottom' }]) }}"
   style="z-index: {{ zIndex }}; -webkit-animation: van-{{ transition || position }}-{{ type }} {{ duration }}ms both; animation: van-{{ transition || position }}-{{ type }} {{ duration }}ms both; {{ display ? '' : 'display: none;' }}{{ customStyle }}"
   bind:animationend="onAnimationEnd"
 >
diff --git a/packages/radio/index.ts b/packages/radio/index.ts
index e1f1e1e2..ce4a28ef 100644
--- a/packages/radio/index.ts
+++ b/packages/radio/index.ts
@@ -19,17 +19,6 @@ VantComponent({
     checkedColor: String
   },
 
-  computed: {
-    iconClass(): string {
-      const { disabled, name, value } = this.data;
-      return this.classNames('van-radio__icon', {
-        'van-radio__icon--disabled': disabled,
-        'van-radio__icon--checked': !disabled && name === value,
-        'van-radio__icon--check': !disabled && name !== value
-      });
-    }
-  },
-
   methods: {
     emitChange(value) {
       const instance = this.getRelationNodes('../radio-group/index')[0] || this;
diff --git a/packages/radio/index.wxml b/packages/radio/index.wxml
index 29d73956..dc61d3fb 100644
--- a/packages/radio/index.wxml
+++ b/packages/radio/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-radio custom-class">
   <view class="van-radio__input">
     <radio-group bindchange="onChange">
@@ -9,7 +11,7 @@
       />
     </radio-group>
     <van-icon
-      class="{{ iconClass }}"
+      class="{{ utils.bem('radio__icon', { disabled, checked: !disabled && name === value, check: !disabled && name !== value }) }}"
       custom-class="icon-class"
       color="{{ value === name ? checkedColor : '' }}"
       name="{{ value === name ? 'checked' : 'check' }}"
diff --git a/packages/submit-bar/index.ts b/packages/submit-bar/index.ts
index 4a363b93..ddf652de 100644
--- a/packages/submit-bar/index.ts
+++ b/packages/submit-bar/index.ts
@@ -44,13 +44,6 @@ VantComponent({
     tipStr() {
       const { tip } = this.data;
       return typeof tip === 'string' ? tip : '';
-    },
-
-    barClass() {
-      const { isIPhoneX, safeAreaInsetBottom } = this.data;
-      return this.classNames('van-submit-bar__bar', 'bar-class', {
-        'van-submit-bar__bar--safe': safeAreaInsetBottom && isIPhoneX
-      });
     }
   },
 
diff --git a/packages/submit-bar/index.wxml b/packages/submit-bar/index.wxml
index a2bc998d..42fc9516 100644
--- a/packages/submit-bar/index.wxml
+++ b/packages/submit-bar/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-submit-bar custom-class">
   <slot name="top" />
 
@@ -5,7 +7,7 @@
     {{ tipStr }}<slot name="tip" />
   </view>
 
-  <view class="{{ barClass }}">
+  <view class="bar-class {{ utils.bem('submit-bar__bar', { safe: safeAreaInsetBottom && isIPhoneX }) }}">
     <slot />
     <view class="van-submit-bar__text">
       <block wx:if="{{ hasPrice }}">
diff --git a/packages/switch/index.ts b/packages/switch/index.ts
index 80a9690d..552de7c0 100644
--- a/packages/switch/index.ts
+++ b/packages/switch/index.ts
@@ -24,13 +24,6 @@ VantComponent({
   },
 
   computed: {
-    classes(): string {
-      return this.classNames('van-switch', {
-        'van-switch--on': this.data.checked,
-        'van-switch--disabled': this.data.disabled
-      });
-    },
-
     style() {
       const backgroundColor = this.data.checked ? this.data.activeColor : this.data.inactiveColor;
       return `font-size: ${this.data.size}; ${ backgroundColor ? `background-color: ${backgroundColor}` : '' }`
diff --git a/packages/switch/index.wxml b/packages/switch/index.wxml
index 6d0a3287..1929fb01 100644
--- a/packages/switch/index.wxml
+++ b/packages/switch/index.wxml
@@ -1,6 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
   style="{{ style }}"
-  class="custom-class {{ classes }}"
+  class="custom-class {{ utils.bem('switch', { on: checked, disabled }) }}"
   bind:tap="onClick"
 >
   <view class="van-switch__node node-class">
diff --git a/packages/tabbar/index.ts b/packages/tabbar/index.ts
index fa628965..cd0c5aad 100644
--- a/packages/tabbar/index.ts
+++ b/packages/tabbar/index.ts
@@ -42,16 +42,6 @@ VantComponent({
     currentActive: -1
   },
 
-  computed: {
-    tabbarClass() {
-      const { fixed, isIPhoneX, safeAreaInsetBottom } = this.data;
-      return this.classNames('custom-class', 'van-tabbar', 'van-hairline--top-bottom', {
-        'van-tabbar--fixed': fixed,
-        'van-tabbar--safe': isIPhoneX && safeAreaInsetBottom
-      });
-    }
-  },
-
   watch: {
     active(active) {
       this.set({ currentActive: active });
diff --git a/packages/tabbar/index.wxml b/packages/tabbar/index.wxml
index b8eb8e47..f05228e2 100644
--- a/packages/tabbar/index.wxml
+++ b/packages/tabbar/index.wxml
@@ -1,5 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
-  class="{{ tabbarClass }}"
+  class="custom-class van-hairline--top-bottom {{ utils.bem('tabbar', { fixed, safe: isIPhoneX && safeAreaInsetBottom }) }}"
   style="{{ zIndex ? 'z-index: ' + zIndex : '' }}"
 >
   <slot />
diff --git a/packages/tag/index.ts b/packages/tag/index.ts
index 9db7bd8d..9e5a0fe9 100644
--- a/packages/tag/index.ts
+++ b/packages/tag/index.ts
@@ -19,17 +19,6 @@ VantComponent({
   },
 
   computed: {
-    classes() {
-      const { data } = this;
-      return this.classNames('van-tag', {
-        'van-tag--mark': data.mark,
-        'van-tag--plain': data.plain,
-        'van-tag--round': data.round,
-        [`van-tag--${data.size}`]: data.size,
-        'van-hairline--surround': data.plain
-      });
-    },
-
     style() {
       const color = this.data.color || COLOR_MAP[this.data.type] || DEFAULT_COLOR;
       const key = this.data.plain ? 'color' : 'background-color';
diff --git a/packages/tag/index.wxml b/packages/tag/index.wxml
index 69e74b16..e66580cd 100644
--- a/packages/tag/index.wxml
+++ b/packages/tag/index.wxml
@@ -1,5 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
-  class="custom-class {{ classes }}"
+  class="custom-class {{ utils.bem('tag', [size, { mark, plain, round }]) }} {{ plain ? 'van-hairline--surround' : '' }}"
   style="{{ style }}"
 >
   <slot />
diff --git a/packages/wxs/bem.wxs b/packages/wxs/bem.wxs
index e6b00faa..93b2777b 100644
--- a/packages/wxs/bem.wxs
+++ b/packages/wxs/bem.wxs
@@ -16,7 +16,7 @@ function traversing(mods, conf) {
     return;
   }
 
-  if (typeof conf === 'string') {
+  if (typeof conf === 'string' || typeof conf === 'number') {
     mods.push(conf);
   } else if (array.isArray(conf)) {
     conf.forEach(function(item) {