From 1db95361824da4b532d47753e9a404da4a2b236c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 10 Feb 2020 16:30:17 +0800
Subject: [PATCH] feat(Form): support using switch

---
 src/form/demo/FieldType.vue                   | 22 ++++--
 src/form/demo/Validate.vue                    |  0
 src/form/test/__snapshots__/demo.spec.js.snap | 32 ++++++--
 src/switch/index.js                           | 73 +++++++++++++++++
 src/switch/index.tsx                          | 78 -------------------
 src/switch/test/index.spec.js                 | 30 +++----
 6 files changed, 125 insertions(+), 110 deletions(-)
 create mode 100644 src/form/demo/Validate.vue
 create mode 100644 src/switch/index.js
 delete mode 100644 src/switch/index.tsx

diff --git a/src/form/demo/FieldType.vue b/src/form/demo/FieldType.vue
index 2a2079cf3..0b3d89d92 100644
--- a/src/form/demo/FieldType.vue
+++ b/src/form/demo/FieldType.vue
@@ -1,13 +1,14 @@
 <template>
   <demo-block :title="$t('fieldType')">
-    <van-form>
-      <van-field
-        name="checkbox"
-        :label="$t('checkbox')"
-        :rules="[{ required: true, message: $t('requireCheckbox') }]"
-      >
+    <van-form @submit="onSubmit">
+      <van-field name="checkbox" :label="$t('checkbox')">
         <van-checkbox v-model="checkbox" slot="input" shape="square" />
       </van-field>
+
+      <van-field name="switch" :label="$t('switch')">
+        <van-switch v-model="switchChecked" slot="input" size="24" />
+      </van-field>
+
       <div style="margin: 16px;">
         <van-button type="info" round block>{{ $t('submit') }}</van-button>
       </div>
@@ -20,12 +21,14 @@ export default {
   i18n: {
     'zh-CN': {
       submit: '提交',
+      switch: '开关',
       checkbox: '复选框',
       fieldType: '表单项类型',
       requireCheckbox: '请勾选复选框',
     },
     'en-US': {
       submit: 'Submit',
+      switch: 'Switch',
       checkbox: 'Checkbox',
       fieldType: 'Field Type',
       requireCheckbox: 'Checkbox is required',
@@ -35,7 +38,14 @@ export default {
   data() {
     return {
       checkbox: false,
+      switchChecked: false,
     };
   },
+
+  methods: {
+    onSubmit(values) {
+      console.log(values);
+    },
+  },
 };
 </script>
diff --git a/src/form/demo/Validate.vue b/src/form/demo/Validate.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/form/test/__snapshots__/demo.spec.js.snap b/src/form/test/__snapshots__/demo.spec.js.snap
index a479872af..d93531cc0 100644
--- a/src/form/test/__snapshots__/demo.spec.js.snap
+++ b/src/form/test/__snapshots__/demo.spec.js.snap
@@ -5,22 +5,27 @@ exports[`renders demo correctly 1`] = `
   <div>
     <form class="van-form">
       <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>username</span></div>
+        <div class="van-cell__title van-field__label"><span>用户名</span></div>
         <div class="van-cell__value">
-          <div class="van-field__body"><input type="text" name="username" placeholder="username" class="van-field__control"></div>
+          <div class="van-field__body"><input type="text" name="username" placeholder="用户名" class="van-field__control"></div>
         </div>
       </div>
       <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>password</span></div>
+        <div class="van-cell__title van-field__label"><span>密码</span></div>
         <div class="van-cell__value">
-          <div class="van-field__body"><input type="password" name="password" placeholder="password" class="van-field__control"></div>
+          <div class="van-field__body"><input type="password" name="password" placeholder="密码" class="van-field__control"></div>
         </div>
       </div>
+      <div style="margin: 16px;"><button class="van-button van-button--info van-button--normal van-button--block van-button--round"><span class="van-button__text">提交</span></button></div>
+    </form>
+  </div>
+  <div>
+    <form class="van-form">
       <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>agree</span></div>
+        <div class="van-cell__title van-field__label"><span>复选框</span></div>
         <div class="van-cell__value">
           <div class="van-field__body">
-            <div class="van-field__control">
+            <div class="van-field__control van-field__control--custom">
               <div role="checkbox" tabindex="0" aria-checked="false" class="van-checkbox">
                 <div class="van-checkbox__icon van-checkbox__icon--square"><i class="van-icon van-icon-success">
                     <!----></i></div>
@@ -28,7 +33,20 @@ exports[`renders demo correctly 1`] = `
             </div>
           </div>
         </div>
-      </div> <button class="van-button van-button--primary van-button--normal"><span class="van-button__text">submit</span></button>
+      </div>
+      <div class="van-cell van-field">
+        <div class="van-cell__title van-field__label"><span>开关</span></div>
+        <div class="van-cell__value">
+          <div class="van-field__body">
+            <div class="van-field__control van-field__control--custom">
+              <div role="switch" aria-checked="false" class="van-switch" style="font-size: 24px;">
+                <div class="van-switch__node"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div style="margin: 16px;"><button class="van-button van-button--info van-button--normal van-button--block van-button--round"><span class="van-button__text">提交</span></button></div>
     </form>
   </div>
 </div>
diff --git a/src/switch/index.js b/src/switch/index.js
new file mode 100644
index 000000000..c9b1e02d7
--- /dev/null
+++ b/src/switch/index.js
@@ -0,0 +1,73 @@
+// Utils
+import { createNamespace, addUnit } from '../utils';
+import { BLUE } from '../utils/constant';
+import { switchProps } from './shared';
+
+// Mixins
+import { FieldMixin } from '../mixins/field';
+
+// Components
+import Loading from '../loading';
+
+const [createComponent, bem] = createNamespace('switch');
+
+export default createComponent({
+  mixins: [FieldMixin],
+
+  props: switchProps,
+
+  computed: {
+    checked() {
+      return this.value === this.activeValue;
+    },
+
+    style() {
+      return {
+        fontSize: addUnit(this.size),
+        backgroundColor: this.checked ? this.activeColor : this.inactiveColor,
+      };
+    },
+  },
+
+  methods: {
+    onClick(event) {
+      this.$emit('click', event);
+
+      if (!this.disabled && !this.loading) {
+        const newValue = this.checked ? this.inactiveValue : this.activeValue;
+        this.$emit('input', newValue);
+        this.$emit('change', newValue);
+      }
+    },
+
+    genLoading() {
+      if (this.loading) {
+        const color = this.checked
+          ? this.activeColor || BLUE
+          : this.inactiveColor || '';
+
+        return <Loading class={bem('loading')} color={color} />;
+      }
+    },
+  },
+
+  render() {
+    const { checked, loading, disabled } = this;
+
+    return (
+      <div
+        class={bem({
+          on: checked,
+          loading,
+          disabled,
+        })}
+        role="switch"
+        style={this.style}
+        aria-checked={String(checked)}
+        onClick={this.onClick}
+      >
+        <div class={bem('node')}>{this.genLoading()}</div>
+      </div>
+    );
+  },
+});
diff --git a/src/switch/index.tsx b/src/switch/index.tsx
deleted file mode 100644
index ad288100f..000000000
--- a/src/switch/index.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-// Utils
-import { createNamespace, addUnit } from '../utils';
-import { BLUE } from '../utils/constant';
-import { emit, inherit } from '../utils/functional';
-import { switchProps, SharedSwitchProps } from './shared';
-
-// Components
-import Loading from '../loading';
-
-// Types
-import { CreateElement, RenderContext } from 'vue/types';
-import { DefaultSlots } from '../utils/types';
-
-export type SwitchEvents = {
-  onChange?(checked: boolean): void;
-};
-
-const [createComponent, bem] = createNamespace('switch');
-
-function Switch(
-  h: CreateElement,
-  props: SharedSwitchProps,
-  slots: DefaultSlots,
-  ctx: RenderContext<SharedSwitchProps>
-) {
-  const {
-    size,
-    value,
-    loading,
-    disabled,
-    activeColor,
-    activeValue,
-    inactiveColor,
-    inactiveValue,
-  } = props;
-
-  const checked = value === activeValue;
-
-  const switchStyle = {
-    fontSize: addUnit(size),
-    backgroundColor: checked ? activeColor : inactiveColor,
-  };
-
-  const loadingColor = checked ? activeColor || BLUE : inactiveColor || '';
-
-  function onClick(event: PointerEvent) {
-    emit(ctx, 'click', event);
-
-    if (!disabled && !loading) {
-      const newValue = checked ? inactiveValue : activeValue;
-      emit(ctx, 'input', newValue);
-      emit(ctx, 'change', newValue);
-    }
-  }
-
-  return (
-    <div
-      class={bem({
-        on: checked,
-        loading,
-        disabled,
-      })}
-      role="switch"
-      style={switchStyle}
-      aria-checked={String(checked)}
-      onClick={onClick}
-      {...inherit(ctx)}
-    >
-      <div class={bem('node')}>
-        {loading && <Loading class={bem('loading')} color={loadingColor} />}
-      </div>
-    </div>
-  );
-}
-
-Switch.props = switchProps;
-
-export default createComponent<SharedSwitchProps, SwitchEvents>(Switch);
diff --git a/src/switch/test/index.spec.js b/src/switch/test/index.spec.js
index 1e6815712..07a177272 100644
--- a/src/switch/test/index.spec.js
+++ b/src/switch/test/index.spec.js
@@ -5,11 +5,9 @@ test('emit event', () => {
   const input = jest.fn();
   const change = jest.fn();
   const wrapper = mount(Switch, {
-    context: {
-      on: {
-        input,
-        change,
-      },
+    listeners: {
+      input,
+      change,
     },
   });
   wrapper.trigger('click');
@@ -22,11 +20,9 @@ test('disabled', () => {
   const input = jest.fn();
   const change = jest.fn();
   const wrapper = mount(Switch, {
-    context: {
-      on: {
-        input,
-        change,
-      },
+    listeners: {
+      input,
+      change,
     },
     propsData: {
       disabled: true,
@@ -47,11 +43,9 @@ test('active-value & inactive-value prop', () => {
       activeValue: '1',
       inactiveValue: '2',
     },
-    context: {
-      on: {
-        input,
-        change,
-      },
+    listeners: {
+      input,
+      change,
     },
   });
 
@@ -86,10 +80,8 @@ test('size prop', () => {
 test('click event', () => {
   const click = jest.fn();
   const wrapper = mount(Switch, {
-    context: {
-      on: {
-        click,
-      },
+    listeners: {
+      click,
     },
   });