From 3051ea85682705edd176dde1687a6250486a6cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Fri, 7 Jun 2019 10:52:19 +0800
Subject: [PATCH] [bugfix] Switch: incorrect activeColor when use activeValue

---
 packages/switch/index.tsx                     |  8 +++--
 .../test/__snapshots__/index.spec.js.snap     |  7 ++++
 packages/switch/test/index.spec.js            | 35 +++++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 packages/switch/test/__snapshots__/index.spec.js.snap

diff --git a/packages/switch/index.tsx b/packages/switch/index.tsx
index 1354a8307..cba941e8b 100644
--- a/packages/switch/index.tsx
+++ b/packages/switch/index.tsx
@@ -21,14 +21,16 @@ function Switch(
 ) {
   const { value, loading, disabled, activeValue, inactiveValue } = props;
 
+  const checked = value === activeValue;
+
   const style = {
     fontSize: props.size,
-    backgroundColor: value ? props.activeColor : props.inactiveColor
+    backgroundColor: checked ? props.activeColor : props.inactiveColor
   };
 
   const onClick = () => {
     if (!disabled && !loading) {
-      const newValue = value === activeValue ? inactiveValue : activeValue;
+      const newValue = checked ? inactiveValue : activeValue;
       emit(ctx, 'input', newValue);
       emit(ctx, 'change', newValue);
     }
@@ -37,7 +39,7 @@ function Switch(
   return (
     <div
       class={bem({
-        on: value === activeValue,
+        on: checked,
         disabled
       })}
       style={style}
diff --git a/packages/switch/test/__snapshots__/index.spec.js.snap b/packages/switch/test/__snapshots__/index.spec.js.snap
new file mode 100644
index 000000000..a6e9b4fae
--- /dev/null
+++ b/packages/switch/test/__snapshots__/index.spec.js.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`inactive-color prop 1`] = `
+<div class="van-switch" style="font-size: 30px; background-color: black;">
+  <div class="van-switch__node"></div>
+</div>
+`;
diff --git a/packages/switch/test/index.spec.js b/packages/switch/test/index.spec.js
index a05bdc9ff..bbc2987d2 100644
--- a/packages/switch/test/index.spec.js
+++ b/packages/switch/test/index.spec.js
@@ -37,3 +37,38 @@ test('disabled', () => {
   expect(input).toHaveBeenCalledTimes(0);
   expect(change).toHaveBeenCalledTimes(0);
 });
+
+test('active-value & inactive-value prop', () => {
+  const input = jest.fn();
+  const change = jest.fn();
+  const wrapper = mount(Switch, {
+    propsData: {
+      value: '1',
+      activeValue: '1',
+      inactiveValue: '2'
+    },
+    context: {
+      on: {
+        input,
+        change
+      }
+    }
+  });
+
+  wrapper.trigger('click');
+
+  expect(input).toHaveBeenCalledWith('2');
+  expect(change).toHaveBeenCalledWith('2');
+});
+
+test('inactive-color prop', () => {
+  const wrapper = mount(Switch, {
+    propsData: {
+      value: '2',
+      inactiveValue: '2',
+      inactiveColor: 'black'
+    }
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});