@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

package/dist/cjs/packages/address/types.js

@@ -1,4 +1,3 @@
-// 已选地址
 "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true

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

@@ -1,7 +1,4 @@
 .nut-animate {
-  .nut-ani-container {
-    display: inline-block;
-  }
   /* Animation css */
   [class*='nut-animate-'] {
     animation-duration: 0.5s;

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

@@ -1,9 +1,10 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-animate {
   /* Animation css */
 }
-.nut-animate .nut-ani-container {
-  display: inline-block;
-}
 .nut-animate [class*=nut-animate-] {
   animation-duration: 0.5s;
   animation-timing-function: ease-out;

package/dist/cjs/packages/animatingnumbers/animatingnumbers.js

@@ -9,11 +9,11 @@ Object.defineProperty(exports, "AnimatingNumbers", {
     }
 });
 var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+var _call_super = require("@swc/helpers/_/_call_super");
 var _class_call_check = require("@swc/helpers/_/_class_call_check");
 var _create_class = require("@swc/helpers/_/_create_class");
 var _define_property = require("@swc/helpers/_/_define_property");
 var _inherits = require("@swc/helpers/_/_inherits");
-var _create_super = require("@swc/helpers/_/_create_super");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _components = require("@tarojs/components");
 var _countup = require("./countup");
@@ -21,11 +21,12 @@ var defaultProps = {};
 var AnimatingNumbers = /*#__PURE__*/ function(Component) {
     "use strict";
     (0, _inherits._)(AnimatingNumbers, Component);
-    var _super = (0, _create_super._)(AnimatingNumbers);
     function AnimatingNumbers(props) {
         (0, _class_call_check._)(this, AnimatingNumbers);
         var _this;
-        _this = _super.call(this, props);
+        _this = (0, _call_super._)(this, AnimatingNumbers, [
+            props
+        ]);
         _this.state = {};
         return _this;
     }

package/dist/cjs/packages/animatingnumbers/countup.js

@@ -18,6 +18,7 @@ var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _components = require("@tarojs/components");
 var _taro = require("@tarojs/taro");
 var _typings = require("../../utils/typings");
+var _mergeprops = require("../../utils/merge-props");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     length: 0,
     value: '',
@@ -26,7 +27,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     thousands: false
 });
 var CountUp = function CountUp(props) {
-    var _ref = (0, _object_spread._)({}, defaultProps, props), length = _ref.length, value = _ref.value, delay = _ref.delay, duration = _ref.duration, className = _ref.className, thousands = _ref.thousands, style = _ref.style, reset = (0, _object_without_properties._)(_ref, [
+    var _mergeProps = (0, _mergeprops.mergeProps)(defaultProps, props), length = _mergeProps.length, value = _mergeProps.value, delay = _mergeProps.delay, duration = _mergeProps.duration, className = _mergeProps.className, thousands = _mergeProps.thousands, style = _mergeProps.style, rest = (0, _object_without_properties._)(_mergeProps, [
         "length",
         "value",
         "delay",
@@ -37,84 +38,95 @@ var CountUp = function CountUp(props) {
     ]);
     var classPrefix = 'nut-countup';
     var countupRef = (0, _react.useRef)(null);
-    var timerRef = (0, _react.useRef)(0);
+    var timerRef = (0, _react.useRef)();
     var numbers = Array.from({
         length: 10
     }, function(v, i) {
         return i;
     });
-    var getShowNumber = function getShowNumber() {
+    var getShowNumber = (0, _react.useCallback)(function() {
         var splitArr = value.split('.');
         var intNumber = length && splitArr[0].length < length ? (Array(length).join('0') + splitArr[0]).slice(-length) : splitArr[0];
         var currNumber = "".concat(thousands ? intNumber.replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') : intNumber).concat(splitArr[1] ? '.' : '').concat(splitArr[1] || '');
         return currNumber.split('');
-    };
-    var _useState = (0, _sliced_to_array._)((0, _react.useState)([]), 2), numerArr = _useState[0], setNumerArr = _useState[1];
+    }, [
+        length,
+        thousands,
+        value
+    ]);
+    var _useState = (0, _sliced_to_array._)((0, _react.useState)([]), 2), numberArr = _useState[0], setNumberArr = _useState[1];
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)([]), 2), transformArr = _useState1[0], setTransformArr = _useState1[1];
     var isLoaded = (0, _react.useRef)(false);
-    var setNumberTransform = function setNumberTransform() {
-        if (countupRef.current && numerArr.length) {
-            var query = (0, _taro.createSelectorQuery)().selectAll('.nut-countup-listitem').node(function(numberItems) {
+    var setNumberTransform = (0, _react.useCallback)(function() {
+        if (countupRef.current && numberArr.length) {
+            (0, _taro.createSelectorQuery)().selectAll('.nut-countup-listitem').node(function(numberItems) {
                 var transformArrCache = [];
                 Object.keys(numberItems).forEach(function(key) {
                     var elem = numberItems[Number(key)];
-                    var idx = Number(numerArr[Number(key)]);
-                    if (elem) {
+                    var idx = Number(numberArr[Number(key)]);
+                    var enabled = elem && typeof idx === 'number' && !Number.isNaN(idx);
+                    if (enabled) {
                         // 计算规则：父元素和实际列表高度的百分比，分割成20等份
                         var transform = idx || idx === 0 ? "translate(0, -".concat((idx === 0 ? 10 : idx) * 5, "%)") : '';
-                        transformArrCache.push(transform);
+                        transformArrCache.push({
+                            transitionDuration: "".concat(duration, "s"),
+                            transform: transform
+                        });
                     }
                 });
                 setTransformArr((0, _to_consumable_array._)(transformArrCache));
             }).exec();
         }
-    };
-    var numberEaseStyle = function numberEaseStyle(idx) {
-        return {
-            transition: "transform ".concat(duration, "s ease-in-out"),
-            transform: transformArr[idx] ? transformArr[idx] : null
-        };
-    };
-    (0, _react.useEffect)(function() {
-        setNumberTransform();
     }, [
-        numerArr
+        numberArr
     ]);
     (0, _react.useEffect)(function() {
-        if (!isLoaded.current) {
-            isLoaded.current = true;
-            timerRef.current = window.setTimeout(function() {
-                setNumerArr(getShowNumber());
-            }, delay);
-        } else {
-            setNumerArr(getShowNumber());
+        if (numberArr.length) {
+            if (!isLoaded.current) {
+                isLoaded.current = true;
+                // @ts-ignore
+                timerRef.current = setTimeout(function() {
+                    setNumberTransform();
+                }, delay);
+            } else {
+                setNumberTransform();
+            }
         }
         return function() {
-            window.clearTimeout(timerRef.current);
+            clearTimeout(timerRef.current);
+            isLoaded.current = false;
         };
     }, [
-        value
+        numberArr,
+        delay,
+        setNumberTransform
+    ]);
+    (0, _react.useEffect)(function() {
+        setNumberArr(getShowNumber());
+    }, [
+        value,
+        getShowNumber
     ]);
-    return /*#__PURE__*/ _react.default.createElement(_components.View, {
+    return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
         className: "".concat(classPrefix, " ").concat(className),
         ref: countupRef
-    }, /*#__PURE__*/ _react.default.createElement("ul", {
+    }, rest), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-list")
-    }, numerArr.map(function(item, idx) {
-        return /*#__PURE__*/ _react.default.createElement("li", {
+    }, numberArr.map(function(item, idx) {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-listitem ").concat(!Number.isNaN(Number(item)) ? "".concat(classPrefix, "-listitem-number") : ''),
             key: idx
-        }, !Number.isNaN(Number(item)) ? /*#__PURE__*/ _react.default.createElement("span", {
+        }, !Number.isNaN(Number(item)) ? /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-number"),
-            style: numberEaseStyle(idx)
+            style: transformArr === null || transformArr === void 0 ? void 0 : transformArr[idx]
         }, (0, _to_consumable_array._)(numbers).concat((0, _to_consumable_array._)(numbers)).map(function(number, subidx) {
-            return /*#__PURE__*/ _react.default.createElement("span", {
+            return /*#__PURE__*/ _react.default.createElement(_components.Text, {
+                className: "".concat(classPrefix, "-number-text"),
                 key: subidx
             }, number);
-        })) : /*#__PURE__*/ _react.default.createElement("span", {
+        })) : /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-separator")
         }, item));
     })));
 };
-CountUp.defaultProps = defaultProps;
 CountUp.displayName = 'NutCountUp';

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-countup-list {
   display: inline-flex;
   height: var(--nutui-countup-height, 32px);
@@ -7,29 +11,35 @@
 .nut-countup-listitem {
   height: var(--nutui-countup-height, 32px);
   overflow: hidden;
-  color: var(--nutui-gray-7, #1a1a1a);
-  font-size: var(--nutui-countup-base-size, 18px);
-  font-weight: var(--nutui-font-weight-bold, 500);
+  user-select: none;
+  -webkit-tap-highlight-color: transparent;
 }
 .nut-countup-listitem-number {
   margin: 0 var(--nutui-countup-lr-margin, 0);
   border-radius: var(--nutui-countup-border-radius, 4px);
-  color: var(--nutui-countup-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-countup-color, var(--nutui-gray-7));
   background-color: var(--nutui-countup-bg-color, inherit);
 }
 .nut-countup-separator {
   display: flex;
   height: 80%;
   align-items: flex-end;
-  color: var(--nutui-countup-bg-color, inherit);
+  color: var(--nutui-countup-separator-color, var(--nutui-gray-7));
+  font-size: var(--nutui-countup-base-size, 18px);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 .nut-countup-number {
   display: flex;
   flex-direction: column;
   align-items: center;
   width: var(--nutui-countup-width, auto);
+  transition: transform 1s ease-in-out;
+  transform: translate(0, 0);
 }
-.nut-countup-number span {
+.nut-countup-number-text {
   height: var(--nutui-countup-height, 32px);
   line-height: var(--nutui-countup-height, 32px);
+  color: var(--nutui-countup-color, var(--nutui-gray-7));
+  font-size: var(--nutui-countup-base-size, 18px);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }

package/dist/cjs/packages/audio/audio.js

@@ -17,6 +17,7 @@ var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _taro = require("@tarojs/taro");
 var _iconsreacttaro = require("@nutui/icons-react-taro");
+var _components = require("@tarojs/components");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../range/index"));
 var _index1 = /*#__PURE__*/ _interop_require_default._(require("../button/index"));
 var _configprovider = require("../configprovider/configprovider");
@@ -85,19 +86,19 @@ var Audio = function Audio(props) {
     audioCtx.autoplay = autoplay || false;
     audioCtx.loop = loop || false;
     audioCtx.onPause(function() {
-        props.onPause && props.onPause(audioCtx);
+        onPause === null || onPause === void 0 ? void 0 : onPause(audioCtx);
     });
     audioCtx.onEnded(function() {
-        if (props.loop) {
+        if (loop) {
             console.warn(locale.audio.tips || 'onPlayEnd事件在loop=false时才会触发');
         } else {
-            props.onPlayEnd && props.onPlayEnd(audioCtx);
+            onPlayEnd === null || onPlayEnd === void 0 ? void 0 : onPlayEnd(audioCtx);
         }
     });
     audioCtx.onPlay(function() {
         var duration = audioCtx.duration;
         setTotalSeconds(Math.floor(duration));
-        props.onPlay && props.onPlay(audioCtx);
+        onPlay === null || onPlay === void 0 ? void 0 : onPlay(audioCtx);
     });
     audioCtx.onCanplay(function() {
         var intervalID = setInterval(function() {
@@ -107,7 +108,7 @@ var Audio = function Audio(props) {
             }
         }, 500);
         setIsCanPlay(true);
-        props.onCanPlay && props.onCanPlay(audioCtx);
+        onCanPlay === null || onCanPlay === void 0 ? void 0 : onCanPlay(audioCtx);
     });
     audioCtx.onTimeUpdate(function() {
         var time = parseInt("".concat(audioCtx.currentTime));
@@ -117,22 +118,21 @@ var Audio = function Audio(props) {
         setCurrentDuration(formatSeconds(audioCtx.currentTime.toString()));
     });
     audioCtx.onError(function(res) {
-        console.warn('code', res.errCode);
-        console.warn('message', res.errMsg);
+        console.warn('onError', res.errCode, res.errMsg);
     });
     var handleBack = function handleBack() {
         var currentTime = Math.floor(audioCtx.currentTime);
         statusRef.current.currentTime = Math.max(currentTime - 1, 0);
         setCurrentDuration(formatSeconds(statusRef.current.currentTime.toString()));
         audioCtx.seek(statusRef.current.currentTime);
-        props.onFastBack && props.onFastBack(audioCtx);
+        onFastBack === null || onFastBack === void 0 ? void 0 : onFastBack(audioCtx);
     };
     var handleForward = function handleForward() {
         var currentTime = Math.floor(audioCtx.currentTime);
         statusRef.current.currentTime = Math.min(currentTime + 1, audioCtx.duration);
         setCurrentDuration(formatSeconds(statusRef.current.currentTime.toString()));
         audioCtx.seek(statusRef.current.currentTime);
-        props.onForward && props.onForward(audioCtx);
+        onForward === null || onForward === void 0 ? void 0 : onForward(audioCtx);
     };
     var handleStatusChange = function handleStatusChange() {
         setPlaying(!playing);
@@ -143,21 +143,21 @@ var Audio = function Audio(props) {
         }
     };
     var renderIcon = function renderIcon() {
-        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-icon")
-        }, /*#__PURE__*/ _react.default.createElement("div", {
+        }, /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-icon-box} ").concat(playing ? "".concat(classPrefix, "-icon-play}") : "".concat(classPrefix, "-icon-stop}")),
             onClick: handleStatusChange
         }, /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Service, {
             className: playing ? 'nut-icon-loading' : ''
-        }))));
+        })));
     };
     var renderProgerss = function renderProgerss() {
-        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-progress")
-        }, /*#__PURE__*/ _react.default.createElement("div", {
+        }, /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "time"
-        }, currentDuration), /*#__PURE__*/ _react.default.createElement("div", {
+        }, currentDuration), /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-progress-bar-wrapper")
         }, /*#__PURE__*/ _react.default.createElement(_index.default, {
             value: percent,
@@ -169,9 +169,9 @@ var Audio = function Audio(props) {
             minDescription: null,
             "inactive-color": "#cccccc",
             "active-color": "#FF0F23"
-        })), /*#__PURE__*/ _react.default.createElement("div", {
+        })), /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "time"
-        }, formatSeconds("".concat(totalSeconds)) || '00:00:00')), /*#__PURE__*/ _react.default.createElement("div", {
+        }, formatSeconds("".concat(totalSeconds)) || '00:00:00')), /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: isCanPlay ? 'custom-button-group' : 'custom-button-group-disable'
         }, /*#__PURE__*/ _react.default.createElement(_index1.default, {
             type: "primary",
@@ -190,7 +190,7 @@ var Audio = function Audio(props) {
         }, locale.audio.forward || '快进')));
     };
     var renderNone = function renderNone() {
-        return /*#__PURE__*/ _react.default.createElement("div", {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "".concat(classPrefix, "-none-container"),
             onClick: handleStatusChange
         }, children);
@@ -207,10 +207,9 @@ var Audio = function Audio(props) {
                 return null;
         }
     };
-    return /*#__PURE__*/ _react.default.createElement("div", (0, _object_spread._)({
+    return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
         className: "".concat(classPrefix, " ").concat(className),
         style: style
     }, rest), renderAudio());
 };
-Audio.defaultProps = defaultProps;
 Audio.displayName = 'NutAudio';