@nutui/nutui-react-taro 3.0.0-beta.8 → 3.0.0

package/dist/es/packages/calendar/style/calendar.scss

@@ -34,6 +34,10 @@
     display: flex;
     flex-direction: column;
     text-align: center;
+
+    &-buttons {
+      height: $calendar-header-height;
+    }
   }
 
   &-title {
@@ -49,10 +53,6 @@
     font-size: $calendar-sub-title-font-size;
   }
 
-  &-header-buttons {
-    height: $calendar-header-height;
-  }
-
   &-weeks {
     display: flex;
     align-items: center;
@@ -101,12 +101,12 @@
     display: flex;
     flex-direction: column;
     text-align: center;
-  }
 
-  &-month-title {
-    height: 23px;
-    line-height: 23px;
-    margin: 8px 0;
+    &-title {
+      height: 23px;
+      line-height: 23px;
+      margin: 8px 0;
+    }
   }
 
   &-days {
@@ -130,6 +130,7 @@
       color: $color-primary;
     }
 
+    &-info,
     &-info-curr {
       position: absolute;
       bottom: 5px;
@@ -138,14 +139,6 @@
       line-height: 14px;
     }
 
-    &-info {
-      position: absolute;
-      bottom: 5px;
-      width: 100%;
-      font-size: 12px;
-      line-height: 14px;
-    }
-
     &-info-top {
       position: absolute;
       width: 100%;
@@ -188,18 +181,18 @@
       }
     }
 
-    &-choose-disabled {
-      background-color: $calendar-choose-disable-background-color;
-      color: $calendar-disable-color !important;
-
-      .nut-calendar-day-info-curr {
-        display: none;
-      }
-    }
-
     &-choose {
       background-color: $calendar-choose-background-color;
       color: $calendar-choose-color;
+
+      &-disabled {
+        background-color: $calendar-choose-disable-background-color;
+        color: $calendar-disable-color !important;
+
+        .nut-calendar-day-info-curr {
+          display: none;
+        }
+      }
     }
   }
 
@@ -211,13 +204,14 @@
     background-color: $white;
 
     .calendar-confirm-btn {
-      height: 44px;
-      margin: 10px 18px;
-      border-radius: 22px;
+      height: 40px;
+      line-height: 40px;
+      margin: 6px 16px;
+      text-align: center;
+      border-radius: $radius-base;
       background: $button-primary-background-color;
       color: $color-primary-text;
-      text-align: center;
-      line-height: 44px;
+      font-weight: $font-weight-bold;
     }
   }
 }

package/dist/es/packages/calendar/style/style.css

@@ -4,12 +4,7 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
@@ -20,12 +15,6 @@
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
-[dir=rtl] .nut-overlay,
-.nut-rtl .nut-overlay {
-  left: auto;
-  right: 0;
-}
-
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
@@ -63,18 +52,17 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
-  color: var(--nutui-color-title, #1a1a1a);
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,35 +75,40 @@
   padding: var(--nutui-popup-title-padding, 16px);
   position: relative;
 }
-.nut-popup-title-left {
-  position: absolute;
-  left: var(--nutui-popup-title-padding, 16px);
-}
-.nut-popup-title-title {
+.nut-popup-title-wrapper {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
+}
+.nut-popup-title-title {
+  color: var(--nutui-color-title, #1a1a1a);
   font-weight: var(--nutui-font-weight-bold, 600);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
+  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-color-text-help, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
+  color: var(--nutui-color-text, #505259);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
+.nut-popup-title-description-gap {
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-popup-title-left {
+  position: absolute;
+  top: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 16px);
+}
 .nut-popup-title-right {
   position: absolute;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-color-text-help, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-color-title, #1a1a1a);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -136,15 +129,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
-  /* #ifndef rn */
+  max-width: 295px;
   transform: translate(-50%, -50%);
-  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-bottom, .nut-popup-top {
-  max-height: 83%;
+  max-height: 87%;
 }
 .nut-popup-bottom {
   bottom: 0;
@@ -152,40 +144,33 @@
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
 }
 .nut-popup-right {
   top: 0;
   right: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
 }
 .nut-popup-top {
   top: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 100px;
-  /* #endif */
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -251,22 +236,16 @@
 }
 @keyframes popup-slide-top-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -278,22 +257,16 @@
 }
 @keyframes popup-slide-right-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -305,22 +278,16 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
-  /* #ifndef rn */
   transform: translate(0, 0);
-  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -332,16 +299,12 @@
 }
 @keyframes popup-slide-left-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -395,9 +358,7 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
-  /* #ifndef rn */
   transform: translate(50%, -50%);
-  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -438,6 +399,9 @@
   flex-direction: column;
   text-align: center;
 }
+.nut-calendar-header-buttons {
+  height: var(--nutui-calendar-header-height, 24px);
+}
 .nut-calendar-title {
   color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-calendar-title-font-size, var(--nutui-font-size-xl, 18px));
@@ -449,9 +413,6 @@
   line-height: 22px;
   font-size: var(--nutui-calendar-sub-title-font-size, var(--nutui-font-size-base, 14px));
 }
-.nut-calendar-header-buttons {
-  height: var(--nutui-calendar-header-height, 24px);
-}
 .nut-calendar-weeks {
   display: flex;
   align-items: center;
@@ -515,14 +476,7 @@
 .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
   color: var(--nutui-color-primary, #ff0f23);
 }
-.nut-calendar-day-info-curr {
-  position: absolute;
-  bottom: 5px;
-  width: 100%;
-  font-size: 12px;
-  line-height: 14px;
-}
-.nut-calendar-day-info {
+.nut-calendar-day-info, .nut-calendar-day-info-curr {
   position: absolute;
   bottom: 5px;
   width: 100%;
@@ -541,7 +495,7 @@
 }
 .nut-calendar-day-active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
-  color: var(--nutui-color-primary-text, #ffffff) !important;
+  color: #ffffff !important;
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
 }
 .nut-calendar-day-active.active-start {
@@ -555,7 +509,7 @@
   border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
 }
 .nut-calendar-day-active .nut-calendar-day-info {
-  color: var(--nutui-color-primary-text, #ffffff);
+  color: #ffffff;
 }
 .nut-calendar-day-disabled {
   color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
@@ -563,6 +517,10 @@
 .nut-calendar-day-disabled .nut-calendar-day-info-curr {
   display: none;
 }
+.nut-calendar-day-choose {
+  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed, #ffebf1));
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
+}
 .nut-calendar-day-choose-disabled {
   background-color: var(--nutui-calendar-choose-disable-background-color, rgba(191, 191, 191, 0.09));
   color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
@@ -570,10 +528,6 @@
 .nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
   display: none;
 }
-.nut-calendar-day-choose {
-  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed, #ffebf1));
-  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
-}
 .nut-calendar-footer {
   display: flex;
   width: 100%;
@@ -581,13 +535,14 @@
   background-color: #ffffff;
 }
 .nut-calendar-footer .calendar-confirm-btn {
-  height: 44px;
-  margin: 10px 18px;
-  border-radius: 22px;
-  background: linear-gradient(90deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
-  color: var(--nutui-color-primary-text, #ffffff);
+  height: 40px;
+  line-height: 40px;
+  margin: 6px 16px;
   text-align: center;
-  line-height: 44px;
+  border-radius: var(--nutui-radius-base, 8px);
+  background: linear-gradient(90deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%);
+  color: #ffffff;
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 
 .nut-calendar-popup .nut-popup-title-right {

package/dist/es/packages/calendar/style/style.harmony.css

@@ -0,0 +1,216 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-calendar {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  font-size: 16px;
+  background-color: #ffffff;
+  color: #1a1a1a;
+  overflow: hidden;
+  height: 100%;
+}
+.nut-calendar.nut-calendar-title .nut-calendar-header .calendar-title {
+  font-size: 16px;
+}
+.nut-calendar .nut-calendar-taro {
+  height: 60vh;
+}
+.nut-calendar .popup-box {
+  height: 100%;
+}
+.nut-calendar ::-webkit-scrollbar {
+  display: none;
+}
+.nut-calendar-header {
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+}
+.nut-calendar-header-buttons {
+  height: 24px;
+}
+.nut-calendar-title {
+  color: #1a1a1a;
+  font-size: 18px;
+  font-weight: 600;
+  line-height: 50px;
+}
+.nut-calendar-sub-title {
+  padding: 7px 0;
+  line-height: 22px;
+  font-size: 14px;
+}
+.nut-calendar-weeks {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  height: 36px;
+  border-radius: 0px 0px 12px 12px;
+  box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.06);
+}
+.nut-calendar-week-item:first-of-type {
+  color: #ff0f23;
+}
+.nut-calendar-week-item:last-of-type {
+  color: #ff0f23;
+}
+.nut-calendar-content {
+  flex: 1;
+  width: 100%;
+  display: block;
+  overflow-y: auto;
+}
+.nut-calendar-pannel {
+  position: relative;
+  width: 100%;
+  height: auto;
+  display: block;
+  box-sizing: border-box;
+}
+.nut-calendar-pannel .calendar-loading-tip {
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+  position: absolute;
+  top: -50px;
+  left: 0;
+  right: 0;
+  font-size: 12px;
+  color: #505259;
+}
+.nut-calendar-month {
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+}
+.nut-calendar-month-title {
+  height: 23px;
+  line-height: 23px;
+  margin: 8px 0;
+}
+.nut-calendar-days {
+  overflow: hidden;
+}
+.nut-calendar-day {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  position: relative;
+  float: left;
+  width: 14.28%;
+  height: 60px;
+  font-weight: 600;
+  margin-bottom: 4px;
+}
+.nut-calendar-day:nth-child(7n+0) {
+  color: #ff0f23;
+}
+.nut-calendar-day:nth-child(7n+1) {
+  color: #ff0f23;
+}
+.nut-calendar-day-info, .nut-calendar-day-info-curr {
+  position: absolute;
+  bottom: 5px;
+  width: 100%;
+  font-size: 12px;
+  line-height: 14px;
+}
+.nut-calendar-day-info-top {
+  position: absolute;
+  width: 100%;
+  top: 5px;
+}
+.nut-calendar-day-info-bottom {
+  position: absolute;
+  width: 100%;
+  bottom: 5px;
+}
+.nut-calendar-day-active {
+  background-color: #ff0f23;
+  color: #ffffff !important;
+  border-radius: 4px;
+}
+.nut-calendar-day-active.active-start {
+  border-radius: 0px;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.nut-calendar-day-active.active-end {
+  border-radius: 0px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.nut-calendar-day-active .nut-calendar-day-info {
+  color: #ffffff;
+}
+.nut-calendar-day-disabled {
+  color: #c2c4cc !important;
+}
+.nut-calendar-day-disabled .nut-calendar-day-info-curr {
+  display: none;
+}
+.nut-calendar-day-choose {
+  background-color: #ffebf1;
+  color: #ff0f23;
+}
+.nut-calendar-day-choose-disabled {
+  background-color: rgba(191, 191, 191, 0.09);
+  color: #c2c4cc !important;
+}
+.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
+  display: none;
+}
+.nut-calendar-footer {
+  display: flex;
+  width: 100%;
+  flex-direction: column;
+  background-color: #ffffff;
+}
+.nut-calendar-footer .calendar-confirm-btn {
+  height: 40px;
+  line-height: 40px;
+  margin: 6px 16px;
+  text-align: center;
+  border-radius: 8px;
+  background: linear-gradient(90deg, #ff475d 0%, #ff0f23 100%);
+  color: #ffffff;
+  font-weight: 600;
+}
+
+.nut-calendar-popup .nut-popup-title-right {
+  top: 7px !important;
+}
+
+[dir=rtl] .nut-calendar-day,
+.nut-rtl .nut-calendar-day {
+  float: right;
+}
+[dir=rtl] .nut-calendar-day-active.active-start {
+  border-top-left-radius: 0;
+  border-top-right-radius: 4px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 4px;
+}
+.nut-rtl .nut-calendar-day-active.active-start {
+  border-top-left-radius: 0;
+  border-top-right-radius: 4px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 4px;
+}
+[dir=rtl] .nut-calendar-day-active.active-end {
+  border-top-right-radius: 0;
+  border-top-left-radius: 4px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 4px;
+}
+.nut-rtl .nut-calendar-day-active.active-end {
+  border-top-right-radius: 0;
+  border-top-left-radius: 4px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 4px;
+}

package/dist/es/packages/calendarcard/calendarcard.js

@@ -8,8 +8,8 @@ import { View } from "@tarojs/components";
 import { ArrowLeft, ArrowRight, DoubleLeft, DoubleRight } from "./icon";
 import { ComponentDefaults } from "../../utils/typings";
 import { convertDateToDay, convertDayToDate, getCurrentMonthDays, getCurrentWeekDays, getPrevMonthDays } from "./utils";
-import { useConfig } from "../configprovider/configprovider";
-import { usePropsValue } from "../../utils/use-props-value";
+import { useConfig } from "../configprovider/index";
+import { usePropsValue } from "../../hooks/use-props-value";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     type: 'single',
     firstDayOfWeek: 0