@nutui/nutui-react-taro 2.0.0-alpha.8 → 2.0.0-beta.1

package/dist/packages/popup/popup.scss

@@ -7,6 +7,25 @@
   color: $gray1;
   -webkit-overflow-scrolling: touch;
 
+  &-title {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: $gray6;
+    color: $gray1;
+    padding: $popup-title-padding;
+    font-weight: $font-weight-bold;
+    line-height: $popup-title-line-height;
+    font-size: $popup-title-font-size;
+    border-bottom: $popup-title-border-bottom;
+  }
+
+  &-left-icon {
+    position: absolute;
+    top: $popup-close-icon-margin;
+    left: $popup-close-icon-margin;
+  }
+
   &__close-icon {
     position: absolute !important;
     z-index: 1;
@@ -93,90 +112,181 @@
 }
 
 .nut-popup-slide {
-  &-center-enter,
-  &-center-exit {
-    opacity: 0;
+  @keyframes popup-scale-fade-in {
+    from {
+      opacity: 0;
+      transform: scale(0.8);
+    }
+
+    to {
+      opacity: 1;
+      transform: scale(1);
+    }
+  }
+
+  @keyframes popup-scale-fade-out {
+    from {
+      opacity: 1;
+      transform: scale(1);
+    }
+
+    to {
+      opacity: 0;
+      transform: scale(0.8);
+    }
+  }
+
+  &-default-enter-active {
+    animation-fill-mode: both;
+    animation-name: popup-scale-fade-in;
+    animation-duration: 0.3s;
+  }
+
+  &-default-exit-active {
+    animation-fill-mode: both;
+    animation-name: popup-scale-fade-out;
+    animation-duration: 0.3s;
+  }
+
+  @keyframes popup-fade-in {
+    from {
+      opacity: 0;
+    }
+
+    to {
+      opacity: 1;
+    }
+  }
+
+  @keyframes popup-fade-out {
+    from {
+      opacity: 1;
+    }
+
+    to {
+      opacity: 0;
+    }
   }
 
   &-center-enter-active {
-    opacity: 1;
-    transition: opacity 0.5s ease;
+    animation-fill-mode: both;
+    animation-name: popup-fade-in;
+    animation-duration: 0.3s;
   }
 
-  &-top-enter {
-    transform: translate(0, -100%);
+  &-center-exit-active {
+    animation-fill-mode: both;
+    animation-name: popup-fade-out;
+    animation-duration: 0.3s;
   }
 
-  &-top-enter-active {
-    transform: translate(0, 0);
-    transition: transform 0.5s;
+  /* 从顶部滑出 */
+  @keyframes popup-slide-top-enter {
+    from {
+      transform: translate3d(0, -100%, 0);
+    }
   }
 
-  &-top-exit {
-    transform: translate(0, 0);
+  @keyframes popup-slide-top-exit {
+    to {
+      transform: translate3d(0, -100%, 0);
+    }
   }
 
-  &-top-exit-active,
-  &-top-exit-done {
-    transform: translate(0, -100%);
-    transition: transform 0.5s;
+  &-top-enter-active,
+  &-top-appear-active {
+    transform: translate3d(0, 0%, 0);
+    animation-fill-mode: both;
+    animation-name: popup-slide-top-enter;
+    animation-duration: 0.3s;
   }
 
-  &-right-enter {
-    transform: translate(100%, 0);
+  &-top-exit-active {
+    animation-fill-mode: both;
+    animation-name: popup-slide-top-exit;
+    animation-duration: 0.3s;
   }
 
-  &-right-enter-active {
-    transform: translate(0, 0);
-    transition: transform 0.5s;
+  /* 从右侧滑出 */
+  @keyframes popup-slide-right-enter {
+    from {
+      transform: translate3d(100%, 0, 0);
+    }
   }
 
-  &-right-exit {
-    transform: translate(0, 0);
+  @keyframes popup-slide-right-exit {
+    to {
+      transform: translate3d(100%, 0, 0);
+    }
   }
 
-  &-right-exit-active,
-  &-right-exit-done {
-    transform: translate(100%, 0);
-    transition: transform 0.5s;
+  &-right-enter-active,
+  &-right-appear-active {
+    transform: translate3d(0, 0, 0);
+    animation-fill-mode: both;
+    animation-name: popup-slide-right-enter;
+    animation-duration: 0.3s;
   }
 
-  &-bottom-enter {
-    transform: translate(0, 100%);
+  &-right-exit {
+    animation-fill-mode: both;
+    animation-name: popup-slide-right-exit;
+    animation-duration: 0.3s;
   }
 
-  &-bottom-enter-active {
-    transform: translate(0, 0);
-    transition: transform 0.5s;
+  /* 从底部滑出 */
+  @keyframes popup-slide-bottom-enter {
+    from {
+      transform: translate3d(0, 100%, 0);
+    }
   }
 
-  &-bottom-exit {
+  @keyframes slide-bottom-exit {
+    to {
+      transform: translate3d(0, 100%, 0);
+    }
+  }
+
+  &-bottom-enter-active,
+  &-bottom-appear-active {
     transform: translate(0, 0);
+    animation-fill-mode: both;
+    animation-name: popup-slide-bottom-enter;
+    animation-duration: 0.3s;
   }
 
-  &-bottom-exit-active,
-  &-bottom-exit-done {
-    transform: translate(0, 100%);
-    transition: transform 0.5s;
+  &-bottom-exit {
+    animation-fill-mode: both;
+    animation-name: slide-bottom-exit;
+    animation-duration: 0.3s;
   }
 
-  &-left-enter {
-    transform: translate(-100%, 0);
+  /* 从左侧滑出 */
+  @keyframes popup-slide-left-enter {
+    from {
+      transform: translate3d(-100%, 0, 0);
+    }
   }
 
-  &-left-enter-active {
-    transform: translate(0, 0);
-    transition: transform 0.5s;
+  @keyframes popup-slide-left-exit {
+    to {
+      transform: translate3d(-100%, 0, 0);
+    }
   }
 
-  &-left-exit {
+  &-left-enter-active,
+  &-left-appear-active {
     transform: translate(0, 0);
+    animation-fill-mode: both;
+    animation-name: popup-slide-left-enter;
+    animation-duration: 0.3s;
   }
 
   &-left-exit-active,
   &-left-exit-done {
-    transform: translate(-100%, 0);
-    transition: transform 0.5s;
+    animation-fill-mode: both;
+    animation-name: popup-slide-left-exit;
+    animation-duration: 0.3s;
   }
 }
 

package/dist/packages/price/price.scss

@@ -2,6 +2,13 @@
   font-size: $font-size-3;
   display: inline;
   color: $primary-color;
+  &--line {
+    div {
+      text-decoration: line-through;
+      font-size: $price-line-font-size !important;
+      color: $price-line-color !important;
+    }
+  }
   &__symbol,
   &__integer,
   &__decimal {
@@ -9,6 +16,7 @@
   }
   &__symbol {
     font-size: $price-symbol-medium-size;
+    padding-right: $price-symbol-padding-right;
     &-large {
       font-size: $price-symbol-big-size;
     }

package/dist/packages/pulltorefresh/pulltorefresh.scss

@@ -1,11 +1,3 @@
-.nut-theme-dark {
-  .nut-pulltorefresh {
-    &-head-content {
-      color: $dark1;
-    }
-  }
-}
-
 .nut-pulltorefresh {
   &-head {
     overflow: hidden;

package/dist/packages/radio/radio.scss

@@ -1,30 +1,4 @@
 
-.nut-theme-dark {
-  .nut-radio {
-    &__label {
-      color: $dark1;
-
-      &--disabled {
-        color: $dark2;
-      }
-    }
-
-    &__button {
-      background: $dark4;
-      color: $dark1;
-
-      &--active {
-        color: $primary-color;
-      }
-
-      &--disabled {
-        color: $dark2;
-        border: 1px solid $dark2;
-      }
-    }
-  }
-}
-
 .nut-radio {
   display: flex;
   align-items: center;
@@ -61,9 +35,14 @@
 
     &--disabled {
       color: $radio-label-disable-color;
-      border: none;
+      border: 1px solid $radio-button-background;
     }
   }
+  .nut-radio__button--active.nut-radio__button--disabled {
+    background: $radio-button-disabled-active-background;
+    color: $radio-button-disabled-active-color;
+    border: 1px solid $radio-button-disabled-active-border-color;
+  }
 
   &__label {
     margin-left: $radio-label-margin-left;
@@ -82,11 +61,13 @@
     font-size: $radio-icon-font-size;
   }
 
-  &__icon--unchecked {
-    color: $radio-icon-disable-color;
-  }
+  &__icon {
+    &--unchecked {
+      color: $radio-icon-disable-color;
+    }
 
-  &__icon--disable {
-    color: $radio-icon-disable-color2;
+    &--disable {
+      color: $radio-icon-disable-color2;
+    }
   }
 }

package/dist/packages/radiogroup/radiogroup.scss

@@ -1,51 +1,13 @@
-.nut-theme-dark {
-  .nut-radiogroup {
-    &--vertical {
-      .nut-radio {
-        &__label {
-          margin-right: 5px;
-        }
-
-        &__button {
-          background-color: $dark4;
-          border: 1px solid $dark6;
-        }
-
-        &__button--active {
-          border-color: $radio-label-button-border-color;
-        }
-      }
-    }
-
-    &--horizontal {
-      .nut-radio {
-        &__label {
-          margin-right: 5px;
-        }
-
-        &__button {
-          background-color: $dark4;
-          border: 1px solid $dark6;
-        }
-
-        &__button--active {
-          border-color: $radio-label-button-border-color;
-        }
-      }
-    }
-  }
-}
-
 .nut-radiogroup {
   .nut-radio {
-    margin-bottom: 5px;
+    margin: $radiogroup-radio-margin;
 
     &__label {
-      margin-right: 5px;
+      margin: $radiogroup-radio-label-margin;
     }
 
     &__button {
-      background-color: $gray4;
+      background-color: $radio-button-background;
     }
   }
 
@@ -56,12 +18,8 @@
         justify-content: space-between;
       }
 
-      &__label {
-        margin-right: 5px;
-      }
-
       &__button {
-        border: 1px solid $gray6;
+        border: 1px solid $radio-button-background;
       }
 
       &__button--active {
@@ -74,13 +32,21 @@
   &--horizontal {
     .nut-radio {
       display: inline-flex;
-      margin-right: 20px;
 
-      &--round {
-        .nut-radio__label {
-          margin: 0 6px;
-        }
+      &__button {
+        border: 1px solid $gray6;
+      }
+
+      &__button--active {
+        border-color: $radio-label-button-border-color;
+        background-color: $radio-label-button-background;
       }
     }
   }
+
+  .nut-radio__button--active.nut-radio__button--disabled {
+    background: $radio-button-disabled-active-background;
+    color: $radio-button-disabled-active-color;
+    border: 1px solid $radio-button-disabled-active-border-color;
+  }
 }

package/dist/packages/searchbar/searchbar.scss

@@ -1,46 +1,3 @@
-.nut-theme-dark {
-  .nut-searchbar {
-    background: $dark5;
-
-    &__label {
-      color: $dark1;
-    }
-
-    &__action-text {
-      color: $dark1;
-    }
-
-    .nut-searchbar__input-clear {
-      & .nut-searchbar__nut-icon-mask-close {
-        color: $dark1;
-
-        &:hover {
-          cursor: pointer;
-          color: $dark1;
-        }
-      }
-    }
-
-    &__right-search-icon,
-    &__left-search-icon {
-      color: $dark1;
-    }
-
-    &__leftout-icon,
-    &__rightout-icon {
-      i {
-        color: $dark1;
-      }
-    }
-  }
-}
-
-.val-text {
-  font-size: 12px;
-  color: $title-color2;
-  padding: 0 20px;
-}
-
 .nut-searchbar {
   display: flex;
   align-items: center;
@@ -49,6 +6,7 @@
   background: $searchbar-background;
   color: $gray1;
   box-sizing: border-box;
+  justify-content: center;
 
   &__content {
     position: relative;
@@ -65,11 +23,12 @@
     padding: 0 5px 0 10px;
   }
 
-  &__rightin-icon {
+  &__rightin {
+    display: flex;
     padding: 0 5px;
   }
 
-  .nut-searchbar__input-box {
+  &__input-box {
     display: flex;
     align-items: center;
     flex: 1;
@@ -89,6 +48,7 @@
     color: $searchbar-input-text-color;
     caret-color: $searchbar-input-curror-color;
     background: transparent;
+    text-align: $searchbar-input-text-align;
   }
 
   &__round {
@@ -112,34 +72,16 @@
   }
 
   &__left {
-    text-align: left;
+    display: flex;
+    padding: $searchbar-left-padding;
+    font-size: $searchbar-left-fontsize;
+    color: $searchbar-left-color;
   }
 
   &__right {
-    text-align: right;
-  }
-
-  &__center {
-    text-align: center;
-  }
-
-  &__label {
-    padding: $searchbar-label-padding;
-    font-size: $searchbar-label-fontsize;
-    color: $searchbar-label-color;
-  }
-
-  &__action-text {
-    padding: $searchbar-action-text-padding;
-    font-size: $searchbar-action-text-fontsize;
-    color: $searchbar-action-text-color;
-  }
-
-  &__leftout-icon {
-    margin-right: 10px;
-  }
-
-  &__rightout-icon {
-    margin-left: 10px;
+    display: flex;
+    padding: $searchbar-right-padding;
+    font-size: $searchbar-right-fontsize;
+    color: $searchbar-right-color;
   }
 }

package/dist/packages/shortpassword/shortpassword.scss

@@ -1,87 +1,4 @@
 
-.nut-theme-dark {
-  .nut-shortpassword {
-    &__title {
-      color: $dark1;
-    }
-
-    &__subtitle {
-      color: $dark2;
-    }
-
-    &__message__forget {
-      color: $dark3;
-    }
-
-    &__input-real {
-      background-color: $dark6;
-      border-radius: 4px;
-    }
-
-    &__input-site {
-      background-color: $dark6;
-    }
-
-    &__input-fake {
-      border: none;
-      background-color: $dark4;
-
-      &__li__icon {
-        background-color: $dark1;
-      }
-    }
-
-    &__message__forget {
-      color: $dark2;
-    }
-  }
-}
-
-.nut-shortpsd-title {
-  line-height: 1;
-  font-size: $font-size-3;
-  color: $title-color;
-}
-
-.nut-shortpsd-subtitle {
-  display: block;
-  margin-top: 12px;
-  margin-bottom: 24px;
-  line-height: 1;
-  font-size: $font-size-1;
-  color: $text-color;
-}
-
-.nut-shortpsdWx-subtitle {
-  display: block;
-  margin-top: 12px;
-  line-height: 1;
-  font-size: $font-size-1;
-  color: $text-color;
-}
-
-.nut-input-w {
-  padding: 24px 0 10px 0;
-  text-align: center;
-  position: relative;
-
-  .nut-input-site {
-    width: 247px;
-    height: 41px;
-    border-radius: 4px;
-  }
-
-  .nut-input-real {
-    position: absolute;
-    right: 247px;
-    width: 247px;
-    height: 41px;
-    outline: 0 none;
-    border: 0;
-    text-decoration: none;
-  }
-}
-
 .nut-shortpassword {
   &__title {
     line-height: 1;
@@ -89,7 +6,7 @@
     color: $title-color;
   }
 
-  &__subtitle {
+  &__description {
     margin-top: 12px;
     margin-bottom: 24px;
     line-height: 1;
@@ -168,10 +85,6 @@
       color: $shortpassword-forget;
       display: flex;
       align-items: center;
-
-      &-tips {
-        margin-left: 3px;
-      }
     }
   }