From f0eb0d18f054eb3cfe88ff9e42e71b8a8aa805c2 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Thu, 22 Apr 2021 19:26:19 +0800
Subject: [PATCH] fix(Tag): incorrect border color when using plain (#8601)

* fix(Tag): incorrect border color when using plain

* fix: snapshot
---
 src/tag/Tag.tsx                               |  1 +
 src/tag/index.less                            |  4 +++-
 src/tag/test/__snapshots__/demo.spec.ts.snap  |  2 +-
 src/tag/test/__snapshots__/index.spec.ts.snap |  9 +++++++++
 src/tag/test/index.spec.ts                    | 12 ++++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/tag/Tag.tsx b/src/tag/Tag.tsx
index c3986fe24..f3a638e23 100644
--- a/src/tag/Tag.tsx
+++ b/src/tag/Tag.tsx
@@ -36,6 +36,7 @@ export default defineComponent({
       if (props.plain) {
         return {
           color: props.textColor || props.color,
+          borderColor: props.color,
         };
       }
       return {
diff --git a/src/tag/index.less b/src/tag/index.less
index e4cde11f9..91c1b5d80 100644
--- a/src/tag/index.less
+++ b/src/tag/index.less
@@ -52,6 +52,7 @@
 
   &--plain {
     background-color: @tag-plain-background-color;
+    border-color: currentColor;
 
     &::before {
       position: absolute;
@@ -59,7 +60,8 @@
       right: 0;
       bottom: 0;
       left: 0;
-      border: 1px solid currentColor;
+      border: 1px solid;
+      border-color: inherit;
       border-radius: inherit;
       content: '';
       pointer-events: none;
diff --git a/src/tag/test/__snapshots__/demo.spec.ts.snap b/src/tag/test/__snapshots__/demo.spec.ts.snap
index 98dd902f7..c82acc0aa 100644
--- a/src/tag/test/__snapshots__/demo.spec.ts.snap
+++ b/src/tag/test/__snapshots__/demo.spec.ts.snap
@@ -204,7 +204,7 @@ exports[`should render demo and match snapshot 1`] = `
     </div>
     <div class="van-cell__value">
       <transition-stub>
-        <span style="color: rgb(114, 50, 221);"
+        <span style="color: rgb(114, 50, 221); border-color: #7232dd;"
               class="van-tag van-tag--plain van-tag--default"
         >
           Tag
diff --git a/src/tag/test/__snapshots__/index.spec.ts.snap b/src/tag/test/__snapshots__/index.spec.ts.snap
index 7055bbb1b..b1388a1dc 100644
--- a/src/tag/test/__snapshots__/index.spec.ts.snap
+++ b/src/tag/test/__snapshots__/index.spec.ts.snap
@@ -4,3 +4,12 @@ exports[`should hide tag when the show prop is false 1`] = `
 <transition-stub>
 </transition-stub>
 `;
+
+exports[`should render border-color correctly 1`] = `
+<transition-stub>
+  <span style="color: blue; border-color: red;"
+        class="van-tag van-tag--plain van-tag--default"
+  >
+  </span>
+</transition-stub>
+`;
diff --git a/src/tag/test/index.spec.ts b/src/tag/test/index.spec.ts
index 5a6de7fd5..20205bb33 100644
--- a/src/tag/test/index.spec.ts
+++ b/src/tag/test/index.spec.ts
@@ -36,3 +36,15 @@ test('should not trigger click event when clicking the close icon', () => {
   wrapper.trigger('click');
   expect(onClick).toHaveBeenCalledTimes(1);
 });
+
+test('should render border-color correctly', () => {
+  const wrapper = mount(Tag, {
+    props: {
+      plain: true,
+      color: 'red',
+      textColor: 'blue',
+    },
+  });
+
+  expect(wrapper.html()).toMatchSnapshot();
+});