@nutui/nutui-react-taro 3.0.18-cpp.beta.1 → 3.0.18

package/dist/es/packages/ellipsis/ellipsis.js

@@ -9,7 +9,7 @@ import React, { useState, useRef, useEffect } from "react";
 import { nextTick, createSelectorQuery } from "@tarojs/taro";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
-import { getRectInMultiPlatform } from "../../utils/taro/get-rect";
+import { getRectInMultiPlatform, getRectInMultiPlatformWithoutCache } from "../../utils/taro/get-rect";
 import { ComponentDefaults } from "../../utils/typings";
 import { useRtl } from "../configprovider/index";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
@@ -217,7 +217,7 @@ export var Ellipsis = function(props) {
                     case 0:
                         return [
                             4,
-                            getRectInMultiPlatform(rootContain.current)
+                            getRectInMultiPlatformWithoutCache(rootContain.current)
                         ];
                     case 1:
                         refe = _state.sent();

package/dist/es/packages/noticebar/style/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/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/noticebar/style/style.harmony.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/noticebar/style-jmapp/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-jmapp/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/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/overlay/overlay.js

@@ -3,6 +3,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useEffect, useState } from "react";
+import { CSSTransition } from "react-transition-group";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
@@ -52,27 +53,20 @@ export var Overlay = function(props) {
         return /*#__PURE__*/ React.createElement(View, _object_spread_props(_object_spread({
             ref: nodeRef,
             className: classes,
-            style: _object_spread_props(_object_spread({}, styles), {
-                display: innerVisible ? 'block' : 'none'
-            })
+            style: styles
         }, rest), {
             catchMove: lockScroll,
             onClick: handleClick
         }), children);
     };
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, renderOverlay());
-// return (
-//   <CSSTransition
-//     nodeRef={nodeRef}
-//     classNames={`${classPrefix}-slide`}
-//     unmountOnExit
-//     timeout={duration}
-//     in={innerVisible}
-//     onEntered={afterShow}
-//     onExited={afterClose}
-//   >
-//     {renderOverlay()}
-//   </CSSTransition>
-// )
+    return /*#__PURE__*/ React.createElement(CSSTransition, {
+        nodeRef: nodeRef,
+        classNames: "".concat(classPrefix, "-slide"),
+        unmountOnExit: true,
+        timeout: duration,
+        in: innerVisible,
+        onEntered: afterShow,
+        onExited: afterClose
+    }, renderOverlay());
 };
 Overlay.displayName = 'NutOverlay';

package/dist/es/packages/popup/popup.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useState, useEffect } from "react";
 import { createPortal } from "react-dom";
-// import { CSSTransition } from 'react-transition-group'
+import { CSSTransition } from "react-transition-group";
 import classNames from "classnames";
 import { Close } from "@nutui/icons-react-taro";
 import { View } from "@tarojs/components";
@@ -107,39 +107,26 @@ export var Popup = function(props) {
             return renderCloseIcon();
         }
     };
-    var renderPop = function() {
-        return /*#__PURE__*/ React.createElement(View, {
+    var renderContent = function() {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(View, {
             ref: refObject,
-            style: _object_spread_props(_object_spread({}, popStyles), {
-                display: innerVisible ? 'block' : 'none'
-            }),
+            style: popStyles,
             className: popClassName,
             onClick: onClick,
             catchMove: lockScroll
-        }, renderTitle(), showChildren ? children : null);
-    // return (
-    //   <CSSTransition
-    //     nodeRef={refObject}
-    //     classNames={transitionName}
-    //     mountOnEnter
-    //     unmountOnExit={destroyOnClose}
-    //     timeout={duration}
-    //     in={innerVisible}
-    //     onEntered={afterShow}
-    //     onExited={afterClose}
-    //   >
-    //     <View
-    //       ref={refObject}
-    //       style={popStyles}
-    //       className={popClassName}
-    //       onClick={onClick}
-    //       catchMove={lockScroll}
-    //     >
-    //       {renderTitle()}
-    //       {showChildren ? children : null}
-    //     </View>
-    //   </CSSTransition>
-    // )
+        }, renderTitle(), showChildren ? children : null));
+    };
+    var renderPop = function() {
+        return /*#__PURE__*/ React.createElement(CSSTransition, {
+            nodeRef: refObject,
+            classNames: transitionName,
+            mountOnEnter: true,
+            unmountOnExit: destroyOnClose,
+            timeout: duration,
+            in: innerVisible,
+            onEntered: afterShow,
+            onExited: afterClose
+        }, renderContent());
     };
     var renderNode = function() {
         return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {

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

@@ -1,11 +1,12 @@
 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 React from "react";
+import React, { useMemo } from "react";
 import { Text, View } from "@tarojs/components";
 import classNames from "classnames";
 import { ComponentDefaults } from "../../utils/typings";
 import { useRtl } from "../configprovider/index";
+import { PriceColorEnum } from "../../types";
 import { harmony } from "../../utils/taro/platform";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     color: 'primary',
@@ -18,9 +19,28 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     line: false
 });
 export var Price = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps, props), color = _$_object_spread.color, price = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, className = _$_object_spread.className, style = _$_object_spread.style;
+    var _$_object_spread = _object_spread({}, defaultProps, props), color = _$_object_spread.color, originalPrice = _$_object_spread.price, symbol = _$_object_spread.symbol, digits = _$_object_spread.digits, thousands = _$_object_spread.thousands, position = _$_object_spread.position, size = _$_object_spread.size, line = _$_object_spread.line, className = _$_object_spread.className, style = _$_object_spread.style;
     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 replaceSpecialChar = function(url) {
         url = url.replace(/"/g, '"');
         url = url.replace(/&/g, '&');
@@ -37,8 +57,8 @@ export var Price = function(props) {
         if (Number(num) === 0) {
             num = 0;
         }
-        num = num.toString();
         if (checkPoint(num)) {
+            num = num.toString();
             num = typeof num.split('.') === 'string' ? num.split('.') : num.split('.')[0];
         }
         if (thousands) {
@@ -51,14 +71,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;
@@ -67,16 +90,20 @@ export var Price = function(props) {
                 "".concat(classPrefix, "-symbol"),
                 "".concat(classPrefix, "-symbol-").concat(size),
                 (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-line"), line), _define_property(_obj, "".concat(classPrefix, "-rtl"), rtl), _obj)
-            ])
+            ]),
+            style: priceColorStyle
         }, symbol ? replaceSpecialChar(symbol) : '');
     };
     var renderInner = function() {
         return /*#__PURE__*/ React.createElement(React.Fragment, null, symbol && position === 'before' ? renderSymbol() : null, /*#__PURE__*/ React.createElement(Text, {
-            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(Text, {
-            className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : '')
-        }, "."), /*#__PURE__*/ React.createElement(Text, {
-            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(Text, {
+            className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : ''),
+            style: priceColorStyle
+        }, ".") : null, /*#__PURE__*/ React.createElement(Text, {
+            className: "".concat(classPrefix, "-decimal ").concat(classPrefix, "-decimal-").concat(size, " ").concat(line ? "".concat(classPrefix, "-line") : ''),
+            style: priceColorStyle
         }, formatDecimal(price))) : null, symbol && position === 'after' ? renderSymbol() : null);
     };
     return /*#__PURE__*/ React.createElement(React.Fragment, null, harmony() ? /*#__PURE__*/ React.createElement(Text, {

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

@@ -1,18 +1,30 @@
 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;
-    price: SimpleValue;
+    /**
+    * 价格类型, 支持自定义颜色
+    */
+    color: PriceColor
+    /**
+    * 价格数量
+    */
+    price: SimpleValue
     /**
     * 符号类型
     */
     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);
+    };
+}();