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

package/dist/packages/actionsheet/actionsheet.scss

@@ -5,16 +5,14 @@
   padding-bottom: env(safe-area-inset-bottom);
   text-align: center;
 
-  .nut-popup-title {
-    border-bottom: 1px solid $actionsheet-border-color;
+  &.nut-popup {
+    min-height: 10%;
+    background-color: $actionsheet-background-color;
+    padding: $actionsheet-padding;
   }
 
-  &__description {
-    padding: 10px;
-    display: block;
-    font-size: $font-size-base;
-    color: $title-color2;
-    margin-inline-start: 0px;
+  .nut-popup-title {
+    border-bottom: 1px solid $actionsheet-border-color;
   }
 
   &__list {
@@ -22,6 +20,7 @@
     list-style: none;
     padding: 0;
     margin: 0;
+    border-radius: $actionsheet-border-radius;
   }
 
   &__cancel,
@@ -32,13 +31,13 @@
     line-height: $actionsheet-item-line-height;
     font-size: $font-size-base;
     color: $actionsheet-item-color;
-    background-color: $background-color3;
+    background-color: $color-background-overlay;
     cursor: pointer;
 
     &-description {
       display: block;
       font-size: $font-size-small;
-      color: $title-color2;
+      color: $color-text;
     }
 
     &.danger {
@@ -46,7 +45,7 @@
     }
 
     &.disabled {
-      color: #e1e1e1 !important;
+      color: $color-text-disabled !important;
       cursor: not-allowed;
     }
   }
@@ -54,5 +53,6 @@
   &__cancel {
     margin-top: 5px;
     border-top: 1px solid $actionsheet-border-color;
+    border-radius: $actionsheet-border-radius;
   }
 }

package/dist/packages/address/address.scss

@@ -17,11 +17,11 @@
       align-items: center;
       margin-bottom: 20px;
       font-size: $font-size-small;
-      line-height: 14px;
-      color: $title-color;
+      line-height: $font-size-base;
+      color: $color-title;
 
       &.active {
-        font-weight: 500;
+        font-weight: $font-weight-bold;
       }
 
       &-info {
@@ -34,7 +34,7 @@
     width: 100%;
     height: 54px;
     padding: 6px 0px 0;
-    border-top: 1px solid #f2f2f2;
+    border-top: 1px solid $color-border;
 
     &-btn {
       width: 90%;

package/dist/packages/animatingnumbers/countup.scss

@@ -4,22 +4,35 @@
     height: $countup-height;
     overflow: hidden;
   }
+
   &__listitem {
     height: $countup-height;
     overflow: hidden;
+    color: $color-title;
     font-size: $countup-base-size;
-    color: $title-color;
-    font-weight: bold;
+    font-weight: $font-weight-bold;
+
+    &--number {
+      margin: 0 $countup-lr-margin;
+      border-radius: $countup-border-radius;
+      color: $countup-color;
+      background-color: $countup-bg-color;
+    }
   }
+
   &__separator {
     display: flex;
     height: 80%;
     align-items: flex-end;
+    color: $countup-bg-color;
   }
+
   &__number {
     display: flex;
     flex-direction: column;
     align-items: center;
+    width: $countup-width;
+
     span {
       height: $countup-height;
       line-height: $countup-height;

package/dist/packages/audio/audio.scss

@@ -3,6 +3,7 @@
   &__icon {
     position: relative;
     display: inline-block;
+
     &-box {
       display: flex;
       align-items: center;
@@ -11,7 +12,7 @@
       height: 30px;
       background: $white;
       border-radius: 50%;
-      box-shadow: 0 0 8px rgba(117, 117, 117, 0.5);
+      box-shadow: 0 0 8px $color-text-disabled;
 
       .nut-icon-am-rotate {
         transform: rotate((360));
@@ -21,6 +22,7 @@
 
     .nut-audio__icon-stop {
       position: relative;
+
       &::after {
         position: absolute;
         left: 50%;
@@ -29,7 +31,7 @@
         content: '';
         height: 2px;
         width: 30px;
-        background: $disable-color;
+        background: $color-text-disabled;
         transform: rotate(45deg);
         transform-origin: 8px -18px;
       }
@@ -47,33 +49,39 @@
       flex: 1;
       margin: 0 10px;
     }
+
     .time {
       min-width: 50px;
       font-size: 12px;
       text-align: center;
     }
+
     .nut-range-button {
       width: 8px;
       height: 8px;
     }
   }
+
   .custom-button-group {
     .nut-button--primary {
       margin: 0 5px;
     }
   }
+
   .custom-button-group-disable {
     .nut-button--primary {
       margin: 0 5px;
       pointer-events: none;
     }
   }
+
   .disable {
     color: blue;
   }
+
   .nut-audio__none-container {
     .nut-voice {
-      border: 1px solid $title-color;
+      border: 1px solid $color-title;
       align-items: center;
     }
   }

package/dist/packages/avatarcropper/avatarcropper.scss

@@ -65,6 +65,10 @@
         cursor: pointer;
         display: flex;
         align-items: center;
+
+        .nut-button {
+          color: #fff;
+        }
       }
     }
     &-highlight {

package/dist/packages/backtop/backtop.scss

@@ -1,22 +1,25 @@
 .nut-backtop {
   display: none;
   position: fixed;
+
   &.show {
     width: 40px;
     height: 40px;
     display: flex;
     align-items: center;
     justify-content: center;
-    background: $background-color3;
-    color: $title-color;
+    background: $color-background-overlay;
+    color: $color-title;
     border: 1px solid $backtop-border-color;
     border-radius: 50%;
+
     &:active {
-      background: rgba(0, 0, 0, 0.1);
+      background: $color-background;
     }
   }
 
   &-main {
     transition: all 0.2s ease-in-out;
+    color: $color-title;
   }
 }

package/dist/packages/barrage/barrage.scss

@@ -6,20 +6,26 @@
   height: 100%;
   overflow: hidden;
   box-sizing: border-box;
-  background-color: $background-color;
-  color: $title-color;
+  background-color: $color-background;
+  color: $color-title;
+
   .barrage-item {
     display: block;
     position: absolute;
     right: 0;
-    padding: 3px 25px;
-    border-radius: 50px;
-    font-size: 12px;
+    padding: 4px 16px;
+    border-radius: 16px;
+    font-size: $font-size-small;
     text-align: center;
     white-space: pre;
     transform: translateX(100%);
-    background: linear-gradient(to right, $gray3, rgba(0, 0, 0, 0));
+    background: linear-gradient(
+      to right,
+      var(--nutui-black-3),
+      var(--nutui-black-1)
+    );
     box-sizing: border-box;
+
     &.move {
       will-change: transform;
       animation-name: moving;
@@ -27,18 +33,22 @@
       animation-play-state: running;
     }
   }
+
   @keyframes moving {
     from {
       transform: translateX(100%);
     }
+
     to {
       transform: translateX(var(--move-distance));
     }
   }
+
   @-webkit-keyframes moving {
     from {
       -webkit-transform: translateX(100%);
     }
+
     to {
       transform: translateX(var(--move-distance));
     }

package/dist/packages/button/button.scss

@@ -1,26 +1,32 @@
 .nut-button {
   position: relative;
+  display: flex;
   display: inline-block;
+  justify-content: center;
+  align-items: center;
   flex-shrink: 0;
-  height: $button-default-height;
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  line-height: $button-default-line-height;
+  height: $button-default-height;
   font-size: $button-default-font-size;
+  font-weight: $button-default-font-weight;
   text-align: center;
   cursor: pointer;
   transition: opacity 0.2s;
   -webkit-appearance: none;
   user-select: none;
   touch-action: manipulation;
-  -webkit-tap-highlight-color: rgba(0,0,0,0);
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   color: $button-default-color;
-  background: $button-default-bg-color;
-  border: $button-border-width solid $button-default-border-color;
+  background: $button-default-background-color;
+
+  &-text {
+    margin-left: $button-text-icon-margin;
 
-  .nut-button-text {
-    margin-left: $button-text-icon-margin-left;
+    &.right {
+      margin-right: $button-text-icon-margin;
+    }
   }
 
   &::before {
@@ -29,9 +35,9 @@
     left: 50%;
     width: 100%;
     height: 100%;
-    background-color: $black;
+    background-color: $color-mask;
     border: inherit;
-    border-color: $black;
+    border-color: $color-mask;
     border-radius: inherit;
     transform: translate(-50%, -50%);
     opacity: 0;
@@ -46,7 +52,7 @@
     opacity: 0.1;
   }
 
-  &__warp {
+  &-wrap {
     height: 100%;
     width: 100%;
     display: flex;
@@ -62,22 +68,59 @@
     }
   }
 
-  &--solid {
-    color: $button-primary-color;
-    background: $button-primary-background-color;
-    background-origin: border-box;
-    border: $button-border-width solid transparent;
+  &.nut-button--icononly {
+    width: $button-default-height;
+    padding: 0;
   }
 
-  &.nut-button--outline {
-    color: $button-primary-border-color;
-    border-color: $button-primary-border-color;
-    background: transparent;
+  &--default {
+    padding: $button-default-padding;
+    border: $button-border-width solid $button-default-border-color;
+
+    &.nut-button--disabled {
+      color: $color-text-help;
+      background: transparent;
+    }
+
+    &.nut-button--none {
+      background: transparent;
+
+      &.nut-button--disabled {
+        color: $color-text-help;
+      }
+    }
+
+    &.nut-button--outline,
+    &.nut-button--dashed {
+      background: transparent;
+
+      &.nut-button--disabled {
+        color: $color-text-help;
+        border-color: $button-default-disabled;
+      }
+    }
   }
 
-  &.nut-button--none {
-    background: transparent;
-    border-color: transparent;
+  &--normal {
+    padding: $button-normal-padding;
+  }
+
+  &--large {
+    height: $button-large-height;
+    padding: $button-large-padding;
+    font-size: $button-large-font-size;
+  }
+
+  &--small {
+    height: $button-small-height;
+    padding: $button-small-padding;
+    font-size: $button-small-font-size;
+  }
+
+  &--mini {
+    height: $button-mini-height;
+    padding: $button-mini-padding;
+    font-size: $button-mini-font-size;
   }
 
   &--primary {
@@ -86,31 +129,30 @@
     background-origin: border-box;
     border: $button-border-width solid transparent;
 
-    &.nut-button--outline {
-      color: $button-primary-border-color;
-      border-color: $button-primary-border-color;
-      background: transparent;
+    &.nut-button--disabled {
+      background: $button-primary-disabled;
+      border-color: $button-primary-disabled;
     }
 
     &.nut-button--none {
+      background: transparent;
       color: $button-primary-border-color;
-    }
-  }
 
-  &--info {
-    color: $button-info-color;
-    background: $button-info-background-color;
-    background-origin: border-box;
-    border: $button-border-width solid transparent;
+      &.nut-button--disabled {
+        color: $button-primary-disabled;
+      }
+    }
 
+    &.nut-button--dashed,
     &.nut-button--outline {
-      color: $button-info-border-color;
-      border-color: $button-info-border-color;
       background: transparent;
-    }
+      color: $button-primary-border-color;
+      border-color: $button-primary-border-color;
 
-    &.nut-button--none {
-      color: $button-info-border-color;
+      &.nut-button--disabled {
+        color: $button-primary-disabled;
+        border-color: $button-primary-disabled;
+      }
     }
   }
 
@@ -120,10 +162,21 @@
     background-origin: border-box;
     border: $button-border-width solid transparent;
 
-    &.nut-button--outline {
+    &.nut-button--disabled {
+      background: $button-success-disabled;
+      border-color: $button-success-disabled;
+    }
+
+    &.nut-button--outline,
+    &.nut-button--dashed {
       color: $button-success-border-color;
       border-color: $button-success-border-color;
       background: transparent;
+
+      &.nut-button--disabled {
+        color: $button-primary-disabled;
+        border-color: $button-primary-disabled;
+      }
     }
 
     &.nut-button--none {
@@ -131,16 +184,55 @@
     }
   }
 
+  &--info {
+    color: $button-info-color;
+    background: $button-info-background-color;
+    background-origin: border-box;
+    border: $button-border-width solid transparent;
+
+    &.nut-button--disabled {
+      background: $button-info-disabled;
+      border-color: $button-info-disabled;
+    }
+
+    &.nut-button--outline,
+    &.nut-button--dashed {
+      color: $button-info-border-color;
+      border-color: $button-info-border-color;
+      background: transparent;
+
+      &.nut-button--disabled {
+        color: $button-primary-disabled;
+        border-color: $button-primary-disabled;
+      }
+    }
+
+    &.nut-button--none {
+      color: $button-info-border-color;
+    }
+  }
+
   &--danger {
     color: $button-danger-color;
     background: $button-danger-background-color;
     background-origin: border-box;
     border: $button-border-width solid transparent;
 
-    &.nut-button--outline {
+    &.nut-button--disabled {
+      background: $button-danger-disabled;
+      border-color: $button-danger-disabled;
+    }
+
+    &.nut-button--outline,
+    &.nut-button--dashed {
       color: $button-danger-border-color;
       border-color: $button-danger-border-color;
       background: transparent;
+
+      &.nut-button--disabled {
+        color: $button-danger-disabled;
+        border-color: $button-danger-disabled;
+      }
     }
 
     &.nut-button--none {
@@ -154,10 +246,21 @@
     background-origin: border-box;
     border: $button-border-width solid transparent;
 
-    &.nut-button--outline {
+    &.nut-button--disabled {
+      background: $button-warning-disabled;
+      border-color: $button-warning-disabled;
+    }
+
+    &.nut-button--outline,
+    &.nut-button--dashed {
       color: $button-warning-border-color;
       border-color: $button-warning-border-color;
       background: transparent;
+
+      &.nut-button--disabled {
+        color: $button-warning-disabled;
+        border-color: $button-warning-disabled;
+      }
     }
 
     &.nut-button--none {
@@ -165,51 +268,49 @@
     }
   }
 
-  &--large {
+  &--block {
+    display: block;
     width: 100%;
-    height: $button-large-height;
-    line-height: $button-large-line-height;
+  }
+
+  &--solid {
+    color: $button-primary-color;
+    background: $button-primary-background-color;
+    background-origin: border-box;
+    border: $button-border-width solid transparent;
 
-    .text {
-      margin-left: $button-text-icon-large-margin-left;
+    &.nut-button--disabled {
+      color: #ffffff;
+      background: $button-default-disabled;
     }
   }
 
-  &--normal {
-    padding: $button-default-padding;
-    font-size: $button-default-font-size;
+  &.nut-button--outline,
+  &.nut-button--dashed {
+    background: transparent;
+    border-width: 1px;
   }
 
-  &--small {
-    height: $button-small-height;
-    line-height: $button-small-line-height;
-    padding: $button-small-padding;
-    font-size: $button-small-font-size;
-
-    .text {
-      margin-left: $button-text-icon-small-margin-left;
-    }
+  &.nut-button--outline {
+    border-style: solid;
   }
 
-  &--mini {
-    height: $button-mini-height;
-    line-height: $button-mini-line-height;
-    padding: $button-mini-padding;
-    font-size: $button-mini-font-size;
-
-    .text {
-      margin-left: $button-text-icon-mini-margin-left;
-    }
+  &.nut-button--dashed {
+    border-style: dashed;
   }
 
-  &--block {
-    display: block;
-    width: 100%;
+  &.nut-button--none {
+    background: transparent;
+    border-color: transparent;
+    background: transparent;
   }
 
   &--disabled {
     cursor: not-allowed;
-    opacity: $button-disabled-opacity;
+    font-weight: 400;
+    color: #ffffff;
+    background: $button-default-disabled;
+    border-color: $button-default-disabled;
   }
 
   &--loading {
@@ -222,6 +323,6 @@
   }
 
   &--square {
-    border-radius: 0;
+    border-radius: $button-square-border-radius;
   }
 }