From a1a1af37f1f82847f6691f8ce43aca3ff59064b2 Mon Sep 17 00:00:00 2001
From: johnsonwong666 <1067100250@qq.com>
Date: Mon, 24 Apr 2023 15:53:22 +0800
Subject: [PATCH 1/3] fix(tab): fix tab height

---
 packages/tabs/index.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tabs/index.wxml b/packages/tabs/index.wxml
index f0a01bb8..1384a038 100644
--- a/packages/tabs/index.wxml
+++ b/packages/tabs/index.wxml
@@ -1,7 +1,7 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 <wxs src="./index.wxs" module="computed" />
 
-<view class="custom-class {{ utils.bem('tabs', [type]) }}">
+<view class="custom-class {{ utils.bem('tabs') }}">
   <van-sticky
     disabled="{{ !sticky }}"
     z-index="{{ zIndex }}"
@@ -9,7 +9,7 @@
     container="{{ container }}"
     bind:scroll="onTouchScroll"
   >
-    <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }} wrap-class">
+    <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabs--' + type) }} wrap-class">
       <slot name="nav-left" />
 
       <scroll-view

From 9e6832bf851e7fc6ed2631e5e467ce672bb33d46 Mon Sep 17 00:00:00 2001
From: johnsonwong666 <1067100250@qq.com>
Date: Mon, 24 Apr 2023 16:21:48 +0800
Subject: [PATCH 2/3] fix(tab): fix tab height

---
 packages/tabs/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tabs/index.wxml b/packages/tabs/index.wxml
index 1384a038..335b14cf 100644
--- a/packages/tabs/index.wxml
+++ b/packages/tabs/index.wxml
@@ -9,7 +9,7 @@
     container="{{ container }}"
     bind:scroll="onTouchScroll"
   >
-    <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabs--' + type) }} wrap-class">
+    <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }} {{ 'van-tabs--' + type }} wrap-class">
       <slot name="nav-left" />
 
       <scroll-view

From 747b30597ab20e0e887dba118fe93fb5999108bd Mon Sep 17 00:00:00 2001
From: johnsonwong666 <1067100250@qq.com>
Date: Mon, 24 Apr 2023 19:32:45 +0800
Subject: [PATCH 3/3] fix(tab): jest change

---
 .../test/__snapshots__/demo.spec.ts.snap      |  4 +-
 .../icon/test/__snapshots__/demo.spec.ts.snap |  4 +-
 .../test/__snapshots__/demo.spec.ts.snap      |  4 +-
 .../tab/test/__snapshots__/demo.spec.ts.snap  | 44 +++++++++----------
 packages/tabs/index.less                      |  8 +---
 packages/tabs/index.wxml                      |  2 +-
 6 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/packages/empty/test/__snapshots__/demo.spec.ts.snap b/packages/empty/test/__snapshots__/demo.spec.ts.snap
index 0cc8524e..dc38f25a 100644
--- a/packages/empty/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/empty/test/__snapshots__/demo.spec.ts.snap
@@ -56,7 +56,7 @@ exports[`should render demo and match snapshot 1`] = `
         bind:change="onChange"
       >
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -70,7 +70,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
diff --git a/packages/icon/test/__snapshots__/demo.spec.ts.snap b/packages/icon/test/__snapshots__/demo.spec.ts.snap
index dee7d18b..9bed7a12 100644
--- a/packages/icon/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/icon/test/__snapshots__/demo.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`should render demo and match snapshot 1`] = `
     bind:change="onSwitch"
   >
     <wx-view
-      class="custom-class van-tabs van-tabs--line"
+      class="custom-class van-tabs"
     >
       <van-sticky
         bind:scroll="onTouchScroll"
@@ -20,7 +20,7 @@ exports[`should render demo and match snapshot 1`] = `
             style="z-index:1"
           >
             <wx-view
-              class="van-tabs__wrap  wrap-class"
+              class="van-tabs--line van-tabs__wrap  wrap-class"
             >
               <wx-scroll-view
                 class="van-tabs__scroll van-tabs__scroll--line"
diff --git a/packages/index-bar/test/__snapshots__/demo.spec.ts.snap b/packages/index-bar/test/__snapshots__/demo.spec.ts.snap
index fa492261..2bc6d33e 100644
--- a/packages/index-bar/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/index-bar/test/__snapshots__/demo.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`should render demo and match snapshot 1`] = `
     bind:change="onChange"
   >
     <wx-view
-      class="custom-class van-tabs van-tabs--line"
+      class="custom-class van-tabs"
     >
       <van-sticky
         bind:scroll="onTouchScroll"
@@ -20,7 +20,7 @@ exports[`should render demo and match snapshot 1`] = `
             style="z-index:1"
           >
             <wx-view
-              class="van-tabs__wrap  wrap-class"
+              class="van-tabs--line van-tabs__wrap  wrap-class"
             >
               <wx-scroll-view
                 class="van-tabs__scroll van-tabs__scroll--line"
diff --git a/packages/tab/test/__snapshots__/demo.spec.ts.snap b/packages/tab/test/__snapshots__/demo.spec.ts.snap
index 3140df14..f11b21c3 100644
--- a/packages/tab/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/tab/test/__snapshots__/demo.spec.ts.snap
@@ -15,7 +15,7 @@ exports[`should render demo and match snapshot 1`] = `
         bind:change="onChange"
       >
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -29,7 +29,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -172,7 +172,7 @@ exports[`should render demo and match snapshot 1`] = `
       </wx-view>
       <van-tabs>
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -186,7 +186,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -308,7 +308,7 @@ exports[`should render demo and match snapshot 1`] = `
       </wx-view>
       <van-tabs>
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -322,7 +322,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap van-tabs__wrap--scrollable  wrap-class"
+                  class="van-tabs--line van-tabs__wrap van-tabs__wrap--scrollable  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -509,7 +509,7 @@ exports[`should render demo and match snapshot 1`] = `
         bind:disabled="onClickDisabled"
       >
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -523,7 +523,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -647,7 +647,7 @@ exports[`should render demo and match snapshot 1`] = `
         tabClass="special-tab"
       >
         <wx-view
-          class="custom-class van-tabs van-tabs--card"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -661,7 +661,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--card van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--card"
@@ -781,7 +781,7 @@ exports[`should render demo and match snapshot 1`] = `
         bind:click="onClick"
       >
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -795,7 +795,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -896,7 +896,7 @@ exports[`should render demo and match snapshot 1`] = `
       </wx-view>
       <van-tabs>
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -910,7 +910,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -1053,7 +1053,7 @@ exports[`should render demo and match snapshot 1`] = `
       </wx-view>
       <van-tabs>
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -1067,7 +1067,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -1210,7 +1210,7 @@ exports[`should render demo and match snapshot 1`] = `
       </wx-view>
       <van-tabs>
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -1224,7 +1224,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -1371,7 +1371,7 @@ exports[`should render demo and match snapshot 1`] = `
         bind:change="onChange"
       >
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -1385,7 +1385,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
@@ -1562,7 +1562,7 @@ exports[`should render demo and match snapshot 1`] = `
         bind:change="onChange"
       >
         <wx-view
-          class="custom-class van-tabs van-tabs--line"
+          class="custom-class van-tabs"
         >
           <van-sticky
             bind:scroll="onTouchScroll"
@@ -1576,7 +1576,7 @@ exports[`should render demo and match snapshot 1`] = `
                 style="z-index:1"
               >
                 <wx-view
-                  class="van-tabs__wrap  wrap-class"
+                  class="van-tabs--line van-tabs__wrap  wrap-class"
                 >
                   <wx-scroll-view
                     class="van-tabs__scroll van-tabs__scroll--line"
diff --git a/packages/tabs/index.less b/packages/tabs/index.less
index 9c8aa1c1..efbed1ef 100644
--- a/packages/tabs/index.less
+++ b/packages/tabs/index.less
@@ -113,15 +113,11 @@
   }
 
   &--line {
-    .van-tabs__wrap {
-      height: var(--tabs-line-height, @tabs-line-height);
-    }
+    height: var(--tabs-line-height, @tabs-line-height);
   }
 
   &--card {
-    .van-tabs__wrap {
-      height: var(--tabs-card-height, @tabs-card-height);
-    }
+    height: var(--tabs-card-height, @tabs-card-height);
   }
 }
 
diff --git a/packages/tabs/index.wxml b/packages/tabs/index.wxml
index 335b14cf..05bb1e1b 100644
--- a/packages/tabs/index.wxml
+++ b/packages/tabs/index.wxml
@@ -9,7 +9,7 @@
     container="{{ container }}"
     bind:scroll="onTouchScroll"
   >
-    <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }} {{ 'van-tabs--' + type }} wrap-class">
+    <view class="{{ utils.bem('tabs--') + type }} {{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }} wrap-class">
       <slot name="nav-left" />
 
       <scroll-view