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

package/dist/packages/formitem/formitem.scss

@@ -11,7 +11,7 @@
     }
   }
 
-  &__label {
+  &-label {
     font-size: $form-item-label-font-size;
     font-weight: normal;
     width: $form-item-label-width;
@@ -30,12 +30,12 @@
     }
   }
 
-  &__body {
+  &-body {
     flex: 1;
     display: flex !important;
     flex-direction: column;
 
-    &__slots {
+    &-slots {
       text-align: $form-item-body-slots-text-align;
 
       .nut-input {
@@ -46,7 +46,7 @@
       .nut-input-text {
         font-size: $form-item-body-font-size;
         text-align: $form-item-body-input-text-align;
-        color: $black;
+        color: $color-title;
         width: 100%;
         outline: 0 none;
         border: 0;
@@ -61,14 +61,14 @@
       .nut-textarea {
         padding: 0 !important;
 
-        .nut-textarea__textarea {
+        .nut-textarea-textarea {
           font: inherit;
           text-align: $form-item-body-input-text-align;
         }
       }
     }
 
-    &__tips {
+    &-tips {
       text-align: $form-item-tip-text-align;
       font-size: $form-item-tip-font-size;
       color: $form-item-error-message-color;

package/dist/packages/grid/grid.scss

@@ -4,7 +4,7 @@
   flex-wrap: wrap;
   border: 0 solid $grid-border-color;
 
-  &__border {
+  &-border {
     border-top-width: 1px;
     border-left-width: 1px;
   }

package/dist/packages/griditem/griditem.scss

@@ -5,7 +5,7 @@
 
   $block: &;
 
-  &__text {
+  &-text {
     color: $grid-item-text-color;
     font-size: $grid-item-text-font-size;
     line-height: 1.5;
@@ -13,7 +13,7 @@
     margin: $grid-item-text-margin 0 0 0;
   }
 
-  &__content {
+  &-content {
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
@@ -22,52 +22,53 @@
     background: $grid-item-content-bg-color;
     border: 0 solid $grid-border-color;
 
-    &--border {
+    &-border {
       border-right-width: 1px;
       border-bottom-width: 1px;
     }
 
-    &--surround {
+    &-surround {
       border-top-width: 1px;
       border-left-width: 1px;
     }
 
-    &--center {
+    &-center {
       align-items: center;
       justify-content: center;
     }
 
-    &--square {
+    &-square {
       position: absolute;
       top: 0;
       right: 0;
       left: 0;
     }
 
-    &--reverse {
+    &-reverse {
       flex-direction: column-reverse;
 
-      #{$block}__text {
+      #{$block}-text {
         margin: 0 0 $grid-item-text-margin;
       }
     }
 
-    &--horizontal {
+    &-horizontal {
       flex-direction: row;
 
-      #{$block}__text {
+      #{$block}-text {
         margin: 0 0 0 $grid-item-text-margin;
       }
     }
 
-    &--horizontal#{&}--reverse {
+    &-horizontal#{&}-reverse {
       flex-direction: row-reverse;
-      #{$block}__text {
+
+      #{$block}-text {
         margin: 0 $grid-item-text-margin 0 0;
       }
     }
 
-    &--clickable {
+    &-clickable {
       cursor: pointer;
 
       &::before {
@@ -76,9 +77,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;

package/dist/packages/image/image.scss

@@ -1,6 +1,7 @@
 .nut-image {
   display: block;
   position: relative;
+
   .nut-img {
     display: block;
     width: 100%;
@@ -22,9 +23,10 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    background: #f7f8fa;
+    background: $color-background;
     background-size: 100% 100%;
   }
+
   .nut-img-error {
     width: 100%;
     height: 100%;
@@ -35,7 +37,7 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    background: #f7f8fa;
+    background: $color-background;
     background-size: 100% 100%;
   }
 }

package/dist/packages/imagepreview/imagepreview.scss

@@ -17,7 +17,7 @@
     left: 0;
     right: 0;
     background: transparent;
-    color: #fff;
+    color: $white;
 
     .arrow {
       position: absolute;
@@ -26,16 +26,6 @@
     }
   }
 
-  .popup-bg {
-    background: rgba(0, 0, 0, 0.9);
-  }
-
-  .popup-box {
-    height: 100%;
-    overflow: visible;
-    background-color: transparent;
-  }
-
   &-pop {
     height: 100%;
     background: transparent !important;

package/dist/packages/indicator/indicator.scss

@@ -4,7 +4,13 @@
   flex-wrap: nowrap;
   align-items: center;
 
-  &__dot {
+  &-dot {
+    display: inline-block;
+    vertical-align: middle;
+    width: $indicator-dot-size;
+    height: $indicator-dot-size;
+    border-radius: 50%;
+    background-color: $indicator-dot-color;
     margin: 0 $indicator-dot-margin;
 
     &:first-child {
@@ -16,29 +22,20 @@
     }
   }
 
-  &__dot {
-    display: inline-block;
-    vertical-align: middle;
-    width: $indicator-dot-size;
-    height: $indicator-dot-size;
-    border-radius: 50%;
-    background-color: $indicator-dot-color;
-  }
-
-  &__active {
+  &-active {
     width: $indicator-dot-active-size;
-    border-radius: $indicator-border-size;
-    background-color: $indicator-color;
+    border-radius: $indicator-border-radius;
+    background: $indicator-color;
   }
 
-  &__vertical {
+  &-vertical {
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
 
-    .nut-indicator__dot {
-      margin: $indicator-dot-vertical-margin 0;
+    .nut-indicator-dot {
+      margin: $indicator-dot-margin 0;
 
       &:first-child {
         margin-top: 0px;
@@ -49,7 +46,7 @@
       }
     }
 
-    .nut-indicator__active {
+    .nut-indicator-active {
       width: $indicator-dot-size;
       height: $indicator-dot-active-size;
     }

package/dist/packages/infiniteloading/infiniteloading.scss

@@ -1,26 +1,33 @@
 .nut-infiniteloading {
   display: block;
   width: 100%;
+
   .nut-infinite-top {
     display: flex;
     align-items: center;
     justify-content: center;
     width: 100%;
     overflow: hidden;
+    font-size: $font-size-small;
+    color: $infiniteloading-color;
+
     .top-box {
       width: 100%;
       display: flex;
       flex-direction: column;
       align-items: center;
       justify-content: center;
-      color: $text-color;
-    }
-  }
-  .nut-infinite-container {
-    .infiniteLi {
-      color: $title-color;
+      &-icons {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: $pulltorefresh-icon-width;
+        height: $pulltorefresh-icon-height;
+        margin-bottom: 4px;
+      }
     }
   }
+
   .nut-infinite-bottom {
     display: flex;
     align-items: center;
@@ -28,11 +35,19 @@
     width: 100%;
     padding-top: 6px;
     font-size: $font-size-small;
-    color: $infiniteloading-bottom-color;
+    color: $infiniteloading-color;
     text-align: center;
 
     .bottom-box {
-      color: $text-color;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &-icons {
+        width: $infiniteloading-icon-size;
+        height: $infiniteloading-icon-size;
+        margin-right: 8px;
+      }
     }
   }
 }

package/dist/packages/input/input.scss

@@ -6,9 +6,10 @@
   width: 100%;
   padding: $input-padding;
   line-height: 24px;
-  background: $white;
   font-size: $input-font-size;
   box-sizing: border-box;
+  border-radius: $input-border-radius;
+  background-color: $input-background-color;
   border-bottom: $input-border-bottom-width solid $input-border-bottom;
 
   .nut-icon {
@@ -17,7 +18,7 @@
 
   .nut-input-native {
     width: 100%;
-    color: $gray1;
+    color: $input-color;
     flex: 1;
     background-color: transparent;
     padding: 0;
@@ -25,6 +26,7 @@
     outline: 0 none;
     font: inherit;
     text-decoration: none;
+    background-color: transparent;
   }
 
   &-disabled {

package/dist/packages/inputnumber/inputnumber.scss

@@ -1,5 +1,5 @@
 .nut-inputnumber {
-  display: $inputnumber-display;
+  display: flex;
   align-items: center;
 
   .nut-input-minus,
@@ -13,35 +13,38 @@
     border-radius: $inputnumber-button-border-radius;
   }
 
-  &--disabled {
+  &-disabled {
     input {
-      color: $inputnumber-icon-void-color !important;
+      color: $inputnumber-disabled-color !important;
     }
   }
 
-  &__icon {
+  &-icon {
     color: $inputnumber-icon-color;
     font-size: $inputnumber-icon-size;
     cursor: pointer;
 
-    &--disabled {
-      color: $inputnumber-icon-disabled-color;
+    &-disabled {
+      color: $inputnumber-disabled-color;
       cursor: not-allowed;
     }
   }
 
   input,
   .nut-number-input,
-  &__text--readonly {
+  &-text-readonly {
+    display: flex;
+    justify-content: center;
+    align-items: center;
     width: $inputnumber-input-width;
     height: $inputnumber-input-height;
     text-align: center;
     outline: none;
     border: $inputnumber-input-border;
+    border-radius: $inputnumber-input-border-radius;
     margin: $inputnumber-input-margin;
     color: $inputnumber-input-font-color;
     background-color: $inputnumber-input-background-color;
-    border-radius: $inputnumber-input-border-radius;
   }
 
   input::-webkit-outer-spin-button,
@@ -50,16 +53,16 @@
   .nut-number-input::-webkit-inner-spin-button {
     appearance: none;
   }
-}
 
-.nut-icon-Minus,
-.nut-icon-minus {
-  --nut-icon-width: 20px;
-  --nut-icon-height: 20px;
-}
+  .nut-icon-Minus,
+  .nut-icon-minus {
+    --nut-icon-width: 16px;
+    --nut-icon-height: 16px;
+  }
 
-.nut-icon-Plus,
-.nut-icon-plus {
-  --nut-icon-width: 20px;
-  --nut-icon-height: 20px;
+  .nut-icon-Plus,
+  .nut-icon-plus {
+    --nut-icon-width: 16px;
+    --nut-icon-height: 16px;
+  }
 }

package/dist/packages/loading/loading.scss

@@ -19,9 +19,9 @@
     }
   }
   .nut-loading-text {
-    padding: 4px;
-    color: $loading-text-color;
-    font-size: $loading-text-size;
+    padding: 8px;
+    color: $loading-color;
+    font-size: $loading-font-size;
   }
 }
 @keyframes nut-loading-rotation {

package/dist/packages/menu/menu.scss

@@ -1,6 +1,7 @@
 @import '../../styles/mixins/text-ellipsis.scss';
 
 .nut-menu {
+  position: relative;
   &.scroll-fixed {
     position: fixed;
     top: $menu-scroll-fixed-top;
@@ -9,56 +10,47 @@
   }
 }
 
-.nut-menu-relative {
-  position: relative;
-}
-
-.nut-menu__bar {
+.nut-menu-bar {
   position: relative;
   display: flex;
   line-height: $menu-bar-line-height;
-  background-color: $white;
+  background-color: $color-background-overlay;
   box-shadow: $menu-bar-box-shadow;
 
   &.opened {
     z-index: $menu-bar-opened-z-index;
   }
 }
-
-.nut-menu__item {
+.nut-menu-title {
   flex: 1;
   text-align: center;
-  font-size: $menu-item-font-size;
-  color: $menu-item-text-color;
+  font-size: $menu-title-font-size;
+  color: $menu-title-color;
   min-width: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  max-width: 100%;
+
+  &-text {
+    @include text-ellipsis;
+    display: block;
+    padding: $menu-title-padding;
+  }
+
+  &-icon {
+    transition: all 0.2s linear;
+  }
 
   &.active {
-    color: $menu-item-active-text-color;
+    color: $menu-item-active-color;
   }
 
   &.disabled {
     color: $menu-item-disabled-color;
   }
-}
-
-.nut-menu__title-icon {
-  transition: all 0.2s linear;
-}
 
-.nut-menu__title {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  max-width: 100%;
-
-  &.active .nut-menu__title-icon {
+  &.active .nut-menu-title-icon {
     transform: rotate(180deg);
   }
 }
-
-.nut-menu__title-text {
-  @include text-ellipsis;
-  display: block;
-  padding-left: $menu-title-text-padding-left;
-  padding-right: $menu-title-text-padding-right;
-}

package/dist/packages/menuitem/menuitem.scss

@@ -1,64 +1,58 @@
 
-.nut-menu-item__content {
-  padding: $menu-item-content-padding;
-  max-height: $menu-item-content-max-height;
-  overflow-y: auto;
-  display: flex;
-  flex-wrap: wrap;
-  background: $menu-item-content-bg-color;
-
-  &_fixed {
-    width: 100%;
-    opacity: 0;
-    position: fixed;
-  }
-}
-
-.nut-menu-item__option {
-  color: $title-color;
-  font-size: $font-size-base;
-  padding-top: $menu-item-option-padding-top;
-  padding-bottom: $menu-item-option-padding-bottom;
-  display: flex;
-  align-items: center;
-
-  &.active {
-    font-weight: 500;
-    color: $menu-item-active-text-color;
+.nut-menu-container {
+  &-content {
+    padding: $menu-content-padding;
+    max-height: $menu-content-max-height;
+    overflow-y: auto;
+    display: flex;
+    flex-wrap: wrap;
+    background: $menu-content-background-color;
+
+    &_fixed {
+      width: 100%;
+      opacity: 0;
+      position: fixed;
+    }
   }
-
-  i {
-    margin-right: $menu-item-option-i-margin-right;
-    display: inline-flex;
+  &-item {
+    display: flex;
     align-items: center;
+    color: $color-title;
+    font-size: $font-size-base;
+    padding: $menu-item-padding;
+
+    &.active {
+      font-weight: $menu-item-active-font-weight;
+      color: $menu-item-active-color;
+    }
+
+    i {
+      display: inline-flex;
+      align-items: center;
+      margin-right: $menu-item-icon-margin;
+    }
+  }
+  &-wrap,
+  &-wrap-up {
+    position: absolute;
+    width: 100%;
+    z-index: $menu-container-z-index;
+    overflow: hidden;
   }
-}
-
-.nut-menu-item__wrap,
-.nut-menu-item__wrap-up {
-  position: absolute;
-  width: 100%;
-  z-index: $menu-item-z-index;
-  overflow: hidden;
-}
 
-.nut-menu-item__wrap-up {
-  bottom: $menu-bar-line-height;
+  &-wrap-up {
+    bottom: $menu-bar-line-height;
+  }
 }
 
-.overlay-fade-enter-active.nut-menu__overlay {
+.overlay-fade-enter-active.nut-menu-container-overlay {
   top: auto;
-  z-index: $menu-item-z-index;
-}
-
-.nut-menu__pop.nut-popup {
-  transition: all 0s ease 0s;
-  transform: none;
+  z-index: $menu-container-z-index;
 }
 
-.placeholder-element {
+.nut-menu-placeholder-element {
   position: fixed;
-  top: $menu-placeholder-top;
+  top: -$menu-bar-line-height;
   left: 0;
   right: 0;
   z-index: $menu-bar-opened-z-index;
@@ -69,44 +63,44 @@
   }
 }
 
-.menu-item-enter {
+.nut-menu-container-down-enter {
   opacity: 0;
   transform: translate(0, -30px);
 }
 
-.menu-item-enter-done {
+.nut-menu-container-down-enter-done {
   opacity: 1;
   transform: translate(0, 0);
   transition: all 100ms;
 }
 
-.menu-item-exit {
+.nut-menu-container-down-exit {
   opacity: 1;
   transition: all 100ms;
 }
 
-.menu-item-exit-done {
+.nut-menu-container-down-exit-done {
   opacity: 0;
   transition: all 100ms;
 }
 
-.menu-item-up-enter {
+.nut-menu-container-up-enter {
   opacity: 0;
   transform: translate(0, 30px);
 }
 
-.menu-item-up-enter-done {
+.nut-menu-container-up-enter-done {
   opacity: 1;
   transform: translate(0, 0);
   transition: all 100ms;
 }
 
-.menu-item-up-exit {
+.nut-menu-container-up-exit {
   opacity: 1;
   transition: all 100ms;
 }
 
-.menu-item-up-exit-done {
+.nut-menu-container-up-exit-done {
   opacity: 0;
   transition: all 100ms;
 }