diginet-core-ui 1.3.61-beta.1 → 1.3.61-beta.2

package/components/popover/index.js

@@ -121,13 +121,13 @@ const Popover = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   arrow,
   bgColor,
   children,
+  clickOutsideToClose,
   direction,
   fullScreen,
   height,
   onClose,
   open,
   pressESCToClose,
-  clickOutsideToClose,
   style,
   transformOrigin,
   trigger,
@@ -167,14 +167,16 @@ const Popover = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   };
 
   const onClickOutside = event => {
-    var _ref$current, _ref$current2, _ref$current2$parentN, _anchor;
+    var _anchor2, _anchor2$current, _anchor3, _ref$current, _ref$current2, _ref$current2$parentN;
 
     if (!ref.current) {
       document.removeEventListener('click', onClickOutside);
       return;
     }
 
-    if (clickOutsideToClose && !((_ref$current = ref.current) !== null && _ref$current !== void 0 && _ref$current.contains(event === null || event === void 0 ? void 0 : event.target)) && (!fullScreen || (_ref$current2 = ref.current) !== null && _ref$current2 !== void 0 && (_ref$current2$parentN = _ref$current2.parentNode) !== null && _ref$current2$parentN !== void 0 && _ref$current2$parentN.contains(event === null || event === void 0 ? void 0 : event.target)) && !((_anchor = anchor) !== null && _anchor !== void 0 && _anchor.contains(event === null || event === void 0 ? void 0 : event.target)) && openState) {
+    const _anchor = ((_anchor2 = anchor) === null || _anchor2 === void 0 ? void 0 : (_anchor2$current = _anchor2.current) === null || _anchor2$current === void 0 ? void 0 : _anchor2$current.element) || ((_anchor3 = anchor) === null || _anchor3 === void 0 ? void 0 : _anchor3.current) || anchor;
+
+    if (clickOutsideToClose && !((_ref$current = ref.current) !== null && _ref$current !== void 0 && _ref$current.contains(event === null || event === void 0 ? void 0 : event.target)) && (!fullScreen || (_ref$current2 = ref.current) !== null && _ref$current2 !== void 0 && (_ref$current2$parentN = _ref$current2.parentNode) !== null && _ref$current2$parentN !== void 0 && _ref$current2$parentN.contains(event === null || event === void 0 ? void 0 : event.target)) && !(_anchor !== null && _anchor !== void 0 && _anchor.contains(event === null || event === void 0 ? void 0 : event.target)) && openState) {
       onClosePopover();
     }
   };
@@ -208,9 +210,9 @@ const Popover = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
 
     if (element || anchor) {
       if (element) anchor = element;else if (anchor && !(anchor instanceof Element)) {
-        var _anchor2, _anchor$current;
+        var _anchor4, _anchor$current;
 
-        anchor = ((_anchor2 = anchor) === null || _anchor2 === void 0 ? void 0 : _anchor2.element) || ((_anchor$current = anchor.current) === null || _anchor$current === void 0 ? void 0 : _anchor$current.element) || anchor.current;
+        anchor = ((_anchor4 = anchor) === null || _anchor4 === void 0 ? void 0 : _anchor4.element) || ((_anchor$current = anchor.current) === null || _anchor$current === void 0 ? void 0 : _anchor$current.element) || anchor.current;
       }
 
       if (anchorOrigin === 'center') {
@@ -322,9 +324,9 @@ const Popover = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     };
   }, []);
   useEffect(() => {
-    var _anchor3, _anchor4;
+    var _anchor5, _anchor6;
 
-    const anchorEl = ((_anchor3 = anchor) === null || _anchor3 === void 0 ? void 0 : _anchor3.element) || ((_anchor4 = anchor) === null || _anchor4 === void 0 ? void 0 : _anchor4.current) || anchor;
+    const anchorEl = ((_anchor5 = anchor) === null || _anchor5 === void 0 ? void 0 : _anchor5.element) || ((_anchor6 = anchor) === null || _anchor6 === void 0 ? void 0 : _anchor6.current) || anchor;
     const eventArr = eventMap.get(trigger) || [];
 
     if (anchorEl && open === undefined && (eventArr === null || eventArr === void 0 ? void 0 : eventArr.length) > 0) {
@@ -362,6 +364,9 @@ const Popover = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
       document.documentElement.style.overflow = 'auto';
     }
   }, [openState]);
+  useEffect(() => {
+    clickOutsideToClose ? document.addEventListener('click', onClickOutside) : document.removeEventListener('click', onClickOutside);
+  }, [clickOutsideToClose]);
   useImperativeHandle(reference, () => ({
     element: ref.current,
     instance: {
@@ -375,9 +380,9 @@ const Popover = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   }));
 
   const renderAnchor = () => {
-    var _anchor5;
+    var _anchor7;
 
-    if (!((_anchor5 = anchor) !== null && _anchor5 !== void 0 && _anchor5.type)) return null;
+    if (!((_anchor7 = anchor) !== null && _anchor7 !== void 0 && _anchor7.type)) return null;
     const AnchorTag = /*#__PURE__*/React.cloneElement(anchor, {
       // onClick: () => {
       //     setOpenState(true);
@@ -409,7 +414,7 @@ const Popover = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     }
 
     return null;
-  }, [openState, zIndex, fullScreen, style, arrow, children, width, height, bgColor]);
+  }, [openState, zIndex, fullScreen, style, arrow, children, width, height, bgColor, clickOutsideToClose]);
   return jsx(React.Fragment, null, renderAnchor(), PopoverView);
 }));
 
@@ -501,6 +506,9 @@ Popover.propTypes = {
   /** The content of the component. */
   children: PropTypes.node,
 
+  /** If `true`, click outside will close component. */
+  clickOutsideToClose: PropTypes.bool,
+
   /**
    * Direction when Popover shown.
    * Note: This prop will overwrite anchorOrigin & transformOrigin.
@@ -521,9 +529,6 @@ Popover.propTypes = {
   /** If `true`, hitting escape will close component. */
   pressESCToClose: PropTypes.bool,
 
-  /** If `true`, click outside will close component. */
-  clickOutsideToClose: PropTypes.bool,
-
   /** Style inline of component. */
   style: PropTypes.object,
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.3.61-beta.1",
+  "version": "1.3.61-beta.2",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",