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

package/dist/packages/radio/radio.scss

@@ -9,66 +9,71 @@
     margin-right: 0 !important;
   }
 
-  &.nut-radio--reverse {
+  &.nut-radio-reverse {
     flex-direction: row-reverse;
-    .nut-radio__label {
+    .nut-radio-label {
       margin-right: $radio-label-margin-left;
       margin-left: 0;
     }
   }
 
-  &__button {
-    display: inline-flex;
-    align-items: center;
-    padding: $radio-button-padding;
-    font-size: $radio-button-font-size;
-    background: $radio-button-background;
-    border-radius: $radio-button-border-radius;
-    color: $radio-label-font-color;
-    box-sizing: border-box;
-    border: 1px solid $radio-button-background;
-
-    &--active {
-      background: $radio-label-button-background;
-      color: $radio-label-font-active-color;
-      border: 1px solid $radio-label-button-border-color;
-    }
-
-    &--disabled {
-      color: $radio-label-disable-color;
-      border: 1px solid $radio-button-background;
-    }
-  }
-  .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;
-  }
-
-  &__label {
+  &-label {
     margin-left: $radio-label-margin-left;
     font-size: $radio-label-font-size;
-    color: $radio-label-font-color;
+    color: $radio-label-color;
 
-    &--disabled {
+    &-disabled {
       color: $radio-label-disable-color;
     }
   }
 
-  &__icon {
-    color: $radio-label-font-active-color;
+  &-icon {
+    color: $color-text-disabled;
     transition-duration: 0.3s;
     transition-property: color, border-color, background-color;
     font-size: $radio-icon-font-size;
   }
 
-  &__icon {
-    &--unchecked {
-      color: $radio-icon-disable-color;
+  &-icon {
+    &-checked {
+      color: $color-primary;
+
+      &.nut-radio-icon-disabled {
+        color: $color-primary-disabled;
+      }
     }
 
-    &--disable {
-      color: $radio-icon-disable-color2;
+    &-disabled {
+      color: $color-text-disabled;
     }
   }
+
+  &-button {
+    display: inline-flex;
+    align-items: center;
+    padding: $radio-button-padding;
+    font-size: $radio-button-font-size;
+    background: $radio-button-background;
+    border-radius: $radio-button-border-radius;
+    color: $radio-label-color;
+    box-sizing: border-box;
+    border: 1px solid $radio-button-background;
+
+    &-active {
+      background: $color-primary-light;
+      color: $color-primary;
+      border: $radio-button-active-border;
+    }
+
+    &-disabled {
+      color: $color-text-disabled;
+      border: 1px solid $radio-button-background;
+    }
+  }
+
+  .nut-radio-button-active.nut-radio-button-disabled {
+    background: $color-text-disabled;
+    color: $white;
+    border: 1px solid $color-text-disabled;
+  }
 }

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

@@ -2,13 +2,13 @@
   display: flex;
 
   &.disabled {
-    .nut-rate-item__icon {
+    .nut-rate-item-icon {
       cursor: not-allowed;
     }
   }
 
   &.readonly {
-    .nut-rate-item__icon {
+    .nut-rate-item-icon {
       cursor: default;
     }
   }
@@ -23,7 +23,7 @@
       margin-right: 0;
     }
 
-    &__half {
+    &-half {
       position: absolute;
       height: 100%;
       width: 50% !important;
@@ -32,23 +32,22 @@
       overflow: hidden;
     }
 
-    &__icon {
+    &-icon {
       color: $rate-icon-color;
       cursor: pointer;
 
-      &--disabled {
-        color: $rate-icon-void-color;
+      &-disabled {
+        color: $rate-icon-inactive-color;
       }
 
-      &.nut-rate-item__icon.nut-rate-item__icon--half {
+      &.nut-rate-item-icon.nut-rate-item-icon-half {
         position: absolute;
-        // width: 50% !important;
         left: 0;
         top: 0;
         overflow: hidden;
       }
 
-      &.nut-rate-item__icon::before {
+      &.nut-rate-item-icon::before {
         position: relative;
         top: auto;
         left: auto;

package/dist/packages/searchbar/searchbar.scss

@@ -4,85 +4,110 @@
   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;
 
-  &__content {
+  &-content {
     flex: 1;
     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;
+  &-icon {
     display: flex;
     justify-content: center;
+    align-items: center;
+  }
+
+  &-clear,
+  &-rightin {
+    width: 16px;
+    height: 16px;
+    color: var(--nutui-black-5);
   }
 
-  &__rightin {
+  &-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 {
+  &-input-box {
     display: flex;
     align-items: center;
     flex: 1;
   }
 
-  &__input {
+  &-input {
     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;
     text-align: $searchbar-input-text-align;
   }
 
-  &__round {
-    border-radius: $searchbar-input-border-radius;
+  &-round {
+    border-radius: $searchbar-content-round-border-radius;
   }
 
-  &__disabled {
+  &-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

@@ -1,20 +1,20 @@
 
 .nut-shortpassword {
-  &__title {
+  &-title {
     line-height: 1;
     font-size: $font-size-large;
-    color: $title-color;
+    color: $color-title;
   }
 
-  &__description {
+  &-description {
     margin-top: 12px;
     margin-bottom: 24px;
     line-height: 1;
     font-size: $font-size-small;
-    color: $text-color;
+    color: $color-text;
   }
 
-  &__input {
+  &-input {
     padding: 0 0 10px;
     text-align: center;
     position: relative;
@@ -50,13 +50,13 @@
       position: absolute;
       left: 0;
 
-      &__li {
+      &-li {
         flex: 1;
         display: flex;
         justify-content: center;
         align-items: center;
 
-        &__icon {
+        &-icon {
           height: 6px;
           width: 6px;
           border-radius: 50%;
@@ -67,19 +67,19 @@
     }
   }
 
-  &__message {
+  &-message {
     margin-top: 9px;
     display: flex;
     justify-content: space-between;
     width: 247px;
 
-    &__error {
+    &-error {
       line-height: 1;
       font-size: $font-size-xs;
       color: $shortpassword-error;
     }
 
-    &__forget {
+    &-forget {
       line-height: 1;
       font-size: $font-size-small;
       color: $shortpassword-forget;
@@ -88,12 +88,12 @@
     }
   }
 
-  &__footer {
+  &-footer {
     display: flex;
     justify-content: space-between;
     margin-top: 20px;
 
-    &__cancel {
+    &-cancel {
       background: $white;
       border: 1px solid $color-primary;
       border-radius: 15px;
@@ -103,7 +103,7 @@
       color: $color-primary;
     }
 
-    &__sure {
+    &-sure {
       background: linear-gradient(
         135deg,
         $color-primary 0%,

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;
+  &-title {
+    height: $sidenavbar-item-height;
     padding: $sidenavbar-title-padding;
     background: $sidenavbar-title-background;
     color: $sidenavbar-title-color;
@@ -37,21 +37,21 @@
     transition: transform 0.5s;
   }
 
-  &__content {
+  &-content {
     position: relative;
     display: block;
   }
 
-  &__list {
+  &-list {
     &.sidenavbar-show {
-      .nut-sidenavbar__content {
+      .nut-sidenavbar-content {
         height: auto;
         overflow: inherit;
       }
     }
 
     &.sidenavbar-hide {
-      .nut-sidenavbar__content {
+      .nut-sidenavbar-content {
         height: 0;
         overflow: hidden;
       }

package/dist/packages/sidenavbaritem/sidenavbaritem.scss

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

package/dist/packages/signature/signature.scss

@@ -2,11 +2,13 @@
   .spcanvas_WEAPP {
     width: 100%;
     height: 100%;
+
     Canvas {
       width: 100%;
     }
   }
-  &__inner {
+
+  &-inner {
     display: flex;
     justify-content: center;
     align-items: center;
@@ -14,7 +16,8 @@
     border: $signature-border-width solid $signature-border-color;
     background-color: $signature-background-color;
   }
-  &__unsupport {
+
+  &-unsupport {
     font-size: $signature-font-size;
   }
 }

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;