setTab7value(item.paneKey)}
- className={`nut-tabs-titles-item ${tab7value === item.paneKey ? 'nut-tabs-titles-item-active' : ''}`}
+ onClick={() => setTabvalue(item.paneKey)}
+ className={`nut-tabs-titles-item ${tabvalue === item.paneKey ? 'nut-tabs-titles-item-active' : ''}`}
key={item.paneKey}
>
{item.icon || null}
@@ -37,7 +37,7 @@ const Demo23 = () => {
))
}}
>
- {list6.map((item) => (
+ {list.map((item) => (
{item.title}
diff --git a/src/packages/tabs/demos/h5/demo3.tsx b/src/packages/tabs/demos/h5/demo3.tsx
index 4fd622f780..25dfb9c7e3 100644
--- a/src/packages/tabs/demos/h5/demo3.tsx
+++ b/src/packages/tabs/demos/h5/demo3.tsx
@@ -2,13 +2,13 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react'
const Demo3 = () => {
- const [tab1value, setTab1value] = useState
('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="simple"
>
diff --git a/src/packages/tabs/demos/h5/demo4.tsx b/src/packages/tabs/demos/h5/demo4.tsx
index 969e5d2c10..fee79f2f56 100644
--- a/src/packages/tabs/demos/h5/demo4.tsx
+++ b/src/packages/tabs/demos/h5/demo4.tsx
@@ -2,13 +2,13 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react'
const Demo4 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="card"
>
diff --git a/src/packages/tabs/demos/h5/demo5.tsx b/src/packages/tabs/demos/h5/demo5.tsx
index ffdd2f1832..f4834a5111 100644
--- a/src/packages/tabs/demos/h5/demo5.tsx
+++ b/src/packages/tabs/demos/h5/demo5.tsx
@@ -2,13 +2,13 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react'
const Demo5 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="button"
>
diff --git a/src/packages/tabs/demos/h5/demo6.tsx b/src/packages/tabs/demos/h5/demo6.tsx
index e218ab08ce..2db225a416 100644
--- a/src/packages/tabs/demos/h5/demo6.tsx
+++ b/src/packages/tabs/demos/h5/demo6.tsx
@@ -2,13 +2,13 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react'
const Demo6 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="divider"
>
diff --git a/src/packages/tabs/demos/h5/demo7.tsx b/src/packages/tabs/demos/h5/demo7.tsx
index 7b92a8a749..57d716eef3 100644
--- a/src/packages/tabs/demos/h5/demo7.tsx
+++ b/src/packages/tabs/demos/h5/demo7.tsx
@@ -2,14 +2,14 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react'
const Demo7 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
>
Tab 1
diff --git a/src/packages/tabs/demos/h5/demo8.tsx b/src/packages/tabs/demos/h5/demo8.tsx
index 6143b08bce..63a2a0ef31 100644
--- a/src/packages/tabs/demos/h5/demo8.tsx
+++ b/src/packages/tabs/demos/h5/demo8.tsx
@@ -2,15 +2,15 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react'
const Demo8 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
>
Tab 1
diff --git a/src/packages/tabs/demos/h5/demo9.tsx b/src/packages/tabs/demos/h5/demo9.tsx
index 0471484c6a..0ec02ebfc9 100644
--- a/src/packages/tabs/demos/h5/demo9.tsx
+++ b/src/packages/tabs/demos/h5/demo9.tsx
@@ -2,15 +2,15 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react'
const Demo9 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
>
Tab 1
diff --git a/src/packages/tabs/demos/taro/demo1.tsx b/src/packages/tabs/demos/taro/demo1.tsx
index f28e4b1c88..b6cfd987d6 100644
--- a/src/packages/tabs/demos/taro/demo1.tsx
+++ b/src/packages/tabs/demos/taro/demo1.tsx
@@ -2,12 +2,12 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo1 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
{
- setTab1value(value)
+ setTabvalue(value)
}}
>
Tab 1
diff --git a/src/packages/tabs/demos/taro/demo10.tsx b/src/packages/tabs/demos/taro/demo10.tsx
index 20cda2a1a3..bf03ee04d9 100644
--- a/src/packages/tabs/demos/taro/demo10.tsx
+++ b/src/packages/tabs/demos/taro/demo10.tsx
@@ -2,14 +2,14 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo10 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
align="left"
>
diff --git a/src/packages/tabs/demos/taro/demo11.tsx b/src/packages/tabs/demos/taro/demo11.tsx
index ef546e76eb..b24a84a74c 100644
--- a/src/packages/tabs/demos/taro/demo11.tsx
+++ b/src/packages/tabs/demos/taro/demo11.tsx
@@ -2,13 +2,13 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo11 = () => {
- const [tab2value, setTab2value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab2value(value)
+ setTabvalue(value)
}}
>
diff --git a/src/packages/tabs/demos/taro/demo12.tsx b/src/packages/tabs/demos/taro/demo12.tsx
index f30cc8b36e..38f6ce8e18 100644
--- a/src/packages/tabs/demos/taro/demo12.tsx
+++ b/src/packages/tabs/demos/taro/demo12.tsx
@@ -2,6 +2,7 @@ import React, { useState, useRef } from 'react'
import { View } from '@tarojs/components'
import { Tabs, Swiper } from '@nutui/nutui-react-taro'
+// TODO:鸿蒙支持的不好
const Demo12 = () => {
const swiperRef = useRef | null>(null)
const [tabIndex, setTabIndex] = useState(0)
diff --git a/src/packages/tabs/demos/taro/demo13.tsx b/src/packages/tabs/demos/taro/demo13.tsx
index 475786e378..3bd2a2b201 100644
--- a/src/packages/tabs/demos/taro/demo13.tsx
+++ b/src/packages/tabs/demos/taro/demo13.tsx
@@ -1,36 +1,32 @@
import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
+import { View } from '@tarojs/components'
+// TODO:鸿蒙支持的不好
const Demo13 = () => {
- const [tab2value, setTab2value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab2value(value)
+ setTabvalue(value)
}}
>
- Tab 1
- Tab 1
- Tab 1
- Tab 1
- Tab 1
- Tab 1
- Tab 1
- Tab 1
+ {Array(8)
+ .fill(null)
+ .map((_, index) => (
+ Tab 1
+ ))}
- Tab 2
- Tab 2
- Tab 2
- Tab 2
- Tab 2
- Tab 2
- Tab 2
- Tab 2
+ {Array(8)
+ .fill(null)
+ .map((_, index) => (
+ Tab 2
+ ))}
Tab 3
diff --git a/src/packages/tabs/demos/taro/demo14.tsx b/src/packages/tabs/demos/taro/demo14.tsx
index 85790f7f6e..5997a4d5a2 100644
--- a/src/packages/tabs/demos/taro/demo14.tsx
+++ b/src/packages/tabs/demos/taro/demo14.tsx
@@ -1,22 +1,25 @@
import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
+import { View } from '@tarojs/components'
+// TODO:鸿蒙支持的不好
const Demo14 = () => {
- const [tab2value, setTab2value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab2value(value)
+ setTabvalue(value)
}}
>
- Tab 1
- Tab 1
- Tab 1
- Tab 1
+ {Array(8)
+ .fill(null)
+ .map((_, index) => (
+ Tab 1
+ ))}
Tab 2
Tab 3
diff --git a/src/packages/tabs/demos/taro/demo15.tsx b/src/packages/tabs/demos/taro/demo15.tsx
index 9921da7f56..f0eed62356 100644
--- a/src/packages/tabs/demos/taro/demo15.tsx
+++ b/src/packages/tabs/demos/taro/demo15.tsx
@@ -1,26 +1,27 @@
import React, { useState, useEffect } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
+import { Text } from '@tarojs/components'
const Demo15 = () => {
- const [tab3value, setTab3value] = useState(0)
- const [list3, setList3] = useState([])
+ const [tabvalue, setTabvalue] = useState(0)
+ const [list, setlist] = useState([])
useEffect(() => {
setTimeout(() => {
- setTab3value(2)
- setList3([...new Array(3).keys()])
+ setTabvalue(2)
+ setlist([...new Array(3).keys()])
}, 3000)
}, [])
return (
<>
{
- setTab3value(value)
+ setTabvalue(value)
}}
>
- {list3.map((item) => (
+ {list.map((item) => (
- Tab {item}
+ Tab {item}
))}
diff --git a/src/packages/tabs/demos/taro/demo16.tsx b/src/packages/tabs/demos/taro/demo16.tsx
index 2d6f90deb2..8780ca3b19 100644
--- a/src/packages/tabs/demos/taro/demo16.tsx
+++ b/src/packages/tabs/demos/taro/demo16.tsx
@@ -1,14 +1,15 @@
import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
+// TODO:鸿蒙支持的不好
const Demo16 = () => {
- const [tab4value, setTab4value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab4value(value)
+ setTabvalue(value)
}}
>
低阶特卖
diff --git a/src/packages/tabs/demos/taro/demo17.tsx b/src/packages/tabs/demos/taro/demo17.tsx
index 72b6b5139e..e0c4b01bfa 100644
--- a/src/packages/tabs/demos/taro/demo17.tsx
+++ b/src/packages/tabs/demos/taro/demo17.tsx
@@ -1,22 +1,23 @@
import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
+import { Text } from '@tarojs/components'
const Demo17 = () => {
- const [tab4value, setTab4value] = useState('0')
- const list4 = Array.from(new Array(10).keys())
+ const [tabvalue, setTabvalue] = useState('0')
+ const list = Array.from(new Array(10).keys())
return (
<>
{
- setTab4value(value)
+ setTabvalue(value)
}}
direction="vertical"
>
- {list4.map((item) => (
+ {list.map((item) => (
- Tab {item}
+ Tab {item}
))}
diff --git a/src/packages/tabs/demos/taro/demo18.tsx b/src/packages/tabs/demos/taro/demo18.tsx
index 35bc59b23c..40a77b57b9 100644
--- a/src/packages/tabs/demos/taro/demo18.tsx
+++ b/src/packages/tabs/demos/taro/demo18.tsx
@@ -1,22 +1,23 @@
import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
+import { Text } from '@tarojs/components'
const Demo18 = () => {
- const [tab5value, setTab5value] = useState('0')
- const list5 = Array.from(new Array(2).keys())
+ const [tabvalue, setTabvalue] = useState('0')
+ const list = Array.from(new Array(2).keys())
return (
<>
{
- setTab5value(value)
+ setTabvalue(value)
}}
direction="vertical"
>
- {list5.map((item) => (
+ {list.map((item) => (
- Tab {item}
+ Tab {item}
))}
diff --git a/src/packages/tabs/demos/taro/demo19.tsx b/src/packages/tabs/demos/taro/demo19.tsx
index 04a7dd0328..a739808306 100644
--- a/src/packages/tabs/demos/taro/demo19.tsx
+++ b/src/packages/tabs/demos/taro/demo19.tsx
@@ -1,23 +1,24 @@
import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
+import { Text } from '@tarojs/components'
const Demo19 = () => {
- const [tab6value, setTab6value] = useState('0')
- const list5 = Array.from(new Array(2).keys())
+ const [tabvalue, setTabvalue] = useState('0')
+ const list = Array.from(new Array(2).keys())
return (
<>
{
- setTab6value(value)
+ setTabvalue(value)
}}
activeType="smile"
direction="vertical"
>
- {list5.map((item) => (
+ {list.map((item) => (
- Tab {item}
+ Tab {item}
))}
diff --git a/src/packages/tabs/demos/taro/demo2.tsx b/src/packages/tabs/demos/taro/demo2.tsx
index 51ed281ab1..7a926f283f 100644
--- a/src/packages/tabs/demos/taro/demo2.tsx
+++ b/src/packages/tabs/demos/taro/demo2.tsx
@@ -2,12 +2,12 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo2 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="smile"
>
diff --git a/src/packages/tabs/demos/taro/demo20.tsx b/src/packages/tabs/demos/taro/demo20.tsx
index 7395364061..5f906bb8e6 100644
--- a/src/packages/tabs/demos/taro/demo20.tsx
+++ b/src/packages/tabs/demos/taro/demo20.tsx
@@ -2,22 +2,23 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo20 = () => {
- const [tab8value, setTab8value] = useState('0')
- const [tab9value, setTab9value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
+ const [tabvalue1, setTabvalue1] = useState('0')
return (
<>
{
- setTab8value(value)
+ setTabvalue(value)
}}
direction="vertical"
>
{
- setTab9value(value)
+ setTabvalue1(value)
}}
direction="horizontal"
>
diff --git a/src/packages/tabs/demos/taro/demo21.tsx b/src/packages/tabs/demos/taro/demo21.tsx
index 5bf0a7a54b..dc648b01b4 100644
--- a/src/packages/tabs/demos/taro/demo21.tsx
+++ b/src/packages/tabs/demos/taro/demo21.tsx
@@ -2,22 +2,22 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo21 = () => {
- const [tab8value, setTab8value] = useState('0')
- const [tab9value, setTab9value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
+ const [tabvalue1, setTabvalue1] = useState('0')
return (
<>
{
- setTab8value(value)
+ setTabvalue(value)
}}
autoHeight
>
{
- setTab9value(value)
+ setTabvalue1(value)
}}
direction="vertical"
>
diff --git a/src/packages/tabs/demos/taro/demo22.tsx b/src/packages/tabs/demos/taro/demo22.tsx
index 20ed7c76fe..42033f9df6 100644
--- a/src/packages/tabs/demos/taro/demo22.tsx
+++ b/src/packages/tabs/demos/taro/demo22.tsx
@@ -1,14 +1,15 @@
import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
+// TODO:鸿蒙支持的不好:自定义变量
const Demo22 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
style={{ '--nutui-tabs-titles-font-size': '20px' }}
>
@@ -17,9 +18,9 @@ const Demo22 = () => {
Tab 3
{
- setTab1value(value)
+ setTabvalue(value)
}}
style={{ '--nutui-tabs-titles-font-size': '12px' }}
>
diff --git a/src/packages/tabs/demos/taro/demo23.tsx b/src/packages/tabs/demos/taro/demo23.tsx
index 7e25c8d647..26bddf40dc 100644
--- a/src/packages/tabs/demos/taro/demo23.tsx
+++ b/src/packages/tabs/demos/taro/demo23.tsx
@@ -4,8 +4,8 @@ import { Tabs } from '@nutui/nutui-react-taro'
import { Star } from '@nutui/icons-react-taro'
const Demo23 = () => {
- const [tab7value, setTab7value] = useState('c1')
- const list6 = [
+ const [tabvalue, setTabvalue] = useState('c1')
+ const list = [
{
title: '自定义 1',
paneKey: 'c1',
@@ -23,22 +23,22 @@ const Demo23 = () => {
return (
<>
{
- return list6.map((item) => (
+ return list.map((item) => (
setTab7value(item.paneKey)}
- className={`nut-tabs-titles-item ${tab7value === item.paneKey ? 'nut-tabs-titles-item-active' : ''}`}
+ onClick={() => setTabvalue(item.paneKey)}
+ className={`nut-tabs-titles-item ${tabvalue === item.paneKey ? 'nut-tabs-titles-item-active' : ''}`}
key={item.paneKey}
>
- {item.icon || null}
+ {item.icon}
{item.title}
))
}}
>
- {list6.map((item) => (
+ {list.map((item) => (
{item.title}
diff --git a/src/packages/tabs/demos/taro/demo3.tsx b/src/packages/tabs/demos/taro/demo3.tsx
index ef31fa2c7d..5047c16d80 100644
--- a/src/packages/tabs/demos/taro/demo3.tsx
+++ b/src/packages/tabs/demos/taro/demo3.tsx
@@ -2,12 +2,12 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo3 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="simple"
>
diff --git a/src/packages/tabs/demos/taro/demo4.tsx b/src/packages/tabs/demos/taro/demo4.tsx
index e52b95d172..7fae3ebf8e 100644
--- a/src/packages/tabs/demos/taro/demo4.tsx
+++ b/src/packages/tabs/demos/taro/demo4.tsx
@@ -2,12 +2,12 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo4 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="card"
>
diff --git a/src/packages/tabs/demos/taro/demo5.tsx b/src/packages/tabs/demos/taro/demo5.tsx
index 9d220b42ad..507824786d 100644
--- a/src/packages/tabs/demos/taro/demo5.tsx
+++ b/src/packages/tabs/demos/taro/demo5.tsx
@@ -2,12 +2,12 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo5 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="button"
>
diff --git a/src/packages/tabs/demos/taro/demo6.tsx b/src/packages/tabs/demos/taro/demo6.tsx
index fac49ec462..9f23d646d9 100644
--- a/src/packages/tabs/demos/taro/demo6.tsx
+++ b/src/packages/tabs/demos/taro/demo6.tsx
@@ -2,12 +2,12 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo6 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
{
- setTab1value(value)
+ setTabvalue(value)
}}
activeType="divider"
>
diff --git a/src/packages/tabs/demos/taro/demo7.tsx b/src/packages/tabs/demos/taro/demo7.tsx
index 259657d358..edf764e65e 100644
--- a/src/packages/tabs/demos/taro/demo7.tsx
+++ b/src/packages/tabs/demos/taro/demo7.tsx
@@ -2,12 +2,12 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo7 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
{
- setTab1value(value)
+ setTabvalue(value)
}}
align="left"
>
diff --git a/src/packages/tabs/demos/taro/demo8.tsx b/src/packages/tabs/demos/taro/demo8.tsx
index 49e3588b72..bee10004af 100644
--- a/src/packages/tabs/demos/taro/demo8.tsx
+++ b/src/packages/tabs/demos/taro/demo8.tsx
@@ -2,13 +2,13 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo8 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
{
- setTab1value(value)
+ setTabvalue(value)
}}
align="left"
>
diff --git a/src/packages/tabs/demos/taro/demo9.tsx b/src/packages/tabs/demos/taro/demo9.tsx
index 9bf81d3beb..08b9b30cc4 100644
--- a/src/packages/tabs/demos/taro/demo9.tsx
+++ b/src/packages/tabs/demos/taro/demo9.tsx
@@ -2,14 +2,14 @@ import React, { useState } from 'react'
import { Tabs } from '@nutui/nutui-react-taro'
const Demo9 = () => {
- const [tab1value, setTab1value] = useState('0')
+ const [tabvalue, setTabvalue] = useState('0')
return (
<>
{
- setTab1value(value)
+ setTabvalue(value)
}}
align="left"
>
diff --git a/src/packages/tabs/tabs.scss b/src/packages/tabs/tabs.scss
index e5c4a3a834..bc5b73e829 100644
--- a/src/packages/tabs/tabs.scss
+++ b/src/packages/tabs/tabs.scss
@@ -5,12 +5,17 @@
display: flex;
}
+.nut-tabs-horizontal {
+ flex-direction: column;
+}
+
.nut-tabs-titles {
display: flex;
box-sizing: border-box;
height: $tabs-titles-height;
user-select: none;
- overflow: hidden;
+ overflow-x: auto;
+ overflow-y: hidden;
background: $tabs-titles-background-color;
scrollbar-width: none;
@@ -22,7 +27,6 @@
.nut-tabs-list {
width: 100%;
- height: auto;
display: flex;
flex-shrink: 0;
}
@@ -41,11 +45,6 @@
}
}
- &-scrollable {
- overflow-x: auto;
- overflow-y: hidden;
- }
-
&-item {
position: relative;
display: flex;
@@ -61,13 +60,17 @@
text-overflow: ellipsis;
white-space: nowrap;
+ .nut-icon {
+ color: $tabs-titles-item-color;
+ }
+
&-left,
&-right {
flex: none;
}
&-text {
- text-align: center;
+ color: $tabs-titles-item-color;
}
&-smile,
@@ -77,9 +80,9 @@
width: 0;
height: 0;
content: ' ';
- bottom: $tabs-tab-line-bottom;
left: 50%;
transform: translate(-50%, 0);
+ bottom: $tabs-tab-line-bottom;
border-radius: $tabs-tab-line-border-radius;
opacity: $tabs-tab-line-opacity;
overflow: hidden;
@@ -93,13 +96,18 @@
font-size: 20px;
width: 100%;
height: 100%;
- color: $color-primary;
}
}
&-active {
- color: $tabs-titles-item-active-color;
- font-weight: $tabs-titles-item-active-font-weight;
+ .nut-icon {
+ color: $tabs-titles-item-active-color;
+ }
+
+ .nut-tabs-titles-item-text {
+ color: $tabs-titles-item-active-color;
+ font-weight: $tabs-titles-item-active-font-weight;
+ }
.nut-tabs-titles-item-line {
overflow: unset;
@@ -113,18 +121,33 @@
overflow: unset;
width: 40px;
height: 20px;
+
+ .nut-icon {
+ color: $tabs-titles-item-active-color;
+ }
}
}
&-disabled {
color: $color-text-disabled;
+ .nut-icon {
+ color: $color-text-disabled;
+ }
+ .nut-tabs-titles-item-text {
+ color: $color-text-disabled;
+ }
}
}
&-simple {
- .nut-tabs-titles-item-active {
- color: $color-title;
- font-size: $tabs-titles-item-active-font-size;
+ .nut-tabs-titles-item {
+ &-active {
+ .nut-tabs-titles-item-text,
+ .nut-icon {
+ color: $color-title;
+ font-size: $tabs-titles-item-active-font-size;
+ }
+ }
}
}
@@ -134,7 +157,6 @@
.nut-tabs-titles-item {
padding: 0;
-
&-active {
font-weight: $font-weight-bold;
background-color: $white;
@@ -158,11 +180,10 @@
.nut-tabs-titles-item-active {
.nut-tabs-titles-item-text {
background: $color-default-light;
- color: $color-text;
+ color: $tabs-titles-item-active-color;
border-radius: $tabs-tab-button-border-radius;
font-weight: $font-weight-bold;
background-color: $tabs-tab-button-active-background-color;
- color: $color-primary;
border: $tabs-tab-button-active-border;
}
}
@@ -196,35 +217,7 @@
}
}
-[dir='rtl'] .nut-tabs-titles,
-.nut-rtl .nut-tabs-titles {
- &-item {
- &-smile,
- &-line {
- left: auto;
- right: 50%;
- transform: translate(50%, 0);
- }
- }
- &-divider {
- .nut-tabs-titles-item {
- &::after {
- right: auto;
- left: 0;
- }
- }
- }
-}
-
-.nut-tabs-horizontal {
- flex-direction: column;
- position: relative;
-}
-
.nut-tabs-vertical {
- flex-direction: row;
- width: 100%;
-
.nut-tabs-ellipsis {
text-overflow: ellipsis;
white-space: nowrap;
@@ -232,47 +225,26 @@
}
.nut-tabs-titles {
- box-sizing: border-box;
flex-direction: column;
height: 100%;
- padding: 0;
width: $tabs-vertical-titles-width;
flex-shrink: 0;
.nut-tabs-list {
- width: 100%;
- display: flex;
flex-direction: column;
- flex-shrink: 0;
- }
-
- &-line {
- .nut-tabs-titles-item {
- padding-left: 14px;
- }
}
}
- .nut-tabs-titles-scrollable {
- overflow-x: hidden;
- overflow-y: auto;
- }
-
.nut-tabs-titles-item {
height: $tabs-vertical-titles-item-height;
- margin: 0;
flex: none;
&-smile {
- width: 0;
- height: 0;
overflow: hidden;
transition: width 0.3s ease;
}
&-line {
- width: 0;
- height: 0;
transform: translate(0, -50%);
transition: height 0.3s ease;
@@ -294,8 +266,6 @@
right: -12px;
bottom: -2%;
left: auto;
- width: 40px;
- height: 20px;
transform: rotate(320deg);
}
}
@@ -304,15 +274,13 @@
.nut-tabs-horizontal {
.nut-tabs-titles {
flex-direction: row;
- overflow-x: auto;
- overflow-y: hidden;
height: $tabs-titles-height;
+ width: 100%;
+ padding: 0 !important;
.nut-tabs-list {
- width: 100%;
- display: flex;
flex-direction: row;
- flex-shrink: 0;
+ height: auto;
}
}
@@ -326,6 +294,9 @@
.nut-tabs-titles-item-line {
left: 50%;
transform: translate(-50%, 0);
+ width: $tabs-tab-line-width;
+ height: $tabs-tab-line-height;
+ background: $tabs-tab-line-color;
}
.nut-tabs-titles-item-smile {
@@ -349,32 +320,32 @@
height: 100%;
}
}
+}
- .nut-tabs-horizontal {
- .nut-tabs-titles {
- display: flex;
- flex-direction: row;
- padding: 0 !important;
- width: 100%;
-
- .nut-tabs-titles-item {
- display: flex;
- align-items: center;
- justify-content: center;
- flex: 1 0 auto;
+.nut-tabs-content {
+ display: flex;
+ box-sizing: border-box;
- &-active {
- color: $color-primary;
- font-weight: $tabs-titles-item-active-font-weight;
- font-size: $tabs-titles-item-active-font-size;
+ &-wrap {
+ overflow: hidden;
+ }
+}
- .nut-tabs-titles-item-line {
- content: ' ';
- width: $tabs-tab-line-width;
- height: $tabs-tab-line-height;
- background: $tabs-tab-line-color;
- }
- }
+[dir='rtl'] .nut-tabs-titles,
+.nut-rtl .nut-tabs-titles {
+ &-item {
+ &-smile,
+ &-line {
+ left: auto;
+ right: 50%;
+ transform: translate(50%, 0);
+ }
+ }
+ &-divider {
+ .nut-tabs-titles-item {
+ &::after {
+ right: auto;
+ left: 0;
}
}
}
@@ -422,12 +393,3 @@
}
}
}
-
-.nut-tabs-content {
- display: flex;
- box-sizing: border-box;
-
- &-wrap {
- overflow: hidden;
- }
-}
diff --git a/src/packages/tabs/tabs.taro.tsx b/src/packages/tabs/tabs.taro.tsx
index 6638e50c45..0bd1473574 100644
--- a/src/packages/tabs/tabs.taro.tsx
+++ b/src/packages/tabs/tabs.taro.tsx
@@ -81,7 +81,6 @@ export const Tabs: FunctionComponent> & {
})
const titleItemsRef = useRef([])
- const navRef = useRef(null)
const getTitles = () => {
const titles: TabsTitle[] = []
@@ -123,7 +122,6 @@ export const Tabs: FunctionComponent> & {
)
const classesTitle = classNames(`${classPrefix}-titles`, {
[`${classPrefix}-titles-${activeType}`]: activeType,
- [`${classPrefix}-titles-scrollable`]: true,
[`${classPrefix}-titles-${align}`]: align,
})
@@ -268,7 +266,7 @@ export const Tabs: FunctionComponent> & {
className={classesTitle}
style={{ ...tabStyle }}
>
-
+
{!!title && typeof title === 'function'
? title()
: titles.current.map((item, index) => {