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

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 {
-    color: $primary-color;
-    font-size: $checkbox-icon-font-size;
-    transition-duration: 0.3s;
-    transition-property: color, border-color, background-color;
+  &-icon-indeterminate {
+    color: $color-primary;
+
+    &.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: $primary-color;
-    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,5 +1,22 @@
 .nut-collapse-item {
-  &__header {
+  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;
     width: 100%;
@@ -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,19 +35,19 @@
       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);
     }
   }
 
-  &__title {
+  &-title {
     color: $collapse-item-color;
     display: flex;
     align-items: center;
   }
 
-  &__extra {
+  &-extra {
     flex: 1;
     display: flex;
     justify-content: flex-end;
@@ -41,13 +58,14 @@
     color: $collapse-item-extra-color;
   }
 
-  &__icon-box {
+  &-icon-box {
     display: flex;
     padding-right: 40px;
     position: relative;
+    color: $color-text;
   }
 
-  &__icon {
+  &-icon {
     display: flex;
     align-items: center;
     position: absolute;
@@ -58,15 +76,19 @@
     transition: transform 0.3s;
   }
 
-  &__header.disabled {
+  &-header.disabled {
     color: $collapse-item-disabled-color;
 
-    .nut-collapse-item__title {
+    .nut-collapse-item-title {
+      color: $collapse-item-disabled-color;
+    }
+
+    .nut-collapse-item-icon {
       color: $collapse-item-disabled-color;
     }
   }
 
-  &__content {
+  &-content {
     overflow: hidden;
     display: block;
     color: $collapse-wrapper-content-color;

package/dist/packages/dialog/dialog.scss

@@ -5,6 +5,7 @@
   flex-direction: column;
   align-items: center;
   width: $dialog-width;
+  max-height: 67%;
   min-height: $dialog-min-height;
   padding: $dialog-padding;
   box-sizing: border-box;
@@ -13,7 +14,7 @@
     --nutui-overlay-zIndex: 1200;
   }
 
-  &__outer {
+  &-outer {
     position: fixed;
     max-height: 100%;
     overflow-y: auto;
@@ -26,35 +27,35 @@
     left: 50%;
     -webkit-transform: translate(-50%, -50%);
     transform: translate(-50%, -50%);
-    border-radius: $dialog-outer-border-radius;
-    z-index: $dialog-outer-z-index;
+    border-radius: $dialog-border-radius;
+    z-index: $dialog-z-index;
     animation-duration: 0.3s;
   }
 
-  &__header {
+  &-header {
     display: block;
     text-align: center;
-    font-size: $font-size-3;
-    color: $title-color;
+    font-size: $font-size-large;
+    line-height: 24px;
+    font-weight: 500;
+    color: $color-title;
     @include oneline-ellipsis();
   }
 
-  &__content {
+  &-content {
     width: 100%;
-    overflow: auto;
-    flex: 1;
     margin: $dialog-content-margin;
     max-height: $dialog-content-max-height;
     line-height: $dialog-content-line-height;
-    font-size: $font-size-1;
-    color: $text-color;
+    font-size: $font-size-base;
+    color: $color-text;
     word-wrap: break-word;
     word-break: break-all;
     white-space: pre-wrap;
     text-align: $dialog-content-text-align;
   }
 
-  &__footer {
+  &-footer {
     display: flex;
     align-items: center;
     width: 100%;
@@ -67,12 +68,16 @@
         min-width: 100%;
         margin: 0;
 
-        &.nut-dialog__footer-cancel {
-          border: 0;
+        &.nut-dialog-footer-ok {
+          order: 1;
         }
 
-        &.nut-dialog__footer-ok {
-          margin-top: $dialog-vertical-footer-ok-margin-top;
+        &.nut-dialog-footer-cancel {
+          border: 0;
+          color: $color-text;
+          order: 2;
+          display: flex;
+          align-items: flex-end;
         }
       }
     }
@@ -81,7 +86,7 @@
       min-width: $dialog-footer-button-min-width;
     }
 
-    &-cancel.nut-dialog__footer-cancel {
+    &-cancel.nut-dialog-footer-cancel {
       margin-right: $dialog-footer-cancel-margin-right;
     }
 
@@ -90,23 +95,3 @@
     }
   }
 }
-
-// .fadeDialog-enter,
-// .fadeDialog-appear {
-//   opacity: 0;
-// }
-
-// .fadeDialog-enter-active,
-// .fadeDialog-appear-active {
-//   opacity: 1;
-//   transition: opacity 1s cubic-bezier(0.3, 1.3, 0.3, 1);
-// }
-
-// .fadeDialog-exit {
-//   opacity: 1;
-// }
-
-// .fadeDialog-exit-active {
-//   opacity: 0;
-//   transition: opacity 1s cubic-bezier(0.3, 1.3, 0.3, 1);
-// }

package/dist/packages/divider/divider.scss

@@ -4,7 +4,7 @@
   font-size: $divider-text-font-size;
   color: $divider-text-color;
   margin: $divider-margin;
-  border: 0 solid currentColor;
+  border: 0 solid $divider-border-color;
   width: 100%;
 
   &::before,
@@ -17,43 +17,43 @@
     flex: 1;
   }
 
-  &__center,
-  &__left,
-  &__right {
+  &-center,
+  &-left,
+  &-right {
     &::before {
-      margin-right: $divider-before-margin-right;
+      margin-right: $divider-spacing;
     }
 
     &::after {
-      margin-left: $divider-after-margin-left;
+      margin-left: $divider-spacing;
     }
   }
 
-  &__left {
+  &-left {
     &::before {
-      max-width: 10%;
+      max-width: $divider-side-width;
     }
   }
 
-  &__right {
+  &-right {
     &::after {
-      max-width: 10%;
+      max-width: $divider-side-width;
     }
   }
 
-  &__hairline {
+  &-hairline {
     &::before,
     &::after {
       transform: scaleY(0.5);
     }
   }
 
-  &__vertical {
+  &-vertical {
     position: relative;
     top: $divider-vertical-top;
     display: inline-block;
     height: $divider-vertical-height;
-    border-left: 1px solid $divider-vertical-border-left;
+    border-left: 1px solid $divider-border-color;
     margin: $divider-vertical-margin;
     width: auto;
   }

package/dist/packages/elevator/elevator.scss

@@ -3,53 +3,60 @@
   display: block;
   position: relative;
   overflow: hidden;
-  &__list {
+
+  &-list {
     display: block;
     position: relative;
-    top: 1px;
+    top: 0;
     overflow: hidden;
-    &__inner {
+    font-size: $elevator-list-font-size;
+    color: $elevator-list-color;
+
+    &-inner {
       height: 100%;
       width: 100%;
       display: block;
-      background-color: $elevator-list-inner-bg-color;
+      background-color: $elevator-list-bg-color;
       overflow: auto;
     }
-    &__item {
+
+    &-item {
       display: block;
-      font-size: $elevator-list-item-font-size;
-      color: $elevator-list-item-font-color;
-      &__code {
+
+      &-code {
         display: flex;
         position: relative;
         height: $elevator-list-item-code-height;
         line-height: $elevator-list-item-code-line-height;
         font-size: $elevator-list-item-code-font-size;
-        color: $elevator-list-item-code-font-color;
-        padding: $elevator-list-item-code-padding;
+        color: $elevator-list-item-code-color;
+        padding: $elevator-list-item-padding;
         font-weight: $elevator-list-item-code-font-weight;
         box-sizing: border-box;
-        border-bottom: $elevator-list-item-code-border-bottom solid
-          $elevator-list-item-code-border-bottom-color;
+        border-bottom: $elevator-list-item-code-border-bottom;
+        background-color: $elevator-list-item-code-background-color;
       }
-      &__name {
+
+      &-name {
         display: flex;
         align-items: center;
-        padding: $elevator-list-item-name-padding;
+        padding: $elevator-list-item-padding;
         height: $elevator-list-item-name-height;
         line-height: $elevator-list-item-name-line-height;
-        &--highcolor {
-          color: $elevator-list-item-highcolor;
+
+        &-highcolor {
+          color: $color-primary;
         }
       }
     }
-    &__fixed {
+
+    &-fixed {
       width: 100%;
       position: absolute;
       top: 0;
       left: 0;
       z-index: 1;
-      padding: $elevator-list-item-code-padding;
+      padding: $elevator-list-item-padding;
       height: $elevator-list-item-code-height;
       line-height: $elevator-list-item-code-line-height;
       font-size: $elevator-list-item-code-font-size;
@@ -60,11 +67,12 @@
       box-shadow: $elevator-list-fixed-box-shadow;
     }
   }
-  &__code--current {
-    position: $elevator-list-item-code-current-position;
+
+  &-code-current {
+    position: absolute;
     right: $elevator-list-item-code-current-right;
     top: $elevator-list-item-code-current-top;
-    transform: $elevator-list-item-code-current-transform;
+    transform: $elevator-bars-transform;
     width: $elevator-list-item-code-current-width;
     height: $elevator-list-item-code-current-height;
     line-height: $elevator-list-item-code-current-line-height;
@@ -73,24 +81,30 @@
     box-shadow: $elevator-list-item-code-current-box-shadow;
     text-align: $elevator-list-item-code-current-text-align;
   }
-  &__bars {
-    position: $elevator-list-item-bars-position;
-    right: $elevator-list-item-bars-right;
-    top: $elevator-list-item-bars-top;
-    transform: $elevator-list-item-bars-transform;
-    padding: $elevator-list-item-bars-padding;
-    background-color: $elevator-list-item-bars-background-color;
-    border-radius: $elevator-list-item-bars-border-radius;
-    text-align: $elevator-list-item-bars-text-align;
-    z-index: $elevator-list-item-bars-z-index;
-    &__inner {
-      &__item {
+
+  &-bars {
+    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;
+    background-color: $elevator-bars-background-color;
+    border-radius: $elevator-bars-border-radius;
+    text-align: center;
+    z-index: $elevator-bars-z-index;
+
+    &-inner {
+      &-item {
         display: block;
-        padding: $elevator-list-item-bars-inner-item-padding;
-        font-size: $elevator-list-item-bars-inner-item-font-size;
-        &--active {
-          color: $elevator-list-item-bars-inner-item-active-color;
+        padding: $elevator-bars-inner-item-padding;
+
+        &-active {
+          font-weight: $font-weight-bold;
+          color: $elevator-bars-active-color;
         }
+
         cursor: pointer;
       }
     }