diff --git a/src/packages/tabbar/__tests__/__snapshots__/tabbar.spec.tsx.snap b/src/packages/tabbar/__tests__/__snapshots__/tabbar.spec.tsx.snap index 9eeb47a2b8..65b96e1b0b 100644 --- a/src/packages/tabbar/__tests__/__snapshots__/tabbar.spec.tsx.snap +++ b/src/packages/tabbar/__tests__/__snapshots__/tabbar.spec.tsx.snap @@ -1,5 +1,5 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`should only render title 1`] = `"
首页
11
分类
逛
"`; +exports[`should only render title 1`] = `"
首页
11
分类
逛
"`; -exports[`should render fixed element when using bottom prop 1`] = `"
首页
分类
"`; +exports[`should render fixed element when using bottom prop 1`] = `"
首页
分类
"`; diff --git a/src/packages/tabbar/demos/h5/demo1.tsx b/src/packages/tabbar/demos/h5/demo1.tsx index 52e4e0aaff..c2bcf25557 100644 --- a/src/packages/tabbar/demos/h5/demo1.tsx +++ b/src/packages/tabbar/demos/h5/demo1.tsx @@ -4,15 +4,11 @@ import { Cart, Category, Hi, Home, User } from '@nutui/icons-react' const Demo1 = () => ( - } - value={9} - /> - } dot /> - } /> - } /> - } /> + } value={9} /> + } dot /> + } /> + } /> + } /> ) diff --git a/src/packages/tabbar/demos/h5/demo2.tsx b/src/packages/tabbar/demos/h5/demo2.tsx index c4b6b30011..77ab75a6ea 100644 --- a/src/packages/tabbar/demos/h5/demo2.tsx +++ b/src/packages/tabbar/demos/h5/demo2.tsx @@ -13,11 +13,11 @@ const Demo2 = () => { setActiveIndex(value) }} > - } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> + } /> ) } diff --git a/src/packages/tabbar/demos/h5/demo4.tsx b/src/packages/tabbar/demos/h5/demo4.tsx index 689135a697..c34d9970cd 100644 --- a/src/packages/tabbar/demos/h5/demo4.tsx +++ b/src/packages/tabbar/demos/h5/demo4.tsx @@ -8,7 +8,7 @@ const Demo4 = () => ( }} > - + diff --git a/src/packages/tabbar/demos/h5/demo5.tsx b/src/packages/tabbar/demos/h5/demo5.tsx index f78ec1d4e4..49810182b1 100644 --- a/src/packages/tabbar/demos/h5/demo5.tsx +++ b/src/packages/tabbar/demos/h5/demo5.tsx @@ -8,7 +8,7 @@ const Demo5 = () => ( } /> } /> } value={110} /> - } /> + } /> ) diff --git a/src/packages/tabbar/demos/h5/demo6.tsx b/src/packages/tabbar/demos/h5/demo6.tsx index a072c6fbbf..a520a164f3 100644 --- a/src/packages/tabbar/demos/h5/demo6.tsx +++ b/src/packages/tabbar/demos/h5/demo6.tsx @@ -4,11 +4,11 @@ import { Cart, Category, Hi, Home, User } from '@nutui/icons-react' const Demo6 = () => ( - } dot /> - } /> - } /> - } dot /> - } /> + } dot /> + } /> + } /> + } dot /> + } /> ) diff --git a/src/packages/tabbar/demos/h5/demo7.tsx b/src/packages/tabbar/demos/h5/demo7.tsx index e62f4d5ef6..ea95c1c801 100644 --- a/src/packages/tabbar/demos/h5/demo7.tsx +++ b/src/packages/tabbar/demos/h5/demo7.tsx @@ -4,11 +4,11 @@ import { Cart, Category, Hi, Home, User } from '@nutui/icons-react' const Demo7 = () => ( - } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> + } /> ) diff --git a/src/packages/tabbar/demos/h5/demo8.tsx b/src/packages/tabbar/demos/h5/demo8.tsx index 0f27cbcfab..56676f6451 100644 --- a/src/packages/tabbar/demos/h5/demo8.tsx +++ b/src/packages/tabbar/demos/h5/demo8.tsx @@ -4,9 +4,9 @@ import { Category, Hi, Home } from '@nutui/icons-react' const Demo8 = () => ( - } /> - } /> - } /> + } /> + } /> + } /> ) diff --git a/src/packages/tabbar/demos/h5/demo9.tsx b/src/packages/tabbar/demos/h5/demo9.tsx index de4800f78d..8a7c7711a6 100644 --- a/src/packages/tabbar/demos/h5/demo9.tsx +++ b/src/packages/tabbar/demos/h5/demo9.tsx @@ -4,11 +4,11 @@ import { Cart, Category, Hi, Home, User } from '@nutui/icons-react' const Demo9 = () => ( - } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> + } /> ) diff --git a/src/packages/tabbar/demos/taro/demo1.tsx b/src/packages/tabbar/demos/taro/demo1.tsx index 9b2011fa9f..5dc7d62d3b 100644 --- a/src/packages/tabbar/demos/taro/demo1.tsx +++ b/src/packages/tabbar/demos/taro/demo1.tsx @@ -8,11 +8,11 @@ const Demo1 = () => ( console.log(value) }} > - } value={9} /> - } /> - } /> - } /> - } /> + } value={9} /> + } /> + } /> + } /> + } /> ) diff --git a/src/packages/tabbar/demos/taro/demo2.tsx b/src/packages/tabbar/demos/taro/demo2.tsx index 3f67fc249b..8e6d3675a0 100644 --- a/src/packages/tabbar/demos/taro/demo2.tsx +++ b/src/packages/tabbar/demos/taro/demo2.tsx @@ -4,11 +4,11 @@ import { Cart, Category, Hi, Home, User } from '@nutui/icons-react-taro' const Demo2 = () => ( - } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> + } /> ) diff --git a/src/packages/tabbar/demos/taro/demo4.tsx b/src/packages/tabbar/demos/taro/demo4.tsx index 0b54da7d9b..cc27a0f16b 100644 --- a/src/packages/tabbar/demos/taro/demo4.tsx +++ b/src/packages/tabbar/demos/taro/demo4.tsx @@ -8,7 +8,7 @@ const Demo4 = () => ( }} > - + diff --git a/src/packages/tabbar/demos/taro/demo6.tsx b/src/packages/tabbar/demos/taro/demo6.tsx index 4bb7683120..75a4064f82 100644 --- a/src/packages/tabbar/demos/taro/demo6.tsx +++ b/src/packages/tabbar/demos/taro/demo6.tsx @@ -4,11 +4,11 @@ import { Cart, Category, Hi, Home, User } from '@nutui/icons-react-taro' const Demo6 = () => ( - } dot /> - } /> - } /> - } dot /> - } /> + } dot /> + } /> + } /> + } dot /> + } /> ) diff --git a/src/packages/tabbar/demos/taro/demo7.tsx b/src/packages/tabbar/demos/taro/demo7.tsx index 729320c969..3e2c8fe155 100644 --- a/src/packages/tabbar/demos/taro/demo7.tsx +++ b/src/packages/tabbar/demos/taro/demo7.tsx @@ -4,11 +4,11 @@ import { Cart, Category, Hi, Home, User } from '@nutui/icons-react-taro' const Demo7 = () => ( - } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> + } /> ) diff --git a/src/packages/tabbar/demos/taro/demo9.tsx b/src/packages/tabbar/demos/taro/demo9.tsx index 4ac817463e..b9e8b3fe7e 100644 --- a/src/packages/tabbar/demos/taro/demo9.tsx +++ b/src/packages/tabbar/demos/taro/demo9.tsx @@ -4,11 +4,11 @@ import { Cart, Category, Hi, Home, User } from '@nutui/icons-react-taro' const Demo9 = () => ( - } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> + } /> ) diff --git a/src/packages/tabbaritem/tabbaritem.scss b/src/packages/tabbaritem/tabbaritem.scss index f096cb8a33..537a261b52 100644 --- a/src/packages/tabbaritem/tabbaritem.scss +++ b/src/packages/tabbaritem/tabbaritem.scss @@ -19,14 +19,16 @@ position: relative; .nut-icon { - width: 24px; - height: 24px; - font-size: 24px; + width: 22px; + height: 22px; + font-size: 22px; } &-nav { display: block; + color: $color-text; font-size: $tabbar-text-font-size; + line-height: $tabbar-text-font-size; margin-top: $tabbar-text-margin-top; } diff --git a/src/packages/tabbaritem/tabbaritem.taro.tsx b/src/packages/tabbaritem/tabbaritem.taro.tsx index a43d76d403..86d2f290f3 100644 --- a/src/packages/tabbaritem/tabbaritem.taro.tsx +++ b/src/packages/tabbaritem/tabbaritem.taro.tsx @@ -24,7 +24,7 @@ const defaultProps = { dot: false, max: 99, top: '0', - right: '5', + right: '0', } as TabbarItemProps export const TabbarItem: FunctionComponent> = ( diff --git a/src/packages/tabbaritem/tabbaritem.tsx b/src/packages/tabbaritem/tabbaritem.tsx index d4b48a4c55..df37c51f10 100644 --- a/src/packages/tabbaritem/tabbaritem.tsx +++ b/src/packages/tabbaritem/tabbaritem.tsx @@ -22,7 +22,7 @@ const defaultProps = { dot: false, max: 99, top: '0', - right: '5', + right: '0', } as TabbarItemProps export const TabbarItem: FunctionComponent> = (