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

package/dist/es/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/es/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/es/packages/animatingnumbers/animatingnumbers.js

@@ -1,8 +1,8 @@
+import { _ as _call_super } from "@swc/helpers/_/_call_super";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _inherits } from "@swc/helpers/_/_inherits";
-import { _ as _create_super } from "@swc/helpers/_/_create_super";
 import React, { Component } from "react";
 import { View } from "@tarojs/components";
 import { CountUp } from "./countup";
@@ -10,11 +10,12 @@ var defaultProps = {};
 export var AnimatingNumbers = /*#__PURE__*/ function(Component) {
     "use strict";
     _inherits(AnimatingNumbers, Component);
-    var _super = _create_super(AnimatingNumbers);
     function AnimatingNumbers(props) {
         _class_call_check(this, AnimatingNumbers);
         var _this;
-        _this = _super.call(this, props);
+        _this = _call_super(this, AnimatingNumbers, [
+            props
+        ]);
         _this.state = {};
         return _this;
     }

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

@@ -3,10 +3,11 @@ 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 { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import React, { useEffect, useRef, useState } from "react";
-import { View } from "@tarojs/components";
+import React, { useEffect, useCallback, useRef, useState } from "react";
+import { View, Text } from "@tarojs/components";
 import { createSelectorQuery } from "@tarojs/taro";
 import { ComponentDefaults } from "../../utils/typings";
+import { mergeProps } from "../../utils/merge-props";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     length: 0,
     value: '',
@@ -15,7 +16,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     thousands: false
 });
 export var CountUp = function(props) {
-    var _ref = _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 = _object_without_properties(_ref, [
+    var _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 = _object_without_properties(_mergeProps, [
         "length",
         "value",
         "delay",
@@ -26,84 +27,95 @@ export var CountUp = function(props) {
     ]);
     var classPrefix = 'nut-countup';
     var countupRef = useRef(null);
-    var timerRef = useRef(0);
+    var timerRef = useRef();
     var numbers = Array.from({
         length: 10
     }, function(v, i) {
         return i;
     });
-    var getShowNumber = function() {
+    var getShowNumber = 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 = _sliced_to_array(useState([]), 2), numerArr = _useState[0], setNumerArr = _useState[1];
+    }, [
+        length,
+        thousands,
+        value
+    ]);
+    var _useState = _sliced_to_array(useState([]), 2), numberArr = _useState[0], setNumberArr = _useState[1];
     var _useState1 = _sliced_to_array(useState([]), 2), transformArr = _useState1[0], setTransformArr = _useState1[1];
     var isLoaded = useRef(false);
-    var setNumberTransform = function() {
-        if (countupRef.current && numerArr.length) {
-            var query = createSelectorQuery().selectAll('.nut-countup-listitem').node(function(numberItems) {
+    var setNumberTransform = useCallback(function() {
+        if (countupRef.current && numberArr.length) {
+            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(_to_consumable_array(transformArrCache));
             }).exec();
         }
-    };
-    var numberEaseStyle = function(idx) {
-        return {
-            transition: "transform ".concat(duration, "s ease-in-out"),
-            transform: transformArr[idx] ? transformArr[idx] : null
-        };
-    };
-    useEffect(function() {
-        setNumberTransform();
     }, [
-        numerArr
+        numberArr
     ]);
     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
+    ]);
+    useEffect(function() {
+        setNumberArr(getShowNumber());
+    }, [
+        value,
+        getShowNumber
     ]);
-    return /*#__PURE__*/ React.createElement(View, {
+    return /*#__PURE__*/ React.createElement(View, _object_spread({
         className: "".concat(classPrefix, " ").concat(className),
         ref: countupRef
-    }, /*#__PURE__*/ React.createElement("ul", {
+    }, rest), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-list")
-    }, numerArr.map(function(item, idx) {
-        return /*#__PURE__*/ React.createElement("li", {
+    }, numberArr.map(function(item, idx) {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-listitem ").concat(!Number.isNaN(Number(item)) ? "".concat(classPrefix, "-listitem-number") : ''),
             key: idx
-        }, !Number.isNaN(Number(item)) ? /*#__PURE__*/ React.createElement("span", {
+        }, !Number.isNaN(Number(item)) ? /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-number"),
-            style: numberEaseStyle(idx)
+            style: transformArr === null || transformArr === void 0 ? void 0 : transformArr[idx]
         }, _to_consumable_array(numbers).concat(_to_consumable_array(numbers)).map(function(number, subidx) {
-            return /*#__PURE__*/ React.createElement("span", {
+            return /*#__PURE__*/ React.createElement(Text, {
+                className: "".concat(classPrefix, "-number-text"),
                 key: subidx
             }, number);
-        })) : /*#__PURE__*/ React.createElement("span", {
+        })) : /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-separator")
         }, item));
     })));
 };
-CountUp.defaultProps = defaultProps;
 CountUp.displayName = 'NutCountUp';

package/dist/es/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/es/packages/audio/audio.d.ts

@@ -2,21 +2,9 @@ import React, { CSSProperties, FunctionComponent } from 'react';
 import { InnerAudioContext } from '@tarojs/taro';
 import { BasicComponent } from "../../utils/typings";
 export interface AudioProps extends BasicComponent {
-    /**
-    * 类名
-    * @default -
-    */
-    className?: string
-    /**
-    * css样式
-    * @default {}
-    */
-    style?: CSSProperties
-    /**
-    * 语音资源链接
-    * @default -
-    */
-    url: string
+    className?: string;
+    style?: CSSProperties;
+    url: string;
     autoplay?: boolean;
     /**
     * 是否循环播放
@@ -25,33 +13,25 @@ export interface AudioProps extends BasicComponent {
     loop?: boolean
     /**
     * 展示形式，可选值：controls 控制面板 progress 进度条 icon 图标 none 自定义
-    * @default 'progress'
+    * @default progress
     */
     type: string
+    onFastBack?: (ctx: InnerAudioContext) => void;
     /**
-    * 语音快退回调,type=progress时生效
-    * @default 
-    */
-    onFastBack?: (ctx: InnerAudioContext) => void
-    /**
-    * 语音快进回调,type=progress时生效
-    * @default 
+    * 语音快进回调，type = progress 时生效
+    * @default -
     */
     onForward?: (ctx: InnerAudioContext) => void
     /**
     * 暂停回调
-    * @default 
+    * @default -
     */
     onPause?: any
     onPlay?: any;
-    /**
-    * 语音播放完成，loop=false时生效
-    * @default 
-    */
-    onPlayEnd?: (ctx: InnerAudioContext) => void
+    onPlayEnd?: (ctx: InnerAudioContext) => void;
     /**
     * 可以播放媒体时触发
-    * @default 
+    * @default -
     */
     onCanPlay?: (ctx: InnerAudioContext) => void
 }

package/dist/es/packages/audio/audio.js

@@ -5,6 +5,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useState, useRef } from "react";
 import { createInnerAudioContext } from "@tarojs/taro";
 import { Service } from "@nutui/icons-react-taro";
+import { View } from "@tarojs/components";
 import Range from "../range/index";
 import Button from "../button/index";
 import { useConfig } from "../configprovider/configprovider";
@@ -73,19 +74,19 @@ export var Audio = function(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() {
@@ -95,7 +96,7 @@ export var Audio = function(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));
@@ -105,22 +106,21 @@ export var Audio = function(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() {
         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() {
         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() {
         setPlaying(!playing);
@@ -131,21 +131,21 @@ export var Audio = function(props) {
         }
     };
     var renderIcon = function() {
-        return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-icon")
-        }, /*#__PURE__*/ React.createElement("div", {
+        }, /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-icon-box} ").concat(playing ? "".concat(classPrefix, "-icon-play}") : "".concat(classPrefix, "-icon-stop}")),
             onClick: handleStatusChange
         }, /*#__PURE__*/ React.createElement(Service, {
             className: playing ? 'nut-icon-loading' : ''
-        }))));
+        })));
     };
     var renderProgerss = function() {
-        return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-progress")
-        }, /*#__PURE__*/ React.createElement("div", {
+        }, /*#__PURE__*/ React.createElement(View, {
             className: "time"
-        }, currentDuration), /*#__PURE__*/ React.createElement("div", {
+        }, currentDuration), /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-progress-bar-wrapper")
         }, /*#__PURE__*/ React.createElement(Range, {
             value: percent,
@@ -157,9 +157,9 @@ export var Audio = function(props) {
             minDescription: null,
             "inactive-color": "#cccccc",
             "active-color": "#FF0F23"
-        })), /*#__PURE__*/ React.createElement("div", {
+        })), /*#__PURE__*/ React.createElement(View, {
             className: "time"
-        }, formatSeconds("".concat(totalSeconds)) || '00:00:00')), /*#__PURE__*/ React.createElement("div", {
+        }, formatSeconds("".concat(totalSeconds)) || '00:00:00')), /*#__PURE__*/ React.createElement(View, {
             className: isCanPlay ? 'custom-button-group' : 'custom-button-group-disable'
         }, /*#__PURE__*/ React.createElement(Button, {
             type: "primary",
@@ -178,7 +178,7 @@ export var Audio = function(props) {
         }, locale.audio.forward || '快进')));
     };
     var renderNone = function() {
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-none-container"),
             onClick: handleStatusChange
         }, children);
@@ -195,10 +195,9 @@ export var Audio = function(props) {
                 return null;
         }
     };
-    return /*#__PURE__*/ React.createElement("div", _object_spread({
+    return /*#__PURE__*/ React.createElement(View, _object_spread({
         className: "".concat(classPrefix, " ").concat(className),
         style: style
     }, rest), renderAudio());
 };
-Audio.defaultProps = defaultProps;
 Audio.displayName = 'NutAudio';