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

package/dist/es/packages/popup/style-jmapp/popup.scss

@@ -88,11 +88,6 @@
     }
   }
 
-  &-bottom,
-  &-top {
-    max-height: 87%;
-  }
-
   &-bottom {
     bottom: 0;
     left: 0;
@@ -101,6 +96,10 @@
     &.nut-popup-round {
       border-radius: $popup-border-radius $popup-border-radius 0 0;
     }
+
+    &-top {
+      position: absolute;
+    }
   }
 
   &-right {

package/dist/es/packages/popup/style-jmapp/style.css

@@ -80,9 +80,6 @@
 .nut-popup-center.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 12px);
 }
-.nut-popup-bottom, .nut-popup-top {
-  max-height: 87%;
-}
 .nut-popup-bottom {
   bottom: 0;
   left: 0;
@@ -91,6 +88,9 @@
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 12px) var(--nutui-popup-border-radius, 12px) 0 0;
 }
+.nut-popup-bottom-top {
+  position: absolute;
+}
 .nut-popup-right {
   top: 0;
   right: 0;

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

@@ -88,11 +88,6 @@
     }
   }
 
-  &-bottom,
-  &-top {
-    max-height: 87%;
-  }
-
   &-bottom {
     bottom: 0;
     left: 0;
@@ -101,6 +96,10 @@
     &.nut-popup-round {
       border-radius: $popup-border-radius $popup-border-radius 0 0;
     }
+
+    &-top {
+      position: absolute;
+    }
   }
 
   &-right {

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

@@ -80,9 +80,6 @@
 .nut-popup-center.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 12px);
 }
-.nut-popup-bottom, .nut-popup-top {
-  max-height: 87%;
-}
 .nut-popup-bottom {
   bottom: 0;
   left: 0;
@@ -91,6 +88,9 @@
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 12px) var(--nutui-popup-border-radius, 12px) 0 0;
 }
+.nut-popup-bottom-top {
+  position: absolute;
+}
 .nut-popup-right {
   top: 0;
   right: 0;

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,19 +90,23 @@ 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, {
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, harmony() || process.env.TARO_ENV === 'dynamic' ? /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, " ").concat(classPrefix, "-").concat(color, " ").concat(className),
         style: style
     }, renderInner()) : /*#__PURE__*/ React.createElement(View, {

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

@@ -9,7 +9,7 @@
   &-integer,
   &-decimal {
     color: $price-color;
-    font-family: 'JD';
+    font-family: 'JDZH-Bold';
     line-height: 1;
   }
 
@@ -18,7 +18,7 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JD-Bold';
+        font-family: 'JDZH-Bold';
         color: $price-darkgray-color;
       }
     }
@@ -29,7 +29,7 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JD-Bold';
+        font-family: 'JDZH-Bold';
         color: $price-primary-color;
       }
     }

package/dist/es/packages/price/style/style.css

@@ -4,22 +4,22 @@
 /* #endif */
 .nut-price {
   direction: ltr;
-  font-size: var(--nutui-font-size-l, 16px);
+  font-size: var(--nutui-font-size-l, 15px);
   display: flex;
   flex-direction: row;
   align-items: baseline;
 }
 .nut-price-symbol, .nut-price-integer, .nut-price-decimal {
   color: var(--nutui-price-color, var(--nutui-color-text-help));
-  font-family: "JD";
+  font-family: "JDZH-Bold";
   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";
+  font-family: "JDZH-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";
+  font-family: "JDZH-Bold";
   color: var(--nutui-price-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-price-symbol {

package/dist/es/packages/price/style/style.harmony.css

@@ -4,22 +4,22 @@
 /* #endif */
 .nut-price {
   direction: ltr;
-  font-size: var(--nutui-font-size-l, 16px);
+  font-size: var(--nutui-font-size-l, 15px);
   display: flex;
   flex-direction: row;
   align-items: baseline;
 }
 .nut-price-symbol, .nut-price-integer, .nut-price-decimal {
   color: var(--nutui-price-color, var(--nutui-color-text-help));
-  font-family: "JD";
+  font-family: "JDZH-Bold";
   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";
+  font-family: "JDZH-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";
+  font-family: "JDZH-Bold";
   color: var(--nutui-price-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-price-symbol {

package/dist/es/packages/price/style-jmapp/price.scss

@@ -9,7 +9,7 @@
   &-integer,
   &-decimal {
     color: $price-color;
-    font-family: 'JD';
+    font-family: 'JDZH-Bold';
     line-height: 1;
   }
 
@@ -18,7 +18,7 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JD-Bold';
+        font-family: 'JDZH-Bold';
         color: $price-darkgray-color;
       }
     }
@@ -29,7 +29,7 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JD-Bold';
+        font-family: 'JDZH-Bold';
         color: $price-primary-color;
       }
     }

package/dist/es/packages/price/style-jmapp/style.css

@@ -11,15 +11,15 @@
 }
 .nut-price-symbol, .nut-price-integer, .nut-price-decimal {
   color: var(--nutui-price-color, var(--nutui-color-text-help));
-  font-family: "JD";
+  font-family: "JDZH-Bold";
   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";
+  font-family: "JDZH-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";
+  font-family: "JDZH-Bold";
   color: var(--nutui-price-color, var(--nutui-color-primary));
 }
 .nut-price-symbol {

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

@@ -9,7 +9,7 @@
   &-integer,
   &-decimal {
     color: $price-color;
-    font-family: 'JD';
+    font-family: 'JDZH-Bold';
     line-height: 1;
   }
 
@@ -18,7 +18,7 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JD-Bold';
+        font-family: 'JDZH-Bold';
         color: $price-darkgray-color;
       }
     }
@@ -29,7 +29,7 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JD-Bold';
+        font-family: 'JDZH-Bold';
         color: $price-primary-color;
       }
     }

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

@@ -11,15 +11,15 @@
 }
 .nut-price-symbol, .nut-price-integer, .nut-price-decimal {
   color: var(--nutui-price-color, var(--nutui-color-text-help));
-  font-family: "JD";
+  font-family: "JDZH-Bold";
   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";
+  font-family: "JDZH-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";
+  font-family: "JDZH-Bold";
   color: var(--nutui-price-color, var(--nutui-color-primary, #ff6666));
 }
 .nut-price-symbol {

package/dist/es/packages/pulltorefresh/pulltorefresh.js

@@ -31,7 +31,58 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 export var PullToRefresh = function(p) {
     var doRefresh = function doRefresh() {
-        return _doRefresh.apply(this, arguments);
+        return _async_to_generator(function() {
+            var e;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        setHeight(headHeight);
+                        setStatus('refreshing');
+                        _state.label = 1;
+                    case 1:
+                        _state.trys.push([
+                            1,
+                            3,
+                            ,
+                            4
+                        ]);
+                        return [
+                            4,
+                            props.onRefresh()
+                        ];
+                    case 2:
+                        _state.sent();
+                        setStatus('complete');
+                        return [
+                            3,
+                            4
+                        ];
+                    case 3:
+                        e = _state.sent();
+                        setHeight(0);
+                        setStatus('pulling');
+                        throw e;
+                    case 4:
+                        if (!(props.completeDelay > 0)) return [
+                            3,
+                            6
+                        ];
+                        return [
+                            4,
+                            sleep(props.completeDelay)
+                        ];
+                    case 5:
+                        _state.sent();
+                        _state.label = 6;
+                    case 6:
+                        setHeight(0);
+                        setStatus('pulling');
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
     };
     var classPrefix = 'nut-pulltorefresh';
     var locale = useConfig().locale;
@@ -88,61 +139,6 @@ export var PullToRefresh = function(p) {
         }
         clearTimeout(timer.current);
     };
-    function _doRefresh() {
-        _doRefresh = _async_to_generator(function() {
-            var e;
-            return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        setHeight(headHeight);
-                        setStatus('refreshing');
-                        _state.label = 1;
-                    case 1:
-                        _state.trys.push([
-                            1,
-                            3,
-                            ,
-                            4
-                        ]);
-                        return [
-                            4,
-                            props.onRefresh()
-                        ];
-                    case 2:
-                        _state.sent();
-                        setStatus('complete');
-                        return [
-                            3,
-                            4
-                        ];
-                    case 3:
-                        e = _state.sent();
-                        setHeight(0);
-                        setStatus('pulling');
-                        throw e;
-                    case 4:
-                        if (!(props.completeDelay > 0)) return [
-                            3,
-                            6
-                        ];
-                        return [
-                            4,
-                            sleep(props.completeDelay)
-                        ];
-                    case 5:
-                        _state.sent();
-                        _state.label = 6;
-                    case 6:
-                        setHeight(0);
-                        setStatus('pulling');
-                        return [
-                            2
-                        ];
-                }
-            });
-        });
-        return _doRefresh.apply(this, arguments);
-    }
     var handleTouchEnd = function() {
         if (props.disabled) return;
         pullingRef.current = false;

package/dist/es/packages/radio/index.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { Radio } from "./radio";
 import { RadioGroup } from "../radiogroup/radiogroup";
 var InnerRadio = Radio;

package/dist/es/packages/radio/radio.js

@@ -21,7 +21,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 export var Radio = function(props) {
     var classPrefix = 'nut-radio';
-    var _ref = _object_spread({}, defaultProps, props), children = _ref.children, className = _ref.className, style = _ref.style, checked = _ref.checked, defaultChecked = _ref.defaultChecked, shape = _ref.shape, value = _ref.value, icon = _ref.icon, activeIcon = _ref.activeIcon, onChange = _ref.onChange, others = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), children = _ref.children, className = _ref.className, style = _ref.style, checked = _ref.checked, defaultChecked = _ref.defaultChecked, shape = _ref.shape, value = _ref.value, icon = _ref.icon, activeIcon = _ref.activeIcon, onChange = _ref.onChange, ariaLabel = _ref.ariaLabel, others = _object_without_properties(_ref, [
         "children",
         "className",
         "style",
@@ -31,7 +31,8 @@ export var Radio = function(props) {
         "value",
         "icon",
         "activeIcon",
-        "onChange"
+        "onChange",
+        "ariaLabel"
     ]);
     // eslint-disable-next-line prefer-const
     var labelPosition = others.labelPosition, disabled = others.disabled;
@@ -110,7 +111,12 @@ export var Radio = function(props) {
     return /*#__PURE__*/ React.createElement(View, {
         className: cls,
         style: style,
-        onClick: handleClick
+        onClick: handleClick,
+        ariaRole: "radio",
+        ariaLabel: ariaLabel,
+        // @ts-ignore
+        ariaChecked: checkedStatement,
+        ariaDisabled: disabled
     }, renderRadioItem());
 };
 Radio.displayName = 'NutRadio';

package/dist/es/packages/radio/style/radio.scss

@@ -47,7 +47,12 @@
   }
 
   &-button {
+    /* #ifdef dynamic*/
+    display: flex;
+    /* #endif */
+    /* #ifndef dynamic*/
     display: inline-flex;
+    /* #endif */
     align-items: center;
     min-height: 30px;
     padding: $radio-button-padding;

package/dist/es/packages/radio/style/style.css

@@ -26,7 +26,7 @@
   color: var(--nutui-color-text-disabled, #c2c4cc);
   transition-duration: 0.3s;
   transition-property: color, border-color, background-color;
-  font-size: var(--nutui-radio-icon-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-radio-icon-font-size, var(--nutui-font-size-icon, 16px));
 }
 .nut-radio-icon-checked {
   color: var(--nutui-color-primary, #ff0f23);
@@ -41,7 +41,12 @@
   color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-radio-button {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   min-height: 30px;
   padding: var(--nutui-radio-button-padding, 5px 18px);

package/dist/es/packages/radio/style/style.harmony.css

@@ -74,7 +74,7 @@
   color: var(--nutui-color-text-disabled, #c2c4cc);
   transition-duration: 0.3s;
   transition-property: color, border-color, background-color;
-  font-size: var(--nutui-radio-icon-font-size, var(--nutui-font-size-l, 16px));
+  font-size: var(--nutui-radio-icon-font-size, var(--nutui-font-size-icon, 16px));
 }
 .nut-radio-icon-checked {
   color: var(--nutui-color-primary, #ff0f23);
@@ -89,7 +89,12 @@
   color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-radio-button {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   min-height: 30px;
   padding: var(--nutui-radio-button-padding, 5px 18px);

package/dist/es/packages/radio/style-jmapp/radio.scss

@@ -47,7 +47,12 @@
   }
 
   &-button {
+    /* #ifdef dynamic*/
+    display: flex;
+    /* #endif */
+    /* #ifndef dynamic*/
     display: inline-flex;
+    /* #endif */
     align-items: center;
     min-height: 30px;
     padding: $radio-button-padding;

package/dist/es/packages/radio/style-jmapp/style.css

@@ -41,7 +41,12 @@
   color: var(--nutui-color-text-disabled);
 }
 .nut-radio-button {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   min-height: 30px;
   padding: var(--nutui-radio-button-padding, 5px 18px);

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

@@ -47,7 +47,12 @@
   }
 
   &-button {
+    /* #ifdef dynamic*/
+    display: flex;
+    /* #endif */
+    /* #ifndef dynamic*/
     display: inline-flex;
+    /* #endif */
     align-items: center;
     min-height: 30px;
     padding: $radio-button-padding;

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

@@ -41,7 +41,12 @@
   color: var(--nutui-color-text-disabled);
 }
 .nut-radio-button {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   min-height: 30px;
   padding: var(--nutui-radio-button-padding, 5px 18px);