@nutui/nutui-react 3.0.0-beta.7 → 3.0.0-beta.9

package/dist/cjs/packages/popup/style/popup.scss

@@ -1,15 +1,8 @@
 .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: $overlay-content-bg-color;
-  color: $color-title;
   -webkit-overflow-scrolling: touch;
   font-size: $font-size-base;
 
@@ -22,38 +15,45 @@
     padding: $popup-title-padding;
     position: relative;
 
-    &-left {
-      position: absolute;
-      left: $popup-title-padding;
-    }
-
-    &-title {
+    &-wrapper {
       display: flex;
       flex-direction: column;
       justify-content: center;
       align-items: center;
+    }
+
+    &-title {
+      color: $color-title;
       font-weight: $font-weight-bold;
       font-size: $popup-title-font-size;
+      line-height: $popup-title-font-size;
     }
 
     &-description {
-      color: $color-text-help;
+      color: $color-text;
       font-size: $popup-description-font-size;
       font-weight: $font-weight;
+      &-gap {
+        margin-top: $popup-description-spacing;
+      }
+    }
+
+    &-left {
+      position: absolute;
+      top: $popup-title-padding;
+      left: $popup-title-padding;
     }
 
     &-right {
       position: absolute;
+      top: $popup-title-padding;
+      right: $popup-title-padding;
+
       z-index: 1;
-      cursor: pointer;
       width: $popup-icon-size;
       height: $popup-icon-size;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      top: $popup-title-padding;
-      right: $popup-title-padding;
-      color: $color-text-help;
+      color: $color-title;
+      cursor: pointer;
 
       &:active {
         opacity: 0.7;
@@ -80,9 +80,8 @@
     top: 50%;
     left: 50%;
     min-height: 10%;
-    /* #ifndef rn */
+    max-width: 295px;
     transform: translate(-50%, -50%);
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius;
@@ -91,7 +90,7 @@
 
   &-bottom,
   &-top {
-    max-height: 83%;
+    max-height: 87%;
   }
 
   &-bottom {
@@ -107,10 +106,8 @@
   &-right {
     top: 0;
     right: 0;
-    /* #ifdef rn */
     width: 100px;
     height: 100%;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius 0 0 $popup-border-radius;
@@ -120,10 +117,8 @@
   &-left {
     top: 0;
     left: 0;
-    /* #ifdef rn */
     width: 100px;
     height: 100%;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: 0 $popup-border-radius $popup-border-radius 0;
@@ -134,9 +129,6 @@
     top: 0;
     left: 0;
     width: 100%;
-    /* #ifdef rn */
-    height: 100px;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: 0 0 $popup-border-radius $popup-border-radius;
@@ -215,25 +207,19 @@
     /* 从顶部滑出 */
     @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 */
       }
     }
 
     &-top-enter-active,
     &-top-appear-active {
-      /* #ifndef rn */
       transform: translate3d(0, 0%, 0);
-      /* #endif*/
       animation-fill-mode: both;
       animation-name: popup-slide-top-enter;
       animation-duration: $popup-animation-duration;
@@ -248,25 +234,19 @@
     /* 从右侧滑出 */
     @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*/
       }
     }
 
     &-right-enter-active,
     &-right-appear-active {
-      /* #ifndef rn */
       transform: translate3d(0, 0, 0);
-      /* #endif*/
       animation-fill-mode: both;
       animation-name: popup-slide-right-enter;
       animation-duration: $popup-animation-duration;
@@ -281,25 +261,19 @@
     /* 从底部滑出 */
     @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 */
       }
     }
 
     &-bottom-enter-active,
     &-bottom-appear-active {
-      /* #ifndef rn */
       transform: translate(0, 0);
-      /* #endif */
       animation-fill-mode: both;
       animation-name: popup-slide-bottom-enter;
       animation-duration: $popup-animation-duration;
@@ -314,17 +288,13 @@
     /* 从左侧滑出 */
     @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 */
       }
     }
 
@@ -396,9 +366,7 @@
   &-center {
     left: auto;
     right: 50%;
-    /* #ifndef rn */
     transform: translate(50%, -50%);
-    /* #endif*/
   }
 
   &-bottom {

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

@@ -16,16 +16,10 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
   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 +57,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);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,35 +80,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-gray-7);
   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-gray-6);
+  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-gray-7);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -136,15 +134,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 +149,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 +241,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 +262,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 +283,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 +304,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 +363,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 {

package/dist/cjs/packages/price/index.d.ts

@@ -1,3 +1,3 @@
 import { Price } from './price';
-export type { PriceProps } from './price';
+export type { PriceProps, PriceSize, PriceColor } from './types';
 export default Price;

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

@@ -1,12 +1,3 @@
 import { FunctionComponent } from 'react';
-import { BasicComponent } from "../../utils/typings";
-export interface PriceProps extends BasicComponent {
-    price: number | string;
-    symbol: string;
-    digits: number;
-    thousands: boolean;
-    position: string;
-    size: string;
-    line: boolean;
-}
+import { PriceProps } from './types';
 export declare const Price: FunctionComponent<Partial<PriceProps>>;

package/dist/cjs/packages/price/price.js

@@ -18,16 +18,18 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
 var _typings = require("../../utils/typings");
 var _index = require("../configprovider/index");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+    color: 'primary',
     price: 0,
     symbol: '¥',
     digits: 2,
     thousands: false,
     position: 'before',
-    size: 'large',
+    size: 'normal',
     line: false
 });
 var Price = function Price(props) {
-    var _ref = (0, _object_spread._)({}, defaultProps, props), price = _ref.price, symbol = _ref.symbol, digits = _ref.digits, thousands = _ref.thousands, position = _ref.position, size = _ref.size, line = _ref.line, className = _ref.className, style = _ref.style, rest = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _object_spread._)({}, defaultProps, props), color = _ref.color, price = _ref.price, symbol = _ref.symbol, digits = _ref.digits, thousands = _ref.thousands, position = _ref.position, size = _ref.size, line = _ref.line, className = _ref.className, style = _ref.style, rest = (0, _object_without_properties._)(_ref, [
+        "color",
         "price",
         "symbol",
         "digits",
@@ -48,10 +50,8 @@ var Price = function Price(props) {
             num = 0;
         }
         if (checkPoint(num)) {
-            num = Number(num).toFixed(digits);
-            num = typeof num.split('.') === 'string' ? num.split('.') : num.split('.')[0];
-        } else {
             num = num.toString();
+            num = typeof num.split('.') === 'string' ? num.split('.') : num.split('.')[0];
         }
         if (thousands) {
             return (num || 0).toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,');
@@ -86,14 +86,14 @@ var Price = function Price(props) {
         });
     };
     return /*#__PURE__*/ _react.default.createElement("div", (0, _object_spread._)({
-        className: "".concat(classPrefix, " ").concat(line ? "".concat(classPrefix, "-line") : '', " ").concat(className),
+        className: "".concat(classPrefix, " ").concat(classPrefix, "-").concat(color, " ").concat(className),
         style: style
     }, rest), symbol && position === 'before' ? renderSymbol() : null, /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-integer ").concat(classPrefix, "-integer-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-    }, formatThousands(price)), digits !== 0 ? /*#__PURE__*/ _react.default.createElement("div", {
+    }, formatThousands(price)), digits ? /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-    }, ".") : null, /*#__PURE__*/ _react.default.createElement("div", {
+    }, "."), /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-    }, formatDecimal(price)), symbol && position === 'after' ? renderSymbol() : null);
+    }, formatDecimal(price))) : null, symbol && position === 'after' ? renderSymbol() : null);
 };
 Price.displayName = 'NutPrice';

package/dist/cjs/packages/price/style/price.scss

@@ -8,15 +8,45 @@
   &-symbol,
   &-integer,
   &-decimal {
-    color: $color-primary;
+    color: $price-color;
+    font-family: 'JD';
+    line-height: 1;
+  }
+
+  &-darkgray {
+    .nut-price {
+      &-symbol,
+      &-integer,
+      &-decimal {
+        font-family: 'JD-Bold';
+        color: $price-darkgray-color;
+      }
+    }
+  }
+
+  &-primary {
+    .nut-price {
+      &-symbol,
+      &-integer,
+      &-decimal {
+        font-family: 'JD-Bold';
+        color: $price-primary-color;
+      }
+    }
   }
 
   &-symbol {
-    font-size: $price-symbol-medium-size;
     padding-right: $price-symbol-padding-right;
+    &-xlarge {
+      font-size: $price-symbol-xlarge-size;
+    }
 
     &-large {
-      font-size: $price-symbol-big-size;
+      font-size: $price-symbol-large-size;
+    }
+
+    &-normal {
+      font-size: $price-symbol-normal-size;
     }
 
     &-small {
@@ -30,10 +60,16 @@
   }
 
   &-integer {
-    font-size: $price-integer-medium-size;
+    &-xlarge {
+      font-size: $price-integer-xlarge-size;
+    }
 
     &-large {
-      font-size: $price-integer-big-size;
+      font-size: $price-integer-large-size;
+    }
+
+    &-normal {
+      font-size: $price-integer-normal-size;
     }
 
     &-small {
@@ -42,10 +78,16 @@
   }
 
   &-decimal {
-    font-size: $price-decimal-medium-size;
+    &-xlarge {
+      font-size: $price-decimal-xlarge-size;
+    }
 
     &-large {
-      font-size: $price-decimal-big-size;
+      font-size: $price-decimal-large-size;
+    }
+
+    &-normal {
+      font-size: $price-decimal-normal-size;
     }
 
     &-small {
@@ -55,7 +97,5 @@
 
   &-line {
     text-decoration: line-through $price-line-color;
-    font-size: $price-line-font-size;
-    color: $price-line-color;
   }
 }