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

package/dist/es/packages/calendarcard/icon.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { Image, View } from "@tarojs/components";
+import { Image } from "@tarojs/components";
 var left = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNi42MDUgOS40OWEuNzcxLjc3MSAwIDAgMSAwLS45OGwzLjYtNC4zNzJhLjc3MS43NzEgMCAwIDEgMS4xOS45ODFMOC4yIDlsMy4xOTcgMy44ODFhLjc3MS43NzEgMCAxIDEtMS4xOTEuOThsLTMuNi00LjM3eiIvPjwvc3ZnPg==';
 var right = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTEuMzk2IDkuNDlhLjc3MS43NzEgMCAwIDAgMC0uOThsLTMuNi00LjM3MmEuNzcxLjc3MSAwIDAgMC0xLjE5MS45ODFMOS44IDlsLTMuMTk2IDMuODgxYS43NzEuNzcxIDAgMCAwIDEuMTkuOThsMy42LTQuMzd6Ii8+PC9zdmc+';
 var doubleLeft = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNMTMuODUzIDQuMDI2YS43NzEuNzcxIDAgMCAxIC4xMiAxLjA4NUwxMC44NjQgOWwzLjExIDMuODg5YS43NzEuNzcxIDAgMSAxLTEuMjA0Ljk2M2wtMy40OTgtNC4zN2EuNzcxLjc3MSAwIDAgMSAwLS45NjRsMy40OTctNC4zNzFhLjc3MS43NzEgMCAwIDEgMS4wODQtLjEyem0tNS4yNDUgMGEuNzcxLjc3MSAwIDAgMSAuMTIgMS4wODVMNS42MTcgOWwzLjExMSAzLjg4OWEuNzcxLjc3MSAwIDAgMS0xLjIwNS45NjNsLTMuNDk3LTQuMzdhLjc3MS43NzEgMCAwIDEgMC0uOTY0bDMuNDk3LTQuMzcxYS43NzEuNzcxIDAgMCAxIDEuMDg1LS4xMnoiLz48L3N2Zz4=';
@@ -13,19 +13,13 @@ if (process.env.TARO_ENV === 'jdharmony_cpp') {
 var Icon = function(param) {
     var url = param.url;
     var style = {
-        background: "url('".concat(url, "') no-repeat center"),
-        backgroundSize: '100% 100%',
         width: 18,
         height: 18
     };
-    if (process.env.TARO_ENV === 'jdharmony_cpp') {
-        return /*#__PURE__*/ React.createElement(Image, {
-            src: url,
-            style: style
-        });
-    }
-    return /*#__PURE__*/ React.createElement(View, {
-        style: style
+    return /*#__PURE__*/ React.createElement(Image, {
+        src: url,
+        style: style,
+        mode: "aspectFit"
     });
 };
 export var ArrowLeft = function() {

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

@@ -49,6 +49,13 @@
     margin-bottom: 4px;
     text-align: center;
 
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-top,
+    &-inner,
+    &-bottom {
+      color: $color-title;
+    }
+
     &.header {
       cursor: auto;
     }
@@ -66,6 +73,12 @@
 
     &.weekend {
       color: $calendar-choose-color;
+
+      .nut-calendarcard-day-top,
+      .nut-calendarcard-day-inner,
+      .nut-calendarcard-day-bottom {
+        color: $calendar-choose-color;
+      }
     }
 
     &.active {

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

@@ -47,6 +47,9 @@
   margin-bottom: 4px;
   text-align: center;
 }
+.nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
+  color: var(--nutui-color-title, #1a1a1a);
+}
 .nut-calendarcard-day.header {
   cursor: auto;
 }
@@ -62,6 +65,11 @@
 .nut-calendarcard-day.weekend {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
 }
+.nut-calendarcard-day.weekend .nut-calendarcard-day-top,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
+}
 .nut-calendarcard-day.active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);

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

@@ -47,6 +47,9 @@
   margin-bottom: 4px;
   text-align: center;
 }
+.nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
+  color: var(--nutui-color-title, #1a1a1a);
+}
 .nut-calendarcard-day.header {
   cursor: auto;
 }
@@ -62,6 +65,11 @@
 .nut-calendarcard-day.weekend {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
 }
+.nut-calendarcard-day.weekend .nut-calendarcard-day-top,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff0f23));
+}
 .nut-calendarcard-day.active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff0f23));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);

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

@@ -49,6 +49,13 @@
     margin-bottom: 4px;
     text-align: center;
 
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-top,
+    &-inner,
+    &-bottom {
+      color: $color-title;
+    }
+
     &.header {
       cursor: auto;
     }
@@ -66,6 +73,12 @@
 
     &.weekend {
       color: $calendar-choose-color;
+
+      .nut-calendarcard-day-top,
+      .nut-calendarcard-day-inner,
+      .nut-calendarcard-day-bottom {
+        color: $calendar-choose-color;
+      }
     }
 
     &.active {

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

@@ -47,6 +47,9 @@
   margin-bottom: 4px;
   text-align: center;
 }
+.nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
+  color: var(--nutui-color-title);
+}
 .nut-calendarcard-day.header {
   cursor: auto;
 }
@@ -62,6 +65,11 @@
 .nut-calendarcard-day.weekend {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
 }
+.nut-calendarcard-day.weekend .nut-calendarcard-day-top,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary));
+}
 .nut-calendarcard-day.active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);

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

@@ -49,6 +49,13 @@
     margin-bottom: 4px;
     text-align: center;
 
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-top,
+    &-inner,
+    &-bottom {
+      color: $color-title;
+    }
+
     &.header {
       cursor: auto;
     }
@@ -66,6 +73,12 @@
 
     &.weekend {
       color: $calendar-choose-color;
+
+      .nut-calendarcard-day-top,
+      .nut-calendarcard-day-inner,
+      .nut-calendarcard-day-bottom {
+        color: $calendar-choose-color;
+      }
     }
 
     &.active {

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

@@ -47,6 +47,9 @@
   margin-bottom: 4px;
   text-align: center;
 }
+.nut-calendarcard-day-top, .nut-calendarcard-day-inner, .nut-calendarcard-day-bottom {
+  color: var(--nutui-color-title);
+}
 .nut-calendarcard-day.header {
   cursor: auto;
 }
@@ -62,6 +65,11 @@
 .nut-calendarcard-day.weekend {
   color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff6666));
 }
+.nut-calendarcard-day.weekend .nut-calendarcard-day-top,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-inner,
+.nut-calendarcard-day.weekend .nut-calendarcard-day-bottom {
+  color: var(--nutui-calendar-choose-color, var(--nutui-color-primary, #ff6666));
+}
 .nut-calendarcard-day.active {
   background-color: var(--nutui-calendar-active-background-color, var(--nutui-color-primary, #ff6666));
   border-radius: var(--nutui-calendar-day-active-border-radius, 4px);

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

@@ -42,13 +42,21 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps),
     },
     onTouchStart: function() {},
     onTouchMove: function() {},
-    onTouchEnd: function() {}
+    onTouchEnd: function() {},
+    overlayProps: {},
+    animated: true
 });
 // 默认1000，参看variables
 var _zIndex = 1100;
 export var Popup = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, visible = _$_object_spread.visible, overlay = _$_object_spread.overlay, closeOnOverlayClick = _$_object_spread.closeOnOverlayClick, overlayStyle = _$_object_spread.overlayStyle, overlayClassName = _$_object_spread.overlayClassName, zIndex = _$_object_spread.zIndex, lockScroll = _$_object_spread.lockScroll, duration = _$_object_spread.duration, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, left = _$_object_spread.left, title = _$_object_spread.title, top = _$_object_spread.top, description = _$_object_spread.description, style = _$_object_spread.style, transition = _$_object_spread.transition, round = _$_object_spread.round, position = _$_object_spread.position, className = _$_object_spread.className, destroyOnClose = _$_object_spread.destroyOnClose, portal = _$_object_spread.portal, resizable = _$_object_spread.resizable, minHeight = _$_object_spread.minHeight, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onOverlayClick = _$_object_spread.onOverlayClick, onCloseIconClick = _$_object_spread.onCloseIconClick, afterShow = _$_object_spread.afterShow, afterClose = _$_object_spread.afterClose, onClick = _$_object_spread.onClick, onTouchStart = _$_object_spread.onTouchStart, onTouchMove = _$_object_spread.onTouchMove, onTouchEnd = _$_object_spread.onTouchEnd, closeAriaLabel = _$_object_spread.closeAriaLabel;
+    var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, visible = _$_object_spread.visible, overlay = _$_object_spread.overlay, closeOnOverlayClick = _$_object_spread.closeOnOverlayClick, overlayStyle = _$_object_spread.overlayStyle, overlayClassName = _$_object_spread.overlayClassName, zIndex = _$_object_spread.zIndex, lockScroll = _$_object_spread.lockScroll, duration = _$_object_spread.duration, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, left = _$_object_spread.left, title = _$_object_spread.title, top = _$_object_spread.top, description = _$_object_spread.description, style = _$_object_spread.style, transition = _$_object_spread.transition, round = _$_object_spread.round, position = _$_object_spread.position, className = _$_object_spread.className, destroyOnClose = _$_object_spread.destroyOnClose, portal = _$_object_spread.portal, resizable = _$_object_spread.resizable, minHeight = _$_object_spread.minHeight, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onOverlayClick = _$_object_spread.onOverlayClick, onCloseIconClick = _$_object_spread.onCloseIconClick, afterShow = _$_object_spread.afterShow, afterClose = _$_object_spread.afterClose, onClick = _$_object_spread.onClick, onTouchStart = _$_object_spread.onTouchStart, onTouchMove = _$_object_spread.onTouchMove, onTouchEnd = _$_object_spread.onTouchEnd, closeAriaLabel = _$_object_spread.closeAriaLabel, overlayProps = _$_object_spread.overlayProps, animated = _$_object_spread.animated;
     var locale = useConfig().locale;
+    var transitionDuration = useMemo(function() {
+        return animated ? Number(duration) : 0;
+    }, [
+        animated,
+        duration
+    ]);
     var _useState = _sliced_to_array(useState(zIndex || _zIndex), 2), index = _useState[0], setIndex = _useState[1];
     var _useState1 = _sliced_to_array(useState(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
     var _useState2 = _sliced_to_array(useState(true), 2), showChildren = _useState2[0], setShowChildren = _useState2[1];
@@ -153,14 +161,14 @@ export var Popup = function(props) {
             if (destroyOnClose) {
                 setTimeout(function() {
                     setShowChildren(false);
-                }, Number(duration));
+                }, transitionDuration);
             }
             onClose === null || onClose === void 0 ? void 0 : onClose();
         }
     }, [
         innerVisible,
         destroyOnClose,
-        duration,
+        transitionDuration,
         onClose,
         setInnerVisible,
         setShowChildren
@@ -340,7 +348,7 @@ export var Popup = function(props) {
             classNames: transitionName,
             mountOnEnter: true,
             unmountOnExit: destroyOnClose,
-            timeout: Number(duration),
+            timeout: Number(transitionDuration),
             in: innerVisible,
             onEntered: afterShow,
             onExited: afterClose
@@ -359,16 +367,16 @@ export var Popup = function(props) {
         }, renderTop(), renderTitle(), showChildren ? children : null));
     };
     var renderNode = function() {
-        return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, _object_spread({
             zIndex: index,
             style: overlayStyles,
             className: overlayClassName,
             visible: innerVisible,
             closeOnOverlayClick: closeOnOverlayClick,
             lockScroll: lockScroll,
-            duration: duration,
+            duration: transitionDuration,
             onClick: handleOverlayClick
-        }) : null, renderPop());
+        }, overlayProps)) : null, renderPop());
     };
     var resolveContainer = function(getContainer) {
         return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;

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

@@ -90,4 +90,6 @@ export interface BasePopup extends BaseProps, BaseOverlay {
     */
     onTouchEnd: (height: number, e: any) => void
     closeAriaLabel?: string;
+    overlayProps?: any;
+    animated?: boolean;
 }

package/dist/es/utils/taro/ConfigurableCSSTransition copy.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+export type TransitionStatus = 'entering' | 'entered' | 'exiting' | 'exited' | 'unmounted';
+interface CSSTransitionProps {
+    in?: boolean;
+    timeout?: number;
+    classNames?: string;
+    nodeRef?: React.RefObject<any>;
+    mountOnEnter?: boolean;
+    unmountOnExit?: boolean;
+    onEntered?: () => void;
+    onExited?: () => void;
+    children: React.ReactElement;
+}
+declare const ConfigurableCSSTransition: React.FC<CSSTransitionProps>;
+export default ConfigurableCSSTransition;

package/dist/es/utils/taro/ConfigurableCSSTransition copy.js

@@ -0,0 +1,119 @@
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import React, { useState, useEffect, useRef, cloneElement, useCallback } from "react";
+var ConfigurableCSSTransition = function(props) {
+    var inPhase = props.in, _props_timeout = props.timeout, timeout = _props_timeout === void 0 ? 300 : _props_timeout, tmp = props.classNames, baseClassName = tmp === void 0 ? '' : tmp, nodeRef = props.nodeRef, mountOnEnter = props.mountOnEnter, unmountOnExit = props.unmountOnExit, onEntered = props.onEntered, onExited = props.onExited, children = props.children;
+    var _useState = _sliced_to_array(useState(function() {
+        if (inPhase) return 'entered';
+        return unmountOnExit || mountOnEnter ? 'unmounted' : 'exited';
+    }), 2), status = _useState[0], setStatus = _useState[1];
+    var _useState1 = _sliced_to_array(useState(function() {
+        if (inPhase) return "".concat(baseClassName, "-enter-done");
+        return "".concat(baseClassName, "-exit-done");
+    }), 2), classes = _useState1[0], setClasses = _useState1[1];
+    var fallbackTimerRef = useRef(null);
+    var statusRef = useRef(status);
+    var prevInPhase = useRef(inPhase);
+    var latestOnAnimationEnd = useRef(children.props.onAnimationEnd);
+    useEffect(function() {
+        latestOnAnimationEnd.current = children.props.onAnimationEnd;
+    });
+    var updateStatus = useCallback(function(nextStatus) {
+        statusRef.current = nextStatus;
+        setStatus(nextStatus);
+    }, []);
+    var handleAnimationEnd = useCallback(function(e) {
+        var _latestOnAnimationEnd_current;
+        (_latestOnAnimationEnd_current = latestOnAnimationEnd.current) === null || _latestOnAnimationEnd_current === void 0 ? void 0 : _latestOnAnimationEnd_current.call(latestOnAnimationEnd, e);
+        if (e && e.target !== e.currentTarget) return;
+        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
+        if (statusRef.current === 'entering') {
+            updateStatus('entered');
+            setClasses("".concat(baseClassName, "-enter-done"));
+            onEntered === null || onEntered === void 0 ? void 0 : onEntered();
+        } else if (statusRef.current === 'exiting') {
+            updateStatus('exited');
+            setClasses("".concat(baseClassName, "-exit-done"));
+            if (unmountOnExit) {
+                updateStatus('unmounted');
+            }
+            onExited === null || onExited === void 0 ? void 0 : onExited();
+        }
+    }, [
+        baseClassName,
+        onEntered,
+        onExited,
+        unmountOnExit,
+        updateStatus
+    ]);
+    var enter = useCallback(function() {
+        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
+        if (statusRef.current === 'unmounted') {
+            updateStatus('exited');
+        }
+        if (timeout === 0) {
+            updateStatus('entered');
+            setClasses("".concat(baseClassName, "-enter-done"));
+            onEntered === null || onEntered === void 0 ? void 0 : onEntered();
+            return;
+        }
+        updateStatus('entering');
+        setClasses("".concat(baseClassName, "-enter ").concat(baseClassName, "-enter-active"));
+        // Safety fallback: Give it extra time over the expected timeout in case onAnimationEnd misses
+        fallbackTimerRef.current = setTimeout(function() {
+            handleAnimationEnd(null);
+        }, timeout + 200);
+    }, [
+        baseClassName,
+        handleAnimationEnd,
+        onEntered,
+        timeout,
+        updateStatus
+    ]);
+    var exit = useCallback(function() {
+        if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
+        if (timeout === 0) {
+            updateStatus('exited');
+            setClasses("".concat(baseClassName, "-exit-done"));
+            if (unmountOnExit) {
+                updateStatus('unmounted');
+            }
+            onExited === null || onExited === void 0 ? void 0 : onExited();
+            return;
+        }
+        updateStatus('exiting');
+        setClasses("".concat(baseClassName, "-exit ").concat(baseClassName, "-exit-active"));
+        fallbackTimerRef.current = setTimeout(function() {
+            handleAnimationEnd(null);
+        }, timeout + 200);
+    }, [
+        baseClassName,
+        handleAnimationEnd,
+        onExited,
+        timeout,
+        unmountOnExit,
+        updateStatus
+    ]);
+    useEffect(function() {
+        if (prevInPhase.current !== inPhase) {
+            if (inPhase) {
+                enter();
+            } else {
+                exit();
+            }
+            prevInPhase.current = inPhase;
+        }
+        return function() {
+            if (fallbackTimerRef.current) clearTimeout(fallbackTimerRef.current);
+        };
+    }, [
+        inPhase,
+        enter,
+        exit
+    ]);
+    if (status === 'unmounted') return null;
+    return /*#__PURE__*/ cloneElement(children, {
+        className: "".concat(children.props.className || '', " ").concat(classes),
+        onAnimationEnd: handleAnimationEnd
+    });
+};
+export default ConfigurableCSSTransition;

package/dist/nutui.react.umd.js

@@ -5489,12 +5489,20 @@
     onTouchMove: function() {
     },
     onTouchEnd: function() {
-    }
+    },
+    overlayProps: {},
+    animated: true
   });
   var _zIndex = 1100;
   var Popup = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$1e, props), children = _$_object_spread.children, visible = _$_object_spread.visible, overlay = _$_object_spread.overlay, closeOnOverlayClick = _$_object_spread.closeOnOverlayClick, overlayStyle = _$_object_spread.overlayStyle, overlayClassName = _$_object_spread.overlayClassName, zIndex = _$_object_spread.zIndex, lockScroll = _$_object_spread.lockScroll, duration = _$_object_spread.duration, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, left2 = _$_object_spread.left, title = _$_object_spread.title, top = _$_object_spread.top, description = _$_object_spread.description, style = _$_object_spread.style, transition = _$_object_spread.transition, round = _$_object_spread.round, position2 = _$_object_spread.position, className = _$_object_spread.className, destroyOnClose = _$_object_spread.destroyOnClose, portal = _$_object_spread.portal, resizable = _$_object_spread.resizable, minHeight = _$_object_spread.minHeight, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onOverlayClick = _$_object_spread.onOverlayClick, onCloseIconClick = _$_object_spread.onCloseIconClick, afterShow = _$_object_spread.afterShow, afterClose = _$_object_spread.afterClose, onClick = _$_object_spread.onClick, onTouchStart = _$_object_spread.onTouchStart, onTouchMove = _$_object_spread.onTouchMove, onTouchEnd = _$_object_spread.onTouchEnd, closeAriaLabel = _$_object_spread.closeAriaLabel;
+    var _$_object_spread = _object_spread({}, defaultProps$1e, props), children = _$_object_spread.children, visible = _$_object_spread.visible, overlay = _$_object_spread.overlay, closeOnOverlayClick = _$_object_spread.closeOnOverlayClick, overlayStyle = _$_object_spread.overlayStyle, overlayClassName = _$_object_spread.overlayClassName, zIndex = _$_object_spread.zIndex, lockScroll = _$_object_spread.lockScroll, duration = _$_object_spread.duration, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, left2 = _$_object_spread.left, title = _$_object_spread.title, top = _$_object_spread.top, description = _$_object_spread.description, style = _$_object_spread.style, transition = _$_object_spread.transition, round = _$_object_spread.round, position2 = _$_object_spread.position, className = _$_object_spread.className, destroyOnClose = _$_object_spread.destroyOnClose, portal = _$_object_spread.portal, resizable = _$_object_spread.resizable, minHeight = _$_object_spread.minHeight, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onOverlayClick = _$_object_spread.onOverlayClick, onCloseIconClick = _$_object_spread.onCloseIconClick, afterShow = _$_object_spread.afterShow, afterClose = _$_object_spread.afterClose, onClick = _$_object_spread.onClick, onTouchStart = _$_object_spread.onTouchStart, onTouchMove = _$_object_spread.onTouchMove, onTouchEnd = _$_object_spread.onTouchEnd, closeAriaLabel = _$_object_spread.closeAriaLabel, overlayProps = _$_object_spread.overlayProps, animated = _$_object_spread.animated;
     var locale = useConfig().locale;
+    var transitionDuration = React.useMemo(function() {
+      return animated ? Number(duration) : 0;
+    }, [
+      animated,
+      duration
+    ]);
     var _useState = _sliced_to_array(React.useState(zIndex || _zIndex), 2), index2 = _useState[0], setIndex = _useState[1];
     var _useState1 = _sliced_to_array(React.useState(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
     var _useState2 = _sliced_to_array(React.useState(true), 2), showChildren = _useState2[0], setShowChildren = _useState2[1];
@@ -5597,14 +5605,14 @@
         if (destroyOnClose) {
           setTimeout(function() {
             setShowChildren(false);
-          }, Number(duration));
+          }, transitionDuration);
         }
         onClose === null || onClose === void 0 ? void 0 : onClose();
       }
     }, [
       innerVisible,
       destroyOnClose,
-      duration,
+      transitionDuration,
       onClose,
       setInnerVisible,
       setShowChildren
@@ -5779,7 +5787,7 @@
         classNames: transitionName,
         mountOnEnter: true,
         unmountOnExit: destroyOnClose,
-        timeout: Number(duration),
+        timeout: Number(transitionDuration),
         in: innerVisible,
         onEntered: afterShow,
         onExited: afterClose
@@ -5798,16 +5806,16 @@
       }, renderTop(), renderTitle(), showChildren ? children : null));
     };
     var renderNode = function() {
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, overlay ? /* @__PURE__ */ React.createElement(Overlay, {
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, overlay ? /* @__PURE__ */ React.createElement(Overlay, _object_spread({
         zIndex: index2,
         style: overlayStyles,
         className: overlayClassName,
         visible: innerVisible,
         closeOnOverlayClick,
         lockScroll,
-        duration,
+        duration: transitionDuration,
         onClick: handleOverlayClick
-      }) : null, renderPop());
+      }, overlayProps)) : null, renderPop());
     };
     var resolveContainer = function(getContainer) {
       return (typeof getContainer === "function" ? getContainer() : getContainer) || document.body;
@@ -7605,19 +7613,13 @@
   var Icon = function(param) {
     var url = param.url;
     var style = {
-      background: "url('".concat(url, "') no-repeat center"),
-      backgroundSize: "100% 100%",
       width: 18,
       height: 18
     };
-    if (process.env.TARO_ENV === "jdharmony_cpp") {
-      return /* @__PURE__ */ React.createElement(components.Image, {
-        src: url,
-        style
-      });
-    }
-    return /* @__PURE__ */ React.createElement(components.View, {
-      style
+    return /* @__PURE__ */ React.createElement(components.Image, {
+      src: url,
+      style,
+      mode: "aspectFit"
     });
   };
   var ArrowLeft = function() {