@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.2

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

@@ -12,7 +12,7 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -25,9 +25,6 @@
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -63,17 +60,23 @@
 }
 
 .nut-popup {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   min-height: 26%;
   max-height: 100%;
   overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1, #ffffff));
-  color: var(--nutui-gray-7, #1a1a1a);
+  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-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-popup-title {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
@@ -85,26 +88,30 @@
   left: var(--nutui-popup-title-padding, 16px);
 }
 .nut-popup-title-title {
-  font-weight: var(--nutui-font-weight-bold, 500);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-weight: var(--nutui-font-weight-bold, 600);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-5, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-1, 10px));
+  color: var(--nutui-color-text-help, #888b94);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
   font-weight: var(--nutui-font-weight, 400);
 }
 .nut-popup-title-right {
-  position: absolute !important;
+  position: absolute;
   z-index: 1;
   cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
+  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-gray-5, #888b94);
+  color: var(--nutui-color-text-help, #888b94);
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -125,7 +132,9 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  /* #ifndef rn */
   transform: translate(-50%, -50%);
+  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px);
@@ -137,6 +146,9 @@
   bottom: 0;
   left: 0;
   width: 100%;
+  /* #ifdef rn */
+  height: 300px;
+  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
@@ -144,6 +156,10 @@
 .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);
@@ -151,6 +167,10 @@
 .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;
@@ -159,6 +179,9 @@
   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);
@@ -227,16 +250,22 @@
 }
 @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);
@@ -248,16 +277,22 @@
 }
 @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);
@@ -269,16 +304,22 @@
 }
 @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);
@@ -290,12 +331,16 @@
 }
 @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 {
@@ -313,7 +358,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -349,7 +394,9 @@
 .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 {
@@ -367,14 +414,14 @@
   display: flex;
   flex-direction: column;
   flex: 1;
-  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-4, 16px));
-  background-color: var(--nutui-gray-1, #ffffff);
-  color: var(--nutui-gray-7, #1a1a1a);
+  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, 16px));
+  background-color: var(--nutui-color-background-overlay, #ffffff);
+  color: var(--nutui-color-title, #1a1a1a);
   overflow: hidden;
   height: 100%;
 }
 .nut-calendar.nut-calendar-title .nut-calendar-header .calendar-title {
-  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-4, 16px));
+  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-calendar .nut-calendar-taro {
   height: 60vh;
@@ -391,15 +438,15 @@
   text-align: center;
 }
 .nut-calendar-title {
-  color: var(--nutui-gray-7, #1a1a1a);
-  font-size: var(--nutui-calendar-title-font-size, var(--nutui-font-size-6, 20px));
-  font-weight: var(--nutui-calendar-title-font-weight, var(--nutui-font-weight-bold, 500));
+  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;
 }
 .nut-calendar-sub-title {
   padding: 7px 0;
   line-height: 22px;
-  font-size: var(--nutui-calendar-sub-title-font-size, var(--nutui-font-size-3, 14px));
+  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);
@@ -436,8 +483,8 @@
   top: -50px;
   left: 0;
   right: 0;
-  font-size: var(--nutui-font-size-2, 12px);
-  color: var(--nutui-gray-6, #505259);
+  font-size: var(--nutui-font-size-s, 12px);
+  color: var(--nutui-color-text, #505259);
 }
 .nut-calendar-month {
   display: flex;
@@ -461,7 +508,7 @@
   float: left;
   width: var(--nutui-calendar-day-width, 14.28%);
   height: var(--nutui-calendar-day-height, 60px);
-  font-weight: var(--nutui-calendar-day-font-weight, var(--nutui-font-weight-bold, 500));
+  font-weight: var(--nutui-calendar-day-font-weight, var(--nutui-font-weight-bold, 600));
   margin-bottom: 4px;
 }
 .nut-calendar-day:nth-child(7n+0), .nut-calendar-day:nth-child(7n+1) {
@@ -523,7 +570,7 @@
   display: none;
 }
 .nut-calendar-day-choose {
-  background-color: var(--nutui-calendar-choose-background-color, var(--nutui-color-primary-light, #ffebf1));
+  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 {

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

@@ -1,9 +1,9 @@
 .nut-calendarcard {
-  background: var(--nutui-gray-1, #ffffff);
+  background: var(--nutui-color-background-overlay, #ffffff);
   border-radius: 12px;
   overflow: hidden;
-  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-4, 16px));
-  color: var(--nutui-gray-7, #1a1a1a);
+  font-size: var(--nutui-calendar-base-font-size, var(--nutui-font-size-l, 16px));
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-calendarcard-header {
   display: flex;
@@ -73,7 +73,7 @@
   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-color-primary-light, #ffebf1));
+  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-calendarcard-day .nut-calendar-day-info {

package/dist/cjs/packages/calendaritem/calendaritem.d.ts

@@ -23,6 +23,7 @@ export interface CalendarItemProps extends PopupProps {
     firstDayOfWeek: number;
     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;

package/dist/cjs/packages/calendaritem/calendaritem.js

@@ -54,7 +54,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
     var locale = (0, _configprovider.useConfig)().locale;
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), style = _$_object_spread.style, className = _$_object_spread.className, children = _$_object_spread.children, popup = _$_object_spread.popup, type = _$_object_spread.type, autoBackfill = _$_object_spread.autoBackfill, title = _$_object_spread.title, defaultValue = _$_object_spread.defaultValue, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, showToday = _$_object_spread.showToday, startText = _$_object_spread.startText, endText = _$_object_spread.endText, confirmText = _$_object_spread.confirmText, showTitle = _$_object_spread.showTitle, showSubTitle = _$_object_spread.showSubTitle, scrollAnimation = _$_object_spread.scrollAnimation, firstDayOfWeek = _$_object_spread.firstDayOfWeek, disableDate = _$_object_spread.disableDate, renderHeaderButtons = _$_object_spread.renderHeaderButtons, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, value = _$_object_spread.value, onConfirm = _$_object_spread.onConfirm, onUpdate = _$_object_spread.onUpdate, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange;
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), style = _$_object_spread.style, className = _$_object_spread.className, children = _$_object_spread.children, popup = _$_object_spread.popup, type = _$_object_spread.type, autoBackfill = _$_object_spread.autoBackfill, title = _$_object_spread.title, defaultValue = _$_object_spread.defaultValue, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, showToday = _$_object_spread.showToday, startText = _$_object_spread.startText, endText = _$_object_spread.endText, confirmText = _$_object_spread.confirmText, showTitle = _$_object_spread.showTitle, showSubTitle = _$_object_spread.showSubTitle, scrollAnimation = _$_object_spread.scrollAnimation, firstDayOfWeek = _$_object_spread.firstDayOfWeek, disableDate = _$_object_spread.disableDate, renderHeaderButtons = _$_object_spread.renderHeaderButtons, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, renderBottomButton = _$_object_spread.renderBottomButton, value = _$_object_spread.value, onConfirm = _$_object_spread.onConfirm, onUpdate = _$_object_spread.onUpdate, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange;
     var weekdays = locale.calendaritem.weekdays;
     var weeks = (0, _to_consumable_array._)(weekdays.slice(firstDayOfWeek, 7)).concat((0, _to_consumable_array._)(weekdays.slice(0, firstDayOfWeek)));
     var monthTitle = locale.calendaritem.monthTitle;
@@ -291,6 +291,7 @@ var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref)
                     type: 'curr'
                 }, monthsData[current.current], true);
             } else if (type === 'multiple') {
+                ;
                 (0, _to_consumable_array._)(currentDate).forEach(function(item) {
                     var dateArr = (0, _utils.splitDate)(item);
                     var currentIndex = current.current;
@@ -349,10 +350,14 @@ var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref)
     };
     (0, _react.useEffect)(function() {
         setCurrentDate(resetDefaultValue() || []);
-        popup && resetRender();
     }, [
         defaultValue
     ]);
+    (0, _react.useEffect)(function() {
+        popup && resetRender();
+    }, [
+        currentDate
+    ]);
     // 暴露出的API
     var scrollToDate = function scrollToDate(date) {
         if (_date.Utils.compareDate(date, propStartDate)) {
@@ -397,6 +402,7 @@ var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref)
         var scrollTop = e.target.scrollTop;
         _taro.default.getEnv() === 'WEB' && setScrollTop(scrollTop);
         var current = Math.floor(scrollTop / avgHeight);
+        if (current < 0) return;
         if (!monthsData[current + 1]) return;
         var nextTop = monthsData[current + 1].scrollTop;
         var nextHeight = monthsData[current + 1].cssHeight;
@@ -473,13 +479,16 @@ var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref)
                 if (isFirst) {
                     state.currDateArray.push((0, _to_consumable_array._)(days));
                 } else if (hasIndex !== '') {
+                    ;
                     currentDate.splice(hasIndex, 1);
                     state.currDateArray.splice(hasIndex, 1);
                 } else {
+                    ;
                     currentDate.push(days[3]);
                     state.currDateArray.push((0, _to_consumable_array._)(days));
                 }
             } else {
+                ;
                 currentDate.push(days[3]);
                 state.currDateArray = [
                     (0, _to_consumable_array._)(days)
@@ -568,19 +577,19 @@ var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref)
         return currentDate.length >= 2 && (type === 'range' || type === 'week') && day.type === 'active' && (0, _utils.isEnd)((0, _utils.getCurrDate)(day, month), currentDate);
     };
     var renderHeader = function renderHeader() {
-        return /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: headerClasses
-        }, showTitle && /*#__PURE__*/ _react.default.createElement("div", {
+        }, showTitle && /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-title")
-        }, title || locale.calendaritem.title), renderHeaderButtons && /*#__PURE__*/ _react.default.createElement("div", {
+        }, title || locale.calendaritem.title), renderHeaderButtons && /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-header-buttons")
-        }, renderHeaderButtons()), showSubTitle && /*#__PURE__*/ _react.default.createElement("div", {
+        }, renderHeaderButtons()), showSubTitle && /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-sub-title")
-        }, yearMonthTitle), /*#__PURE__*/ _react.default.createElement("div", {
+        }, yearMonthTitle), /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-weeks"),
             ref: weeksPanel
         }, weeks.map(function(item) {
-            return /*#__PURE__*/ _react.default.createElement("div", {
+            return /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "".concat(classPrefix, "-week-item"),
                 key: item
             }, item);
@@ -595,25 +604,25 @@ var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref)
             className: "".concat(classPrefix, "-content"),
             onScroll: monthsViewScroll,
             ref: monthsRef
-        }, /*#__PURE__*/ _react.default.createElement("div", {
+        }, /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-pannel"),
             ref: monthsPanel
-        }, /*#__PURE__*/ _react.default.createElement("div", {
+        }, /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "viewArea",
             ref: viewAreaRef,
             style: {
                 transform: "translateY(".concat(translateY, "px)")
             }
         }, monthsData.slice(monthDefaultRange[0], monthDefaultRange[1]).map(function(month, key) {
-            return /*#__PURE__*/ _react.default.createElement("div", {
+            return /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "".concat(classPrefix, "-month"),
                 key: key
-            }, /*#__PURE__*/ _react.default.createElement("div", {
+            }, /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "".concat(classPrefix, "-month-title")
-            }, month.title), /*#__PURE__*/ _react.default.createElement("div", {
+            }, month.title), /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "".concat(classPrefix, "-days")
             }, month.monthData.map(function(day, i) {
-                return /*#__PURE__*/ _react.default.createElement("div", {
+                return /*#__PURE__*/ _react.default.createElement(_components.View, {
                     className: [
                         "".concat(classPrefix, "-day"),
                         getClasses(day, month)
@@ -622,33 +631,35 @@ var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref)
                         chooseDay(day, month);
                     },
                     key: i
-                }, /*#__PURE__*/ _react.default.createElement("div", {
+                }, /*#__PURE__*/ _react.default.createElement(_components.View, {
                     className: "".concat(classPrefix, "-day-day")
-                }, renderDay ? renderDay(day) : day.day), !isStartTip(day, month) && renderDayTop && /*#__PURE__*/ _react.default.createElement("div", {
+                }, renderDay ? renderDay(day) : day.day), !isStartTip(day, month) && renderDayTop && /*#__PURE__*/ _react.default.createElement(_components.View, {
                     className: "".concat(classPrefix, "-day-info-top")
-                }, renderDayTop(day)), !isStartTip(day, month) && !isEndTip(day, month) && renderDayBottom && /*#__PURE__*/ _react.default.createElement("div", {
+                }, renderDayTop(day)), !isStartTip(day, month) && !isEndTip(day, month) && renderDayBottom && /*#__PURE__*/ _react.default.createElement(_components.View, {
                     className: "".concat(classPrefix, "-day-info-bottom")
-                }, renderDayBottom(day)), !isStartTip(day, month) && !isEndTip(day, month) && !renderDayBottom && showToday && (0, _utils.isCurrDay)(month, day.day) && /*#__PURE__*/ _react.default.createElement("div", {
+                }, renderDayBottom(day)), !isStartTip(day, month) && !isEndTip(day, month) && !renderDayBottom && showToday && (0, _utils.isCurrDay)(month, day.day) && /*#__PURE__*/ _react.default.createElement(_components.View, {
                     className: "".concat(classPrefix, "-day-info-curr")
-                }, locale.calendaritem.today), isStartTip(day, month) && /*#__PURE__*/ _react.default.createElement("div", {
+                }, locale.calendaritem.today), isStartTip(day, month) && /*#__PURE__*/ _react.default.createElement(_components.View, {
                     className: "".concat(classPrefix, "-day-info ").concat((0, _utils.isStartAndEnd)(currentDate) ? "".concat(classPrefix, "-day-info-top") : '')
-                }, startText || locale.calendaritem.start), isEndTip(day, month) && /*#__PURE__*/ _react.default.createElement("div", {
+                }, startText || locale.calendaritem.start), isEndTip(day, month) && /*#__PURE__*/ _react.default.createElement(_components.View, {
                     className: "".concat(classPrefix, "-day-info")
                 }, endText || locale.calendaritem.end));
             })));
         }))));
     };
     var renderFooter = function renderFooter() {
-        return /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "nut-calendar-footer"
-        }, children, /*#__PURE__*/ _react.default.createElement("div", {
+        }, children, /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "calendar-confirm-btn",
             onClick: confirm
-        }, confirmText || locale.confirm));
+        }, renderBottomButton ? renderBottomButton() : /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "calendar-confirm-btn"
+        }, confirmText || locale.confirm)));
     };
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement("div", {
+    return /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: classes,
         style: style
-    }, renderHeader(), renderContent(), popup && !autoBackfill ? renderFooter() : ''));
+    }, renderHeader(), renderContent(), popup && !autoBackfill ? renderFooter() : '');
 });
 CalendarItem.displayName = 'NutCalendarItem';

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

@@ -1,6 +1,6 @@
 .nut-price {
   direction: ltr;
-  font-size: var(--nutui-font-size-4, 16px);
+  font-size: var(--nutui-font-size-l, 16px);
   display: flex;
   flex-direction: row;
   align-items: baseline;
@@ -41,9 +41,9 @@
   font-size: var(--nutui-price-decimal-small-size, 10px);
 }
 .nut-price-line {
-  text-decoration: line-through var(--nutui-price-line-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  text-decoration: line-through var(--nutui-price-line-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   font-size: var(--nutui-price-line-font-size, 12px);
-  color: var(--nutui-price-line-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  color: var(--nutui-price-line-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 
 .nut-tag {
@@ -52,7 +52,7 @@
   flex-direction: row;
   justify-content: center;
   align-items: center;
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-1, 10px));
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
   border-radius: var(--nutui-tag-border-radius, 2px);
   height: var(--nutui-tag-height, 14px);
   color: var(--nutui-tag-color, #ffffff);
@@ -63,20 +63,20 @@
   margin-left: 4px;
 }
 .nut-tag-text {
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-1, 10px));
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
   color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text-plain {
-  color: var(--nutui-gray-7, #1a1a1a);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-tag-default {
-  background: var(--nutui-tag-background-color, var(--nutui-gray-7, #1a1a1a));
+  background: var(--nutui-tag-background-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-tag-primary {
   background: #fa2c19;
 }
 .nut-tag-info {
-  background: var(--nutui-tag-info-background-color, var(--nutui-color-info, #1988fa));
+  background: var(--nutui-tag-info-background-color, var(--nutui-color-info, #0073ff));
 }
 .nut-tag-success {
   background: var(--nutui-tag-success-background-color, #4fc08d);
@@ -85,7 +85,7 @@
   background: var(--nutui-tag-danger-background-color, var(--nutui-color-danger, #ff0f23));
 }
 .nut-tag-warning {
-  background: var(--nutui-tag-warning-background-color, var(--nutui-color-warning, #c47600));
+  background: var(--nutui-tag-warning-background-color, var(--nutui-color-warning, #ffbf00));
 }
 .nut-tag-round {
   border-radius: var(--nutui-tag-round-border-radius, 8px);
@@ -100,11 +100,13 @@
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-1, 10px));
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
+  color: var(--nutui-tag-color, #ffffff);
+  margin-left: 4px;
 }
 .nut-tag-plain {
   background-color: #fff;
-  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-gray-7, #1a1a1a);
+  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-color-title, #1a1a1a);
 }
 
 [dir=rtl] .nut-tag .nut-icon,
@@ -142,7 +144,7 @@
   word-break: break-all;
   line-height: 1.5;
   font-size: 14px;
-  color: var(--nutui-gray-7, #1a1a1a);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-card-right-price {
   display: flex;
@@ -177,7 +179,7 @@
 .nut-card-right-other .nut-tag {
   padding: 0 2px;
   margin-right: 5px;
-  font-size: var(--nutui-font-size-1, 10px);
+  font-size: var(--nutui-font-size-xs, 11px);
 }
 .nut-card-right-shop {
   display: flex;
@@ -186,7 +188,7 @@
 }
 .nut-card-right-shop-name {
   line-height: 1.5;
-  color: var(--nutui-gray-6, #505259);
+  color: var(--nutui-color-text, #505259);
   font-size: 12px;
   padding-top: 4px;
 }