ag-common 0.0.685 → 0.0.686

package/dist/ui/components/Modal/Modal.js

@@ -90,7 +90,7 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top'
     if (portalId === undefined) {
         portalId = globalId;
     }
-    const [elem, setElem] = (0, react_1.useState)();
+    const [portalElem, setPortalElem] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {
         if (portalId === null ||
             document.querySelectorAll(`#${portalId}`).length > 0) {
@@ -128,6 +128,17 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top'
         ref,
         moveMouseOutside: closeOnMoveMouseOutside,
     }, () => {
+        var _a;
+        //there might be multiple models open, only close the last one on the stack
+        if (portalElem) {
+            const myid = Array.prototype.indexOf.call(portalElem.children, 
+            //parent because fixed background is first
+            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.parentElement);
+            const childcount = portalElem.children.length;
+            if (myid + 1 !== childcount) {
+                return;
+            }
+        }
         if (closeOnClickOutside && open) {
             setOpen(false);
             setBounced(false);
@@ -139,10 +150,10 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top'
         }
     }, [open, bounced]);
     (0, react_1.useEffect)(() => {
-        if (elem === undefined && portalId) {
-            setElem(document.getElementById(portalId));
+        if (portalElem === undefined && portalId) {
+            setPortalElem(document.getElementById(portalId));
         }
-    }, [elem, portalId]);
+    }, [portalElem, portalId]);
     if (!open) {
         return react_1.default.createElement(react_1.default.Fragment, null);
     }
@@ -150,11 +161,11 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top'
         react_1.default.createElement(ModalBase, { "data-bounced": bounced, "data-position": position, "data-topposition": topPosition, ref: ref, className: className, style: style },
             showCloseButton && (react_1.default.createElement(CloseStyled, { "data-type": "modal-close", onClick: () => setOpen(false) })),
             children)));
-    if (portalId && elem === undefined) {
+    if (portalId && portalElem === undefined) {
         return null;
     }
-    if (portalId && elem) {
-        return (0, react_dom_1.createPortal)(Content, elem);
+    if (portalId && portalElem) {
+        return (0, react_dom_1.createPortal)(Content, portalElem);
     }
     return Content;
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.685",
+  "version": "0.0.686",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",