@nutui/nutui-react 1.5.1 → 2.0.0-alpha.1

package/dist/esm/Popover.js

@@ -7,48 +7,85 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _typeof from "@babel/runtime/helpers/typeof";
-var _excluded = ["children", "list", "theme", "location", "visible", "offset", "className", "style", "onClick", "onChoose", "iconClassPrefix", "iconFontClassName"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-import React__default, { useRef, useState, useEffect } from 'react';
-import Icon from './Icon.js';
-import Overlay from './Overlay.js';
-import { g as getRect } from './useClientRect-56bb675b.js';
-import { C as ComponentDefaults } from './typings-f27b58f4.js';
-
-/**
- * 过滤ref
- */
+var _excluded = ["children", "list", "theme", "location", "visible", "offset", "className", "style", "onClick", "onChoose"];
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function(sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _objectSpread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), true).forEach(function(key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
+}
+function _createSuper(Derived) {
+  var hasNativeReflectConstruct = _isNativeReflectConstruct();
+  return function _createSuperInternal() {
+    var Super = _getPrototypeOf(Derived), result;
+    if (hasNativeReflectConstruct) {
+      var NewTarget = _getPrototypeOf(this).constructor;
+      result = Reflect.construct(Super, arguments, NewTarget);
+    } else {
+      result = Super.apply(this, arguments);
+    }
+    return _possibleConstructorReturn(this, result);
+  };
+}
+function _isNativeReflectConstruct() {
+  if (typeof Reflect === "undefined" || !Reflect.construct)
+    return false;
+  if (Reflect.construct.sham)
+    return false;
+  if (typeof Proxy === "function")
+    return true;
+  try {
+    Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {
+    }));
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+import React__default, { useRef, useState, useEffect } from "react";
+import Overlay from "./Overlay.js";
+import { g as getRect } from "./use-client-rect.js";
+import { C as ComponentDefaults } from "./typings.js";
 function fillRef(ref, node) {
-  if (typeof ref === 'function') {
+  if (typeof ref === "function") {
     ref(node);
-  } else if (_typeof(ref) === 'object' && ref && 'current' in ref) {
+  } else if (_typeof(ref) === "object" && ref && "current" in ref) {
     ref.current = node;
   }
 }
-/**
- * 将ref合并到一个ref函数中以支持ref传递
- */
 function composeRef() {
   for (var _len = arguments.length, refs = new Array(_len), _key = 0; _key < _len; _key++) {
     refs[_key] = arguments[_key];
   }
-  return function (node) {
-    refs.forEach(function (ref) {
+  return function(node) {
+    refs.forEach(function(ref) {
       fillRef(ref, node);
     });
   };
 }
-var Trigger = /*#__PURE__*/function (_React__default$Compo) {
-  _inherits(Trigger, _React__default$Compo);
-  var _super = _createSuper(Trigger);
-  function Trigger() {
-    _classCallCheck(this, Trigger);
+var Trigger = /* @__PURE__ */ function(_React__default$Compo) {
+  _inherits(Trigger2, _React__default$Compo);
+  var _super = _createSuper(Trigger2);
+  function Trigger2() {
+    _classCallCheck(this, Trigger2);
     return _super.apply(this, arguments);
   }
-  _createClass(Trigger, [{
+  _createClass(Trigger2, [{
     key: "fireEvents",
     value: function fireEvents(type, e) {
       var childCallback = this.props.children.props[type];
@@ -63,13 +100,10 @@ var Trigger = /*#__PURE__*/function (_React__default$Compo) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props = this.props,
-        children = _this$props.children,
-        _this$props$className = _this$props.className,
-        className = _this$props$className === void 0 ? '' : _this$props$className;
+      var _this$props = this.props, children = _this$props.children, _this$props$className = _this$props.className, className = _this$props$className === void 0 ? "" : _this$props$className;
       var child = React__default.Children.only(children);
       var newChildProps = {
-        key: 'trigger'
+        key: "trigger"
       };
       if (child && child.props && child.props.className) {
         newChildProps.className = className;
@@ -80,105 +114,79 @@ var Trigger = /*#__PURE__*/function (_React__default$Compo) {
       return trigger;
     }
   }]);
-  return Trigger;
+  return Trigger2;
 }(React__default.Component);
 var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
   list: [],
-  theme: 'light',
-  location: 'bottom',
+  theme: "light",
+  location: "bottom",
   visible: false,
   offset: 20,
-  className: '',
-  onClick: function onClick(e) {},
-  onChoose: function onChoose(item, index) {}
+  className: "",
+  onClick: function onClick(e) {
+  },
+  onChoose: function onChoose(item, index) {
+  }
 });
-var Popover = function Popover(props) {
-  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props),
-    children = _defaultProps$props.children,
-    list = _defaultProps$props.list,
-    theme = _defaultProps$props.theme,
-    location = _defaultProps$props.location,
-    visible = _defaultProps$props.visible,
-    offset = _defaultProps$props.offset,
-    className = _defaultProps$props.className,
-    style = _defaultProps$props.style,
-    onClick = _defaultProps$props.onClick,
-    onChoose = _defaultProps$props.onChoose,
-    iconClassPrefix = _defaultProps$props.iconClassPrefix,
-    iconFontClassName = _defaultProps$props.iconFontClassName,
-    reset = _objectWithoutProperties(_defaultProps$props, _excluded);
+var Popover = function Popover2(props) {
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children, list = _defaultProps$props.list, theme = _defaultProps$props.theme, location = _defaultProps$props.location, visible = _defaultProps$props.visible, offset = _defaultProps$props.offset, className = _defaultProps$props.className, style = _defaultProps$props.style, onClick2 = _defaultProps$props.onClick, onChoose2 = _defaultProps$props.onChoose, reset = _objectWithoutProperties(_defaultProps$props, _excluded);
   var goodItem = useRef(null);
-  setTimeout(function () {
+  setTimeout(function() {
     if (goodItem.current && getRect(goodItem.current)) {
       setElWidth(getRect(goodItem.current).width);
       setElHeight(getRect(goodItem.current).height);
     }
   });
-  var _useState = useState(''),
-    _useState2 = _slicedToArray(_useState, 2),
-    classes = _useState2[0],
-    setClasses = _useState2[1];
-  var _useState3 = useState(0),
-    _useState4 = _slicedToArray(_useState3, 2),
-    elWidth = _useState4[0],
-    setElWidth = _useState4[1];
-  var _useState5 = useState(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    elHeight = _useState6[0],
-    setElHeight = _useState6[1];
-  var _useState7 = useState(''),
-    _useState8 = _slicedToArray(_useState7, 2),
-    popoverContent = _useState8[0],
-    setPopoverContent = _useState8[1];
-  var _useState9 = useState(''),
-    _useState10 = _slicedToArray(_useState9, 2),
-    popoverArrow = _useState10[0],
-    setPopoverArrow = _useState10[1];
-  useEffect(function () {
+  var _useState = useState(""), _useState2 = _slicedToArray(_useState, 2), classes = _useState2[0], setClasses = _useState2[1];
+  var _useState3 = useState(0), _useState4 = _slicedToArray(_useState3, 2), elWidth = _useState4[0], setElWidth = _useState4[1];
+  var _useState5 = useState(0), _useState6 = _slicedToArray(_useState5, 2), elHeight = _useState6[0], setElHeight = _useState6[1];
+  var _useState7 = useState(""), _useState8 = _slicedToArray(_useState7, 2), popoverContent = _useState8[0], setPopoverContent = _useState8[1];
+  var _useState9 = useState(""), _useState10 = _slicedToArray(_useState9, 2), popoverArrow = _useState10[0], setPopoverArrow = _useState10[1];
+  useEffect(function() {
     setClasses(classesSelf());
     setPopoverContent(popoverContentSelf());
     setPopoverArrow(popoverArrowSelf());
   }, [list, theme]);
-  var getStyle = function getStyle() {
+  var getStyle = function getStyle2() {
     var offNumer = Number(offset) ? Number(offset) : 0;
-    var style = {};
-    if (location.includes('top')) {
-      style.bottom = "".concat(elHeight + offNumer, "px");
-    } else if (location.includes('right')) {
-      style.left = "".concat(elWidth + offNumer, "px");
-    } else if (location.includes('left')) {
-      style.right = "".concat(elWidth + offNumer, "px");
+    var style2 = {};
+    if (location.includes("top")) {
+      style2.bottom = "".concat(elHeight + offNumer, "px");
+    } else if (location.includes("right")) {
+      style2.left = "".concat(elWidth + offNumer, "px");
+    } else if (location.includes("left")) {
+      style2.right = "".concat(elWidth + offNumer, "px");
     } else {
-      style.top = "".concat(elHeight + offNumer, "px");
+      style2.top = "".concat(elHeight + offNumer, "px");
     }
-    return style;
+    return style2;
   };
-  var classesSelf = function classesSelf() {
-    var prefixCls = 'nut-popover';
-    return "".concat(prefixCls, " ").concat(theme ? "".concat(prefixCls, "--").concat(theme) : '');
+  var classesSelf = function classesSelf2() {
+    var prefixCls = "nut-popover";
+    return "".concat(prefixCls, " ").concat(theme ? "".concat(prefixCls, "--").concat(theme) : "");
   };
-  var popoverContentSelf = function popoverContentSelf() {
-    var prefixCls = 'popover-content';
-    return "".concat(prefixCls, "-show ").concat(prefixCls, " ").concat(location ? "".concat(prefixCls, "--").concat(location) : '');
+  var popoverContentSelf = function popoverContentSelf2() {
+    var prefixCls = "popover-content";
+    return "".concat(prefixCls, "-show ").concat(prefixCls, " ").concat(location ? "".concat(prefixCls, "--").concat(location) : "");
   };
-  var filter = function filter() {
-    var ms = ['top', 'bottom', 'left', 'right'];
-    return ms.filter(function (m) {
+  var filter = function filter2() {
+    var ms = ["top", "bottom", "left", "right"];
+    return ms.filter(function(m) {
       return location.includes(m);
     })[0];
   };
-  var popoverArrowSelf = function popoverArrowSelf() {
-    var prefixCls = 'popover-arrow';
-    return "".concat(prefixCls, " ").concat(prefixCls, "-").concat(filter(), " ").concat(location ? "".concat(prefixCls, "--").concat(location) : '');
+  var popoverArrowSelf = function popoverArrowSelf2() {
+    var prefixCls = "popover-arrow";
+    return "".concat(prefixCls, " ").concat(prefixCls, "-").concat(filter(), " ").concat(location ? "".concat(prefixCls, "--").concat(location) : "");
   };
-  var handleClick = function handleClick(e) {
+  var handleClick = function handleClick2(e) {
     if (props.onClick) {
       props.onClick(e);
     }
   };
-  var handleChoose = function handleChoose(item, index) {
+  var handleChoose = function handleChoose2(item, index) {
     if (!item.disabled) {
-      onChoose(item, index);
+      onChoose2(item, index);
     }
   };
   return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", _objectSpread({
@@ -187,7 +195,7 @@ var Popover = function Popover(props) {
   }, reset), React__default.createElement(Trigger, {
     forwardedRef: goodItem
   }, React__default.createElement("div", {
-    onClick: function onClick(e) {
+    onClick: function onClick3(e) {
       return handleClick(e);
     }
   }, Array.isArray(children) ? children[0] : children, visible ? React__default.createElement("div", {
@@ -195,31 +203,28 @@ var Popover = function Popover(props) {
     style: getStyle()
   }, React__default.createElement("div", {
     className: "".concat(popoverArrow)
-  }), Array.isArray(children) ? children[1] : '', React__default.createElement("div", null, list.map(function (item, i) {
+  }), Array.isArray(children) ? children[1] : "", React__default.createElement("div", null, list.map(function(item, i) {
     return React__default.createElement("div", {
       key: item.name,
-      className: "popover-menu-item ".concat(item.disabled ? 'disabled' : ''),
-      onClick: function onClick() {
+      className: "popover-menu-item ".concat(item.disabled ? "disabled" : ""),
+      onClick: function onClick3() {
         handleChoose(item, i);
       }
-    }, item.icon ? React__default.createElement(Icon, {
-      classPrefix: iconClassPrefix,
-      fontClassName: iconFontClassName,
-      className: "popover-menu-item-img",
-      name: item.icon
-    }) : '', React__default.createElement("div", {
+    }, item.icon ? item.icon : null, React__default.createElement("div", {
       className: "popover-menu-item-name"
     }, item.name));
   }))) : null))), visible ? React__default.createElement(Overlay, {
-    visible: visible,
-    onClick: function onClick(e) {
+    visible,
+    onClick: function onClick3(e) {
       return handleClick(e);
     },
     style: {
-      background: 'transparent'
+      background: "transparent"
     }
-  }) : '');
+  }) : null);
 };
 Popover.defaultProps = defaultProps;
-Popover.displayName = 'NutPopover';
-export { Popover as default };
+Popover.displayName = "NutPopover";
+export {
+  Popover as default
+};

package/dist/esm/Popup/style/index.js

@@ -1,3 +1,2 @@
-import '../../Icon/style'
 import '../../Overlay/style'
 import '../../../packages/popup/popup.scss'

package/dist/esm/Popup.js

@@ -1,102 +1,79 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React__default, { useState, useEffect } from 'react';
-import { createPortal } from 'react-dom';
-import { CSSTransition } from 'react-transition-group';
-import classNames from 'classnames';
-import { d as defaultOverlayProps } from './overlay-de6c79d5.js';
-import Icon from './Icon.js';
-import Overlay from './Overlay.js';
-import { c as cn } from './bem-3b438e61.js';
-import { C as ComponentDefaults } from './typings-f27b58f4.js';
-import '@bem-react/classname';
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function(sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _objectSpread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), true).forEach(function(key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
+}
+import React__default, { useState, useEffect } from "react";
+import { createPortal } from "react-dom";
+import { CSSTransition } from "react-transition-group";
+import classNames from "classnames";
+import { Close } from "@nutui/icons-react";
+import { d as defaultOverlayProps } from "./overlay2.js";
+import Overlay from "./Overlay.js";
+import { C as ComponentDefaults } from "./typings.js";
 var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
-  position: 'center',
-  transition: '',
-  style: {},
-  popClass: '',
+  position: "center",
+  transition: "",
+  overlayStyle: {},
+  overlayClassName: "",
   closeable: false,
-  closeIconPosition: 'top-right',
-  closeIcon: 'close',
-  closeIconSize: '12px',
-  destroyOnClose: true,
-  teleport: null,
+  closeIconPosition: "top-right",
+  closeIcon: "close",
+  destroyOnClose: false,
+  portal: null,
   overlay: true,
   round: false,
-  onOpen: function onOpen() {},
-  onClose: function onClose() {},
-  onClick: function onClick(e) {},
-  onOpened: function onOpened(e) {},
-  onClosed: function onClosed(e) {},
-  onClickOverlay: function onClickOverlay(e) {},
-  onClickCloseIcon: function onClickCloseIcon(e) {}
+  onOpen: function onOpen() {
+  },
+  onClose: function onClose() {
+  },
+  onClick: function onClick(e) {
+  },
+  onClickOverlay: function onClickOverlay(e) {
+    return true;
+  },
+  onClickCloseIcon: function onClickCloseIcon(e) {
+    return true;
+  }
 }, defaultOverlayProps);
-// 默认1000，参看variables
-var _zIndex = 1000;
-var Popup = function Popup(props) {
-  var _classNames;
-  var children = props.children,
-    visible = props.visible,
-    overlay = props.overlay,
-    closeOnClickOverlay = props.closeOnClickOverlay,
-    overlayStyle = props.overlayStyle,
-    overlayClass = props.overlayClass,
-    zIndex = props.zIndex,
-    lockScroll = props.lockScroll,
-    duration = props.duration,
-    closeable = props.closeable,
-    closeIconPosition = props.closeIconPosition,
-    closeIcon = props.closeIcon,
-    style = props.style,
-    transition = props.transition,
-    round = props.round,
-    position = props.position,
-    popClass = props.popClass,
-    className = props.className,
-    destroyOnClose = props.destroyOnClose,
-    teleport = props.teleport,
-    onOpen = props.onOpen,
-    onClose = props.onClose,
-    onClickOverlay = props.onClickOverlay,
-    onClickCloseIcon = props.onClickCloseIcon,
-    onOpened = props.onOpened,
-    onClosed = props.onClosed,
-    onClick = props.onClick,
-    iconClassPrefix = props.iconClassPrefix,
-    iconFontClassName = props.iconFontClassName,
-    closeIconSize = props.closeIconSize;
-  var _useState = useState(zIndex || _zIndex),
-    _useState2 = _slicedToArray(_useState, 2),
-    index = _useState2[0],
-    setIndex = _useState2[1];
-  var _useState3 = useState(visible),
-    _useState4 = _slicedToArray(_useState3, 2),
-    innerVisible = _useState4[0],
-    setInnerVisible = _useState4[1];
-  var _useState5 = useState(true),
-    _useState6 = _slicedToArray(_useState5, 2),
-    showChildren = _useState6[0],
-    setShowChildren = _useState6[1];
-  var _useState7 = useState(''),
-    _useState8 = _slicedToArray(_useState7, 2),
-    transitionName = _useState8[0],
-    setTransitionName = _useState8[1];
-  var b = cn('popup');
+var _zIndex = 1e3;
+var Popup = function Popup2(props) {
+  var _classNames, _classNames2;
+  var children = props.children, visible = props.visible, overlay = props.overlay, closeOnOverlayClick = props.closeOnOverlayClick, overlayStyle = props.overlayStyle, overlayClassName = props.overlayClassName, zIndex = props.zIndex, lockScroll = props.lockScroll, duration = props.duration, closeable = props.closeable, closeIconPosition = props.closeIconPosition, closeIcon = props.closeIcon, style = props.style, transition = props.transition, round = props.round, position = props.position, className = props.className, destroyOnClose = props.destroyOnClose, portal = props.portal, onOpen2 = props.onOpen, onClose2 = props.onClose, onClickOverlay2 = props.onClickOverlay, onClickCloseIcon2 = props.onClickCloseIcon, afterShow = props.afterShow, afterClose = props.afterClose, onClick2 = props.onClick;
+  var _useState = useState(zIndex || _zIndex), _useState2 = _slicedToArray(_useState, 2), index = _useState2[0], setIndex = _useState2[1];
+  var _useState3 = useState(visible), _useState4 = _slicedToArray(_useState3, 2), innerVisible = _useState4[0], setInnerVisible = _useState4[1];
+  var _useState5 = useState(true), _useState6 = _slicedToArray(_useState5, 2), showChildren = _useState6[0], setShowChildren = _useState6[1];
+  var _useState7 = useState(""), _useState8 = _slicedToArray(_useState7, 2), transitionName = _useState8[0], setTransitionName = _useState8[1];
+  var classPrefix = "nut-popup";
   var baseStyle = {
     zIndex: index,
     animationDuration: "".concat(duration, "s")
   };
   var overlayStyles = _objectSpread(_objectSpread({}, overlayStyle), baseStyle);
   var popStyles = _objectSpread(_objectSpread({}, style), baseStyle);
-  var classes = classNames((_classNames = {
-    round: round
-  }, _defineProperty(_classNames, "nut-popup-".concat(position), true), _defineProperty(_classNames, "".concat(popClass), true), _defineProperty(_classNames, "".concat(className || ''), true), _classNames), b(''));
-  var closeClasses = classNames(_defineProperty({
-    'nut-popup__close-icon': true
-  }, "nut-popup__close-icon--".concat(closeIconPosition), true));
-  var open = function open() {
+  var popClassName = classNames((_classNames = {
+    round
+  }, _defineProperty(_classNames, "".concat(classPrefix), true), _defineProperty(_classNames, "".concat(classPrefix, "-").concat(position), true), _defineProperty(_classNames, "".concat(className || ""), true), _classNames));
+  var closeClasses = classNames((_classNames2 = {}, _defineProperty(_classNames2, "".concat(classPrefix, "__close-icon"), true), _defineProperty(_classNames2, "".concat(classPrefix, "__close-icon--").concat(closeIconPosition), true), _classNames2));
+  var open = function open2() {
     if (!innerVisible) {
       setInnerVisible(true);
       setIndex(++_zIndex);
@@ -104,50 +81,62 @@ var Popup = function Popup(props) {
     if (destroyOnClose) {
       setShowChildren(true);
     }
-    onOpen && onOpen();
+    onOpen2 && onOpen2();
   };
-  var close = function close() {
+  var close = function close2() {
     if (innerVisible) {
       setInnerVisible(false);
       if (destroyOnClose) {
-        setTimeout(function () {
+        setTimeout(function() {
           setShowChildren(false);
-          onClose && onClose();
-        }, Number(duration) * 1000);
+        }, Number(duration) * 1e3);
       }
+      onClose2 && onClose2();
     }
   };
-  var onHandleClickOverlay = function onHandleClickOverlay(e) {
-    if (closeOnClickOverlay) {
-      onClickOverlay && onClickOverlay(e);
-      close();
+  var onHandleClickOverlay = function onHandleClickOverlay2(e) {
+    if (closeOnOverlayClick) {
+      var closed = onClickOverlay2 && onClickOverlay2(e);
+      closed && close();
     }
   };
-  var onHandleClick = function onHandleClick(e) {
-    onClick && onClick(e);
+  var onHandleClick = function onHandleClick2(e) {
+    onClick2 && onClick2(e);
   };
-  var onHandleClickCloseIcon = function onHandleClickCloseIcon(e) {
-    onClickCloseIcon && onClickCloseIcon(e);
-    close();
+  var onHandleClickCloseIcon = function onHandleClickCloseIcon2(e) {
+    var closed = onClickCloseIcon2 && onClickCloseIcon2(e);
+    closed && close();
   };
-  var onHandleOpened = function onHandleOpened(e) {
-    onOpened && onOpened(e);
+  var onHandleOpened = function onHandleOpened2(e) {
+    afterShow && afterShow();
   };
-  var onHandleClosed = function onHandleClosed(e) {
-    onClosed && onClosed(e);
+  var onHandleClosed = function onHandleClosed2(e) {
+    afterClose && afterClose();
   };
-  var resolveContainer = function resolveContainer(getContainer) {
-    var container = typeof getContainer === 'function' ? getContainer() : getContainer;
+  var resolveContainer = function resolveContainer2(getContainer) {
+    var container = typeof getContainer === "function" ? getContainer() : getContainer;
     return container || document.body;
   };
-  var renderToContainer = function renderToContainer(getContainer, node) {
+  var renderToContainer = function renderToContainer2(getContainer, node) {
     if (getContainer) {
       var container = resolveContainer(getContainer);
       return createPortal(node, container);
     }
     return node;
   };
-  var renderPop = function renderPop() {
+  var renderIcon = function renderIcon2() {
+    if (closeable) {
+      return React__default.createElement("div", {
+        className: closeClasses,
+        onClick: onHandleClickCloseIcon
+      }, React__default.isValidElement(closeIcon) ? closeIcon : React__default.createElement(Close, {
+        width: 12,
+        height: 12
+      }));
+    }
+    return null;
+  };
+  var renderPop = function renderPop2() {
     return React__default.createElement(CSSTransition, {
       classNames: transitionName,
       unmountOnExit: true,
@@ -157,39 +146,33 @@ var Popup = function Popup(props) {
       onExited: onHandleClosed
     }, React__default.createElement("div", {
       style: popStyles,
-      className: classes,
+      className: popClassName,
       onClick: onHandleClick
-    }, showChildren ? children : '', closeable ? React__default.createElement("div", {
-      className: closeClasses,
-      onClick: onHandleClickCloseIcon
-    }, React__default.createElement(Icon, {
-      classPrefix: iconClassPrefix,
-      fontClassName: iconFontClassName,
-      name: closeIcon,
-      size: closeIconSize
-    })) : ''));
+    }, showChildren ? children : "", renderIcon()));
   };
-  var renderNode = function renderNode() {
+  var renderNode = function renderNode2() {
     return React__default.createElement(React__default.Fragment, null, overlay ? React__default.createElement(React__default.Fragment, null, React__default.createElement(Overlay, {
       style: overlayStyles,
-      overlayClass: overlayClass,
+      className: overlayClassName,
       visible: innerVisible,
-      closeOnClickOverlay: closeOnClickOverlay,
-      zIndex: zIndex,
-      lockScroll: lockScroll,
-      duration: duration,
+      closeOnOverlayClick,
+      zIndex,
+      lockScroll,
+      duration,
       onClick: onHandleClickOverlay
     }), renderPop()) : React__default.createElement(React__default.Fragment, null, renderPop()));
   };
-  useEffect(function () {
+  useEffect(function() {
     visible && open();
     !visible && close();
   }, [visible]);
-  useEffect(function () {
-    setTransitionName(transition || "nut-popup-slide-".concat(position));
-  }, [position]);
-  return React__default.createElement(React__default.Fragment, null, renderToContainer(teleport, renderNode()));
+  useEffect(function() {
+    setTransitionName(transition || "".concat(classPrefix, "-slide-").concat(position));
+  }, [position, transition]);
+  return React__default.createElement(React__default.Fragment, null, renderToContainer(portal, renderNode()));
 };
 Popup.defaultProps = defaultProps;
-Popup.displayName = 'NutPopup';
-export { Popup as default };
+Popup.displayName = "NutPopup";
+export {
+  Popup as default
+};