@nutui/nutui-react 2.2.0 → 2.3.0-beta.0

package/dist/packages/radiogroup/radiogroup.scss

@@ -2,51 +2,51 @@
   .nut-radio {
     margin: $radiogroup-radio-margin;
 
-    &__label {
+    &-label {
       margin: $radiogroup-radio-label-margin;
     }
 
-    &__button {
+    &-button {
       background-color: $radio-button-background;
     }
   }
 
-  &--vertical {
+  &-vertical {
     .nut-radio {
-      &.nut-radio--reverse {
+      &.nut-radio-reverse {
         width: 100%;
         justify-content: space-between;
       }
 
-      &__button {
+      &-button {
         border: 1px solid $radio-button-background;
       }
 
-      &__button--active {
-        border-color: $radio-label-button-border-color;
-        background-color: $radio-label-button-background;
+      &-button-active {
+        border: $radio-button-active-border;
+        background-color: $color-primary-light;
       }
     }
   }
 
-  &--horizontal {
+  &-horizontal {
     .nut-radio {
       display: inline-flex;
 
-      &__button {
-        border: 1px solid $gray6;
+      &-button {
+        border: 1px solid $white;
       }
 
-      &__button--active {
-        border-color: $radio-label-button-border-color;
-        background-color: $radio-label-button-background;
+      &-button-active {
+        border: $radio-button-active-border;
+        background-color: $color-primary-light;
       }
     }
   }
 
-  .nut-radio__button--active.nut-radio__button--disabled {
-    background: $radio-button-disabled-active-background;
-    color: $radio-button-disabled-active-color;
-    border: 1px solid $radio-button-disabled-active-border-color;
+  .nut-radio-button-active.nut-radio-button-disabled {
+    background: $color-text-disabled;
+    color: $white;
+    border: 1px solid $color-text-disabled;
   }
 }

package/dist/packages/range/range.scss

@@ -4,19 +4,23 @@
   width: 100%;
   height: $range-height;
   align-items: center;
+
   .min,
   .max {
     font-size: $font-size-small;
-    color: $range-font-color;
+    color: $range-color;
     user-select: none;
   }
+
   &-vertical {
     height: 100%;
     flex-direction: column;
     padding: 0px 15px;
+
     .nut-range {
       width: $range-height;
       height: 100%;
+
       &-button {
         &-wrapper,
         &-wrapper-right {
@@ -35,12 +39,15 @@
           transform: translate3d(-50%, -50%, 0);
         }
       }
+
       .number {
         transform: translate3d(100%, 0, 0);
       }
+
       &-vertical {
         margin: $range-margin 0px;
       }
+
       &-mark {
         position: absolute;
         width: 100%;
@@ -64,6 +71,7 @@
         user-select: none;
         transform: translateY(-50%);
       }
+
       &-tick {
         position: absolute;
         top: 0px;
@@ -81,6 +89,7 @@
     }
   }
 }
+
 .nut-range {
   display: block;
   position: relative;
@@ -90,6 +99,7 @@
   background-color: $range-inactive-color;
   border-radius: 2px;
   cursor: pointer;
+
   &::before {
     position: absolute;
     top: -8px;
@@ -148,10 +158,11 @@
       justify-content: center;
       user-select: none;
       font-size: $font-size-small;
-      color: $range-font-color;
+      color: $range-color;
       transform: translate3d(0, -100%, 0);
     }
   }
+
   &-disabled {
     cursor: not-allowed;
     opacity: 0.54;

package/dist/packages/rate/rate.scss

@@ -37,12 +37,11 @@
       cursor: pointer;
 
       &--disabled {
-        color: $rate-icon-void-color;
+        color: $rate-icon-inactive-color;
       }
 
       &.nut-rate-item__icon.nut-rate-item__icon--half {
         position: absolute;
-        // width: 50% !important;
         left: 0;
         top: 0;
         overflow: hidden;

package/dist/packages/searchbar/searchbar.scss

@@ -4,7 +4,8 @@
   width: $searchbar-width;
   padding: $searchbar-padding;
   background: $searchbar-background;
-  color: $gray1;
+  color: $searchbar-color;
+  font-size: $searchbar-font-size;
   box-sizing: border-box;
   justify-content: center;
 
@@ -13,20 +14,72 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    padding: $searchbar-content-padding;
     height: $searchbar-input-height;
-    background: $searchbar-input-background;
+    background: $searchbar-content-background;
     border-radius: $searchbar-content-border-radius;
   }
 
   &__icon {
-    padding: 0 5px 0 10px;
     display: flex;
     justify-content: center;
+    align-items: center;
   }
 
+  &__clear,
   &__rightin {
+    width: 16px;
+    height: 16px;
+    color: var(--nutui-black-5);
+  }
+
+  &__left,
+  &__right {
     display: flex;
-    padding: 0 5px;
+    &.nut-icon {
+      width: 20px;
+      height: 20px;
+    }
+  }
+
+  &__left {
+    margin-right: $searchbar-gap;
+    & > * {
+      margin-right: $searchbar-gap;
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
+
+  &__right {
+    margin-left: $searchbar-gap;
+
+    & > * {
+      margin-left: $searchbar-gap;
+
+      &:first-child {
+        margin-left: 0;
+      }
+    }
+  }
+
+  &__left > text,
+  &__left > view {
+    margin-right: $searchbar-gap;
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+
+  &__right > text,
+  &__right > view {
+    margin-left: $searchbar-gap;
+
+    &:first-child {
+      margin-left: 0;
+    }
   }
 
   &__input-box {
@@ -39,13 +92,11 @@
     border: 0;
     outline: 0;
     box-sizing: border-box;
-    width: $searchbar-input-width;
+    width: 100%;
     height: $searchbar-input-height;
     line-height: $searchbar-input-height;
-    width: 100%;
     padding: $searchbar-input-padding;
-    border-radius: 0;
-    font-size: $font-size-small;
+    font-size: $searchbar-font-size;
     color: $searchbar-input-text-color;
     caret-color: $searchbar-input-curror-color;
     background: transparent;
@@ -53,36 +104,10 @@
   }
 
   &__round {
-    border-radius: $searchbar-input-border-radius;
+    border-radius: $searchbar-content-round-border-radius;
   }
 
   &__disabled {
     cursor: not-allowed;
   }
-
-  &__clear {
-    padding: $searchbar-clear-icon-padding;
-
-    i {
-      color: $gray1 !important;
-    }
-  }
-
-  .pos-right {
-    right: 40px;
-  }
-
-  &__left {
-    display: flex;
-    padding: $searchbar-left-padding;
-    font-size: $searchbar-left-fontsize;
-    color: $searchbar-left-color;
-  }
-
-  &__right {
-    display: flex;
-    padding: $searchbar-right-padding;
-    font-size: $searchbar-right-fontsize;
-    color: $searchbar-right-color;
-  }
 }

package/dist/packages/shortpassword/shortpassword.scss

@@ -3,7 +3,7 @@
   &__title {
     line-height: 1;
     font-size: $font-size-large;
-    color: $title-color;
+    color: $color-title;
   }
 
   &__description {
@@ -11,7 +11,7 @@
     margin-bottom: 24px;
     line-height: 1;
     font-size: $font-size-small;
-    color: $text-color;
+    color: $color-text;
   }
 
   &__input {

package/dist/packages/sidenavbar/sidenavbar.scss

@@ -17,19 +17,19 @@
   }
 
   .arrow-down {
-    border-top: 4px solid #909ca4;
+    border-top: 4px solid $color-text-help;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
   }
 
   .arrow-up {
-    border-bottom: 4px solid #909ca4;
+    border-bottom: 4px solid $color-text-help;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
   }
 
   &__title {
-    height: $sidenav-bar-item-height;
+    height: $sidenavbar-item-height;
     padding: $sidenavbar-title-padding;
     background: $sidenavbar-title-background;
     color: $sidenavbar-title-color;

package/dist/packages/sidenavbaritem/sidenavbaritem.scss

@@ -1,6 +1,6 @@
 .nut-subsidenavbar {
   &__item {
-    height: $sidenav-bar-item-height;
+    height: $sidenavbar-item-height;
     color: $sidenavbar-sub-item-color;
     padding: $sidenavbar-sub-item-padding;
     box-sizing: border-box;

package/dist/packages/signature/signature.scss

@@ -2,10 +2,12 @@
   .spcanvas_WEAPP {
     width: 100%;
     height: 100%;
+
     Canvas {
       width: 100%;
     }
   }
+
   &__inner {
     display: flex;
     justify-content: center;
@@ -14,6 +16,7 @@
     border: $signature-border-width solid $signature-border-color;
     background-color: $signature-background-color;
   }
+
   &__unsupport {
     font-size: $signature-font-size;
   }

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: $color-primary-stop-2;
+        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/subsidenavbar/subsidenavbar.scss

@@ -1,6 +1,6 @@
 .nut-subsidenavbar {
   &__title {
-    height: $sidenav-bar-item-height;
+    height: $sidenavbar-item-height;
     padding: $sidenavbar-sub-title-padding;
     box-sizing: border-box;
     background-color: $sidenavbar-sub-title-background;

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/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 {
+  &-button {
     display: flex;
     align-items: center;
     justify-content: center;
     border-radius: 50%;
     background: $color-primary-text;
     transition: transform 0.3s;
-  }
-
-  &__label {
-    color: $color-primary-text;
-    font-size: $font-size-small;
-    &.open {
-      transform: translateX(-16px);
-    }
-
-    &.close {
-      transform: translateX(16px);
-    }
-  }
-
-  &-disabled {
-    opacity: 0.6;
+    box-shadow: $switch-button-box-shadow;
   }
 
   &-base {
@@ -47,23 +24,53 @@
     height: $switch-height;
     line-height: $switch-line-height;
 
-    .switch-button {
+    .nut-switch-button {
       height: $switch-inside-height;
       width: $switch-inside-width;
       transform: $switch-inside-close-transform;
     }
 
-    &.switch-open {
-      .switch-button {
+    &.nut-switch-open {
+      .nut-switch-button {
         transform: $switch-inside-open-transform;
       }
+
+      &.nut-switch-disabled {
+        background-color: $switch-open-disabled-background-color;
+      }
     }
 
-    &.switch-close {
-      .close-line {
-        width: 8px;
+    &.nut-switch-close {
+      .nut-switch-close-line {
+        width: 12px;
         height: 2px;
       }
+
+      &.nut-switch-disabled {
+        background-color: $switch-close-disabled-background-color;
+      }
+    }
+  }
+
+  &-close {
+    background-color: $switch-close-background-color;
+
+    &-line {
+      background: $switch-close-line-background-color;
+      border-radius: 2px;
+    }
+  }
+
+  &-label {
+    color: $color-primary-text;
+    font-size: $font-size-small;
+
+    &.open {
+      transform: translateX(-18px);
+    }
+
+    &.close {
+      transform: translateX(14px);
     }
   }
 }

package/dist/packages/tabbar/tabbar.scss

@@ -10,7 +10,7 @@
   justify-content: center;
   align-items: center;
   box-sizing: border-box;
-  background: $white;
+  background: $color-background-overlay;
 
   &__wrap {
     width: 100%;