@nutui/nutui-react 2.0.0-alpha.0 → 2.0.0-alpha.2

package/dist/esm/Menu.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["className", "titleIcon", "scrollFixed", "lockScroll", "closeOnClickOverlay", "children", "activeColor"];
+var _excluded = ["className", "icon", "scrollFixed", "lockScroll", "closeOnOverlayClick", "children", "activeColor"];
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
   if (Object.getOwnPropertySymbols) {
@@ -29,17 +29,15 @@ import classNames from "classnames";
 import { ArrowUp2, ArrowDown2 } from "@nutui/icons-react";
 import { C as ComponentDefaults } from "./typings.js";
 var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
-  className: "",
-  style: {},
   activeColor: "",
-  closeOnClickOverlay: true,
+  closeOnOverlayClick: true,
   scrollFixed: false,
   lockScroll: true,
-  titleIcon: null
+  icon: null
 });
 var Menu = function Menu2(props) {
-  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), className = _defaultProps$props.className, titleIcon = _defaultProps$props.titleIcon, scrollFixed = _defaultProps$props.scrollFixed, lockScroll = _defaultProps$props.lockScroll, closeOnClickOverlay = _defaultProps$props.closeOnClickOverlay, children = _defaultProps$props.children, activeColor = _defaultProps$props.activeColor, rest = _objectWithoutProperties(_defaultProps$props, _excluded);
-  var parentRef = useRef(null);
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), className = _defaultProps$props.className, icon = _defaultProps$props.icon, scrollFixed = _defaultProps$props.scrollFixed, lockScroll = _defaultProps$props.lockScroll, closeOnOverlayClick = _defaultProps$props.closeOnOverlayClick, children = _defaultProps$props.children, activeColor = _defaultProps$props.activeColor, rest = _objectWithoutProperties(_defaultProps$props, _excluded);
+  var menuRef = useRef(null);
   var _useState = useState(false), _useState2 = _slicedToArray(_useState, 2), isScrollFixed = _useState2[0], setIsScrollFixed = _useState2[1];
   var getScrollTop = function getScrollTop2(el) {
     return Math.max(0, "scrollTop" in el ? el.scrollTop : el.pageYOffset);
@@ -58,92 +56,96 @@ var Menu = function Menu2(props) {
       return window.removeEventListener("scroll", onScroll);
     };
   }, []);
-  var _useState3 = useState([]), _useState4 = _slicedToArray(_useState3, 2), itemShow = _useState4[0], setItemShow = _useState4[1];
-  var _useState5 = useState([]), _useState6 = _slicedToArray(_useState5, 2), itemTitle = _useState6[0], setItemTitle = _useState6[1];
-  var toggleItemShow = function toggleItemShow2(index) {
-    itemShow[index] = !itemShow[index];
-    var temp = itemShow.map(function(i, idx) {
+  var _useState3 = useState([]), _useState4 = _slicedToArray(_useState3, 2), showMenuItem = _useState4[0], setShowMenuItem = _useState4[1];
+  var _useState5 = useState([]), _useState6 = _slicedToArray(_useState5, 2), menuItemTitle = _useState6[0], setMenuItemTitle = _useState6[1];
+  var toggleMenuItem = function toggleMenuItem2(index) {
+    showMenuItem[index] = !showMenuItem[index];
+    var temp = showMenuItem.map(function(i, idx) {
       return idx === index ? i : false;
     });
-    setItemShow(_toConsumableArray(temp));
+    setShowMenuItem(_toConsumableArray(temp));
   };
-  var hideItemShow = function hideItemShow2(index) {
-    itemShow[index] = false;
-    setItemShow(_toConsumableArray(itemShow));
+  var hideMenuItem = function hideMenuItem2(index) {
+    showMenuItem[index] = false;
+    setShowMenuItem(_toConsumableArray(showMenuItem));
   };
   var updateTitle = function updateTitle2(text, index) {
-    itemTitle[index] = text;
-    setItemTitle(_toConsumableArray(itemTitle));
-  };
-  var parent = function parent2() {
-    return parentRef;
+    menuItemTitle[index] = text;
+    setMenuItemTitle(_toConsumableArray(menuItemTitle));
   };
   var cloneChildren = function cloneChildren2() {
     return React__default.Children.map(children, function(child, index) {
       return React__default.cloneElement(child, {
-        showPopup: itemShow[index],
-        orderKey: index,
+        show: showMenuItem[index],
+        index,
         activeColor,
         parent: {
-          closeOnClickOverlay,
+          closeOnOverlayClick,
           lockScroll,
-          toggleItemShow,
+          toggleMenuItem,
           updateTitle,
-          hideItemShow,
-          parent
+          hideMenuItem,
+          menuRef
         }
       });
     });
   };
-  return React__default.createElement("div", _objectSpread(_objectSpread({
-    className: "nut-menu ".concat(className, " ").concat(isScrollFixed ? "scroll-fixed" : "")
-  }, rest), {}, {
-    ref: parentRef
+  var menuTitle = function menuTitle2() {
+    return React__default.Children.map(children, function(child, index) {
+      if (React__default.isValidElement(child)) {
+        var _child$props = child.props, title = _child$props.title, options = _child$props.options, value = _child$props.value, disabled = _child$props.disabled, direction = _child$props.direction;
+        var selected = options === null || options === void 0 ? void 0 : options.filter(function(option) {
+          return option.value === value;
+        });
+        var finallyTitle = function finallyTitle2() {
+          if (title)
+            return title;
+          if (menuItemTitle && menuItemTitle[index])
+            return menuItemTitle[index];
+          if (selected && selected.length && selected[0].text)
+            return selected[0].text;
+          return "";
+        };
+        return React__default.createElement("div", {
+          className: classNames("nut-menu__item ", className, {
+            active: showMenuItem[index],
+            disabled
+          }),
+          style: {
+            color: showMenuItem[index] ? activeColor : ""
+          },
+          key: index,
+          onClick: function onClick() {
+            !disabled && toggleMenuItem(index);
+          }
+        }, React__default.createElement("div", {
+          className: classNames("nut-menu__title ", {
+            active: showMenuItem[index],
+            disabled
+          })
+        }, React__default.createElement("div", {
+          className: "nut-menu__title-text"
+        }, finallyTitle()), icon || (direction === "up" ? React__default.createElement(ArrowUp2, {
+          className: "nut-menu__title-icon"
+        }) : React__default.createElement(ArrowDown2, {
+          className: "nut-menu__title-icon"
+        }))));
+      }
+      return null;
+    });
+  };
+  return React__default.createElement("div", _objectSpread(_objectSpread({}, rest), {}, {
+    className: classNames("nut-menu", className, {
+      "scroll-fixed": isScrollFixed
+    }),
+    ref: menuRef
   }), React__default.createElement("div", {
     className: "nut-menu-relative"
   }, React__default.createElement("div", {
-    className: "nut-menu__bar ".concat(itemShow.includes(true) ? "opened" : "", " ").concat(className)
-  }, React__default.Children.toArray(children).map(function(child, index) {
-    if (!child)
-      return null;
-    var _child$props = child.props, disabled = _child$props.disabled, title = _child$props.title, value = _child$props.value, direction = _child$props.direction, options = _child$props.options, className2 = _child$props.className;
-    var currentTitle = options === null || options === void 0 ? void 0 : options.filter(function(option) {
-      return option.value === value;
-    });
-    function finallyTitle() {
-      if (title)
-        return title;
-      if (itemTitle && itemTitle[index])
-        return itemTitle[index];
-      if (currentTitle && currentTitle[0] && currentTitle[0].text)
-        return currentTitle[0].text;
-      return "";
-    }
-    return React__default.createElement("div", {
-      className: "nut-menu__item ".concat(classNames({
-        active: itemShow[index],
-        disabled
-      }), " ").concat(className2),
-      style: {
-        color: itemShow[index] ? activeColor : ""
-      },
-      key: index,
-      onClick: function onClick() {
-        !disabled && toggleItemShow(index);
-      }
-    }, React__default.createElement("div", {
-      className: "nut-menu__title ".concat(classNames({
-        active: itemShow[index],
-        disabled
-      }))
-    }, React__default.createElement("div", {
-      className: "nut-menu__title-text"
-    }, finallyTitle()), titleIcon || React__default.createElement(React__default.Fragment, null, direction === "up" ? React__default.createElement(ArrowUp2, {
-      className: "nut-menu__title-icon"
-    }) : React__default.createElement(ArrowDown2, {
-      className: "nut-menu__title-icon"
-    }))));
-  })), cloneChildren()));
+    className: classNames("nut-menu__bar", {
+      opened: showMenuItem.includes(true)
+    })
+  }, menuTitle()), cloneChildren()));
 };
 Menu.defaultProps = defaultProps;
 Menu.displayName = "NutMenu";

package/dist/esm/MenuItem.js

@@ -28,11 +28,10 @@ import { Check } from "@nutui/icons-react";
 import { O as Overlay } from "./overlay2.js";
 import { C as ComponentDefaults } from "./typings.js";
 var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
-  className: "",
-  style: {},
   columns: 1,
   direction: "down",
-  optionsIcon: null,
+  icon: null,
+  closeOnClickAway: false,
   activeTitleClass: "",
   inactiveTitleClass: "",
   onChange: function onChange(value) {
@@ -40,20 +39,18 @@ var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
   }
 });
 var MenuItem = forwardRef(function(props, ref) {
-  var mergedProps = _objectSpread(_objectSpread({}, defaultProps), props);
-  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), style = _defaultProps$props.style, options = _defaultProps$props.options, value = _defaultProps$props.value, columns = _defaultProps$props.columns, title = _defaultProps$props.title, optionsIcon = _defaultProps$props.optionsIcon, direction = _defaultProps$props.direction, onChange2 = _defaultProps$props.onChange, activeTitleClass = _defaultProps$props.activeTitleClass, inactiveTitleClass = _defaultProps$props.inactiveTitleClass, children = _defaultProps$props.children;
-  var activeColor = mergedProps.activeColor, showPopup = mergedProps.showPopup, parent = mergedProps.parent, orderKey = mergedProps.orderKey;
-  var _useState = useState(showPopup), _useState2 = _slicedToArray(_useState, 2), _showPopup = _useState2[0], setShowPopup = _useState2[1];
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), className = _defaultProps$props.className, style = _defaultProps$props.style, options = _defaultProps$props.options, value = _defaultProps$props.value, columns = _defaultProps$props.columns, title = _defaultProps$props.title, icon = _defaultProps$props.icon, direction = _defaultProps$props.direction, onChange2 = _defaultProps$props.onChange, activeTitleClass = _defaultProps$props.activeTitleClass, inactiveTitleClass = _defaultProps$props.inactiveTitleClass, closeOnClickAway = _defaultProps$props.closeOnClickAway, children = _defaultProps$props.children, activeColor = _defaultProps$props.activeColor, show = _defaultProps$props.show, parent = _defaultProps$props.parent, index = _defaultProps$props.index;
+  var _useState = useState(show), _useState2 = _slicedToArray(_useState, 2), _showPopup = _useState2[0], setShowPopup = _useState2[1];
   var _useState3 = useState(value), _useState4 = _slicedToArray(_useState3, 2), _value = _useState4[0], setValue = _useState4[1];
   useEffect(function() {
-    setShowPopup(showPopup);
-  }, [showPopup]);
+    setShowPopup(show);
+  }, [show]);
   useEffect(function() {
     getParentOffset();
   }, [_showPopup]);
   useImperativeHandle(ref, function() {
     return {
-      toggle: parent.toggleItemShow
+      toggle: parent.toggleMenuItem
     };
   });
   var getIconCName = function getIconCName2(optionVal, value2) {
@@ -62,11 +59,11 @@ var MenuItem = forwardRef(function(props, ref) {
   };
   var setTitle = function setTitle2(text) {
     if (!title) {
-      parent.updateTitle(text, orderKey);
+      parent.updateTitle(text, index);
     }
   };
   var handleClick = function handleClick2(item) {
-    parent.toggleItemShow(orderKey);
+    parent.toggleMenuItem(index);
     setTitle(item.text);
     setValue(item.value);
     onChange2 && onChange2(item);
@@ -77,7 +74,7 @@ var MenuItem = forwardRef(function(props, ref) {
   }), _useState6 = _slicedToArray(_useState5, 2), position = _useState6[0], setPosition = _useState6[1];
   var getParentOffset = function getParentOffset2() {
     setTimeout(function() {
-      var p = parent.parent().current;
+      var p = parent.menuRef.current;
       var rect = p.getBoundingClientRect();
       setPosition({
         height: rect.height,
@@ -102,42 +99,47 @@ var MenuItem = forwardRef(function(props, ref) {
   };
   var placeholderStyle = function placeholderStyle2() {
     if (direction === "down") {
-      return _objectSpread(_objectSpread({
-        height: "".concat(position.top + position.height, "px")
-      }, isShow()), style);
+      return _objectSpread({
+        height: "".concat(position.top + position.height, "px"),
+        top: 0
+      }, isShow());
     }
-    return _objectSpread(_objectSpread({
+    return _objectSpread({
       height: "".concat(window.innerHeight - position.top, "px"),
+      bottom: "0px",
       top: "auto"
-    }, isShow()), style);
+    }, isShow());
   };
-  return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
+  return React__default.createElement(React__default.Fragment, null, closeOnClickAway ? React__default.createElement("div", {
     className: "placeholder-element ".concat(classNames({
       up: direction === "up"
     })),
     style: placeholderStyle(),
     onClick: function onClick() {
-      return parent.toggleItemShow(orderKey);
+      return parent.toggleMenuItem(index);
     }
-  }), React__default.createElement(Overlay, {
+  }) : null, React__default.createElement(Overlay, {
     className: "nut-menu__overlay",
     style: getPosition(),
     lockScroll: parent.lockScroll,
     visible: _showPopup,
-    closeOnOverlayClick: parent.closeOnClickOverlay,
+    closeOnOverlayClick: parent.closeOnOverlayClick,
     onClick: function onClick() {
-      parent.closeOnClickOverlay && parent.toggleItemShow(orderKey);
+      parent.closeOnOverlayClick && parent.toggleMenuItem(index);
     }
   }), React__default.createElement("div", {
-    className: direction === "down" ? "nut-menu-item__wrap" : "nut-menu-item__wrap-up",
-    style: _objectSpread({}, isShow())
+    className: classNames(className, {
+      "nut-menu-item__wrap": direction === "down",
+      "nut-menu-item__wrap-up": direction !== "down"
+    }),
+    style: _objectSpread(_objectSpread({}, style), isShow())
   }, React__default.createElement(CSSTransition, {
     "in": _showPopup,
     timeout: 100,
     classNames: direction === "down" ? "menu-item" : "menu-item-up"
   }, React__default.createElement("div", {
     className: "nut-menu-item__content"
-  }, options === null || options === void 0 ? void 0 : options.map(function(item, index) {
+  }, options === null || options === void 0 ? void 0 : options.map(function(item, index2) {
     return React__default.createElement("div", {
       className: "nut-menu-item__option ".concat(classNames({
         active: item.value === _value
@@ -149,7 +151,7 @@ var MenuItem = forwardRef(function(props, ref) {
       onClick: function onClick() {
         handleClick(item);
       }
-    }, item.value === _value ? React__default.createElement("i", null, optionsIcon || React__default.createElement(Check, {
+    }, item.value === _value ? React__default.createElement("i", null, icon || React__default.createElement(Check, {
       color: activeColor,
       className: getIconCName(item.value, value)
     })) : null, React__default.createElement("div", {

package/dist/esm/NavBar.js

@@ -22,35 +22,21 @@ function _objectSpread(target) {
 }
 import React__default from "react";
 import classNames from "classnames";
-import { Left } from "@nutui/icons-react";
-import { c as cn } from "./bem.js";
 import { C as ComponentDefaults } from "./typings.js";
-import "@bem-react/classname";
 var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
-  title: "",
-  description: "",
-  leftShow: true,
-  className: "",
-  leftText: "",
+  left: "",
+  right: "",
+  back: "",
   fixed: false,
   safeAreaInsetTop: false,
-  border: false,
   placeholder: false,
-  zIndex: 10,
-  style: {}
+  zIndex: 10
 });
 var NavBar = function NavBar2(props) {
   var _classNames;
-  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), description = _defaultProps$props.description, title = _defaultProps$props.title, leftShow = _defaultProps$props.leftShow, className = _defaultProps$props.className, style = _defaultProps$props.style, leftText = _defaultProps$props.leftText, fixed = _defaultProps$props.fixed, safeAreaInsetTop = _defaultProps$props.safeAreaInsetTop, border = _defaultProps$props.border, placeholder = _defaultProps$props.placeholder, zIndex = _defaultProps$props.zIndex, onClickTitle = _defaultProps$props.onClickTitle, onClickIcon = _defaultProps$props.onClickIcon, onClickBack = _defaultProps$props.onClickBack, onClickRight = _defaultProps$props.onClickRight;
-  var b = cn("navbar");
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), right = _defaultProps$props.right, left = _defaultProps$props.left, className = _defaultProps$props.className, style = _defaultProps$props.style, back = _defaultProps$props.back, fixed = _defaultProps$props.fixed, safeAreaInsetTop = _defaultProps$props.safeAreaInsetTop, placeholder = _defaultProps$props.placeholder, zIndex = _defaultProps$props.zIndex, onClickBack = _defaultProps$props.onClickBack;
+  var classPrefix = "nut-navbar";
   var children = Array.isArray(props.children) ? props.children : [props.children];
-  var slot = children.reduce(function(slot2, item) {
-    var data = slot2;
-    if (item && item.props) {
-      data[item.props.slot] = item.props.children;
-    }
-    return data;
-  }, {});
   var styles = function styles2() {
     return _objectSpread(_objectSpread({}, style), {}, {
       zIndex
@@ -58,40 +44,23 @@ var NavBar = function NavBar2(props) {
   };
   var renderLeft = function renderLeft2() {
     return React__default.createElement("div", {
-      className: "".concat(b("left")),
+      className: "".concat(classPrefix, "__left")
+    }, back && React__default.createElement("div", {
+      className: "".concat(classPrefix, "__left__back"),
       onClick: function onClick(e) {
         return onClickBack(e);
       }
-    }, leftShow && React__default.createElement(Left, {
-      name: "left",
-      color: "#979797"
-    }), leftText && React__default.createElement("div", {
-      className: "".concat(b("text"))
-    }, leftText), slot.left);
+    }, back), left);
   };
   var renderContent = function renderContent2() {
     return React__default.createElement("div", {
-      className: "".concat(b("title"))
-    }, title && React__default.createElement("div", {
-      className: "title",
-      onClick: function onClick(e) {
-        return onClickTitle(e);
-      }
-    }, title), slot.titleIcon && React__default.createElement("div", {
-      onClick: function onClick(e) {
-        return onClickIcon(e);
-      }
-    }, slot.titleIcon), slot.content);
+      className: "".concat(classPrefix, "__title")
+    }, children);
   };
   var renderRight = function renderRight2() {
     return React__default.createElement("div", {
-      className: "".concat(b("right")),
-      onClick: function onClick(e) {
-        return onClickRight(e);
-      }
-    }, description && React__default.createElement("div", {
-      className: "".concat(b("text"))
-    }, description), slot.right);
+      className: "".concat(classPrefix, "__right")
+    }, right);
   };
   var renderWrapper = function renderWrapper2() {
     return React__default.createElement("div", {
@@ -99,10 +68,10 @@ var NavBar = function NavBar2(props) {
       style: styles()
     }, renderLeft(), renderContent(), renderRight());
   };
-  var classes = classNames((_classNames = {}, _defineProperty(_classNames, "nut-navbar--border", border), _defineProperty(_classNames, "nut-navbar--fixed", fixed), _defineProperty(_classNames, "nut-navbar--safe-area-inset-top", safeAreaInsetTop), _classNames));
-  var cls = classNames(b(""), classes, className);
+  var classes = classNames((_classNames = {}, _defineProperty(_classNames, "".concat(classPrefix, "--fixed"), fixed), _defineProperty(_classNames, "".concat(classPrefix, "--safe-area-inset-top"), safeAreaInsetTop), _classNames));
+  var cls = classNames(classPrefix, classes, className);
   return React__default.createElement(React__default.Fragment, null, fixed && placeholder ? React__default.createElement("div", {
-    className: "".concat(b(""), "--placeholder")
+    className: "".concat(classPrefix, "--placeholder")
   }, renderWrapper()) : renderWrapper());
 };
 NavBar.defaultProps = defaultProps;

package/dist/esm/NumberKeyboard.js

@@ -165,7 +165,7 @@ var NumberKeyboard = function NumberKeyboard2(props) {
   return React__default.createElement("div", null, React__default.createElement(Popup, {
     visible: show,
     position: "bottom",
-    popClass,
+    className: popClass,
     onClickOverlay: onClose2,
     overlay,
     onClickCloseIcon: onClose2,

package/dist/esm/Popup.js

@@ -28,20 +28,17 @@ 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 cn } from "./bem.js";
 import { C as ComponentDefaults } from "./typings.js";
-import "@bem-react/classname";
 var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
   position: "center",
   transition: "",
   overlayStyle: {},
-  overlayClass: "",
-  popClass: "",
+  overlayClassName: "",
   closeable: false,
   closeIconPosition: "top-right",
   closeIcon: "close",
-  destroyOnClose: true,
-  teleport: null,
+  destroyOnClose: false,
+  portal: null,
   overlay: true,
   round: false,
   onOpen: function onOpen() {
@@ -50,36 +47,32 @@ var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
   },
   onClick: function onClick(e) {
   },
-  onOpened: function onOpened(e) {
-  },
-  onClosed: function onClosed(e) {
-  },
   onClickOverlay: function onClickOverlay(e) {
+    return true;
   },
   onClickCloseIcon: function onClickCloseIcon(e) {
+    return true;
   }
 }, defaultOverlayProps);
 var _zIndex = 1e3;
 var Popup = function Popup2(props) {
-  var _classNames;
-  var children = props.children, visible = props.visible, overlay = props.overlay, closeOnOverlayClick = props.closeOnOverlayClick, 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, onOpen2 = props.onOpen, onClose2 = props.onClose, onClickOverlay2 = props.onClickOverlay, onClickCloseIcon2 = props.onClickCloseIcon, onOpened2 = props.onOpened, onClosed2 = props.onClosed, onClick2 = props.onClick;
+  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 b = cn("popup");
+  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 = {
+  var popClassName = classNames((_classNames = {
     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));
+  }, _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);
@@ -96,29 +89,29 @@ var Popup = function Popup2(props) {
       if (destroyOnClose) {
         setTimeout(function() {
           setShowChildren(false);
-          onClose2 && onClose2();
         }, Number(duration) * 1e3);
       }
+      onClose2 && onClose2();
     }
   };
   var onHandleClickOverlay = function onHandleClickOverlay2(e) {
     if (closeOnOverlayClick) {
-      onClickOverlay2 && onClickOverlay2(e);
-      close();
+      var closed = onClickOverlay2 && onClickOverlay2(e);
+      closed && close();
     }
   };
   var onHandleClick = function onHandleClick2(e) {
     onClick2 && onClick2(e);
   };
   var onHandleClickCloseIcon = function onHandleClickCloseIcon2(e) {
-    onClickCloseIcon2 && onClickCloseIcon2(e);
-    close();
+    var closed = onClickCloseIcon2 && onClickCloseIcon2(e);
+    closed && close();
   };
   var onHandleOpened = function onHandleOpened2(e) {
-    onOpened2 && onOpened2(e);
+    afterShow && afterShow();
   };
   var onHandleClosed = function onHandleClosed2(e) {
-    onClosed2 && onClosed2(e);
+    afterClose && afterClose();
   };
   var resolveContainer = function resolveContainer2(getContainer) {
     var container = typeof getContainer === "function" ? getContainer() : getContainer;
@@ -153,14 +146,14 @@ var Popup = function Popup2(props) {
       onExited: onHandleClosed
     }, React__default.createElement("div", {
       style: popStyles,
-      className: classes,
+      className: popClassName,
       onClick: onHandleClick
     }, showChildren ? children : "", renderIcon()));
   };
   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,
-      className: overlayClass,
+      className: overlayClassName,
       visible: innerVisible,
       closeOnOverlayClick,
       zIndex,
@@ -174,9 +167,9 @@ var Popup = function Popup2(props) {
     !visible && close();
   }, [visible]);
   useEffect(function() {
-    setTransitionName(transition || "nut-popup-slide-".concat(position));
-  }, [position]);
-  return React__default.createElement(React__default.Fragment, null, renderToContainer(teleport, renderNode()));
+    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";