@nutui/nutui-react-taro 3.0.0-beta.9 → 3.0.1

package/dist/cjs/packages/popover/style/style.css

@@ -4,19 +4,14 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -67,7 +62,7 @@
   position: fixed;
   min-height: 46%;
   max-height: 100%;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,13 +82,13 @@
   align-items: center;
 }
 .nut-popup-title-title {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   font-weight: var(--nutui-font-weight-bold, 600);
   font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
   line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
@@ -112,7 +107,7 @@
   z-index: 1;
   width: var(--nutui-popup-icon-size, 20px);
   height: var(--nutui-popup-icon-size, 20px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
 .nut-popup-title-right:active {
@@ -243,6 +238,9 @@
   from {
     transform: translate3d(0, -100%, 0);
   }
+  to {
+    transform: translate3d(0, 0%, 0);
+  }
 }
 @keyframes popup-slide-top-exit {
   to {
@@ -264,6 +262,9 @@
   from {
     transform: translate3d(100%, 0, 0);
   }
+  to {
+    transform: translate3d(0%, 0, 0);
+  }
 }
 @keyframes popup-slide-right-exit {
   to {
@@ -285,6 +286,9 @@
   from {
     transform: translate3d(0, 100%, 0);
   }
+  to {
+    transform: translate3d(0, 0%, 0);
+  }
 }
 @keyframes slide-bottom-exit {
   to {
@@ -306,6 +310,9 @@
   from {
     transform: translate3d(-100%, 0, 0);
   }
+  to {
+    transform: translate3d(0%, 0, 0);
+  }
 }
 @keyframes popup-slide-left-exit {
   to {
@@ -437,7 +444,7 @@
   background: var(--nutui-popover-content-background-color, #ffffff);
   border-radius: var(--nutui-popover-border-radius, var(--nutui-radius-xs, 4px));
   font-size: var(--nutui-popover-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-popover-text-color, var(--nutui-black-10));
+  color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   line-height: 28px;
   max-height: initial;
   overflow-y: initial;
@@ -447,7 +454,7 @@
   align-items: center;
   justify-content: center;
   padding: 0 var(--nutui-popover-menu-item-padding, 8px);
-  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-black-3));
+  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   max-width: var(--nutui-popover-menu-item-width, 160px);
   word-wrap: break-word;
 }
@@ -481,7 +488,7 @@
   width: 12px;
   height: 12px;
   font-size: 12px;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon .nut-icon {
   width: 12px;
@@ -489,7 +496,7 @@
   font-size: 12px;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-disabled {
-  color: var(--nutui-popover-disable-color, var(--nutui-gray-4));
+  color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
   cursor: not-allowed;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-taroitem {
@@ -548,14 +555,14 @@
 }
 
 .nut-popover-dark {
-  background: var(--nutui-popover-text-color, var(--nutui-black-10));
+  background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   color: var(--nutui-popover-content-background-color, #ffffff);
 }
 .nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
-  color: var(--nutui-popover-text-color, var(--nutui-black-10));
+  color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
 }
 .nut-popover-dark .nut-popover-content {
-  background: var(--nutui-popover-text-color, var(--nutui-black-10)) !important;
+  background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7))) !important;
   color: var(--nutui-popover-content-background-color, #ffffff) !important;
 }
 .nut-popover-dark .nut-popover-content .nut-popover-menu-item-action-icon {

package/dist/cjs/packages/popover/style/style.harmony.css

@@ -0,0 +1,294 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-popover {
+  position: absolute;
+  display: inline-block;
+  word-break: normal;
+}
+.nut-popover-arrow {
+  position: absolute;
+  width: 8px;
+  height: 4px;
+}
+.nut-popover-arrow .nut-icon-ArrowRadius {
+  position: absolute;
+  color: #ffffff;
+}
+.nut-popover-arrow-top {
+  bottom: -4px;
+}
+.nut-popover-arrow-bottom {
+  top: -4px;
+}
+.nut-popover-arrow-left {
+  right: -6px;
+  transform-origin: center top;
+}
+.nut-popover-arrow-left.nut-popover-arrow-left {
+  top: 50%;
+  transform: rotate(90deg) translateY(-50%);
+}
+.nut-popover-arrow-left.nut-popover-arrow-left-start {
+  top: 16px;
+  right: -8px;
+  transform: rotate(90deg) translateY(0%);
+}
+.nut-popover-arrow-left.nut-popover-arrow-left-end {
+  bottom: 16px;
+  right: -8px;
+  transform: rotate(90deg) translateY(0%);
+}
+.nut-popover-arrow-right {
+  transform-origin: center top;
+}
+.nut-popover-arrow-right.nut-popover-arrow-right {
+  top: 50%;
+  left: -6px;
+  transform: rotate(-90deg) translateY(-50%);
+}
+.nut-popover-arrow-right.nut-popover-arrow-right-start {
+  top: 16px;
+  left: -8px;
+  transform: rotate(-90deg) translateY(0%);
+}
+.nut-popover-arrow-right.nut-popover-arrow-right-end {
+  bottom: 16px;
+  left: -8px;
+  transform: rotate(-90deg) translateY(0%);
+}
+.nut-popover .nut-popover-content {
+  position: absolute;
+  background: #ffffff;
+  border-radius: 4px;
+  font-size: 12px;
+  color: rgba(0, 0, 0, 0.7);
+  line-height: 28px;
+  max-height: initial;
+  overflow-y: initial;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+  max-width: 160px;
+  word-wrap: break-word;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item:last-child {
+  margin-bottom: 0px;
+  border-bottom: none;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item-icon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item-icon .nut-icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item-name {
+  width: calc(100% - 34px);
+  word-break: keep-all;
+  margin: 0 8px 0 4px;
+  flex: 1;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item-action-icon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+  color: #505259;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item-action-icon .nut-icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-disabled {
+  color: #c2c4cc;
+  cursor: not-allowed;
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-taroitem {
+  display: flex;
+}
+.nut-popover .nut-popover-content-top .nut-popover-arrow-top {
+  left: 50%;
+  transform-origin: center left;
+  transform: rotate(180deg) translateX(-50%);
+}
+.nut-popover .nut-popover-content-top-end {
+  right: 0;
+}
+.nut-popover .nut-popover-content-top-end .nut-popover-arrow-top-end {
+  right: 16px;
+  bottom: -3.5px;
+  transform: rotate(180deg) translateX(0%);
+}
+.nut-popover .nut-popover-content-top-start {
+  left: 0;
+}
+.nut-popover .nut-popover-content-top-start .nut-popover-arrow-top-start {
+  left: 16px;
+  bottom: -3.5px;
+  transform: rotate(180deg) translateX(0%);
+}
+.nut-popover .nut-popover-content-bottom .nut-popover-arrow-bottom {
+  left: 50%;
+  transform: translateX(-50%);
+}
+.nut-popover .nut-popover-content-bottom-end {
+  right: 0;
+}
+.nut-popover .nut-popover-content-bottom-end .nut-popover-arrow-bottom-end {
+  right: 16px;
+  transform: translateX(0%);
+}
+.nut-popover .nut-popover-content-bottom-start {
+  left: 0;
+}
+.nut-popover .nut-popover-content-bottom-start .nut-popover-arrow-bottom-start {
+  left: 16px;
+  transform: translateX(0%);
+}
+.nut-popover .nut-popover-content-left-end {
+  bottom: 0;
+}
+.nut-popover .nut-popover-content-left-start {
+  top: 0;
+}
+.nut-popover .nut-popover-content-right-end {
+  bottom: 0;
+}
+.nut-popover .nut-popover-content-right-start {
+  top: 0;
+}
+
+.nut-popover-dark {
+  background: rgba(0, 0, 0, 0.7);
+  color: #ffffff;
+}
+.nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
+  color: rgba(0, 0, 0, 0.7);
+}
+.nut-popover-dark .nut-popover-content {
+  background: rgba(0, 0, 0, 0.7) !important;
+  color: #ffffff !important;
+}
+.nut-popover-dark .nut-popover-content .nut-popover-menu-item-action-icon {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+[dir=rtl] .nut-popover .nut-popover-content .nut-popover-menu-item-name,
+.nut-rtl .nut-popover .nut-popover-content .nut-popover-menu-item-name {
+  margin-left: 0;
+  margin-right: 4px;
+}
+[dir=rtl] .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon {
+  right: auto;
+  left: 8px;
+}
+.nut-rtl .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon {
+  right: auto;
+  left: 8px;
+}
+[dir=rtl] .nut-popover .nut-popover-content-top .nut-popover-arrow-top,
+.nut-rtl .nut-popover .nut-popover-content-top .nut-popover-arrow-top {
+  left: auto;
+  right: 50%;
+  transform: translateX(50%);
+}
+[dir=rtl] .nut-popover .nut-popover-content-top-end,
+.nut-rtl .nut-popover .nut-popover-content-top-end {
+  right: auto;
+  left: 0;
+}
+[dir=rtl] .nut-popover .nut-popover-content-top-end .nut-popover-arrow-top-end,
+.nut-rtl .nut-popover .nut-popover-content-top-end .nut-popover-arrow-top-end {
+  right: auto;
+  left: 16px;
+}
+[dir=rtl] .nut-popover .nut-popover-content-top-start,
+.nut-rtl .nut-popover .nut-popover-content-top-start {
+  left: auto;
+  right: 0;
+}
+[dir=rtl] .nut-popover .nut-popover-content-top-start .nut-popover-arrow-top-start,
+.nut-rtl .nut-popover .nut-popover-content-top-start .nut-popover-arrow-top-start {
+  left: auto;
+  right: 16px;
+}
+[dir=rtl] .nut-popover .nut-popover-content-bottom .nut-popover-arrow-bottom,
+.nut-rtl .nut-popover .nut-popover-content-bottom .nut-popover-arrow-bottom {
+  left: auto;
+  right: 50%;
+  transform: translateX(50%);
+}
+[dir=rtl] .nut-popover .nut-popover-content-bottom-end,
+.nut-rtl .nut-popover .nut-popover-content-bottom-end {
+  right: auto;
+  left: 0;
+}
+[dir=rtl] .nut-popover .nut-popover-content-bottom-end .nut-popover-arrow-bottom-end,
+.nut-rtl .nut-popover .nut-popover-content-bottom-end .nut-popover-arrow-bottom-end {
+  right: auto;
+  left: 16px;
+}
+[dir=rtl] .nut-popover .nut-popover-content-bottom-start,
+.nut-rtl .nut-popover .nut-popover-content-bottom-start {
+  left: auto;
+  right: 0;
+}
+[dir=rtl] .nut-popover .nut-popover-content-bottom-start .nut-popover-arrow-bottom-start,
+.nut-rtl .nut-popover .nut-popover-content-bottom-start .nut-popover-arrow-bottom-start {
+  left: auto;
+  right: 16px;
+}
+
+.nut-popover-enter-from,
+.nut-popover-leave-active {
+  transform: scale(0.8);
+  opacity: 0;
+}
+
+.nut-popover-enter-active {
+  transition-timing-function: ease-out;
+}
+
+.nut-popover-leave-active {
+  transition-timing-function: ease-in;
+}
+
+.nut-popover-content-bg {
+  position: fixed;
+  height: 100%;
+  width: 100%;
+  top: 0;
+  left: 0;
+  background: transparent;
+  z-index: 999;
+}
+
+[dir=rtl] .nut-popover-content-bg,
+.nut-rtl .nut-popover-content-bg {
+  left: auto;
+  right: 0;
+}
+
+.nut-popover-wrapper {
+  display: inline-block;
+}
+
+.nut-popover-content-copy {
+  position: absolute;
+  top: -99999px;
+}

package/dist/cjs/packages/popover/types.d.ts

@@ -1,5 +1,6 @@
-export type PopoverTheme = 'light' | 'dark';
-export type PopoverLocation = 'bottom' | 'top' | 'left' | 'right' | 'top-start' | 'top-end' | 'bottom-start' | 'bottom-end' | 'left-start' | 'left-end' | 'right-start' | 'right-end';
+import { FixAutoComplete } from "../../types/fix-string-literal-union";
+export type PopoverTheme = FixAutoComplete<'light' | 'dark'>;
+export type PopoverLocation = FixAutoComplete<'bottom' | 'top' | 'left' | 'right' | 'top-start' | 'top-end' | 'bottom-start' | 'bottom-end' | 'left-start' | 'left-end' | 'right-start' | 'right-end'>;
 export interface PopoverList {
     key?: string;
     name: string;

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

@@ -1,3 +1,3 @@
 import { Popup } from "./popup";
-export type { PopupProps } from "./popup";
+export type { PopupProps, CloseIconPosition, Teleport } from './types.taro';
 export default Popup;

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

@@ -1,26 +1,3 @@
-import React, { FunctionComponent, ReactNode } from 'react';
-import { ITouchEvent } from '@tarojs/components';
-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: ITouchEvent) => boolean | void;
-    onCloseIconClick: (e: ITouchEvent) => boolean | void;
-}
+import React, { FunctionComponent } from 'react';
+import { PopupProps } from './types.taro';
 export declare const Popup: FunctionComponent<Partial<PopupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onClick' | 'title'>>;
-export {};

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

@@ -22,9 +22,9 @@ var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _components = require("@tarojs/components");
 var _overlay = require("../overlay/overlay");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"));
-var _typings = require("../../utils/typings");
-var _uselockscolltaro = require("../../utils/use-lock-scoll-taro");
-var defaultProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+var _uselockscolltaro = require("../../hooks/use-lock-scoll-taro");
+var _platformtaro = require("../../utils/platform-taro");
+var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
     position: 'center',
     transition: '',
     overlayStyle: {},
@@ -38,13 +38,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) {
@@ -56,17 +56,14 @@ var Popup = function Popup(props) {
     var _useState3 = (0, _sliced_to_array._)((0, _react.useState)(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
     var refObject = (0, _uselockscolltaro.useLockScrollTaro)(innerVisible && lockScroll);
     var classPrefix = 'nut-popup';
-    var baseStyle = {
-        zIndex: index
-    };
-    var overlayStyles = (0, _object_spread_props._)((0, _object_spread._)({}, overlayStyle), {
-        '--nutui-overlay-zIndex': index
-    });
-    var popStyles = (0, _object_spread._)({}, style, baseStyle);
+    var overlayStyles = (0, _object_spread._)({}, overlayStyle);
+    var contentZIndex = (0, _platformtaro.harmony)() ? index + 1 : index // 解决harmony层级问题
+    ;
+    var popStyles = (0, _object_spread._)({
+        zIndex: contentZIndex
+    }, style);
     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);
@@ -88,30 +85,20 @@ 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 onHandleOpened = function onHandleOpened(e) {
-        afterShow && afterShow();
-    };
-    var onHandleClosed = function onHandleClosed(e) {
-        afterClose && afterClose();
+    var handleCloseIconClick = function handleCloseIconClick(e) {
+        onCloseIconClick(e) && close();
     };
     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(_components.View, {
             className: closeClasses,
-            onClick: onHandleClickCloseIcon
+            onClick: handleCloseIconClick
         }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null)));
     };
     var renderTitle = function renderTitle() {
@@ -132,6 +119,15 @@ var Popup = function Popup(props) {
             return renderCloseIcon();
         }
     };
+    var renderContent = function renderContent() {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_components.View, {
+            ref: refObject,
+            style: popStyles,
+            className: popClassName,
+            onClick: onClick,
+            catchMove: lockScroll
+        }, renderTitle(), showChildren ? children : null));
+    };
     var renderPop = function renderPop() {
         return /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
             nodeRef: refObject,
@@ -140,25 +136,20 @@ var Popup = function Popup(props) {
             unmountOnExit: destroyOnClose,
             timeout: duration,
             in: innerVisible,
-            onEntered: onHandleOpened,
-            onExited: onHandleClosed
-        }, /*#__PURE__*/ _react.default.createElement(_components.View, {
-            ref: refObject,
-            style: popStyles,
-            className: popClassName,
-            onClick: onHandleClick,
-            catchMove: lockScroll
-        }, renderTitle(), showChildren ? children : ''));
+            onEntered: afterShow,
+            onExited: afterClose
+        }, renderContent());
     };
     var renderNode = function renderNode() {
         return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay ? /*#__PURE__*/ _react.default.createElement(_index.default, {
+            zIndex: index,
             style: overlayStyles,
             className: overlayClassName,
             visible: innerVisible,
             closeOnOverlayClick: closeOnOverlayClick,
             lockScroll: lockScroll,
             duration: duration,
-            onClick: onHandleClickOverlay
+            onClick: handleOverlayClick
         }) : null, renderPop());
     };
     (0, _react.useEffect)(function() {
@@ -173,8 +164,7 @@ var Popup = function Popup(props) {
         transition
     ]);
     var resolveContainer = function resolveContainer(getContainer) {
-        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
-        return container || document.body;
+        return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;
     };
     var renderToContainer = function renderToContainer(getContainer, node) {
         if (getContainer) {