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

package/dist/packages/radio/radio.scss

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

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: $color-primary;
-        background-color: $color-primary-light;
+      &__button--active {
+        border-color: $radio-label-button-border-color;
+        background-color: $radio-label-button-background;
       }
     }
   }
 
-  &-horizontal {
+  &--horizontal {
     .nut-radio {
       display: inline-flex;
 
-      &-button {
-        border: 1px solid $white;
+      &__button {
+        border: 1px solid $gray6;
       }
 
-      &-button-active {
-        border-color: $color-primary;
-        background-color: $color-primary-light;
+      &__button--active {
+        border-color: $radio-label-button-border-color;
+        background-color: $radio-label-button-background;
       }
     }
   }
 
-  .nut-radio-button-active.nut-radio-button-disabled {
-    background: $color-text-disabled;
-    color: $white;
-    border: 1px solid $color-text-disabled;
+  .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;
   }
 }

package/dist/packages/range/range.scss

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

package/dist/packages/rate/rate.scss

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

package/dist/packages/safearea/safearea.scss

@@ -0,0 +1,14 @@
+.nut-safe-area {
+  display: block;
+  width: 100%;
+  &-position-top {
+    padding-top: calc(
+      env(safe-area-inset-top) * var(--nutui-safe-area-multiple, 1)
+    );
+  }
+  &-position-bottom {
+    padding-bottom: calc(
+      env(safe-area-inset-bottom) * var(--nutui-safe-area-multiple, 1)
+    );
+  }
+}

package/dist/packages/searchbar/searchbar.scss

@@ -4,8 +4,7 @@
   width: $searchbar-width;
   padding: $searchbar-padding;
   background: $searchbar-background;
-  color: $searchbar-color;
-  font-size: $searchbar-font-size;
+  color: $gray1;
   box-sizing: border-box;
   justify-content: center;
 
@@ -14,72 +13,20 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: $searchbar-content-padding;
     height: $searchbar-input-height;
-    background: $searchbar-content-background;
+    background: $searchbar-input-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;
-    &.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;
-    }
+    padding: 0 5px;
   }
 
   &__input-box {
@@ -92,11 +39,13 @@
     border: 0;
     outline: 0;
     box-sizing: border-box;
-    width: 100%;
+    width: $searchbar-input-width;
     height: $searchbar-input-height;
     line-height: $searchbar-input-height;
+    width: 100%;
     padding: $searchbar-input-padding;
-    font-size: $searchbar-font-size;
+    border-radius: 0;
+    font-size: $font-size-small;
     color: $searchbar-input-text-color;
     caret-color: $searchbar-input-curror-color;
     background: transparent;
@@ -104,10 +53,36 @@
   }
 
   &__round {
-    border-radius: $searchbar-content-round-border-radius;
+    border-radius: $searchbar-input-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

@@ -2,16 +2,16 @@
 .nut-shortpassword {
   &__title {
     line-height: 1;
-    font-size: $font-size-large;
-    color: $color-title;
+    font-size: $font-size-3;
+    color: $title-color;
   }
 
   &__description {
     margin-top: 12px;
     margin-bottom: 24px;
     line-height: 1;
-    font-size: $font-size-small;
-    color: $color-text;
+    font-size: $font-size-1;
+    color: $text-color;
   }
 
   &__input {
@@ -75,13 +75,13 @@
 
     &__error {
       line-height: 1;
-      font-size: $font-size-xs;
+      font-size: $font-size-0;
       color: $shortpassword-error;
     }
 
     &__forget {
       line-height: 1;
-      font-size: $font-size-small;
+      font-size: $font-size-1;
       color: $shortpassword-forget;
       display: flex;
       align-items: center;
@@ -95,25 +95,25 @@
 
     &__cancel {
       background: $white;
-      border: 1px solid $color-primary;
+      border: 1px solid $primary-color;
       border-radius: 15px;
       padding: 8px 38px;
       line-height: 1;
-      font-size: $font-size-base;
-      color: $color-primary;
+      font-size: $font-size-2;
+      color: $primary-color;
     }
 
     &__sure {
       background: linear-gradient(
         135deg,
-        $color-primary 0%,
-        $color-primary-stop-2 100%
+        $primary-color 0%,
+        $primary-color-end 100%
       );
       border-radius: 15px;
       padding: 8px 38px;
       line-height: 1;
-      font-size: $font-size-base;
-      color: $color-primary-text;
+      font-size: $font-size-2;
+      color: $primary-text-color;
     }
   }
 }

package/dist/packages/sidenavbar/sidenavbar.scss

@@ -17,19 +17,19 @@
   }
 
   .arrow-down {
-    border-top: 4px solid $color-text-help;
+    border-top: 4px solid #909ca4;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
   }
 
   .arrow-up {
-    border-bottom: 4px solid $color-text-help;
+    border-bottom: 4px solid #909ca4;
     border-left: 4px solid transparent;
     border-right: 4px solid transparent;
   }
 
   &__title {
-    height: $sidenavbar-item-height;
+    height: $sidenav-bar-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: $sidenavbar-item-height;
+    height: $sidenav-bar-item-height;
     color: $sidenavbar-sub-item-color;
     padding: $sidenavbar-sub-item-padding;
     box-sizing: border-box;

package/dist/packages/signature/signature.scss

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

package/dist/packages/skeleton/skeleton.scss

@@ -47,9 +47,9 @@
     z-index: 1;
     background: linear-gradient(
       90deg,
-      var(--nutui-white-1),
-      var(--nutui-white-8) 50%,
-      var(--nutui-white-1) 80%
+      hsla(0, 0%, 100%, 0),
+      hsla(0, 0%, 100%, 0.5) 50%,
+      hsla(0, 0%, 100%, 0) 80%
     );
     background-repeat: no-repeat;
     animation: nut-skeleton 2s ease-in-out 0s infinite;

package/dist/packages/step/step.scss

@@ -62,7 +62,7 @@
     text-align: center;
 
     .nut-step-description {
-      color: $color-title;
+      color: $title-color;
     }
   }
 
@@ -76,7 +76,7 @@
   &-description {
     display: block;
     font-size: $steps-base-description-font-size;
-    color: $steps-base-description-color;
+    color: $steps-base-content-color;
   }
 
   &:last-child {
@@ -105,7 +105,7 @@
     }
 
     .nut-step-description {
-      color: $steps-wait-description-color;
+      color: $steps-wait-content-color;
     }
   }
 
@@ -129,6 +129,8 @@
 .nut-steps-dot {
   .nut-step-head {
     margin: $steps-dot-head-margin;
+    //margin-top: 7px;
+    //margin-bottom: 0;
   }
 
   .nut-step-line {
@@ -149,7 +151,7 @@
     }
 
     .nut-step-description {
-      color: $steps-wait-description-color;
+      color: $steps-wait-content-color;
     }
   }
 
@@ -175,7 +177,7 @@
         margin-top: -7px;
         width: 14px;
         height: 14px;
-        background-color: $color-primary-stop-2;
+        background-color: $primary-color-end;
         border-radius: 50%;
         opacity: 0.23;
       }
@@ -212,7 +214,7 @@
     text-align: left;
 
     .nut-step-description {
-      color: $steps-base-description-color;
+      color: $steps-base-content-color;
     }
   }
 }

package/dist/packages/subsidenavbar/subsidenavbar.scss

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

package/dist/packages/swipe/swipe.scss

@@ -2,16 +2,13 @@
   position: relative;
   overflow: hidden;
   cursor: grab;
-  background-color: $white;
 
   &__wrapper {
     transition-timing-function: cubic-bezier(0.18, 0.89, 0.32, 1);
     transition-property: transform;
-
     .nut-button {
       height: 100%;
     }
-
     .nut-cell {
       margin: 0;
     }

package/dist/packages/swiper/swiper.scss

@@ -24,6 +24,7 @@
     left: 50%;
     bottom: $swiper-indicator-bottom;
     transform: translateX(-50%);
+    z-index: 1;
   }
 
   &__indicator-vertical {
@@ -34,5 +35,6 @@
     -webkit-box-orient: vertical;
     -webkit-box-direction: normal;
     transform: translateY(-50%);
+    z-index: 1;
   }
 }