diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index a9a9e5e57..3e15693ec 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -9,6 +9,7 @@ - List - Dialog - Slider +- Switch - NoticeBar ##### ImagePreview diff --git a/packages/address-edit/test/__snapshots__/demo.spec.js.snap b/packages/address-edit/test/__snapshots__/demo.spec.js.snap index eb8c5aee7..577c1b36e 100644 --- a/packages/address-edit/test/__snapshots__/demo.spec.js.snap +++ b/packages/address-edit/test/__snapshots__/demo.spec.js.snap @@ -41,7 +41,7 @@ exports[`renders demo correctly 1`] = `
设为默认收货地址
-
+
diff --git a/packages/address-edit/test/__snapshots__/index.spec.js.snap b/packages/address-edit/test/__snapshots__/index.spec.js.snap index 7aa48d65c..fa9769485 100644 --- a/packages/address-edit/test/__snapshots__/index.spec.js.snap +++ b/packages/address-edit/test/__snapshots__/index.spec.js.snap @@ -95,7 +95,7 @@ exports[`create a AddressEdit with props 1`] = `
设为默认收货地址
-
+
diff --git a/packages/skeleton/test/__snapshots__/demo.spec.js.snap b/packages/skeleton/test/__snapshots__/demo.spec.js.snap index 724d55f6f..785a20ad3 100644 --- a/packages/skeleton/test/__snapshots__/demo.spec.js.snap +++ b/packages/skeleton/test/__snapshots__/demo.spec.js.snap @@ -24,7 +24,7 @@ exports[`renders demo correctly 1`] = `
-
+
diff --git a/packages/switch-cell/test/__snapshots__/demo.spec.js.snap b/packages/switch-cell/test/__snapshots__/demo.spec.js.snap index ecb45e240..114866d0d 100644 --- a/packages/switch-cell/test/__snapshots__/demo.spec.js.snap +++ b/packages/switch-cell/test/__snapshots__/demo.spec.js.snap @@ -7,7 +7,7 @@ exports[`renders demo correctly 1`] = `
标题
-
+
@@ -19,7 +19,7 @@ exports[`renders demo correctly 1`] = `
标题
-
+
@@ -31,7 +31,7 @@ exports[`renders demo correctly 1`] = `
标题
-
+
diff --git a/packages/switch-cell/test/__snapshots__/index.spec.js.snap b/packages/switch-cell/test/__snapshots__/index.spec.js.snap index 9d283bac4..f3855ca9b 100644 --- a/packages/switch-cell/test/__snapshots__/index.spec.js.snap +++ b/packages/switch-cell/test/__snapshots__/index.spec.js.snap @@ -3,7 +3,7 @@ exports[`border prop 1`] = `
-
+
@@ -13,7 +13,7 @@ exports[`border prop 1`] = ` exports[`cell-size prop 1`] = `
-
+
diff --git a/packages/switch/index.tsx b/packages/switch/index.tsx index 0c7381934..e8e5dcef2 100644 --- a/packages/switch/index.tsx +++ b/packages/switch/index.tsx @@ -31,6 +31,8 @@ function Switch( inactiveValue } = props; + const checked = value === activeValue; + const switchStyle = { fontSize: size, backgroundColor: value ? activeColor : inactiveColor @@ -40,7 +42,7 @@ function Switch( function onClick() { if (!disabled && !loading) { - const newValue = value === activeValue ? inactiveValue : activeValue; + const newValue = checked ? inactiveValue : activeValue; emit(ctx, 'input', newValue); emit(ctx, 'change', newValue); } @@ -49,10 +51,12 @@ function Switch( return (
diff --git a/packages/switch/test/__snapshots__/demo.spec.js.snap b/packages/switch/test/__snapshots__/demo.spec.js.snap index ea58099e8..373b66449 100644 --- a/packages/switch/test/__snapshots__/demo.spec.js.snap +++ b/packages/switch/test/__snapshots__/demo.spec.js.snap @@ -3,34 +3,34 @@ exports[`renders demo correctly 1`] = `
-
+
-
+
-
+
-
+
-
+
-
+