@nutui/nutui-react 3.0.17 → 3.0.18

package/dist/es/packages/noticebar/style-jrkf/noticebar.scss

@@ -51,6 +51,9 @@
       min-width: $noticebar-left-icon-width;
       margin-right: $noticebar-icon-gap;
       background-size: 100% 100%;
+      .nut-icon {
+        color: $noticebar-color;
+      }
     }
 
     &-right-icon {
@@ -63,12 +66,14 @@
       .nut-icon {
         width: 12px;
         height: 12px;
+        color: $noticebar-color;
       }
     }
 
     &-wrap {
       display: flex;
       flex: 1;
+      align-items: center;
       height: $noticebar-line-height;
       line-height: $noticebar-line-height;
       overflow: hidden;
@@ -77,6 +82,7 @@
       .nut-noticebar-box-wrap-content {
         position: absolute;
         white-space: nowrap;
+        color: $noticebar-color;
 
         &.nut-ellipsis {
           max-width: 100%;

package/dist/es/packages/noticebar/style-jrkf/style.css

@@ -45,6 +45,9 @@
   margin-right: var(--nutui-noticebar-icon-gap, 4px);
   background-size: 100% 100%;
 }
+.nut-noticebar .nut-noticebar-box-left-icon .nut-icon {
+  color: var(--nutui-noticebar-color, #d9500b);
+}
 .nut-noticebar .nut-noticebar-box-right-icon {
   display: flex;
   align-items: center;
@@ -55,10 +58,12 @@
 .nut-noticebar .nut-noticebar-box-right-icon .nut-icon {
   width: 12px;
   height: 12px;
+  color: var(--nutui-noticebar-color, #d9500b);
 }
 .nut-noticebar .nut-noticebar-box-wrap {
   display: flex;
   flex: 1;
+  align-items: center;
   height: var(--nutui-noticebar-line-height, 24px);
   line-height: var(--nutui-noticebar-line-height, 24px);
   overflow: hidden;
@@ -67,6 +72,7 @@
 .nut-noticebar .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content {
   position: absolute;
   white-space: nowrap;
+  color: var(--nutui-noticebar-color, #d9500b);
 }
 .nut-noticebar .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content.nut-ellipsis {
   max-width: 100%;

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 declare const _default: {
-    text(message: string | React.ReactNode, option?: {}): void;
+    text(message: string | React.ReactNode, option?: {}): Promise<void>;
     hide(): void;
 };
 export default _default;

package/dist/es/packages/notify/notify.js

@@ -27,8 +27,11 @@ function getInstance(props, callback) {
 }
 function notice(opts) {
     opts = _object_spread({}, options, opts);
-    getInstance(opts, function(notification) {
-        messageInstance = notification;
+    return new Promise(function(resolve) {
+        getInstance(opts, function(notification) {
+            messageInstance = notification;
+            resolve();
+        });
     });
 }
 var errorMsg = function(message) {

package/dist/es/packages/price/price.js

@@ -2,10 +2,11 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import React from "react";
+import React, { useMemo } from "react";
 import classNames from "classnames";
 import { ComponentDefaults } from "../../utils/typings";
 import { useRtl } from "../configprovider/index";
+import { PriceColorEnum } from "../../types";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     color: 'primary',
     price: 0,
@@ -17,7 +18,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     line: false
 });
 export var Price = function(props) {
-    var _ref = _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 = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), color = _ref.color, originalPrice = _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 = _object_without_properties(_ref, [
         "color",
         "price",
         "symbol",
@@ -31,6 +32,25 @@ export var Price = function(props) {
     ]);
     var classPrefix = 'nut-price';
     var rtl = useRtl();
+    var price = useMemo(function() {
+        return originalPrice.toString().replace(/[^\d.]/g, '');
+    }, [
+        originalPrice
+    ]);
+    var isCustomPriceColor = useMemo(function() {
+        var specificPriceColor = Object.values(PriceColorEnum);
+        return !specificPriceColor.includes(color);
+    }, [
+        color
+    ]);
+    var priceColorStyle = useMemo(function() {
+        return isCustomPriceColor ? {
+            color: color
+        } : {};
+    }, [
+        isCustomPriceColor,
+        color
+    ]);
     var checkPoint = function(price) {
         return String(price).indexOf('.') > 0;
     };
@@ -52,14 +72,17 @@ export var Price = function(props) {
             decimalNum = 0;
         }
         if (checkPoint(decimalNum)) {
-            decimalNum = Number(decimalNum).toFixed(digits);
-            decimalNum = typeof decimalNum.split('.') === 'string' ? 0 : decimalNum.split('.')[1] || 0;
+            decimalNum = digits ? Number(decimalNum).toFixed(digits) : "".concat(decimalNum);
+            decimalNum = typeof decimalNum.split('.') === 'string' ? 0 : decimalNum.split('.')[1] || '';
         } else {
-            decimalNum = 0;
+            decimalNum = '';
+        }
+        if (digits) {
+            var result = "0.".concat(decimalNum);
+            var resultFixed = Number(result).toFixed(digits);
+            return String(resultFixed).substring(2, resultFixed.length);
         }
-        var result = "0.".concat(decimalNum);
-        var resultFixed = Number(result).toFixed(digits);
-        return String(resultFixed).substring(2, resultFixed.length);
+        return decimalNum;
     };
     var renderSymbol = function() {
         var _obj;
@@ -69,20 +92,24 @@ export var Price = function(props) {
                 "".concat(classPrefix, "-symbol-").concat(size),
                 (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-line"), line), _define_property(_obj, "".concat(classPrefix, "-rtl"), rtl), _obj)
             ]),
+            style: priceColorStyle,
             dangerouslySetInnerHTML: {
                 __html: symbol || ''
             }
         });
     };
     return /*#__PURE__*/ React.createElement("div", _object_spread({
-        className: "".concat(classPrefix, " ").concat(classPrefix, "-").concat(color, " ").concat(className),
+        className: "".concat(classPrefix, " ").concat(classPrefix, "-").concat(isCustomPriceColor ? 'custom' : color, " ").concat(className),
         style: style
     }, rest), symbol && position === 'before' ? renderSymbol() : null, /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-integer ").concat(classPrefix, "-integer-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-    }, formatThousands(price)), digits ? /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-    }, "."), /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
+        className: "".concat(classPrefix, "-integer ").concat(classPrefix, "-integer-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : ''),
+        style: priceColorStyle
+    }, formatThousands(price)), digits !== 0 ? /*#__PURE__*/ React.createElement(React.Fragment, null, checkPoint(price) || digits ? /*#__PURE__*/ React.createElement("div", {
+        className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : ''),
+        style: priceColorStyle
+    }, ".") : null, /*#__PURE__*/ React.createElement("div", {
+        className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : ''),
+        style: priceColorStyle
     }, formatDecimal(price))) : null, symbol && position === 'after' ? renderSymbol() : null);
 };
 Price.displayName = 'NutPrice';

package/dist/es/types/spec/price/base.d.ts

@@ -1,10 +1,16 @@
 import { BaseProps } from '../../base/props';
 import { SimpleValue, UISize } from '../../base/atoms';
 export type PriceSize = Exclude<UISize, 'mini'>;
-export type PriceColor = 'primary' | 'gray' | 'darkgray';
+export type SpecificPriceColor = 'primary' | 'gray' | 'darkgray';
+export type PriceColor = SpecificPriceColor | string;
+export declare enum PriceColorEnum {
+    Primary = "primary",
+    Gray = "gray",
+    Darkgray = "darkgray"
+}
 export interface BasePrice extends BaseProps {
     /**
-    * 价格类型
+    * 价格类型, 支持自定义颜色
     */
     color: PriceColor
     /**
@@ -16,9 +22,9 @@ export interface BasePrice extends BaseProps {
     */
     symbol: string
     /**
-    * 小数位位数
+    * 小数位位数，传入null数据原样输出
     */
-    digits: number
+    digits: number | null
     /**
     * 是否按照千分号形式显示
     */

package/dist/es/types/spec/price/base.js

@@ -1 +1,6 @@
-export { };
+export var PriceColorEnum = /*#__PURE__*/ function(PriceColorEnum) {
+    PriceColorEnum["Primary"] = "primary";
+    PriceColorEnum["Gray"] = "gray";
+    PriceColorEnum["Darkgray"] = "darkgray";
+    return PriceColorEnum;
+}({});

package/dist/es/utils/taro/get-rect.d.ts

@@ -10,3 +10,4 @@ export interface Rect {
 }
 export declare function makeRect(width: number, height: number): Rect;
 export declare const getRectInMultiPlatform: (element: any, harmonyId?: string) => Promise<Rect>;
+export declare const getRectInMultiPlatformWithoutCache: (element: any, harmonyId?: string) => Promise<Rect>;

package/dist/es/utils/taro/get-rect.js

@@ -56,3 +56,37 @@ export var getRectInMultiPlatform = /*#__PURE__*/ function() {
         return _ref.apply(this, arguments);
     };
 }();
+// 获取元素位置，不走缓存
+export var getRectInMultiPlatformWithoutCache = /*#__PURE__*/ function() {
+    var _ref = _async_to_generator(function(element) {
+        var harmonyId;
+        var _arguments = arguments;
+        return _ts_generator(this, function(_state) {
+            harmonyId = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : '';
+            if (element) {
+                if (inBrowser) {
+                    return [
+                        2,
+                        Promise.resolve(getRect(element))
+                    ];
+                }
+                return [
+                    2,
+                    new Promise(function(resolve, reject) {
+                        createSelectorQuery().select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
+                            var _param = _sliced_to_array(param, 1), rects = _param[0];
+                            resolve(rects);
+                        });
+                    })
+                ];
+            }
+            return [
+                2,
+                Promise.resolve(makeRect(0, 0))
+            ];
+        });
+    });
+    return function getRectInMultiPlatformWithoutCache(element) {
+        return _ref.apply(this, arguments);
+    };
+}();