@nutui/nutui-react 3.0.0-beta.8 → 3.0.0

package/dist/cjs/packages/popup/popup.d.ts

@@ -1,25 +1,3 @@
-import React, { FunctionComponent, MouseEvent, ReactNode } from 'react';
-import { OverlayProps } from "../overlay/overlay";
-type Teleport = HTMLElement | (() => HTMLElement) | null;
-export interface PopupProps extends OverlayProps {
-    position: string;
-    transition: string;
-    overlayStyle: React.CSSProperties;
-    overlayClassName: string;
-    closeable: boolean;
-    closeIconPosition: string;
-    closeIcon: ReactNode;
-    left: ReactNode;
-    title: ReactNode;
-    description: ReactNode;
-    destroyOnClose: boolean;
-    portal: Teleport;
-    overlay: boolean;
-    round: boolean;
-    onOpen: () => void;
-    onClose: () => void;
-    onOverlayClick: (e: MouseEvent) => boolean | void;
-    onCloseIconClick: (e: MouseEvent) => boolean | void;
-}
+import React, { FunctionComponent } from 'react';
+import { PopupProps } from './types';
 export declare const Popup: FunctionComponent<Partial<PopupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'title'>>;
-export {};

package/dist/cjs/packages/popup/popup.js

@@ -21,9 +21,8 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
 var _iconsreact = require("@nutui/icons-react");
 var _overlay = require("../overlay/overlay");
 var _overlay1 = /*#__PURE__*/ _interop_require_default._(require("../overlay"));
-var _typings = require("../../utils/typings");
-var _uselockscroll = require("../../utils/use-lock-scroll");
-var defaultProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+var _uselockscroll = require("../../hooks/use-lock-scroll");
+var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
     position: 'center',
     transition: '',
     overlayStyle: {},
@@ -37,13 +36,13 @@ var defaultProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object
     round: false,
     onOpen: function onOpen() {},
     onClose: function onClose() {},
-    onOverlayClick: function onOverlayClick(e) {
+    onOverlayClick: function onOverlayClick() {
         return true;
     },
-    onCloseIconClick: function onCloseIconClick(e) {
+    onCloseIconClick: function onCloseIconClick() {
         return true;
     }
-}), _overlay.defaultOverlayProps);
+});
 // 默认1000，参看variables
 var _zIndex = 1100;
 var Popup = function Popup(props) {
@@ -54,20 +53,14 @@ var Popup = function Popup(props) {
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
     var _useState2 = (0, _sliced_to_array._)((0, _react.useState)(true), 2), showChildren = _useState2[0], setShowChildren = _useState2[1];
     var _useState3 = (0, _sliced_to_array._)((0, _react.useState)(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
-    var shouldLockScroll = !innerVisible ? false : lockScroll;
-    (0, _uselockscroll.useLockScroll)(nodeRef, shouldLockScroll);
+    (0, _uselockscroll.useLockScroll)(nodeRef, innerVisible && lockScroll);
     var classPrefix = 'nut-popup';
-    var baseStyle = {
+    var overlayStyles = (0, _object_spread._)({}, overlayStyle);
+    var popStyles = (0, _object_spread_props._)((0, _object_spread._)({}, style), {
         zIndex: index
-    };
-    var overlayStyles = (0, _object_spread_props._)((0, _object_spread._)({}, overlayStyle), {
-        '--nutui-overlay-zIndex': index
     });
-    var popStyles = (0, _object_spread._)({}, style, baseStyle);
     var _obj;
-    var popClassName = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
-    var _obj1;
-    var closeClasses = (0, _classnames.default)((_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-title-right"), true), (0, _define_property._)(_obj1, "".concat(classPrefix, "-title-right-").concat(closeIconPosition), true), _obj1));
+    var popClassName = (0, _classnames.default)(classPrefix, (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
     var open = function open() {
         if (!innerVisible) {
             setInnerVisible(true);
@@ -89,36 +82,21 @@ var Popup = function Popup(props) {
             onClose && onClose();
         }
     };
-    var onHandleClickOverlay = function onHandleClickOverlay(e) {
+    var handleOverlayClick = function handleOverlayClick(e) {
         e.stopPropagation();
-        if (closeOnOverlayClick) {
-            var closed = onOverlayClick && onOverlayClick(e);
-            closed && close();
+        if (closeOnOverlayClick && onOverlayClick(e)) {
+            close();
         }
     };
-    var onHandleClick = function onHandleClick(e) {
-        onClick && onClick(e);
-    };
-    var onHandleClickCloseIcon = function onHandleClickCloseIcon(e) {
-        var closed = onCloseIconClick && onCloseIconClick(e);
-        closed && close();
+    var handleCloseIconClick = function handleCloseIconClick(e) {
+        onCloseIconClick(e) && close();
     };
-    var onHandleOpened = function onHandleOpened(e) {
-        afterShow && afterShow();
-    };
-    var onHandleClosed = function onHandleClosed(e) {
-        afterClose && afterClose();
-    };
-    var resolveContainer = function resolveContainer(getContainer) {
-        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
-        return container || document.body;
-    };
-    var renderToContainer = function renderToContainer(getContainer, node) {
-        if (getContainer) {
-            var container = resolveContainer(getContainer);
-            return /*#__PURE__*/ (0, _reactdom.createPortal)(node, container);
-        }
-        return node;
+    var renderCloseIcon = function renderCloseIcon() {
+        var closeClasses = (0, _classnames.default)("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, closeable && /*#__PURE__*/ _react.default.createElement("div", {
+            className: closeClasses,
+            onClick: handleCloseIconClick
+        }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null)));
     };
     var renderTitle = function renderTitle() {
         if (left || title || description) {
@@ -127,19 +105,15 @@ var Popup = function Popup(props) {
             }, position === 'bottom' && /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, left && /*#__PURE__*/ _react.default.createElement("div", {
                 className: "".concat(classPrefix, "-title-left")
             }, left), (title || description) && /*#__PURE__*/ _react.default.createElement("div", {
+                className: "".concat(classPrefix, "-title-wrapper")
+            }, title && /*#__PURE__*/ _react.default.createElement("div", {
                 className: "".concat(classPrefix, "-title-title")
-            }, title, description && /*#__PURE__*/ _react.default.createElement("div", {
-                className: "".concat(classPrefix, "-title-description")
-            }, description))), closeable && /*#__PURE__*/ _react.default.createElement("div", {
-                className: closeClasses,
-                onClick: onHandleClickCloseIcon
-            }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null)));
+            }, title), description && /*#__PURE__*/ _react.default.createElement("div", {
+                className: "".concat(classPrefix, "-title-description ").concat(title ? "".concat(classPrefix, "-title-description-gap") : '')
+            }, description))), renderCloseIcon());
         }
         if (closeable) {
-            return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, closeable && /*#__PURE__*/ _react.default.createElement("div", {
-                className: closeClasses,
-                onClick: onHandleClickCloseIcon
-            }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null)));
+            return renderCloseIcon();
         }
     };
     var renderPop = function renderPop() {
@@ -150,29 +124,29 @@ var Popup = function Popup(props) {
             unmountOnExit: destroyOnClose,
             timeout: duration,
             in: innerVisible,
-            onEntered: onHandleOpened,
-            onExited: onHandleClosed
+            onEntered: afterShow,
+            onExited: afterClose
         }, /*#__PURE__*/ _react.default.createElement("div", {
             ref: nodeRef,
             style: popStyles,
             className: popClassName,
-            onClick: onHandleClick
-        }, renderTitle(), showChildren ? children : ''));
+            onClick: onClick
+        }, renderTitle(), showChildren && children));
     };
     var renderNode = function renderNode() {
-        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay ? /*#__PURE__*/ _react.default.createElement(_overlay1.default, {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay && /*#__PURE__*/ _react.default.createElement(_overlay1.default, {
+            zIndex: index,
             style: overlayStyles,
             className: overlayClassName,
             visible: innerVisible,
             closeOnOverlayClick: closeOnOverlayClick,
             lockScroll: lockScroll,
             duration: duration,
-            onClick: onHandleClickOverlay
-        }) : null, /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderPop()));
+            onClick: handleOverlayClick
+        }), renderPop());
     };
     (0, _react.useEffect)(function() {
-        visible && open();
-        !visible && close();
+        visible ? open() : close();
     }, [
         visible
     ]);
@@ -182,6 +156,16 @@ var Popup = function Popup(props) {
         position,
         transition
     ]);
+    var resolveContainer = function resolveContainer(getContainer) {
+        return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;
+    };
+    var renderToContainer = function renderToContainer(getContainer, node) {
+        if (getContainer) {
+            var container = resolveContainer(getContainer);
+            return /*#__PURE__*/ (0, _reactdom.createPortal)(node, container);
+        }
+        return node;
+    };
     return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderToContainer(portal, renderNode()));
 };
 Popup.displayName = 'NutPopup';

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

@@ -1,15 +1,8 @@
 .nut-popup {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
   background-color: $overlay-content-bg-color;
-  color: $color-title;
   -webkit-overflow-scrolling: touch;
   font-size: $font-size-base;
 
@@ -22,38 +15,45 @@
     padding: $popup-title-padding;
     position: relative;
 
-    &-left {
-      position: absolute;
-      left: $popup-title-padding;
-    }
-
-    &-title {
+    &-wrapper {
       display: flex;
       flex-direction: column;
       justify-content: center;
       align-items: center;
+    }
+
+    &-title {
+      color: $color-title;
       font-weight: $font-weight-bold;
       font-size: $popup-title-font-size;
+      line-height: $popup-title-font-size;
     }
 
     &-description {
-      color: $color-text-help;
+      color: $color-text;
       font-size: $popup-description-font-size;
       font-weight: $font-weight;
+      &-gap {
+        margin-top: $popup-description-spacing;
+      }
+    }
+
+    &-left {
+      position: absolute;
+      top: $popup-title-padding;
+      left: $popup-title-padding;
     }
 
     &-right {
       position: absolute;
+      top: $popup-title-padding;
+      right: $popup-title-padding;
+
       z-index: 1;
-      cursor: pointer;
       width: $popup-icon-size;
       height: $popup-icon-size;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      top: $popup-title-padding;
-      right: $popup-title-padding;
-      color: $color-text-help;
+      color: $color-title;
+      cursor: pointer;
 
       &:active {
         opacity: 0.7;
@@ -80,9 +80,8 @@
     top: 50%;
     left: 50%;
     min-height: 10%;
-    /* #ifndef rn */
+    max-width: 295px;
     transform: translate(-50%, -50%);
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius;
@@ -91,7 +90,7 @@
 
   &-bottom,
   &-top {
-    max-height: 83%;
+    max-height: 87%;
   }
 
   &-bottom {
@@ -107,10 +106,8 @@
   &-right {
     top: 0;
     right: 0;
-    /* #ifdef rn */
     width: 100px;
     height: 100%;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius 0 0 $popup-border-radius;
@@ -120,10 +117,8 @@
   &-left {
     top: 0;
     left: 0;
-    /* #ifdef rn */
     width: 100px;
     height: 100%;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: 0 $popup-border-radius $popup-border-radius 0;
@@ -134,9 +129,6 @@
     top: 0;
     left: 0;
     width: 100%;
-    /* #ifdef rn */
-    height: 100px;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: 0 0 $popup-border-radius $popup-border-radius;
@@ -215,25 +207,19 @@
     /* 从顶部滑出 */
     @keyframes popup-slide-top-enter {
       from {
-        /* #ifndef rn */
         transform: translate3d(0, -100%, 0);
-        /* #endif */
       }
     }
 
     @keyframes popup-slide-top-exit {
       to {
-        /* #ifndef rn */
         transform: translate3d(0, -100%, 0);
-        /* #endif */
       }
     }
 
     &-top-enter-active,
     &-top-appear-active {
-      /* #ifndef rn */
       transform: translate3d(0, 0%, 0);
-      /* #endif*/
       animation-fill-mode: both;
       animation-name: popup-slide-top-enter;
       animation-duration: $popup-animation-duration;
@@ -248,25 +234,19 @@
     /* 从右侧滑出 */
     @keyframes popup-slide-right-enter {
       from {
-        /* #ifndef rn */
         transform: translate3d(100%, 0, 0);
-        /* #endif*/
       }
     }
 
     @keyframes popup-slide-right-exit {
       to {
-        /* #ifndef rn */
         transform: translate3d(100%, 0, 0);
-        /* #endif*/
       }
     }
 
     &-right-enter-active,
     &-right-appear-active {
-      /* #ifndef rn */
       transform: translate3d(0, 0, 0);
-      /* #endif*/
       animation-fill-mode: both;
       animation-name: popup-slide-right-enter;
       animation-duration: $popup-animation-duration;
@@ -281,25 +261,19 @@
     /* 从底部滑出 */
     @keyframes popup-slide-bottom-enter {
       from {
-        /* #ifndef rn */
         transform: translate3d(0, 100%, 0);
-        /* #endif */
       }
     }
 
     @keyframes slide-bottom-exit {
       to {
-        /* #ifndef rn */
         transform: translate3d(0, 100%, 0);
-        /* #endif */
       }
     }
 
     &-bottom-enter-active,
     &-bottom-appear-active {
-      /* #ifndef rn */
       transform: translate(0, 0);
-      /* #endif */
       animation-fill-mode: both;
       animation-name: popup-slide-bottom-enter;
       animation-duration: $popup-animation-duration;
@@ -314,17 +288,13 @@
     /* 从左侧滑出 */
     @keyframes popup-slide-left-enter {
       from {
-        /* #ifndef rn */
         transform: translate3d(-100%, 0, 0);
-        /* #endif */
       }
     }
 
     @keyframes popup-slide-left-exit {
       to {
-        /* #ifndef rn */
         transform: translate3d(-100%, 0, 0);
-        /* #endif */
       }
     }
 
@@ -396,9 +366,7 @@
   &-center {
     left: auto;
     right: 50%;
-    /* #ifndef rn */
     transform: translate(50%, -50%);
-    /* #endif*/
   }
 
   &-bottom {