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

package/dist/packages/calendar/calendar.scss

@@ -5,8 +5,8 @@
   flex-direction: column;
   flex: 1;
   font-size: $calendar-base-font-size;
-  background-color: $white;
-  color: $gray1;
+  background-color: $color-background-overlay;
+  color: $color-title;
   overflow: hidden;
   height: 100%;
 
@@ -38,9 +38,10 @@
   }
 
   &-title {
+    color: $color-title;
     font-size: $calendar-title-font-size;
     font-weight: $calendar-title-font-weight;
-    line-height: 44px;
+    line-height: 50px;
   }
 
   &-sub-title {
@@ -65,7 +66,7 @@
   &-week-item {
     &:first-of-type,
     &:last-of-type {
-      color: $calendar-day67-color;
+      color: $color-primary;
     }
   }
 
@@ -93,7 +94,7 @@
       left: 0;
       right: 0;
       font-size: $font-size-small;
-      color: $text-color;
+      color: $color-text;
     }
   }
 
@@ -127,7 +128,7 @@
 
     &:nth-child(7n + 0),
     &:nth-child(7n + 1) {
-      color: $calendar-day67-color;
+      color: $color-primary;
     }
 
     &-info-curr {
@@ -181,7 +182,7 @@
     }
 
     &-disabled {
-      color: $calendar-disable-color !important;
+      color: $color-text-disabled !important;
 
       .nut-calendar-day-info-curr {
         display: none;
@@ -189,8 +190,8 @@
     }
 
     &-choose-disabled {
-      background-color: $calendar-choose-disable-background-color;
-      color: $calendar-disable-color !important;
+      background-color: $calendar-choose-background-color-disabled;
+      color: $color-text-disabled !important;
 
       .nut-calendar-day-info-curr {
         display: none;
@@ -199,7 +200,7 @@
 
     &-choose {
       background-color: $calendar-choose-background-color;
-      color: $calendar-choose-color;
+      color: $color-primary;
     }
   }
 
@@ -222,6 +223,6 @@
   }
 }
 
-.nut-calendar-popup .nut-popup__close-icon {
+.nut-calendar-popup .nut-popup-title-right {
   top: 7px !important;
 }

package/dist/packages/calendarcard/calendarcard.scss

@@ -1,9 +1,9 @@
 .nut-calendarcard {
-  background: $white;
+  background: $color-background-overlay;
   border-radius: 12px;
   overflow: hidden;
   font-size: $calendar-base-font-size;
-  color: $gray1;
+  color: $color-title;
 
   &-header {
     display: flex;
@@ -82,11 +82,11 @@
 
     &.mid {
       background-color: $calendar-choose-background-color;
-      color: $calendar-choose-color;
+      color: $color-primary;
     }
 
     &.weekend {
-      color: $calendar-choose-color;
+      color: $color-primary;
     }
 
     .nut-calendar-day-info {
@@ -97,7 +97,7 @@
     &.prev,
     &.next,
     &.disabled {
-      color: $calendar-disable-color;
+      color: $color-text-disabled;
       cursor: not-allowed;
     }
   }

package/dist/packages/card/card.scss

@@ -3,46 +3,57 @@
 .nut-card {
   width: 100%;
   display: flex;
-  .nut-card__left {
+  background-color: inherit;
+  border-radius: $card-border-radius;
+
+  &-left {
     width: 120px;
     height: 120px;
     flex-shrink: 0;
-    background-color: $card-left-background-color;
-    border-radius: $card-left-border-radius;
+
     > img {
       display: block;
       width: 100%;
       height: 100%;
+      border-radius: $card-border-radius;
     }
   }
-  .nut-card__right {
+
+  &-right {
     flex: 1;
     padding: 0 10px 8px;
-    .nut-card__right-title {
+
+    &-title {
       @include moreline-ellipsis();
       line-height: 1.5;
       font-size: 14px;
+      color: $color-title;
     }
-    .nut-cardright-price {
+
+    &-price {
       display: flex;
       align-items: center;
       height: 18px;
       line-height: 18px;
       margin-top: 9px;
+
       .nut-price {
         .nut-price__big {
           font-size: 18px;
         }
+
         .nut-price__symbol,
         .nut-price__point,
         .nut-price__small {
           font-size: 12px;
         }
       }
-      .nut-cardright-price-origin {
+
+      &-origin {
         &.nut-price {
           margin-left: 2px;
           color: #d2a448;
+
           .nut-price__big,
           .nut-price__symbol,
           .nut-price__point,
@@ -52,23 +63,27 @@
         }
       }
     }
-    .nut-cardright-other {
+
+    &-other {
       display: flex;
       align-items: center;
       padding: 5px 0 2px;
+
       .nut-tag {
         padding: 0 2px;
         margin-right: 5px;
         font-size: $font-size-xs;
       }
     }
-    .nut-cardright-shop {
+
+    &-shop {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      .nut-cardright-shop-name {
+
+      &-name {
         line-height: 1.5;
-        color: #999;
+        color: $color-text;
         font-size: 12px;
         padding-top: 4px;
       }

package/dist/packages/cascader/cascader.scss

@@ -2,14 +2,13 @@
 .nut-cascader {
   width: 100%;
   font-size: $cascader-font-size;
-  line-height: $cascader-line-height;
 
-  .nut-tabs__titles {
+  .nut-tabs-titles {
     padding: $cascader-tabs-item-padding;
-    background: $gray6;
+    background: $color-background-overlay;
   }
 
-  .nut-tabs__titles-item {
+  .nut-tabs-titles-item {
     flex: initial;
     min-width: auto;
     width: auto;
@@ -19,6 +18,7 @@
 
   .nut-tabpane {
     padding: 0;
+    background: $color-background-overlay;
   }
 
   &-pane {

package/dist/packages/cell/cell.scss

@@ -13,18 +13,18 @@
   margin: 10px 0;
   box-sizing: border-box;
 
-  &__left {
+  &-left {
     display: flex;
     flex-direction: column;
     flex: 1;
   }
 
-  &__description {
+  &-description {
     font-size: $cell-description-font-size;
     color: $cell-description-color;
   }
 
-  &__extra {
+  &-extra {
     display: inline-flex;
     justify-content: flex-end;
     align-items: center;

package/dist/packages/cellgroup/cellgroup.scss

@@ -1,7 +1,7 @@
 .nut-cell-group {
   display: block;
 
-  &__title {
+  &-title {
     display: inherit;
     padding: $cell-group-title-padding;
     color: $cell-group-title-color;
@@ -11,7 +11,7 @@
     margin-bottom: 10px;
   }
 
-  &__description {
+  &-description {
     display: inherit;
     padding: $cell-group-description-padding;
     color: $cell-group-description-color;
@@ -21,7 +21,7 @@
     margin-bottom: 10px;
   }
 
-  &__wrap {
+  &-wrap {
     display: inherit;
     border-radius: $cell-border-radius;
     overflow: hidden;
@@ -34,9 +34,9 @@
     }
   }
 
-  &__wrap--divider {
+  &-wrap-divider {
     .nut-cell {
-      &__divider {
+      &-divider {
         position: absolute;
         box-sizing: border-box;
         pointer-events: none;
@@ -47,7 +47,7 @@
         border-top: $cell-divider-border-bottom;
       }
       &:last-child {
-        .nut-cell__divider {
+        .nut-cell-divider {
           border-top: 0 !important;
         }
       }

package/dist/packages/checkbox/checkbox.scss

@@ -3,44 +3,104 @@
   display: flex;
   align-items: center;
 
-  &--reverse {
-    flex-direction: row-reverse;
+  &-icon {
+    color: $color-text-disabled;
+    font-size: $checkbox-icon-font-size;
+  }
 
-    .nut-checkbox__label {
-      margin-right: $checkbox-label-margin-left;
-      margin-left: 0;
+  &-icon-checked {
+    color: $color-primary;
+    transition-duration: 0.3s;
+    transition-property: color, border-color, background-color;
+
+    &.nut-checkbox-icon-disabled {
+      color: $color-primary-disabled;
     }
   }
 
-  &__label {
+  &-label {
     margin-left: $checkbox-label-margin-left;
     font-size: $checkbox-label-font-size;
     color: $checkbox-label-color;
 
-    &--disabled {
-      color: $checkbox-label-disable-color;
+    &-disabled {
+      color: $color-text-disabled;
     }
   }
 
-  &__icon {
+  &-icon-indeterminate {
     color: $color-primary;
-    font-size: $checkbox-icon-font-size;
-    transition-duration: 0.3s;
-    transition-property: color, border-color, background-color;
+
+    &.nut-checkbox-icon-disabled {
+      color: $color-primary-disabled;
+    }
   }
 
-  &__icon--unchecked {
-    color: $checkbox-icon-disable-color;
-    font-size: $checkbox-icon-font-size;
+  &-icon-disabled {
+    color: $color-text-disabled;
   }
 
-  &__icon--indeterminate {
-    color: $color-primary;
-    font-size: $checkbox-icon-font-size;
+  &-reverse {
+    flex-direction: row-reverse;
+
+    .nut-checkbox-label {
+      margin-right: $checkbox-label-margin-left;
+      margin-left: 0;
+    }
   }
 
-  &__icon--disable {
-    color: $disable-color;
-    font-size: $checkbox-icon-font-size;
+  &-button {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    padding: $checkbox-button-padding;
+    font-size: $checkbox-button-font-size;
+    background: $checkbox-button-background;
+    border-radius: $checkbox-button-border-radius;
+    color: $checkbox-label-color;
+    box-sizing: border-box;
+    border: 1px solid $checkbox-button-background;
+    overflow: hidden;
+
+    &-active {
+      background: $color-primary-light;
+      color: $color-primary;
+      border: $checkbox-button-active-border;
+    }
+
+    &-disabled {
+      color: $color-text-disabled;
+      border: 1px solid $checkbox-button-background;
+    }
+    &-icon {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      width: 0;
+      height: 0;
+      border-top: 10px solid transparent;
+      border-left: 10px solid transparent;
+      border-bottom: 10px solid $color-primary;
+      border-right: 10px solid $color-primary;
+      display: flex;
+      align-items: flex-end;
+      justify-content: flex-end;
+      &-checked {
+        width: 12px;
+        height: 12px;
+        position: absolute;
+        color: $white;
+        top: 50%;
+        left: 50%;
+        transform: translate(-2px, -2px);
+      }
+      // background-color: $color-primary;
+    }
+  }
+
+  .nut-checkbox-button-active.nut-checkbox-button-disabled {
+    background: $color-text-disabled;
+    color: $white;
+    border: 1px solid $color-text-disabled;
   }
 }

package/dist/packages/checkboxgroup/checkboxgroup.scss

@@ -2,32 +2,42 @@
   .nut-checkbox {
     margin-bottom: 5px;
 
-    &__label {
+    &-label {
       margin-right: 5px;
     }
 
-    &__button {
-      background-color: $gray4;
+    &-button {
+      background-color: $color-background;
     }
   }
 
-  &--vertical {
+  &-vertical {
     .nut-checkbox {
-      &.nut-checkbox--reverse {
+      &.nut-checkbox-reverse {
         width: 100%;
         justify-content: space-between;
       }
 
-      &__label {
+      &-label {
         margin-right: 5px;
       }
+
+      &-button-active {
+        border: $radio-button-active-border;
+        background-color: $color-primary-light;
+      }
     }
   }
 
-  &--horizontal {
+  &-horizontal {
     .nut-checkbox {
       display: inline-flex;
       margin-right: 20px;
+
+      &-button-active {
+        border: $radio-button-active-border;
+        background-color: $color-primary-light;
+      }
     }
   }
 }

package/dist/packages/collapseitem/collapseitem.scss

@@ -1,4 +1,21 @@
 .nut-collapse-item {
+  position: relative;
+  &::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 16px;
+    bottom: 0;
+    left: 16px;
+    border-bottom: $collapse-item-border-bottom;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+  }
+  &:last-child::after {
+    display: none;
+  }
+
   &__header {
     position: relative;
     display: flex;
@@ -7,7 +24,7 @@
     padding: $collapse-item-padding;
     font-size: $collapse-item-font-size;
     line-height: $collapse-item-line-height;
-    background-color: $background-color3;
+    background-color: $color-background-overlay;
     box-sizing: border-box;
 
     &::after {
@@ -18,7 +35,7 @@
       right: 16px;
       bottom: 0;
       left: 16px;
-      border-bottom: 1px solid #ebedf0;
+      border-bottom: $collapse-item-header-border-bottom;
       -webkit-transform: scaleY(0.5);
       transform: scaleY(0.5);
     }
@@ -45,6 +62,7 @@
     display: flex;
     padding-right: 40px;
     position: relative;
+    color: $color-text;
   }
 
   &__icon {
@@ -64,6 +82,10 @@
     .nut-collapse-item__title {
       color: $collapse-item-disabled-color;
     }
+
+    .nut-collapse-item__icon {
+      color: $collapse-item-disabled-color;
+    }
   }
 
   &__content {

package/dist/packages/dialog/dialog.scss

@@ -37,7 +37,7 @@
     text-align: center;
     font-size: $font-size-large;
     font-weight: $dialog-header-font-weight;
-    color: $title-color;
+    color: $color-title;
     @include oneline-ellipsis();
   }
 
@@ -46,8 +46,8 @@
     margin: $dialog-content-margin;
     max-height: $dialog-content-max-height;
     line-height: $dialog-content-line-height;
-    font-size: $font-size-small;
-    color: $text-color;
+    font-size: $font-size-base;
+    color: $color-text;
     word-wrap: break-word;
     word-break: break-all;
     white-space: pre-wrap;
@@ -73,7 +73,7 @@
 
         &.nut-dialog__footer-cancel {
           border: 0;
-          color: $text-color;
+          color: $color-text;
           order: 2;
           display: flex;
           align-items: flex-end;

package/dist/packages/elevator/elevator.scss

@@ -86,6 +86,7 @@
     position: absolute;
     right: $elevator-bars-right;
     top: $elevator-bars-top;
+    color: $color-text-help;
     font-size: $elevator-bars-font-size;
     transform: $elevator-bars-transform;
     padding: $elevator-bars-padding;

package/dist/packages/empty/empty.scss

@@ -5,8 +5,9 @@
   flex-direction: column;
   justify-content: center;
   padding: $empty-padding;
-  background-color: $background-color3;
-  &__image {
+  background-color: $color-background-overlay;
+
+  &-image {
     width: $empty-image-size;
     height: $empty-image-size;
 
@@ -23,11 +24,40 @@
     }
   }
 
-  &__description {
+  &-title {
+    margin-top: $empty-title-margin-top;
+    margin-bottom: $empty-title-margin-bottom;
+    color: $color-title;
+    font-size: $font-size-base;
+    line-height: $empty-title-line-height;
+  }
+
+  &-description {
     margin-top: $empty-description-margin-top;
-    padding: $empty-description-padding;
-    color: $empty-description-color;
-    font-size: $empty-description-font-size;
+    color: $color-text-help;
+    font-size: $font-size-small;
     line-height: $empty-description-line-height;
   }
+
+  &-small {
+    .nut-empty-image {
+      width: $empty-image-small-size;
+      height: $empty-image-small-size;
+    }
+  }
+
+  &-actions {
+    display: flex;
+    margin-top: 16px;
+
+    .nut-button.nut-empty-actions-left,
+    .nut-button.nut-empty-actions-right {
+      height: 28px;
+      padding: 0px 12px;
+      font-weight: 400;
+    }
+    .nut-button.nut-empty-actions-left {
+      margin-right: 16px;
+    }
+  }
 }