@nutui/nutui-react-taro 3.0.11-patch.0 → 3.0.12

package/dist/es/packages/progress/progress.js

@@ -21,7 +21,8 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 export var Progress = function(props) {
     var rtl = useRtl();
-    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, percent = _ref.percent, background = _ref.background, color = _ref.color, strokeWidth = _ref.strokeWidth, showText = _ref.showText, animated = _ref.animated, children = _ref.children, lazy = _ref.lazy, delay = _ref.delay, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, percent = _ref.percent, background = _ref.background, color = _ref.color, strokeWidth = _ref.strokeWidth, showText = _ref.showText, animated = _ref.animated, children = _ref.children, lazy = _ref.lazy, delay = _ref.delay, // tc
+    showInfo = _ref.showInfo, borderRadius = _ref.borderRadius, fontSize = _ref.fontSize, activeColor = _ref.activeColor, backgroundColor = _ref.backgroundColor, active = _ref.active, activeMode = _ref.activeMode, duration = _ref.duration, ariaLabel = _ref.ariaLabel, onActiveEnd = _ref.onActiveEnd, rest = _object_without_properties(_ref, [
         "className",
         "style",
         "percent",
@@ -32,24 +33,51 @@ export var Progress = function(props) {
         "animated",
         "children",
         "lazy",
-        "delay"
+        "delay",
+        "showInfo",
+        "borderRadius",
+        "fontSize",
+        "activeColor",
+        "backgroundColor",
+        "active",
+        "activeMode",
+        "duration",
+        "ariaLabel",
+        "onActiveEnd"
     ]);
     var classPrefix = 'nut-progress';
+    var _props_showText, _ref1;
+    var effectiveShowText = (_ref1 = (_props_showText = props.showText) !== null && _props_showText !== void 0 ? _props_showText : showInfo) !== null && _ref1 !== void 0 ? _ref1 : defaultProps.showText;
+    var _props_color, _ref2;
+    var effectiveColor = (_ref2 = (_props_color = props.color) !== null && _props_color !== void 0 ? _props_color : activeColor) !== null && _ref2 !== void 0 ? _ref2 : defaultProps.color;
+    var _props_background, _ref3;
+    var effectiveBgColor = (_ref3 = (_props_background = props.background) !== null && _props_background !== void 0 ? _props_background : backgroundColor) !== null && _ref3 !== void 0 ? _ref3 : defaultProps.background;
+    var _props_animated, _ref4;
+    var effectiveAnimated = (_ref4 = (_props_animated = props.animated) !== null && _props_animated !== void 0 ? _props_animated : active) !== null && _ref4 !== void 0 ? _ref4 : defaultProps.animated;
     var _obj;
-    var classesInner = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-inner"), true), _define_property(_obj, "".concat(classPrefix, "-active"), animated), _obj));
-    var stylesOuter = {
-        width: '100%',
-        backgroundColor: background
-    };
+    var classesInner = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-inner"), true), _define_property(_obj, "".concat(classPrefix, "-active"), effectiveAnimated), _obj));
     var _useState = _sliced_to_array(useState(percent), 2), displayPercent = _useState[0], setDispalyPercent = _useState[1];
-    var stylesInner = {
-        width: "".concat(displayPercent, "%"),
-        background: color || '#FF0F23'
+    var getStyles = function() {
+        // 基础样式
+        var baseStyles = {
+            height: strokeWidth && pxTransform(Number(strokeWidth)),
+            borderRadius: borderRadius && pxTransform(parseInt(borderRadius.toString()))
+        };
+        var transitionStyle = {
+            transition: "width ".concat(duration || 300, "ms ease-in-out")
+        };
+        return {
+            outer: _object_spread({
+                width: '100%',
+                backgroundColor: effectiveBgColor
+            }, baseStyles),
+            inner: _object_spread({
+                width: "".concat(displayPercent, "%"),
+                background: effectiveColor || '#FF0F23'
+            }, baseStyles, transitionStyle)
+        };
     };
-    if (strokeWidth) {
-        stylesOuter.height = pxTransform(Number(strokeWidth));
-        stylesInner.height = pxTransform(Number(strokeWidth));
-    }
+    var _getStyles = getStyles(), stylesOuter = _getStyles.outer, stylesInner = _getStyles.inner;
     var handlePercent = function() {
         var timer = null;
         if (delay) {
@@ -64,9 +92,24 @@ export var Progress = function(props) {
         };
     };
     useEffect(function() {
-        setDispalyPercent(percent);
+        var timer = null;
+        if (activeMode === 'backwards') {
+            setDispalyPercent(0);
+            timer = setTimeout(function() {
+                setDispalyPercent(percent);
+            }, duration || 300);
+        } else {
+            setDispalyPercent(percent);
+        }
+        return function() {
+            if (timer) {
+                clearTimeout(timer);
+            }
+        };
     }, [
-        percent
+        percent,
+        activeMode,
+        duration
     ]);
     var _useState1 = _sliced_to_array(useState(false), 2), intersecting = _useState1[0], setIntersecting = _useState1[1];
     var progressRef = useRef(null);
@@ -154,7 +197,8 @@ export var Progress = function(props) {
     };
     var computeInnerStyle = function() {
         var style = {
-            backgroundColor: color || '#ff0f23'
+            backgroundColor: effectiveColor || '#ff0f23',
+            fontSize: fontSize && pxTransform(parseInt(fontSize.toString()))
         };
         if (harmony()) {
             style.width = harmony() ? pxTransform("".concat(percent, "%").length * 9 + 4) : "".concat(percent, "%").length * 9 + 4;
@@ -165,7 +209,8 @@ export var Progress = function(props) {
         ref: progressRef,
         id: selector,
         className: classNames(classPrefix, className),
-        style: style
+        style: style,
+        "aria-label": ariaLabel
     }, rest), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-outer"),
         style: stylesOuter
@@ -173,22 +218,13 @@ export var Progress = function(props) {
         className: classesInner,
         style: _object_spread_props(_object_spread({}, stylesInner), {
             position: 'relative'
-        })
-    }, showText && /*#__PURE__*/ React.createElement(View, {
-        style: _define_property({
-            position: 'relative'
-        }, rtl ? 'left' : 'right', computeRight())
-    }, /*#__PURE__*/ React.createElement(View, {
+        }),
+        onTransitionEnd: onActiveEnd
+    })), effectiveShowText && /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-text"),
-        style: _object_spread_props(_object_spread({}, getTextStyle()), {
-            height: // eslint-disable-next-line no-nested-ternary
-            harmony() ? pxTransform(strokeWidth ? Number(strokeWidth) + 8 : 18) : strokeWidth ? Number(strokeWidth) + 8 : 18,
-            position: 'absolute',
-            top: -(strokeWidth ? (Number(strokeWidth) + 8 - 9) / 2 + 5 : 9)
-        })
-    }, children || /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classPrefix, "-text-inner"),
-        style: computeInnerStyle()
-    }, "".concat(percent, "%")))))));
+        style: {
+            fontSize: fontSize && parseInt(fontSize.toString())
+        }
+    }, children || "".concat(percent, "%")));
 };
 Progress.displayName = 'NutProgress';

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

@@ -5,11 +5,10 @@
   width: 100%;
 
   &-outer {
-    flex: auto;
+    flex: 1;
     border-radius: $progress-border-radius;
     height: $progress-height;
     background: $progress-background;
-
     .nut-progress-active:before {
       content: '';
       position: absolute;
@@ -35,26 +34,11 @@
   &-text {
     display: flex;
     align-items: center;
-    position: absolute;
-    top: $progress-text-position-top;
-    bottom: $progress-text-position-bottom;
     transition: all 0.4s;
-    transform: translate(-50%);
-
-    &-inner {
-      display: flex;
-      flex-direction: row;
-      justify-content: center;
-      align-items: center;
-      height: 100%;
-      width: 100%;
-      color: $progress-text-color;
-      padding: $progress-text-padding;
-      border-radius: $progress-text-border-radius;
-      font-size: $progress-text-font-size;
-      line-height: 1;
-      background: $progress-text-background;
-    }
+    margin-left: 12px;
+    color: $color-text-help;
+    font-family: PingFang SC;
+    font-size: $progress-text-font-size;
   }
 
   @keyframes progressActive {

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

@@ -9,7 +9,7 @@
   width: 100%;
 }
 .nut-progress-outer {
-  flex: auto;
+  flex: 1;
   border-radius: var(--nutui-progress-border-radius, 12px);
   height: var(--nutui-progress-height, 10px);
   background: var(--nutui-progress-background, var(--nutui-color-background, #f2f3f5));
@@ -36,25 +36,11 @@
 .nut-progress-text {
   display: flex;
   align-items: center;
-  position: absolute;
-  top: var(--nutui-progress-text-position-top, -4px);
-  bottom: var(--nutui-progress-text-position-bottom, -4px);
   transition: all 0.4s;
-  transform: translate(-50%);
-}
-.nut-progress-text-inner {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  width: 100%;
-  color: var(--nutui-progress-text-color, #ffffff);
-  padding: var(--nutui-progress-text-padding, 0 5px);
-  border-radius: var(--nutui-progress-text-border-radius, 5px);
-  font-size: var(--nutui-progress-text-font-size, 9px);
-  line-height: 1;
-  background: var(--nutui-progress-text-background, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
+  margin-left: 12px;
+  color: var(--nutui-color-text-help, #888b94);
+  font-family: PingFang SC;
+  font-size: var(--nutui-progress-text-font-size, 13px);
 }
 @keyframes progressActive {
   0% {

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

@@ -9,7 +9,7 @@
   width: 100%;
 }
 .nut-progress-outer {
-  flex: auto;
+  flex: 1;
   border-radius: 12px;
   height: 10px;
   background: #f2f3f5;
@@ -36,25 +36,11 @@
 .nut-progress-text {
   display: flex;
   align-items: center;
-  position: absolute;
-  top: -4px;
-  bottom: -4px;
   transition: all 0.4s;
-  transform: translate(-50%);
-}
-.nut-progress-text-inner {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  width: 100%;
-  color: #ffffff;
-  padding: 0 5px;
-  border-radius: 5px;
-  font-size: 9px;
-  line-height: 1;
-  background: linear-gradient(135deg, #ff475d 0%, #ff0f23 100%);
+  margin-left: 12px;
+  color: #888b94;
+  font-family: PingFang SC;
+  font-size: 13px;
 }
 @keyframes progressActive {
   0% {

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

@@ -5,11 +5,10 @@
   width: 100%;
 
   &-outer {
-    flex: auto;
+    flex: 1;
     border-radius: $progress-border-radius;
     height: $progress-height;
     background: $progress-background;
-
     .nut-progress-active:before {
       content: '';
       position: absolute;
@@ -35,26 +34,11 @@
   &-text {
     display: flex;
     align-items: center;
-    position: absolute;
-    top: $progress-text-position-top;
-    bottom: $progress-text-position-bottom;
     transition: all 0.4s;
-    transform: translate(-50%);
-
-    &-inner {
-      display: flex;
-      flex-direction: row;
-      justify-content: center;
-      align-items: center;
-      height: 100%;
-      width: 100%;
-      color: $progress-text-color;
-      padding: $progress-text-padding;
-      border-radius: $progress-text-border-radius;
-      font-size: $progress-text-font-size;
-      line-height: 1;
-      background: $progress-text-background;
-    }
+    margin-left: 12px;
+    color: $color-text-help;
+    font-family: PingFang SC;
+    font-size: $progress-text-font-size;
   }
 
   @keyframes progressActive {

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

@@ -9,7 +9,7 @@
   width: 100%;
 }
 .nut-progress-outer {
-  flex: auto;
+  flex: 1;
   border-radius: var(--nutui-progress-border-radius, 12px);
   height: var(--nutui-progress-height, 10px);
   background: var(--nutui-progress-background, var(--nutui-color-surface-1));
@@ -36,25 +36,11 @@
 .nut-progress-text {
   display: flex;
   align-items: center;
-  position: absolute;
-  top: var(--nutui-progress-text-position-top, -4px);
-  bottom: var(--nutui-progress-text-position-bottom, -4px);
   transition: all 0.4s;
-  transform: translate(-50%);
-}
-.nut-progress-text-inner {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  width: 100%;
-  color: var(--nutui-progress-text-color, var(--nutui-color-text-dark));
-  padding: var(--nutui-progress-text-padding, 0 5px);
-  border-radius: var(--nutui-progress-text-border-radius, 5px);
+  margin-left: 12px;
+  color: var(--nutui-color-text-help);
+  font-family: PingFang SC;
   font-size: var(--nutui-progress-text-font-size, 9px);
-  line-height: 1;
-  background: var(--nutui-progress-text-background, #ff0f23);
 }
 @keyframes progressActive {
   0% {

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

@@ -5,11 +5,10 @@
   width: 100%;
 
   &-outer {
-    flex: auto;
+    flex: 1;
     border-radius: $progress-border-radius;
     height: $progress-height;
     background: $progress-background;
-
     .nut-progress-active:before {
       content: '';
       position: absolute;
@@ -35,26 +34,11 @@
   &-text {
     display: flex;
     align-items: center;
-    position: absolute;
-    top: $progress-text-position-top;
-    bottom: $progress-text-position-bottom;
     transition: all 0.4s;
-    transform: translate(-50%);
-
-    &-inner {
-      display: flex;
-      flex-direction: row;
-      justify-content: center;
-      align-items: center;
-      height: 100%;
-      width: 100%;
-      color: $progress-text-color;
-      padding: $progress-text-padding;
-      border-radius: $progress-text-border-radius;
-      font-size: $progress-text-font-size;
-      line-height: 1;
-      background: $progress-text-background;
-    }
+    margin-left: 12px;
+    color: $color-text-help;
+    font-family: PingFang SC;
+    font-size: $progress-text-font-size;
   }
 
   @keyframes progressActive {

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

@@ -9,7 +9,7 @@
   width: 100%;
 }
 .nut-progress-outer {
-  flex: auto;
+  flex: 1;
   border-radius: var(--nutui-progress-border-radius, 12px);
   height: var(--nutui-progress-height, 10px);
   background: var(--nutui-progress-background, var(--nutui-color-surface-1));
@@ -36,25 +36,11 @@
 .nut-progress-text {
   display: flex;
   align-items: center;
-  position: absolute;
-  top: var(--nutui-progress-text-position-top, -4px);
-  bottom: var(--nutui-progress-text-position-bottom, -4px);
   transition: all 0.4s;
-  transform: translate(-50%);
-}
-.nut-progress-text-inner {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  width: 100%;
-  color: var(--nutui-progress-text-color, var(--nutui-color-text-dark));
-  padding: var(--nutui-progress-text-padding, 0 5px);
-  border-radius: var(--nutui-progress-text-border-radius, 5px);
+  margin-left: 12px;
+  color: var(--nutui-color-text-help);
+  font-family: PingFang SC;
   font-size: var(--nutui-progress-text-font-size, 9px);
-  line-height: 1;
-  background: var(--nutui-progress-text-background, var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff9999) 0%, var(--nutui-color-primary-stop-2, #ff6666) 100%)));
 }
 @keyframes progressActive {
   0% {