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

package/dist/packages/navbar/navbar.scss

@@ -5,7 +5,6 @@
   align-items: center;
   height: $navbar-height;
   box-sizing: border-box;
-  padding: $navbar-padding;
   background: $navbar-background;
   box-shadow: $navbar-box-shadow;
   font-size: $navbar-font-size;
@@ -13,24 +12,24 @@
   margin-bottom: $navbar-margin-bottom;
   overflow: hidden;
 
-  &--fixed {
+  &-fixed {
     position: fixed;
     top: 0;
     left: 0;
     width: 100%;
   }
 
-  &--placeholder {
+  &-placeholder {
     display: inline-block;
     width: 100%;
   }
 
-  &--safe-area-inset-top {
+  &-safe-area-inset-top {
     padding-top: constant(safe-area-inset-top);
     padding-top: env(safe-area-inset-top);
   }
 
-  &__title {
+  &-title {
     min-width: 53%;
     margin: 0 auto;
     text-align: center;
@@ -41,11 +40,11 @@
     font-weight: $navbar-title-font-weight;
     color: $navbar-title-font-color;
 
-    .nut-tabs__titles {
-      background: $white;
+    .nut-tabs-titles {
+      background: transparent;
 
-      &-item__text {
-        color: $title-color;
+      &-item-text {
+        color: $color-title;
       }
     }
 
@@ -54,24 +53,31 @@
     }
   }
 
-  &__title ::-webkit-scrollbar {
+  &-title ::-webkit-scrollbar {
     display: none;
   }
 
-  &__left,
-  &__right {
+  &-left,
+  &-right {
     position: absolute;
     top: 0;
     bottom: 0;
     display: flex;
     align-items: center;
     cursor: pointer;
-    padding: 0 16px;
+    padding: 0 14px;
+
+    .nut-icon,
+    .nutui-iconfont {
+      width: 20px;
+      height: 20px;
+      font-size: 20px;
+    }
   }
 
-  &__left {
+  &-left {
     left: 0;
-    &__back {
+    &-back {
       display: flex;
       align-items: center;
       justify-content: center;
@@ -79,7 +85,37 @@
     }
   }
 
-  &__right {
+  &-right {
     right: 0;
+    .nut-icon {
+      margin-left: 12px;
+      &:first-child {
+        margin-left: 0;
+      }
+    }
+  }
+
+  &-title-align-left {
+    padding: 0 14px;
+
+    .nut-navbar-left {
+      position: static;
+      padding: 0;
+      .nut-icon {
+        margin-left: 12px;
+        &:first-child {
+          margin-left: 0;
+        }
+      }
+    }
+    .nut-navbar-left-back {
+      margin-right: 0;
+    }
+    .nut-navbar-title {
+      margin: 0;
+      flex: 1;
+      justify-content: flex-start;
+      padding: 0 8px;
+    }
   }
 }

package/dist/packages/noticebar/noticebar.scss

@@ -1,24 +1,25 @@
 .nut-noticebar {
   width: 100%;
 
-  .nut-noticebar-page {
+  .nut-noticebar-box {
+    position: relative;
     display: flex;
-    padding: $noticebar-box-padding;
+    align-items: center;
     height: $noticebar-height;
+    padding: $noticebar-box-padding;
     font-size: $noticebar-font-size;
-    position: relative;
-    align-items: center;
     background: $noticebar-background;
     color: $noticebar-color;
+    border-radius: $noticebar-border-radius;
 
-    &.wrapable {
+    &-wrapable {
       height: auto;
       padding: $noticebar-wrap-padding;
 
-      .wrap {
+      .nut-noticebar-box-wrap {
         height: auto;
 
-        .content {
+        .nut-noticebar-box-wrap-content {
           position: relative;
           white-space: normal;
           word-wrap: break-word;
@@ -26,45 +27,40 @@
       }
     }
 
-    .withicon {
-      position: relative;
-      padding-right: 40px;
-    }
-
-    .left-icon {
+    &-left-icon {
       display: flex;
       height: $noticebar-left-icon-width;
       min-width: $noticebar-left-icon-width;
-      margin: $noticebar-lefticon-margin;
+      margin-right: $noticebar-icon-gap;
       background-size: 100% 100%;
     }
 
-    .right-icon {
+    &-right-icon {
       display: flex;
       align-items: center;
       justify-content: center;
       width: $noticebar-right-icon-width;
-      margin: $noticebar-righticon-margin;
+      margin-left: $noticebar-icon-gap;
     }
 
-    .wrap {
+    &-wrap {
       display: flex;
       flex: 1;
       height: $noticebar-line-height;
       line-height: $noticebar-line-height;
       overflow: hidden;
       position: relative;
-    }
 
-    .content {
-      position: absolute;
-      white-space: nowrap;
-
-      &.nut-ellipsis {
-        max-width: 100%;
+      .nut-noticebar-box-wrap-content {
+        position: absolute;
         white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
+
+        &.nut-ellipsis {
+          max-width: 100%;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
       }
     }
 
@@ -81,24 +77,6 @@
     }
   }
 
-  @keyframes nut-notice-bar-play {
-    to {
-      transform: translate3d(-100%, 0, 0);
-    }
-  }
-
-  @keyframes nut-notice-bar-play-infinite {
-    to {
-      transform: translate3d(-100%, 0, 0);
-    }
-  }
-
-  @keyframes nut-notice-bar-play-vertical {
-    to {
-      transform: translateY($noticebar-height);
-    }
-  }
-
   .nut-noticebar-vertical {
     position: relative;
     display: flex;
@@ -110,22 +88,22 @@
     background: $noticebar-background;
     color: $noticebar-color;
 
-    .left-icon {
+    .nut-noticebar-box-left-icon {
       height: $noticebar-left-icon-width;
       min-width: $noticebar-left-icon-width;
-      margin: $noticebar-lefticon-margin;
+      margin: $noticebar-icon-gap;
       background-size: 100% 100%;
       display: flex;
       align-self: center;
     }
 
-    .horseLamp_list {
+    .nut-noticebar-box-horseLamp-list {
       margin: 0;
       padding: 0;
       display: block;
       flex: 1;
 
-      .horseLamp_list_item {
+      &-item {
         display: flex;
         align-items: center;
         height: $noticebar-height;
@@ -133,7 +111,7 @@
       }
     }
 
-    .nut-noticebar__inner {
+    .nut-noticebar-box-wrap {
       display: flex;
       height: 100%;
       width: 100%;
@@ -142,12 +120,30 @@
       flex-direction: column;
     }
 
-    .go {
+    .nut-noticebar-box-right-icon {
       align-self: center;
       display: flex;
       justify-content: center;
       width: $noticebar-right-icon-width;
-      margin: $noticebar-righticon-margin;
+      margin-left: $noticebar-icon-gap;
+    }
+  }
+
+  @keyframes nut-notice-bar-play {
+    to {
+      transform: translate3d(-100%, 0, 0);
+    }
+  }
+
+  @keyframes nut-notice-bar-play-infinite {
+    to {
+      transform: translate3d(-100%, 0, 0);
+    }
+  }
+
+  @keyframes nut-notice-bar-play-vertical {
+    to {
+      transform: translateY($noticebar-height);
     }
   }
 }

package/dist/packages/notify/notify.scss

@@ -42,18 +42,19 @@
 }
 
 .nut-notify {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   box-sizing: border-box;
   padding: $notify-padding;
   color: $notify-text-color;
   font-size: $notify-font-size;
   white-space: pre-wrap;
-  text-align: center;
   word-wrap: break-word;
   height: $notify-height;
-  line-height: $notify-line-height;
-  &--popup-top {
+  &-popup-top,
+  &-popup-bottom {
     position: fixed;
-    top: 0;
     left: 0;
     width: 100%;
     overflow-y: auto;
@@ -61,33 +62,31 @@
     z-index: 9999;
   }
 
-  &--popup-bottom {
-    position: fixed;
+  &-popup-top {
+    top: 0;
+  }
+
+  &-popup-bottom {
     bottom: 0;
-    left: 0;
-    width: 100%;
-    overflow-y: auto;
-    transition: transform 0.3s;
-    z-index: 9999;
   }
 
-  &--base {
+  &-base {
     background: $notify-base-background-color;
   }
 
-  &--primary {
+  &-primary {
     background: $notify-primary-background-color;
   }
 
-  &--success {
+  &-success {
     background: $notify-success-background-color;
   }
 
-  &--danger {
+  &-danger {
     background: $notify-danger-background-color;
   }
 
-  &--warning {
+  &-warning {
     background: $notify-warning-background-color;
   }
 }

package/dist/packages/numberkeyboard/numberkeyboard.scss

@@ -1,28 +1,26 @@
 
 .nut-numberkeyboard {
-  width: $numberkeyboard-width;
+  width: 100%;
   padding: $numberkeyboard-padding;
-  background-color: $numberkeyboard-background-color;
   user-select: none;
-  background-color: $gray4;
+  background-color: $numberkeyboard-background-color;
 
-  &__header {
+  &-header {
     position: relative;
     display: flex;
     align-items: center;
     justify-content: center;
     box-sizing: content-box;
-    height: $numberkeyboard-header-height;
-    padding: $numberkeyboard-header-padding;
-    color: $numberkeyboard-header-color;
-    font-size: $numberkeyboard-header-font-size;
+    padding: $popup-title-padding;
+    color: $color-title;
+    font-size: $popup-title-font-size;
 
-    &__title {
-      color: $title-color;
+    &-title {
+      color: $color-title;
       display: inline-block;
     }
 
-    &__close {
+    &-close {
       position: absolute;
       display: block;
       right: 0;
@@ -35,23 +33,23 @@
     }
   }
 
-  &__body {
+  &-body {
     display: flex;
     padding: 6px 0 0 6px;
 
-    &__keys {
+    &-keys {
       display: flex;
       flex: 3;
       flex-wrap: wrap;
     }
 
-    &__wrapper {
+    &-wrapper {
       position: relative;
       flex: 1;
       flex-basis: 33%;
       box-sizing: border-box;
       padding: 0 6px 6px 0;
-      background-color: $gray5;
+      background-color: $numberkeyboard-wrapper-background-color;
 
       .key {
         display: flex;
@@ -61,9 +59,12 @@
         font-size: $numberkeyboard-key-font-size;
         line-height: $numberkeyboard-key-line-height;
         background-color: $numberkeyboard-key-background-color;
-        color: $numberkeyboard-key-font-color;
+        color: $numberkeyboard-key-color;
         border-radius: $numberkeyboard-key-border-radius;
+        border: $numberkeyboard-key-border;
+        font-weight: $font-weight-bold;
         cursor: pointer;
+
         &.active {
           background-color: $numberkeyboard-key-active-background-color;
         }
@@ -71,12 +72,12 @@
     }
   }
 
-  &__sidebar {
+  &-sidebar {
     display: flex;
     flex: 1;
     flex-direction: column;
 
-    .nut-numberkeyboard__body__wrapper {
+    .nut-numberkeyboard-body-wrapper {
       .key {
         position: absolute;
         top: 0;
@@ -88,8 +89,9 @@
 
       .confirm {
         font-size: $numberkeyboard-key-confirm-font-size;
-        color: $numberkeyboard-key-confirm-font-color;
+        color: $numberkeyboard-key-confirm-color;
         background-color: $numberkeyboard-key-confirm-background-color;
+
         &.active {
           background-color: rgba(255, 0, 0, 0.7);
         }

package/dist/packages/pagination/pagination.scss

@@ -3,20 +3,20 @@
   font-size: $pagination-font-size;
   color: $pagination-color;
 
-  &__contain {
+  &-contain {
     display: flex;
   }
 
-  &__simple {
+  &-simple {
     height: 39px;
     width: 124px;
     line-height: 39px;
     text-align: center;
   }
 
-  &__prev,
-  &__item,
-  &__next {
+  &-prev,
+  &-item,
+  &-next {
     height: 39px;
     min-width: 39px;
     flex-shrink: 0;
@@ -30,13 +30,13 @@
     cursor: pointer;
   }
 
-  &__prev,
-  &__item {
+  &-prev,
+  &-item {
     border-right: none;
   }
 
-  &__prev,
-  &__next {
+  &-prev,
+  &-next {
     padding: $pagination-prev-next-padding;
   }
 
@@ -56,4 +56,27 @@
     background-color: $pagination-disable-background-color;
     cursor: not-allowed;
   }
+
+  &-lite {
+    width: $pagination-lite-width;
+    height: $pagination-lite-height;
+    display: flex;
+    font-size: $font-size-xs;
+    color: $color-primary-text;
+    background-color: $pagination-lite-background-color;
+    border-radius: $pagination-lite-radius;
+    &-active,
+    &-default {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: $pagination-lite-height;
+      height: $pagination-lite-height;
+    }
+    &-active {
+      border-radius: $pagination-lite-radius;
+      font-size: $font-size-small;
+      background-color: $pagination-lite-active-background-color;
+    }
+  }
 }

package/dist/packages/picker/picker.scss

@@ -1,39 +1,39 @@
 
 .nut-picker {
-  background-color: $background-color3;
+  background-color: $color-background-overlay;
   width: 100%;
 
-  &__control {
+  &-control {
     display: flex;
-    height: 56px;
-    font-size: 16px;
+    height: $popup-title-height;
+    font-size: $popup-title-font-size;
     align-items: center;
     justify-content: space-between;
-    padding: $picker-bar-button-padding;
+    padding: $popup-title-padding;
   }
 
-  &__cancel-btn {
-    color: $picker-bar-cancel-color;
-    font-size: $picker-bar-cancel-font-size;
+  &-cancel-btn {
+    color: $picker-title-cancel-color;
+    font-size: $picker-title-cancel-font-size;
   }
 
-  &__confirm-btn {
-    color: $picker-bar-ok-color;
-    font-size: $picker-bar-ok-font-size;
+  &-confirm-btn {
+    color: $picker-title-ok-color;
+    font-size: $picker-title-ok-font-size;
   }
 
-  &__title {
+  &-title {
     flex: 1;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     text-align: center;
-    color: $picker-bar-title-color;
-    font-size: $picker-bar-title-font-size;
-    font-weight: $picker-bar-title-font-weight;
+    color: $color-title;
+    font-size: $popup-title-font-size;
+    font-weight: $popup-title-font-weight;
   }
 
-  &__panel {
+  &-panel {
     display: flex;
     position: relative;
   }
@@ -81,7 +81,7 @@
     left: 0;
     right: 0;
     bottom: 0;
-    background-image: $picker-mask-bg-img;
+    background-image: $picker-mask-background;
     background-position: top, bottom;
     background-size: 100% 108px;
     background-repeat: no-repeat;
@@ -144,8 +144,8 @@
     height: $picker-item-height;
     line-height: $picker-item-height;
     text-align: center;
-    color: $picker-item-text-color;
-    font-size: $picker-bar-title-font-size;
+    color: $color-title;
+    font-size: $font-size-base;
   }
 
   &-roller-item-hidden {