@nutui/nutui-react 3.0.0-beta.6 → 3.0.0-beta.8

package/dist/es/packages/tabs/style/style.css

@@ -21,12 +21,17 @@
   display: flex;
 }
 
+.nut-tabs-horizontal {
+  flex-direction: column;
+}
+
 .nut-tabs-titles {
   display: flex;
   box-sizing: border-box;
   height: var(--nutui-tabs-titles-height, 44px);
   user-select: none;
-  overflow: hidden;
+  overflow-x: auto;
+  overflow-y: hidden;
   background: var(--nutui-tabs-titles-background-color, var(--nutui-color-background, #f5f6fa));
   scrollbar-width: none;
 }
@@ -37,7 +42,6 @@
 }
 .nut-tabs-titles .nut-tabs-list {
   width: 100%;
-  height: auto;
   display: flex;
   flex-shrink: 0;
 }
@@ -53,10 +57,6 @@
 .nut-tabs-titles-right .nut-tabs-titles-item {
   padding: 0 22px;
 }
-.nut-tabs-titles-scrollable {
-  overflow-x: auto;
-  overflow-y: hidden;
-}
 .nut-tabs-titles-item {
   position: relative;
   display: flex;
@@ -72,11 +72,14 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.nut-tabs-titles-item .nut-icon {
+  color: var(--nutui-tabs-titles-item-color, var(--nutui-color-title, #1a1a1a));
+}
 .nut-tabs-titles-item-left, .nut-tabs-titles-item-right {
   flex: none;
 }
 .nut-tabs-titles-item-text {
-  text-align: center;
+  color: var(--nutui-tabs-titles-item-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-tabs-titles-item-smile, .nut-tabs-titles-item-line {
   position: absolute;
@@ -84,9 +87,9 @@
   width: 0;
   height: 0;
   content: " ";
-  bottom: var(--nutui-tabs-line-bottom, 15%);
   left: 50%;
   transform: translate(-50%, 0);
+  bottom: var(--nutui-tabs-line-bottom, 15%);
   border-radius: var(--nutui-tabs-line-border-radius, 2px);
   opacity: var(--nutui-tabs-tab-line-opacity, 1);
   overflow: hidden;
@@ -99,9 +102,11 @@
   font-size: 20px;
   width: 100%;
   height: 100%;
-  color: var(--nutui-color-primary, #ff0f23);
 }
-.nut-tabs-titles-item-active {
+.nut-tabs-titles-item-active .nut-icon {
+  color: var(--nutui-tabs-titles-item-active-color, var(--nutui-color-primary, #ff0f23));
+}
+.nut-tabs-titles-item-active .nut-tabs-titles-item-text {
   color: var(--nutui-tabs-titles-item-active-color, var(--nutui-color-primary, #ff0f23));
   font-weight: var(--nutui-tabs-titles-item-active-font-weight, var(--nutui-font-weight-bold, 600));
 }
@@ -117,10 +122,20 @@
   width: 40px;
   height: 20px;
 }
+.nut-tabs-titles-item-active .nut-tabs-titles-item-smile .nut-icon {
+  color: var(--nutui-tabs-titles-item-active-color, var(--nutui-color-primary, #ff0f23));
+}
 .nut-tabs-titles-item-disabled {
   color: var(--nutui-color-text-disabled, #c2c4cc);
 }
-.nut-tabs-titles-simple .nut-tabs-titles-item-active {
+.nut-tabs-titles-item-disabled .nut-icon {
+  color: var(--nutui-color-text-disabled, #c2c4cc);
+}
+.nut-tabs-titles-item-disabled .nut-tabs-titles-item-text {
+  color: var(--nutui-color-text-disabled, #c2c4cc);
+}
+.nut-tabs-titles-simple .nut-tabs-titles-item-active .nut-tabs-titles-item-text,
+.nut-tabs-titles-simple .nut-tabs-titles-item-active .nut-icon {
   color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-tabs-titles-item-active-font-size, var(--nutui-font-size-l, 16px));
 }
@@ -149,11 +164,10 @@
 }
 .nut-tabs-titles-button .nut-tabs-titles-item-active .nut-tabs-titles-item-text {
   background: var(--nutui-color-default-light);
-  color: var(--nutui-color-text, #505259);
+  color: var(--nutui-tabs-titles-item-active-color, var(--nutui-color-primary, #ff0f23));
   border-radius: var(--nutui-tabs-button-border-radius, 50px);
   font-weight: var(--nutui-font-weight-bold, 600);
   background-color: var(--nutui-tabs-button-active-background-color, var(--nutui-color-primary-light-pressed, #ffebf1));
-  color: var(--nutui-color-primary, #ff0f23);
   border: var(--nutui-tabs-button-active-border, 1px solid var(--nutui-color-primary, #ff0f23));
 }
 .nut-tabs-titles-divider {
@@ -178,68 +192,29 @@
   display: none;
 }
 
-[dir=rtl] .nut-tabs-titles-item-smile, [dir=rtl] .nut-tabs-titles-item-line,
-.nut-rtl .nut-tabs-titles-item-smile,
-.nut-rtl .nut-tabs-titles-item-line {
-  left: auto;
-  right: 50%;
-  transform: translate(50%, 0);
-}
-[dir=rtl] .nut-tabs-titles-divider .nut-tabs-titles-item::after,
-.nut-rtl .nut-tabs-titles-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-vertical .nut-tabs-ellipsis {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
 }
 .nut-tabs-vertical .nut-tabs-titles {
-  box-sizing: border-box;
   flex-direction: column;
   height: 100%;
-  padding: 0;
   width: var(--nutui-tabs-vertical-titles-width, 100px);
   flex-shrink: 0;
 }
 .nut-tabs-vertical .nut-tabs-titles .nut-tabs-list {
-  width: 100%;
-  display: flex;
   flex-direction: column;
-  flex-shrink: 0;
-}
-.nut-tabs-vertical .nut-tabs-titles-line .nut-tabs-titles-item {
-  padding-left: 14px;
-}
-.nut-tabs-vertical .nut-tabs-titles-scrollable {
-  overflow-x: hidden;
-  overflow-y: auto;
 }
 .nut-tabs-vertical .nut-tabs-titles-item {
   height: var(--nutui-tabs-vertical-titles-item-height, 40px);
-  margin: 0;
   flex: none;
 }
 .nut-tabs-vertical .nut-tabs-titles-item-smile {
-  width: 0;
-  height: 0;
   overflow: hidden;
   transition: width 0.3s ease;
 }
 .nut-tabs-vertical .nut-tabs-titles-item-line {
-  width: 0;
-  height: 0;
   transform: translate(0, -50%);
   transition: height 0.3s ease;
 }
@@ -259,21 +234,17 @@
   right: -12px;
   bottom: -2%;
   left: auto;
-  width: 40px;
-  height: 20px;
   transform: rotate(320deg);
 }
 .nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles {
   flex-direction: row;
-  overflow-x: auto;
-  overflow-y: hidden;
   height: var(--nutui-tabs-titles-height, 44px);
+  width: 100%;
+  padding: 0 !important;
 }
 .nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles .nut-tabs-list {
-  width: 100%;
-  display: flex;
   flex-direction: row;
-  flex-shrink: 0;
+  height: auto;
 }
 .nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-content {
   flex-direction: row;
@@ -284,6 +255,9 @@
 .nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles-item-active .nut-tabs-titles-item-line {
   left: 50%;
   transform: translate(-50%, 0);
+  width: var(--nutui-tabs-tab-line-width, 12px);
+  height: var(--nutui-tabs-tab-line-height, 2px);
+  background: var(--nutui-tabs-tab-line-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles-item-active .nut-tabs-titles-item-smile {
   left: 50%;
@@ -301,28 +275,26 @@
 .nut-tabs-vertical .nut-tabs-content .nut-tabpane {
   height: 100%;
 }
-.nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles {
+
+.nut-tabs-content {
   display: flex;
-  flex-direction: row;
-  padding: 0 !important;
-  width: 100%;
+  box-sizing: border-box;
 }
-.nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles .nut-tabs-titles-item {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex: 1 0 auto;
+.nut-tabs-content-wrap {
+  overflow: hidden;
 }
-.nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles .nut-tabs-titles-item-active {
-  color: var(--nutui-color-primary, #ff0f23);
-  font-weight: var(--nutui-tabs-titles-item-active-font-weight, var(--nutui-font-weight-bold, 600));
-  font-size: var(--nutui-tabs-titles-item-active-font-size, var(--nutui-font-size-l, 16px));
+
+[dir=rtl] .nut-tabs-titles-item-smile, [dir=rtl] .nut-tabs-titles-item-line,
+.nut-rtl .nut-tabs-titles-item-smile,
+.nut-rtl .nut-tabs-titles-item-line {
+  left: auto;
+  right: 50%;
+  transform: translate(50%, 0);
 }
-.nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles .nut-tabs-titles-item-active .nut-tabs-titles-item-line {
-  content: " ";
-  width: var(--nutui-tabs-tab-line-width, 12px);
-  height: var(--nutui-tabs-tab-line-height, 2px);
-  background: var(--nutui-tabs-tab-line-color, var(--nutui-color-primary, #ff0f23));
+[dir=rtl] .nut-tabs-titles-divider .nut-tabs-titles-item::after,
+.nut-rtl .nut-tabs-titles-divider .nut-tabs-titles-item::after {
+  right: auto;
+  left: 0;
 }
 
 [dir=rtl] .nut-tabs-vertical .nut-tabs-titles-line .nut-tabs-titles-item,
@@ -352,12 +324,4 @@
   right: 50%;
   left: auto;
   transform: translate(50%, 0) rotate(0deg);
-}
-
-.nut-tabs-content {
-  display: flex;
-  box-sizing: border-box;
-}
-.nut-tabs-content-wrap {
-  overflow: hidden;
 }

package/dist/es/packages/tabs/style/tabs.scss

@@ -4,12 +4,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;
 
@@ -21,7 +26,6 @@
 
   .nut-tabs-list {
     width: 100%;
-    height: auto;
     display: flex;
     flex-shrink: 0;
   }
@@ -40,11 +44,6 @@
     }
   }
 
-  &-scrollable {
-    overflow-x: auto;
-    overflow-y: hidden;
-  }
-
   &-item {
     position: relative;
     display: flex;
@@ -60,13 +59,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,
@@ -76,9 +79,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;
@@ -92,13 +95,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;
@@ -112,18 +120,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;
+        }
+      }
     }
   }
 
@@ -133,7 +156,6 @@
 
     .nut-tabs-titles-item {
       padding: 0;
-
       &-active {
         font-weight: $font-weight-bold;
         background-color: $white;
@@ -157,11 +179,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;
       }
     }
@@ -195,35 +216,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;
@@ -231,47 +224,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;
 
@@ -293,8 +265,6 @@
         right: -12px;
         bottom: -2%;
         left: auto;
-        width: 40px;
-        height: 20px;
         transform: rotate(320deg);
       }
     }
@@ -303,15 +273,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;
       }
     }
 
@@ -325,6 +293,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 {
@@ -348,32 +319,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;
       }
     }
   }
@@ -421,12 +392,3 @@
     }
   }
 }
-
-.nut-tabs-content {
-  display: flex;
-  box-sizing: border-box;
-
-  &-wrap {
-    overflow: hidden;
-  }
-}

package/dist/es/packages/tabs/tabs.d.ts

@@ -8,66 +8,18 @@ export type TabsTitle = {
     value: string | number;
 };
 export interface TabsProps extends BasicComponent {
-    /**
-    * 标签栏样式
-    * @default {}
-    */
-    tabStyle: React.CSSProperties
-    /**
-    * 当前激活 tab 面板的值
-    * @default 0
-    */
-    value: string | number
-    /**
-    * 初始化激活 tab 的值
-    * @default 0
-    */
-    defaultValue: string | number
-    /**
-    * 标签选中色
-    * @default #1A1A1A
-    */
-    activeColor: string
-    /**
-    * 使用横纵方向
-    * @default horizontal
-    */
-    direction: 'horizontal' | 'vertical'
-    /**
-    * 选中底部展示样式 可选值 line、smile、simple、card、button、divider
-    * @default line
-    */
-    activeType: 'line' | 'smile' | 'simple' | 'card' | 'button' | 'divider'
-    /**
-    * 切换动画时长,单位 ms 0 代表无动画
-    * @default 300
-    */
-    duration: number | string
-    /**
-    * 标题对齐方式
-    * @default -
-    */
-    align: 'left' | 'right'
-    /**
-    * 自定义导航区域
-    * @default -
-    */
-    title: () => JSX.Element[]
-    /**
-    * 当前激活的标签改变时触发
-    * @default -
-    */
-    onChange: (index: string | number) => void
-    /**
-    * 点击标签时触发
-    * @default -
-    */
-    onClick: (index: string | number) => void
-    /**
-    * 自动高度。设置为 true 时，nut-tabs 和 nut-tabs\_\_content 会随着当前 nut-tabpane 的高度而发生变化。
-    * @default false
-    */
-    autoHeight: boolean
+    tabStyle: React.CSSProperties;
+    value: string | number;
+    defaultValue: string | number;
+    activeColor: string;
+    direction: 'horizontal' | 'vertical';
+    activeType: 'line' | 'smile' | 'simple' | 'card' | 'button' | 'divider';
+    duration: number | string;
+    align: 'left' | 'right';
+    title: () => JSX.Element[];
+    onChange: (index: string | number) => void;
+    onClick: (index: string | number) => void;
+    autoHeight: boolean;
     children?: React.ReactNode;
 }
 export declare const Tabs: FunctionComponent<Partial<TabsProps>> & {