@nutui/nutui-react 2.1.0-beta.1 → 2.1.1-beta.0

package/dist/packages/skeleton/skeleton.scss

@@ -6,7 +6,7 @@
   vertical-align: middle;
   width: 100%;
 
-  &__content {
+  &-content {
     display: flex;
 
     .avatar {
@@ -14,7 +14,7 @@
       background: $skeleton-background !important;
     }
 
-    .nut-skeleton__block {
+    .nut-skeleton-block {
       width: $skeleton-line-width;
       height: $skeleton-line-height;
       background: $skeleton-background;
@@ -27,18 +27,18 @@
       display: flex;
       flex-direction: column;
 
-      .nut-skeleton__title {
+      .nut-skeleton-title {
         width: 30%;
         height: $skeleton-line-height;
         background: $skeleton-background;
       }
-      .nut-skeleton__block:last-child {
+      .nut-skeleton-block:last-child {
         width: 70%;
       }
     }
   }
 
-  &__animation {
+  &-animation {
     position: absolute;
     top: 0;
     left: 0;
@@ -47,9 +47,9 @@
     z-index: 1;
     background: linear-gradient(
       90deg,
-      hsla(0, 0%, 100%, 0),
-      hsla(0, 0%, 100%, 0.5) 50%,
-      hsla(0, 0%, 100%, 0) 80%
+      var(--nutui-white-1),
+      var(--nutui-white-8) 50%,
+      var(--nutui-white-1) 80%
     );
     background-repeat: no-repeat;
     animation: nut-skeleton 2s ease-in-out 0s infinite;

package/dist/packages/step/step.scss

@@ -60,10 +60,6 @@
     padding-left: 10%;
     padding-right: 10%;
     text-align: center;
-
-    .nut-step-description {
-      color: $title-color;
-    }
   }
 
   &-title {
@@ -76,7 +72,7 @@
   &-description {
     display: block;
     font-size: $steps-base-description-font-size;
-    color: $steps-base-content-color;
+    color: $steps-base-description-color;
   }
 
   &:last-child {
@@ -91,28 +87,29 @@
       border-color: $steps-process-icon-bg-color;
       color: $steps-process-icon-color;
     }
-
     .nut-step-title {
       color: $steps-process-title-color;
       font-size: $steps-process-title-font-size;
       font-weight: $steps-process-title-font-weight;
     }
+    .nut-step-description {
+      color: $steps-process-description-color;
+    }
   }
 
   &.nut-step-wait {
     .nut-step-title {
       color: $steps-wait-title-color;
     }
-
     .nut-step-description {
-      color: $steps-wait-content-color;
+      color: $steps-wait-description-color;
     }
   }
 
   &.nut-step-finish {
     .nut-step-icon {
       background-color: $steps-finish-icon-bg-color;
-      border-color: $steps-finish-icon-color;
+      border-color: $steps-finish-icon-border-color;
       color: $steps-finish-icon-color;
     }
 
@@ -123,20 +120,19 @@
     .nut-step-title {
       color: $steps-finish-title-color;
     }
+    .nut-step-description {
+      color: $steps-finish-description-color;
+    }
   }
 }
 
 .nut-steps-dot {
   .nut-step-head {
     margin: $steps-dot-head-margin;
-    //margin-top: 7px;
-    //margin-bottom: 0;
   }
-
   .nut-step-line {
     top: 7px;
   }
-
   .nut-step-icon {
     width: $steps-dot-icon-width;
     height: $steps-dot-icon-height;
@@ -144,28 +140,20 @@
     border-radius: 50%;
     box-sizing: content-box;
   }
-
   .nut-step-wait {
-    .nut-step-title {
-      color: $steps-wait-title-color;
-    }
-
-    .nut-step-description {
-      color: $steps-wait-content-color;
+    .nut-step-icon {
+      background-color: $steps-dot-wait-icon-bg-color;
     }
   }
-
   .nut-step-finish {
     .nut-step-icon {
-      background-color: $steps-finish-icon-bg-color;
-      border-color: $steps-finish-icon-color;
+      background-color: $steps-dot-finish-icon-bg-color;
+      border-color: $steps-dot-finish-icon-border-color;
     }
   }
-
   .nut-step-process {
     .nut-step-icon {
       position: relative;
-      background-color: $steps-process-icon-bg-color;
 
       &:before {
         content: '';
@@ -177,7 +165,7 @@
         margin-top: -7px;
         width: 14px;
         height: 14px;
-        background-color: $primary-color-end;
+        background-color: $steps-process-icon-before-bg-color;
         border-radius: 50%;
         opacity: 0.23;
       }
@@ -204,17 +192,24 @@
     position: absolute;
     display: inline-block;
     width: 1px;
-    height: 100%;
-    background: #909ca4;
+    height: $steps-base-line-width;
+    background: $steps-base-line-background;
+    top: calc(
+      $steps-base-icon-height +
+        (100% - $steps-base-line-width - $steps-base-icon-margin-bottom) / 2
+    );
+    left: calc(50% - 1px);
+  }
+
+  &.nut-steps-dot {
+    .nut-step-line {
+      top: calc($steps-dot-icon-height + (100% - $steps-base-line-width) / 2);
+    }
   }
 
   .nut-step-main {
     display: inline-block;
     padding-left: 6%;
     text-align: left;
-
-    .nut-step-description {
-      color: $steps-base-content-color;
-    }
   }
 }

package/dist/packages/sticky/sticky.scss

@@ -1,3 +1,3 @@
-.nut-sticky--fixed {
+.nut-sticky-fixed {
   position: fixed;
 }

package/dist/packages/subsidenavbar/subsidenavbar.scss

@@ -1,6 +1,6 @@
 .nut-subsidenavbar {
-  &__title {
-    height: $sidenav-bar-item-height;
+  &-title {
+    height: $sidenavbar-item-height;
     padding: $sidenavbar-sub-title-padding;
     box-sizing: border-box;
     background-color: $sidenavbar-sub-title-background;
@@ -8,16 +8,16 @@
     box-sizing: border-box;
   }
 
-  &__list {
+  &-list {
     &.sidenavbar-show {
-      .nut-subsidenavbar__content {
+      .nut-subsidenavbar-content {
         height: auto;
         overflow: inherit;
       }
     }
 
     &.sidenavbar-hide {
-      .nut-subsidenavbar__content {
+      .nut-subsidenavbar-content {
         height: 0;
         overflow: hidden;
       }

package/dist/packages/swipe/swipe.scss

@@ -2,31 +2,34 @@
   position: relative;
   overflow: hidden;
   cursor: grab;
+  background-color: $white;
 
-  &__wrapper {
+  &-wrapper {
     transition-timing-function: cubic-bezier(0.18, 0.89, 0.32, 1);
     transition-property: transform;
+
     .nut-button {
       height: 100%;
     }
+
     .nut-cell {
       margin: 0;
     }
   }
 
-  &__left,
-  &__right {
+  &-left,
+  &-right {
     position: absolute;
     top: 0;
     height: 100%;
   }
 
-  &__left {
+  &-left {
     left: 0;
     transform: translate3d(-100%, 0, 0);
   }
 
-  &__right {
+  &-right {
     right: 0;
     transform: translate3d(101%, 0, 0);
   }

package/dist/packages/swiper/swiper.scss

@@ -7,18 +7,18 @@
   box-sizing: content-box;
   overflow: hidden;
 
-  &__inner {
+  &-inner {
     display: flex;
     height: 100%;
   }
 
-  &__vertical {
+  &-vertical {
     -webkit-box-orient: vertical;
     -webkit-box-direction: normal;
     flex-direction: column;
   }
 
-  &__indicator {
+  &-indicator {
     display: flex;
     position: absolute;
     left: 50%;
@@ -27,7 +27,7 @@
     z-index: 1;
   }
 
-  &__indicator-vertical {
+  &-indicator-vertical {
     top: 50%;
     left: 12px;
     bottom: auto;

package/dist/packages/switch/switch.scss

@@ -2,44 +2,21 @@
   cursor: pointer;
   display: flex;
   align-items: center;
-  background-color: $switch-active-background-color;
+  background-color: $switch-open-background-color;
   border-radius: $switch-border-radius;
   background-size: 100% 100%;
   background-repeat: no-repeat;
   background-position: center center;
   flex: 0 0 auto; // 防止被压缩
 
-  &.switch-close {
-    background-color: $switch-inactive-background-color;
-    .close-line {
-      background: $switch-close-line-background-color;
-      border-radius: 2px;
-    }
-  }
-
   .switch-button {
     display: flex;
     align-items: center;
     justify-content: center;
     border-radius: 50%;
-    background: $primary-text-color;
+    background: $color-primary-text;
     transition: transform 0.3s;
-  }
-
-  &__label {
-    color: $primary-text-color;
-    font-size: $font-size-1;
-    &.open {
-      transform: translateX(-16px);
-    }
-
-    &.close {
-      transform: translateX(16px);
-    }
-  }
-
-  &-disabled {
-    opacity: 0.6;
+    box-shadow: $switch-button-box-shadow;
   }
 
   &-base {
@@ -53,17 +30,51 @@
       transform: $switch-inside-close-transform;
     }
 
-    &.switch-open {
+    &.nut-switch-open {
       .switch-button {
         transform: $switch-inside-open-transform;
       }
+
+      &.nut-switch-disabled {
+        background-color: $switch-open-disabled-background-color;
+      }
     }
 
-    &.switch-close {
+    &.nut-switch-close {
       .close-line {
         width: 8px;
         height: 2px;
       }
+
+      &.nut-switch-disabled {
+        background-color: $switch-close-disabled-background-color;
+      }
+    }
+  }
+
+  &-close {
+    background-color: $switch-close-background-color;
+
+    .close-line {
+      background: $switch-close-line-background-color;
+      border-radius: 2px;
     }
   }
+
+  &-label {
+    color: $color-primary-text;
+    font-size: $font-size-small;
+
+    &.open {
+      transform: translateX(-16px);
+    }
+
+    &.close {
+      transform: translateX(16px);
+    }
+  }
+
+  // &-disabled {
+  //   opacity: 0.5;
+  // }
 }

package/dist/packages/tabbar/tabbar.scss

@@ -10,9 +10,9 @@
   justify-content: center;
   align-items: center;
   box-sizing: border-box;
-  background: $white;
+  background: $color-background-overlay;
 
-  &__wrap {
+  &-wrap {
     width: 100%;
     height: $tabbar-height;
     display: flex;
@@ -25,13 +25,13 @@
     border-right: 0;
   }
 
-  &__fixed {
+  &-fixed {
     position: fixed;
     bottom: 0px;
     left: 0px;
   }
 
-  &__safe-area {
+  &-safe-area {
     display: block;
     width: 100%;
     padding-bottom: constant(safe-area-inset-bottom);

package/dist/packages/tabbaritem/tabbaritem.scss

@@ -14,13 +14,19 @@
     color: $tabbar-active-color;
   }
 
-  &__icon-box {
+  &-icon-box {
     padding: 0px;
     display: flex;
     flex-direction: column;
     align-items: center;
     position: relative;
 
+    .nut-icon {
+      width: 24px;
+      height: 24px;
+      font-size: 24px;
+    }
+
     &-nav {
       display: block;
       font-size: $tabbar-text-font-size;
@@ -31,6 +37,7 @@
       font-size: $tabbar-text-large-font-size;
       margin-top: 0;
       line-height: $tabbar-text-line-height;
+      font-weight: $tabbar-text-large-font-weight;
     }
   }
 }

package/dist/packages/table/table.scss

@@ -2,52 +2,52 @@
   display: flex;
   width: 100%;
   flex-direction: column;
-  font-size: $font-size-2;
-  color: $title-color;
+  font-size: $font-size-base;
+  color: $color-title;
 
-  &__main {
+  &-main {
     display: table;
     width: 100%;
     border-collapse: collapse;
     overflow-x: hidden;
-    color: $title-color;
-    background-color: $background-color3;
+    color: $color-title;
+    background-color: $color-background-overlay;
 
-    &--striped {
-      .nut-table__main__head {
-        &__tr {
+    &-striped {
+      .nut-table-main-head {
+        &-tr {
           background-color: $table-tr-even-bg-color;
         }
       }
 
-      .nut-table__main__body {
-        &__tr:nth-child(odd) {
+      .nut-table-main-body {
+        &-tr:nth-child(odd) {
           background-color: $table-tr-odd-bg-color;
         }
       }
 
-      .nut-table__main__body {
-        &__tr:nth-child(even) {
+      .nut-table-main-body {
+        &-tr:nth-child(even) {
           background-color: $table-tr-even-bg-color;
         }
       }
     }
 
-    &__head,
-    &__body {
-      &__tr {
+    &-head,
+    &-body {
+      &-tr {
         display: table-row;
 
-        &__th {
+        &-th {
           display: table-cell;
           padding: $table-cols-padding;
         }
 
-        &__td {
+        &-td {
           display: table-cell;
           padding: $table-cols-padding;
 
-          &__nodata {
+          &-nodata {
             display: flex;
             height: 50px;
             align-items: center;
@@ -55,37 +55,37 @@
           }
         }
 
-        &--border {
+        &-border {
           border: 1px solid $table-border-color;
         }
 
-        &--alignleft,
-        &--align {
+        &-alignleft,
+        &-align {
           text-align: left;
         }
 
-        &--aligncenter {
+        &-aligncenter {
           text-align: center;
         }
 
-        &--alignright {
+        &-alignright {
           text-align: right;
         }
       }
     }
 
-    &__head {
+    &-head {
       display: table-header-group;
     }
 
-    &__body {
+    &-body {
       display: table-row-group;
     }
   }
 
-  &__summary {
-    color: $title-color;
-    background-color: $background-color3;
+  &-summary {
+    color: $color-title;
+    background-color: $color-background-overlay;
     display: flex;
     align-items: center;
     justify-content: center;

package/dist/packages/tabpane/tabpane.scss

@@ -2,8 +2,8 @@
   width: 100%;
   flex-shrink: 0;
   display: block;
-  background-color: $gray6;
-  color: $gray1;
+  background-color: $color-background-overlay;
+  color: $color-title;
   padding: 24px 20px;
   box-sizing: border-box;
   overflow: auto;