@nutui/nutui-react-taro 3.0.0-beta.11 → 3.0.0-beta.13

package/dist/es/packages/calendar/calendar.d.ts

@@ -1,140 +1,32 @@
 import React, { ReactNode } from 'react';
 import type { CalendarDay, CalendarType, CalendarRef } from './types';
 export interface CalendarProps {
-    /**
-    * 类型，日期选择'single'，区间选择'range'
-    * @default single
-    */
-    type?: CalendarType
-    /**
-    * 自动回填
-    * @default false
-    */
-    autoBackfill?: boolean
-    /**
-    * 是否弹窗状态展示
-    * @default true
-    */
-    popup?: boolean
-    /**
-    * 是否可见
-    * @default false
-    */
-    visible?: boolean
-    /**
-    * 显示标题
-    * @default 日期选择
-    */
-    title?: string
-    /**
-    * 默认值，日期选择 string 格式，区间选择 Array 格式
-    * @default -
-    */
-    defaultValue?: string | string[]
-    /**
-    * 开始日期， 如果不限制开始日期传 null
-    * @default 今天
-    */
-    startDate?: string
-    /**
-    * 结束日期，如果不限制结束日期传 null
-    * @default 距离今天 365 天
-    */
-    endDate?: string
-    /**
-    * 是否展示今天标记
-    * @default true
-    */
-    showToday?: boolean
-    /**
-    * 范围选择，开始信息文案
-    * @default 开始
-    */
-    startText?: ReactNode
-    /**
-    * 范围选择，结束信息文案
-    * @default 结束
-    */
-    endText?: ReactNode
-    /**
-    * 底部确认按钮文案
-    * @default 确认
-    */
-    confirmText?: ReactNode
-    /**
-    * 是否在展示日历标题
-    * @default true
-    */
-    showTitle?: boolean
-    /**
-    * 是否展示日期标题
-    * @default true
-    */
-    showSubTitle?: boolean
-    /**
-    * 是否启动滚动动画
-    * @default true
-    */
-    scrollAnimation?: boolean
-    /**
-    * 设置周起始日
-    * @default 0
-    */
-    firstDayOfWeek: number
-    /**
-    * 自定义 Icon
-    * @default close
-    */
-    closeIcon?: ReactNode
-    /**
-    * 设置不可选日期
-    * @default -
-    */
-    disableDate: (date: CalendarDay) => boolean
-    /**
-    * 自定义日历标题下部，可用以添加自定义操作
-    * @default -
-    */
-    renderHeaderButtons?: () => string | JSX.Element
-    /**
-    * 自定义日历底部按钮
-    * @default -
-    */
-    renderBottomButton?: () => string | JSX.Element
-    /**
-    * 日期信息
-    * @default -
-    */
-    renderDay?: (date: CalendarDay) => string | JSX.Element
-    /**
-    * 日期顶部信息
-    * @default -
-    */
-    renderDayTop?: (date: CalendarDay) => string | JSX.Element
-    /**
-    * 日期底部信息
-    * @default -
-    */
-    renderDayBottom?: (date: CalendarDay) => string | JSX.Element
-    /**
-    * 关闭时触发
-    * @default -
-    */
-    onClose?: () => void
-    /**
-    * 选择之后或是点击确认按钮触发
-    * @default -
-    */
-    onConfirm?: (param: string) => void
-    /**
-    * 点击/选择后触发
-    * @default -
-    */
-    onDayClick?: (data: string) => void
-    /**
-    * 年月子标题到达顶部时触发
-    * @default -
-    */
-    onPageChange?: (param: string) => void
+    type?: CalendarType;
+    autoBackfill?: boolean;
+    popup?: boolean;
+    visible?: boolean;
+    title?: string;
+    defaultValue?: string | string[];
+    startDate?: string;
+    endDate?: string;
+    showToday?: boolean;
+    startText?: ReactNode;
+    endText?: ReactNode;
+    confirmText?: ReactNode;
+    showTitle?: boolean;
+    showSubTitle?: boolean;
+    scrollAnimation?: boolean;
+    firstDayOfWeek: number;
+    closeIcon?: ReactNode;
+    disableDate: (date: CalendarDay) => boolean;
+    renderHeaderButtons?: () => string | JSX.Element;
+    renderBottomButton?: () => string | JSX.Element;
+    renderDay?: (date: CalendarDay) => string | JSX.Element;
+    renderDayTop?: (date: CalendarDay) => string | JSX.Element;
+    renderDayBottom?: (date: CalendarDay) => string | JSX.Element;
+    onClose?: () => void;
+    onConfirm?: (param: string) => void;
+    onDayClick?: (data: string) => void;
+    onPageChange?: (param: string) => void;
 }
 export declare const Calendar: React.ForwardRefExoticComponent<Partial<CalendarProps> & Omit<React.HTMLAttributes<HTMLDivElement>, ""> & React.RefAttributes<CalendarRef>>;

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,19 +4,14 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -67,7 +62,7 @@
   position: fixed;
   min-height: 46%;
   max-height: 100%;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,13 +82,13 @@
   align-items: center;
 }
 .nut-popup-title-title {
-  color: var(--nutui-gray-7);
+  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-l, 16px));
   line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-6);
+  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);
 }
@@ -112,7 +107,7 @@
   z-index: 1;
   width: var(--nutui-popup-icon-size, 20px);
   height: var(--nutui-popup-icon-size, 20px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
 .nut-popup-title-right:active {
@@ -382,8 +377,8 @@
   flex-direction: column;
   flex: 1;
   font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, 16px));
-  background-color: var(--nutui-gray-1);
-  color: var(--nutui-gray-7);
+  background-color: var(--nutui-color-background-overlay, #ffffff);
+  color: var(--nutui-color-title, #1a1a1a);
   overflow: hidden;
   height: 100%;
 }
@@ -404,8 +399,11 @@
   flex-direction: column;
   text-align: center;
 }
+.nut-calendar-header-buttons {
+  height: var(--nutui-calendar-header-height, 24px);
+}
 .nut-calendar-title {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-calendar-title-font-size, var(--nutui-font-size-xl, 18px));
   font-weight: var(--nutui-calendar-title-font-weight, var(--nutui-font-weight-bold, 600));
   line-height: 50px;
@@ -415,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;
@@ -427,7 +422,7 @@
   box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.06);
 }
 .nut-calendar-week-item:first-of-type, .nut-calendar-week-item:last-of-type {
-  color: var(--nutui-brand-6);
+  color: var(--nutui-color-primary, #ff0f23);
 }
 .nut-calendar-content {
   flex: 1;
@@ -451,7 +446,7 @@
   left: 0;
   right: 0;
   font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
 }
 .nut-calendar-month {
   display: flex;
@@ -479,16 +474,9 @@
   margin-bottom: 4px;
 }
 .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
-  color: var(--nutui-brand-6);
-}
-.nut-calendar-day-info-curr {
-  position: absolute;
-  bottom: 5px;
-  width: 100%;
-  font-size: 12px;
-  line-height: 14px;
+  color: var(--nutui-color-primary, #ff0f23);
 }
-.nut-calendar-day-info {
+.nut-calendar-day-info, .nut-calendar-day-info-curr {
   position: absolute;
   bottom: 5px;
   width: 100%;
@@ -506,7 +494,7 @@
   bottom: 5px;
 }
 .nut-calendar-day-active {
-  background-color: var(--nutui-calendar-active-background-color, var(--nutui-brand-6));
+  background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
   color: #ffffff !important;
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
 }
@@ -524,22 +512,22 @@
   color: #ffffff;
 }
 .nut-calendar-day-disabled {
-  color: var(--nutui-calendar-disable-color, var(--nutui-gray-4)) !important;
+  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
 }
 .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-gray-4)) !important;
+  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
 }
 .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-brand-1));
-  color: var(--nutui-calendar-choose-color, var(--nutui-brand-6));
-}
 .nut-calendar-footer {
   display: flex;
   width: 100%;
@@ -547,13 +535,14 @@
   background-color: #ffffff;
 }
 .nut-calendar-footer .calendar-confirm-btn {
-  height: 44px;
-  margin: 10px 18px;
-  border-radius: 22px;
+  height: 40px;
+  line-height: 40px;
+  margin: 6px 16px;
+  text-align: center;
+  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;
-  text-align: center;
-  line-height: 44px;
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 
 .nut-calendar-popup .nut-popup-title-right {

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

@@ -30,6 +30,9 @@
   flex-direction: column;
   text-align: center;
 }
+.nut-calendar-header-buttons {
+  height: 24px;
+}
 .nut-calendar-title {
   color: #1a1a1a;
   font-size: 18px;
@@ -41,9 +44,6 @@
   line-height: 22px;
   font-size: 14px;
 }
-.nut-calendar-header-buttons {
-  height: 24px;
-}
 .nut-calendar-weeks {
   display: flex;
   align-items: center;
@@ -113,14 +113,7 @@
 .nut-calendar-day:nth-child(7n+1) {
   color: #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%;
@@ -161,6 +154,10 @@
 .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;
@@ -168,10 +165,6 @@
 .nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
   display: none;
 }
-.nut-calendar-day-choose {
-  background-color: #ffebf1;
-  color: #ff0f23;
-}
 .nut-calendar-footer {
   display: flex;
   width: 100%;
@@ -179,13 +172,14 @@
   background-color: #ffffff;
 }
 .nut-calendar-footer .calendar-confirm-btn {
-  height: 44px;
-  margin: 10px 18px;
-  border-radius: 22px;
+  height: 40px;
+  line-height: 40px;
+  margin: 6px 16px;
+  text-align: center;
+  border-radius: 8px;
   background: linear-gradient(90deg, #ff475d 0%, #ff0f23 100%);
   color: #ffffff;
-  text-align: center;
-  line-height: 44px;
+  font-weight: 600;
 }
 
 .nut-calendar-popup .nut-popup-title-right {

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

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

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

@@ -3,11 +3,11 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-calendarcard {
-  background: var(--nutui-gray-1);
+  background: var(--nutui-color-background-overlay, #ffffff);
   border-radius: 12px;
   overflow: hidden;
   font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, 16px));
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-calendarcard-header {
   display: flex;
@@ -60,10 +60,10 @@
   line-height: 12px;
 }
 .nut-calendarcard-day.weekend {
-  color: var(--nutui-calendar-choose-color, var(--nutui-brand-6));
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-calendarcard-day.active {
-  background-color: var(--nutui-calendar-active-background-color, var(--nutui-brand-6));
+  background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);
 }
 .nut-calendarcard-day.active .nut-calendarcard-day-top,
@@ -72,7 +72,7 @@
   color: #ffffff;
 }
 .nut-calendarcard-day.start, .nut-calendarcard-day.end {
-  background-color: var(--nutui-calendar-active-background-color, var(--nutui-brand-6));
+  background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-calendarcard-day.start .nut-calendarcard-day-top,
 .nut-calendarcard-day.start .nut-calendarcard-day-inner,
@@ -90,12 +90,12 @@
   border-bottom-right-radius: var(--nutui-calendar-day-active-border-radius, 4px);
 }
 .nut-calendarcard-day.mid {
-  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-brand-1));
+  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light-pressed, #ffebf1));
 }
 .nut-calendarcard-day.mid .nut-calendarcard-day-top,
 .nut-calendarcard-day.mid .nut-calendarcard-day-inner,
 .nut-calendarcard-day.mid .nut-calendarcard-day-bottom {
-  color: var(--nutui-calendar-choose-color, var(--nutui-brand-6));
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-calendarcard-day .nut-calendar-day-info {
   color: #ffffff;
@@ -110,7 +110,7 @@
 .nut-calendarcard-day.next .nut-calendarcard-day-bottom, .nut-calendarcard-day.disabled .nut-calendarcard-day-top,
 .nut-calendarcard-day.disabled .nut-calendarcard-day-inner,
 .nut-calendarcard-day.disabled .nut-calendarcard-day-bottom {
-  color: var(--nutui-calendar-disable-color, var(--nutui-gray-4));
+  color: var(--nutui-calendar-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 
 [dir=rtl] .nut-calendarcard-header-left .left, [dir=rtl] .nut-calendarcard-header-right .left,

package/dist/es/packages/calendaritem/calendaritem.js

@@ -11,7 +11,7 @@ import { ComponentDefaults } from "../../utils/typings";
 import { Utils, getCurrMonthData, getDaysStatus, getPreMonthDates } from "../../utils/date";
 import requestAniFrame from "../../utils/raf";
 import { useConfig } from "../configprovider/index";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { splitDate, isMultiple, isCurrDay, getCurrDate, isStart, isEnd, isStartAndEnd } from "../calendar/utils";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     type: 'single',
@@ -639,7 +639,6 @@ export var CalendarItem = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         return /*#__PURE__*/ React.createElement(View, {
             className: "nut-calendar-footer"
         }, children, /*#__PURE__*/ React.createElement(View, {
-            className: "calendar-confirm-btn",
             onClick: confirm
         }, renderBottomButton ? renderBottomButton() : /*#__PURE__*/ React.createElement(View, {
             className: "calendar-confirm-btn"

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

@@ -20,7 +20,7 @@
 }
 .nut-price-primary .nut-price-symbol, .nut-price-primary .nut-price-integer, .nut-price-primary .nut-price-decimal {
   font-family: "JD-Bold";
-  color: var(--nutui-price-color, var(--nutui-brand-6));
+  color: var(--nutui-price-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-price-symbol {
   padding-right: var(--nutui-price-symbol-padding-right, 0px);
@@ -91,10 +91,10 @@
   color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text-plain {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-tag-default {
-  background: var(--nutui-tag-background-color, var(--nutui-gray-7));
+  background: var(--nutui-tag-background-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-tag-primary {
   background: #fa2c19;
@@ -106,10 +106,10 @@
   background: var(--nutui-tag-success-background-color, #4fc08d);
 }
 .nut-tag-danger {
-  background: var(--nutui-tag-danger-background-color, var(--nutui-red-2));
+  background: var(--nutui-tag-danger-background-color, var(--nutui-color-danger, #ff0f23));
 }
 .nut-tag-warning {
-  background: var(--nutui-tag-warning-background-color, var(--nutui-yellow-2));
+  background: var(--nutui-tag-warning-background-color, var(--nutui-color-warning, #ffbf00));
 }
 .nut-tag-round {
   border-radius: var(--nutui-tag-round-border-radius, 8px);
@@ -130,7 +130,7 @@
 }
 .nut-tag-plain {
   background-color: #fff;
-  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-gray-7);
+  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-color-title, #1a1a1a);
 }
 
 [dir=rtl] .nut-tag .nut-icon,
@@ -168,7 +168,7 @@
   word-break: break-all;
   line-height: 1.5;
   font-size: 14px;
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-card-right-price {
   display: flex;
@@ -202,7 +202,7 @@
 }
 .nut-card-right-shop-name {
   line-height: 1.5;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   font-size: 12px;
   padding-top: 4px;
 }