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

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

@@ -20,7 +20,7 @@ var _icon = require("./icon");
 var _typings = require("../../utils/typings");
 var _utils = require("./utils");
 var _configprovider = require("../configprovider");
-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

@@ -69,7 +69,7 @@
 .nut-calendarcard-day.active .nut-calendarcard-day-top,
 .nut-calendarcard-day.active .nut-calendarcard-day-inner,
 .nut-calendarcard-day.active .nut-calendarcard-day-bottom {
-  color: var(--nutui-color-primary-text, #ffffff);
+  color: #ffffff;
 }
 .nut-calendarcard-day.start, .nut-calendarcard-day.end {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
@@ -79,7 +79,7 @@
 .nut-calendarcard-day.start .nut-calendarcard-day-bottom, .nut-calendarcard-day.end .nut-calendarcard-day-top,
 .nut-calendarcard-day.end .nut-calendarcard-day-inner,
 .nut-calendarcard-day.end .nut-calendarcard-day-bottom {
-  color: var(--nutui-color-primary-text, #ffffff);
+  color: #ffffff;
 }
 .nut-calendarcard-day.start {
   border-top-left-radius: var(--nutui-calendar-day-active-border-radius, 4px);
@@ -98,7 +98,7 @@
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-calendarcard-day .nut-calendar-day-info {
-  color: var(--nutui-color-primary-text, #ffffff);
+  color: #ffffff;
 }
 .nut-calendarcard-day.prev, .nut-calendarcard-day.next, .nut-calendarcard-day.disabled {
   cursor: not-allowed;

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

@@ -21,7 +21,7 @@ var _typings = require("../../utils/typings");
 var _date = require("../../utils/date");
 var _raf = /*#__PURE__*/ _interop_require_default._(require("../../utils/raf"));
 var _configprovider = require("../configprovider");
-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',

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

@@ -10,44 +10,63 @@
   align-items: baseline;
 }
 .nut-price-symbol, .nut-price-integer, .nut-price-decimal {
-  color: var(--nutui-color-primary, #ff0f23);
+  color: var(--nutui-price-color, var(--nutui-color-text-help));
+  font-family: "JD";
+  line-height: 1;
+}
+.nut-price-darkgray .nut-price-symbol, .nut-price-darkgray .nut-price-integer, .nut-price-darkgray .nut-price-decimal {
+  font-family: "JD-Bold";
+  color: var(--nutui-price-darkgray-color, var(--nutui-gray-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-color-primary, #ff0f23));
 }
 .nut-price-symbol {
-  font-size: var(--nutui-price-symbol-medium-size, 14px);
-  padding-right: var(--nutui-price-symbol-padding-right, 1px);
+  padding-right: var(--nutui-price-symbol-padding-right, 0px);
+}
+.nut-price-symbol-xlarge {
+  font-size: var(--nutui-price-symbol-xlarge-size, 12px);
 }
 .nut-price-symbol-large {
-  font-size: var(--nutui-price-symbol-big-size, 18px);
+  font-size: var(--nutui-price-symbol-large-size, 12px);
+}
+.nut-price-symbol-normal {
+  font-size: var(--nutui-price-symbol-normal-size, 12px);
 }
 .nut-price-symbol-small {
-  font-size: var(--nutui-price-symbol-small-size, 10px);
+  font-size: var(--nutui-price-symbol-small-size, 12px);
 }
 .nut-price-symbol-rtl {
   padding-right: 0;
-  padding-left: var(--nutui-price-symbol-padding-right, 1px);
+  padding-left: var(--nutui-price-symbol-padding-right, 0px);
 }
-.nut-price-integer {
-  font-size: var(--nutui-price-integer-medium-size, 16px);
+.nut-price-integer-xlarge {
+  font-size: var(--nutui-price-integer-xlarge-size, 24px);
 }
 .nut-price-integer-large {
-  font-size: var(--nutui-price-integer-big-size, 24px);
+  font-size: var(--nutui-price-integer-large-size, 18px);
+}
+.nut-price-integer-normal {
+  font-size: var(--nutui-price-integer-normal-size, 16px);
 }
 .nut-price-integer-small {
   font-size: var(--nutui-price-integer-small-size, 12px);
 }
-.nut-price-decimal {
-  font-size: var(--nutui-price-decimal-medium-size, 14px);
+.nut-price-decimal-xlarge {
+  font-size: var(--nutui-price-decimal-xlarge-size, 12px);
 }
 .nut-price-decimal-large {
-  font-size: var(--nutui-price-decimal-big-size, 18px);
+  font-size: var(--nutui-price-decimal-large-size, 12px);
+}
+.nut-price-decimal-normal {
+  font-size: var(--nutui-price-decimal-normal-size, 12px);
 }
 .nut-price-decimal-small {
-  font-size: var(--nutui-price-decimal-small-size, 10px);
+  font-size: var(--nutui-price-decimal-small-size, 12px);
 }
 .nut-price-line {
-  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-color-border, rgba(0, 0, 0, 0.06)));
+  text-decoration: line-through var(--nutui-price-line-color, var(--nutui-color-text-help));
 }
 
 .nut-tag {

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

@@ -19,11 +19,11 @@ var _ts_generator = require("@swc/helpers/_/_ts_generator");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _iconsreact = require("@nutui/icons-react");
-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 _usepropsvalue = require("../../hooks/use-props-value");
 var _configprovider = require("../configprovider");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     activeColor: '',
@@ -434,7 +434,7 @@ var InternalCascader = function InternalCascader(props, ref) {
                 if (/*#__PURE__*/ (0, _react.isValidElement)(activeIcon)) {
                     return activeIcon;
                 }
-                return /*#__PURE__*/ _react.default.createElement(_iconsreact.Checklist, {
+                return /*#__PURE__*/ _react.default.createElement(_iconsreact.Check, {
                     className: "".concat(checked ? "".concat(classPrefix, "-icon-check") : '')
                 });
             }
@@ -493,7 +493,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,