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

package/dist/cjs/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/cjs/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/cjs/packages/calendarcard/calendarcard.js

@@ -21,7 +21,7 @@ var _icon = require("./icon");
 var _typings = require("../../utils/typings");
 var _utils = require("./utils");
 var _index = require("../configprovider/index");
-var _usepropsvalue = require("../../utils/use-props-value");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     type: 'single',
     firstDayOfWeek: 0

package/dist/cjs/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/cjs/packages/calendaritem/calendaritem.js

@@ -23,7 +23,7 @@ var _typings = require("../../utils/typings");
 var _date = require("../../utils/date");
 var _raf = /*#__PURE__*/ _interop_require_default._(require("../../utils/raf"));
 var _index = require("../configprovider/index");
-var _usepropsvalue = require("../../utils/use-props-value");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var _utils = require("../calendar/utils");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     type: 'single',
@@ -651,7 +651,6 @@ var CalendarItem = /*#__PURE__*/ _react.default.forwardRef(function(props, ref)
         return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "nut-calendar-footer"
         }, children, /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: "calendar-confirm-btn",
             onClick: confirm
         }, renderBottomButton ? renderBottomButton() : /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "calendar-confirm-btn"

package/dist/cjs/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;
 }

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

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { PopupProps } from "../popup/popup";
+import { PopupProps, CloseIconPosition } from "../popup/index";
 import { CascaderOption, CascaderValue, CascaderOptionKey } from './types';
 export interface CascaderProps extends Pick<PopupProps, 'className' | 'style' | 'closeIcon' | 'closeable' | 'title' | 'left' | 'closeIconPosition' | 'onClose'> {
     popup: boolean;
@@ -13,7 +13,7 @@ export interface CascaderProps extends Pick<PopupProps, 'className' | 'style' |
     optionKey: CascaderOptionKey;
     format: Record<string, string | number | null>;
     closeable: boolean;
-    closeIconPosition: string;
+    closeIconPosition: CloseIconPosition;
     closeIcon: ReactNode;
     lazy: boolean;
     onLoad: (node: any, resolve: any) => void;

package/dist/cjs/packages/cascader/cascader.js

@@ -20,12 +20,12 @@ var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _components = require("@tarojs/components");
-var _popup = require("../popup/popup");
+var _index = /*#__PURE__*/ _interop_require_default._(require("../popup/index"));
 var _tabs = require("../tabs/tabs");
 var _utils = /*#__PURE__*/ _interop_require_wildcard._(require("./utils"));
 var _typings = require("../../utils/typings");
-var _usepropsvalue = require("../../utils/use-props-value");
-var _index = require("../configprovider/index");
+var _usepropsvalue = require("../../hooks/use-props-value");
+var _index1 = require("../configprovider/index");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     activeColor: '',
     activeIcon: 'checklist',
@@ -47,7 +47,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     onPathChange: function onPathChange() {}
 });
 var InternalCascader = function InternalCascader(props, ref) {
-    var locale = (0, _index.useConfig)().locale;
+    var locale = (0, _index1.useConfig)().locale;
     var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, activeColor = _$_object_spread.activeColor, activeIcon = _$_object_spread.activeIcon, popup = _$_object_spread.popup, _object_spread_popupProps = _$_object_spread.popupProps, popupProps = _object_spread_popupProps === void 0 ? {} : _object_spread_popupProps, visible = _$_object_spread.visible, options = _$_object_spread.options, value = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, optionKey = _$_object_spread.optionKey, format = _$_object_spread.format, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, lazy = _$_object_spread.lazy, title = _$_object_spread.title, left = _$_object_spread.left, onLoad = _$_object_spread.onLoad, onClose = _$_object_spread.onClose, onChange = _$_object_spread.onChange, onPathChange = _$_object_spread.onPathChange;
     var _useState = (0, _sliced_to_array._)((0, _react.useState)('c1'), 2), tabvalue = _useState[0], setTabvalue = _useState[1];
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)([]), 2), optionsData = _useState1[0], setOptionsData = _useState1[1];
@@ -495,7 +495,7 @@ var InternalCascader = function InternalCascader(props, ref) {
             className: classesPane
         }))));
     };
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, popup ? /*#__PURE__*/ _react.default.createElement(_popup.Popup, (0, _object_spread_props._)((0, _object_spread._)({}, popupProps), {
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, popup ? /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread_props._)((0, _object_spread._)({}, popupProps), {
         visible: innerVisible,
         position: "bottom",
         round: true,