@nutui/nutui-react-taro 3.0.19-cpp.25 → 3.0.19-cpp.26-beta.2

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

@@ -4,13 +4,13 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import React, { useState, useEffect, useRef } from "react";
+import React, { useState, useEffect, useRef, useMemo, useCallback } from "react";
 import { nextTick } from "@tarojs/taro";
 import { createPortal } from "react-dom";
-// import { CSSTransition } from 'react-transition-group'
 import classNames from "classnames";
 import { Close } from "@nutui/icons-react-taro";
 import { View } from "@tarojs/components";
+import ConfigurableCSSTransition from "../../utils/taro/ConfigurableCSSTransition";
 import { getRectInMultiPlatformWithoutCache } from "../../utils/taro/get-rect";
 import { defaultOverlayProps } from "../overlay/overlay";
 import Overlay from "../overlay/index";
@@ -48,54 +48,57 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps),
 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 innerIndex = zIndex || _zIndex;
-    var _useState = _sliced_to_array(useState(innerIndex), 2), index = _useState[0], setIndex = _useState[1];
+    var locale = useConfig().locale;
+    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];
-    var _useState3 = _sliced_to_array(useState(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
     var nodeRef = useLockScrollTaro(innerVisible && lockScroll);
-    var topNodeRef = React.useRef(null);
+    var topNodeRef = useRef(null);
     var rootRect = useRef(null);
     var touchStartRef = useRef(0);
     var touchMoveDistanceRef = useRef(0);
     var heightRef = useRef(0);
     var defaultHeightRef = useRef(0);
     var isTouching = useRef(false);
-    var locale = useConfig().locale;
     var classPrefix = 'nut-popup';
-    var overlayStyles = _object_spread({}, overlayStyle);
-    var contentZIndex = harmony() ? index + 1 : index // 解决harmony层级问题
-    ;
-    var popStyles = _object_spread({
-        zIndex: contentZIndex,
-        minHeight: minHeight
-    }, style);
-    var _obj;
-    var popClassName = classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
-    var _useState4 = _sliced_to_array(useState(''), 2), popupHeight = _useState4[0], setPopupHeight = _useState4[1];
-    var _useState5 = _sliced_to_array(useState(''), 2), topBottom = _useState5[0], setTopBottom = _useState5[1];
-    var resizeStyles = function() {
-        if (popupHeight !== '') {
-            return {
-                height: popupHeight
-            };
-        }
-    };
-    var open = function() {
-        if (!innerVisible) {
-            // 当高度改变后，再次打开时，将高度置为初始高度
-            if (position === 'bottom' && resizable && nodeRef.current && heightRef.current) {
-                setPopupHeight(pxTransform(defaultHeightRef.current));
-            }
-            setInnerVisible(true);
-            setIndex(++innerIndex);
-        }
-        if (destroyOnClose) {
-            setShowChildren(true);
-        }
-        onOpen && onOpen();
-    };
-    var getPopupHeight = function() {
+    var transitionName = useMemo(function() {
+        return transition || "".concat(classPrefix, "-slide-").concat(position);
+    }, [
+        transition,
+        position
+    ]);
+    var overlayStyles = useMemo(function() {
+        return _object_spread({}, overlayStyle);
+    }, [
+        overlayStyle
+    ]);
+    var contentZIndex = useMemo(function() {
+        return harmony() ? index + 1 : index // 解决harmony层级问题
+        ;
+    }, [
+        index
+    ]);
+    var popStyles = useMemo(function() {
+        return _object_spread({
+            zIndex: contentZIndex,
+            minHeight: minHeight
+        }, style);
+    }, [
+        contentZIndex,
+        minHeight,
+        style
+    ]);
+    var popClassName = useMemo(function() {
+        var _obj;
+        return classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
+    }, [
+        round,
+        position,
+        className
+    ]);
+    var _useState3 = _sliced_to_array(useState(''), 2), popupHeight = _useState3[0], setPopupHeight = _useState3[1];
+    var _useState4 = _sliced_to_array(useState(''), 2), topBottom = _useState4[0], setTopBottom = _useState4[1];
+    var getPopupHeight = useCallback(function() {
         return _async_to_generator(function() {
             var _nodeRef_current, rect, height;
             return _ts_generator(this, function(_state) {
@@ -115,19 +118,36 @@ export var Popup = function(props) {
                 }
             });
         })();
-    };
-    useEffect(function() {
-        if (innerVisible && topNodeRef.current && nodeRef.current) {
-            nextTick(function() {
-                nextTick(function() {
-                    getPopupHeight();
-                });
+    }, [
+        nodeRef
+    ]);
+    var open = useCallback(function() {
+        if (!innerVisible) {
+            // 当高度改变后，再次打开时，将高度置为初始高度
+            if (position === 'bottom' && resizable && nodeRef.current && heightRef.current) {
+                setPopupHeight(pxTransform(defaultHeightRef.current));
+            }
+            setInnerVisible(true);
+            setIndex(function(prev) {
+                return prev + 1;
             });
         }
+        if (destroyOnClose) {
+            setShowChildren(true);
+        }
+        onOpen === null || onOpen === void 0 ? void 0 : onOpen();
     }, [
-        innerVisible
+        innerVisible,
+        position,
+        resizable,
+        destroyOnClose,
+        onOpen,
+        nodeRef,
+        setInnerVisible,
+        setIndex,
+        setShowChildren
     ]);
-    var close = function() {
+    var close = useCallback(function() {
         if (innerVisible) {
             setInnerVisible(false);
             if (destroyOnClose) {
@@ -135,28 +155,70 @@ export var Popup = function(props) {
                     setShowChildren(false);
                 }, Number(duration));
             }
-            onClose && onClose();
+            onClose === null || onClose === void 0 ? void 0 : onClose();
         }
-    };
-    var handleOverlayClick = function(e) {
+    }, [
+        innerVisible,
+        destroyOnClose,
+        duration,
+        onClose,
+        setInnerVisible,
+        setShowChildren
+    ]);
+    useEffect(function() {
+        visible ? open() : close();
+    }, [
+        visible,
+        open,
+        close
+    ]);
+    useEffect(function() {
+        if (innerVisible && topNodeRef.current && nodeRef.current) {
+            nextTick(function() {
+                nextTick(function() {
+                    getPopupHeight();
+                });
+            });
+        }
+    }, [
+        innerVisible,
+        getPopupHeight,
+        nodeRef
+    ]);
+    var handleOverlayClick = useCallback(function(e) {
         e.stopPropagation();
         if (closeOnOverlayClick && onOverlayClick(e)) {
             close();
         }
-    };
-    var handleCloseIconClick = function(e) {
+    }, [
+        closeOnOverlayClick,
+        onOverlayClick,
+        close
+    ]);
+    var handleCloseIconClick = useCallback(function(e) {
         onCloseIconClick(e) && close();
-    };
-    var renderCloseIcon = function() {
+    }, [
+        onCloseIconClick,
+        close
+    ]);
+    var renderCloseIcon = useCallback(function() {
+        if (!closeable) return null;
         var closeClasses = classNames("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
-        return /*#__PURE__*/ React.createElement(React.Fragment, null, closeable && /*#__PURE__*/ React.createElement(View, {
+        return /*#__PURE__*/ React.createElement(View, {
             className: closeClasses,
             onClick: handleCloseIconClick,
             ariaRole: "button",
             ariaLabel: closeAriaLabel || locale.close
-        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
-    };
-    var renderTop = function() {
+        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null));
+    }, [
+        closeable,
+        closeIconPosition,
+        handleCloseIconClick,
+        closeAriaLabel,
+        locale.close,
+        closeIcon
+    ]);
+    var renderTop = useCallback(function() {
         if (!top) return null;
         return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-bottom-top"),
@@ -165,8 +227,11 @@ export var Popup = function(props) {
                 bottom: topBottom
             }
         }, top);
-    };
-    var renderTitle = function() {
+    }, [
+        top,
+        topBottom
+    ]);
+    var renderTitle = useCallback(function() {
         if (left || title || description) {
             return /*#__PURE__*/ React.createElement(View, {
                 className: "".concat(classPrefix, "-title")
@@ -183,8 +248,15 @@ export var Popup = function(props) {
         if (closeable) {
             return renderCloseIcon();
         }
-    };
-    var handleTouchStart = function(event) {
+    }, [
+        left,
+        title,
+        description,
+        position,
+        closeable,
+        renderCloseIcon
+    ]);
+    var handleTouchStart = useCallback(function(event) {
         return _async_to_generator(function() {
             var _nodeRef_current, _rootRect_current, e, rect;
             return _ts_generator(this, function(_state) {
@@ -214,8 +286,13 @@ export var Popup = function(props) {
                 }
             });
         })();
-    };
-    var handleTouchMove = function(event) {
+    }, [
+        position,
+        resizable,
+        onTouchStart,
+        nodeRef
+    ]);
+    var handleTouchMove = useCallback(function(event) {
         if (position !== 'bottom' || !resizable || !nodeRef.current || !rootRect.current) return;
         var e = event;
         e.stopPropagation();
@@ -234,21 +311,42 @@ export var Popup = function(props) {
             }
         };
         requestAnimationFrame(handleMove);
-    };
-    var handleTouchEnd = function(event) {
+    }, [
+        position,
+        resizable,
+        minHeight,
+        onTouchMove,
+        nodeRef
+    ]);
+    var handleTouchEnd = useCallback(function(event) {
         if (position !== 'bottom' || !resizable || !nodeRef.current || !rootRect.current) return;
         var e = event;
         isTouching.current = false;
         var min = typeof minHeight === 'number' ? minHeight : parseInt(String(minHeight || 0), 10) || 0;
         var currentHeight = Math.max(min, heightRef.current - touchMoveDistanceRef.current);
         onTouchEnd === null || onTouchEnd === void 0 ? void 0 : onTouchEnd(currentHeight, e);
-    };
+    }, [
+        position,
+        resizable,
+        minHeight,
+        onTouchEnd,
+        nodeRef
+    ]);
     var renderPop = function() {
-        return /*#__PURE__*/ React.createElement(View, {
+        return /*#__PURE__*/ React.createElement(ConfigurableCSSTransition, {
+            nodeRef: nodeRef,
+            classNames: transitionName,
+            mountOnEnter: true,
+            unmountOnExit: destroyOnClose,
+            timeout: Number(duration),
+            in: innerVisible,
+            onEntered: afterShow,
+            onExited: afterClose
+        }, /*#__PURE__*/ React.createElement(View, {
             ref: nodeRef,
-            style: _object_spread(_object_spread_props(_object_spread({}, popStyles), {
-                display: innerVisible ? (popStyles === null || popStyles === void 0 ? void 0 : popStyles.display) || 'block' : 'none'
-            }), resizeStyles()),
+            style: _object_spread({}, popStyles, popupHeight ? {
+                height: popupHeight
+            } : {}),
             className: popClassName,
             onClick: onClick,
             catchMove: lockScroll,
@@ -256,24 +354,8 @@ export var Popup = function(props) {
             onTouchMove: handleTouchMove,
             onTouchEnd: handleTouchEnd,
             onTouchCancel: handleTouchEnd
-        }, renderTop(), renderTitle(), showChildren ? children : null);
+        }, renderTop(), renderTitle(), showChildren ? children : null));
     };
-    // const renderPop = () => {
-    // return (
-    //   <CSSTransition
-    //     nodeRef={nodeRef}
-    //     classNames={transitionName}
-    //     mountOnEnter
-    //     unmountOnExit={destroyOnClose}
-    //     timeout={duration}
-    //     in={innerVisible}
-    //     onEntered={afterShow}
-    //     onExited={afterClose}
-    //   >
-    //     {renderContent()}
-    //   </CSSTransition>
-    // )
-    // }
     var renderNode = function() {
         return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
             zIndex: index,
@@ -286,17 +368,6 @@ export var Popup = function(props) {
             onClick: handleOverlayClick
         }) : null, renderPop());
     };
-    useEffect(function() {
-        visible ? open() : close();
-    }, [
-        visible
-    ]);
-    useEffect(function() {
-        setTransitionName(transition || "".concat(classPrefix, "-slide-").concat(position));
-    }, [
-        position,
-        transition
-    ]);
     var resolveContainer = function(getContainer) {
         return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;
     };

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

@@ -26,7 +26,6 @@
       color: $color-title;
       font-weight: $font-weight-bold;
       font-size: $popup-title-font-size;
-      line-height: $popup-title-font-size;
     }
 
     &-description {
@@ -79,6 +78,8 @@
   &-center {
     top: 50%;
     left: 50%;
+    right: auto;
+    bottom: auto;
     min-height: 10%;
     max-width: 295px;
     transform: translate(-50%, -50%);
@@ -91,6 +92,8 @@
   &-bottom {
     bottom: 0;
     left: 0;
+    right: auto;
+    top: auto;
     width: 100%;
 
     &.nut-popup-round {
@@ -105,6 +108,8 @@
   &-right {
     top: 0;
     right: 0;
+    left: auto;
+    bottom: auto;
     width: 100px;
     height: 100%;
 
@@ -116,6 +121,8 @@
   &-left {
     top: 0;
     left: 0;
+    right: auto;
+    bottom: auto;
     width: 100px;
     height: 100%;
 
@@ -127,6 +134,8 @@
   &-top {
     top: 0;
     left: 0;
+    right: auto;
+    bottom: auto;
     width: 100%;
 
     &.nut-popup-round {
@@ -210,6 +219,9 @@
     }
 
     @keyframes popup-slide-top-exit {
+      from {
+        transform: translate3d(0, 0%, 0);
+      }
       to {
         transform: translate3d(0, -100%, 0);
       }
@@ -240,6 +252,9 @@
     }
 
     @keyframes popup-slide-right-exit {
+      from {
+        transform: translate3d(0%, 0, 0);
+      }
       to {
         transform: translate3d(100%, 0, 0);
       }
@@ -253,7 +268,7 @@
       animation-duration: $popup-animation-duration;
     }
 
-    &-right-exit {
+    &-right-exit-active {
       animation-fill-mode: both;
       animation-name: popup-slide-right-exit;
       animation-duration: $popup-animation-duration;
@@ -269,7 +284,10 @@
       }
     }
 
-    @keyframes slide-bottom-exit {
+    @keyframes popup-slide-bottom-exit {
+      from {
+        transform: translate3d(0, 0%, 0);
+      }
       to {
         transform: translate3d(0, 100%, 0);
       }
@@ -277,15 +295,15 @@
 
     &-bottom-enter-active,
     &-bottom-appear-active {
-      transform: translate(0, 0);
+      transform: translate3d(0, 0, 0);
       animation-fill-mode: both;
       animation-name: popup-slide-bottom-enter;
       animation-duration: $popup-animation-duration;
     }
 
-    &-bottom-exit {
+    &-bottom-exit-active {
       animation-fill-mode: both;
-      animation-name: slide-bottom-exit;
+      animation-name: popup-slide-bottom-exit;
       animation-duration: $popup-animation-duration;
     }
 
@@ -300,6 +318,9 @@
     }
 
     @keyframes popup-slide-left-exit {
+      from {
+        transform: translate3d(0%, 0, 0);
+      }
       to {
         transform: translate3d(-100%, 0, 0);
       }
@@ -307,14 +328,13 @@
 
     &-left-enter-active,
     &-left-appear-active {
-      transform: translate(0, 0);
+      transform: translate3d(0, 0, 0);
       animation-fill-mode: both;
       animation-name: popup-slide-left-enter;
       animation-duration: $popup-animation-duration;
     }
 
-    &-left-exit-active,
-    &-left-exit-done {
+    &-left-exit-active {
       animation-fill-mode: both;
       animation-name: popup-slide-left-exit;
       animation-duration: $popup-animation-duration;