@motech-development/breeze-ui 2.1.0 → 2.1.1

package/lib/index.esm.js

@@ -1964,49 +1964,21 @@ const ModalDialog = styled.div`
   position: relative;
 `;
 const Modal = ({ children, isOpen, onDismiss, size = 'sm', title })=>{
-    const output = document.createElement('div');
     const doNotDismiss = (e)=>{
         e.stopPropagation();
     };
-    const modal = /*#__PURE__*/ jsxs(Suspense, {
-        fallback: /*#__PURE__*/ jsx(Loader, {}),
-        children: [
-            /*#__PURE__*/ jsx(ModalOuter, {
-                "aria-modal": true,
-                "aria-label": title,
-                role: "dialog",
-                tabIndex: -1,
-                onClick: onDismiss,
-                children: /*#__PURE__*/ jsx(ModalDialog, {
-                    size: size,
-                    role: "document",
-                    children: /*#__PURE__*/ jsx(ModalContent, {
-                        onClick: doNotDismiss,
-                        children: /*#__PURE__*/ jsx(Card, {
-                            padding: "lg",
-                            children: children
-                        })
-                    })
-                })
-            }),
-            /*#__PURE__*/ jsx(Overlay, {})
-        ]
-    });
     useEffect(()=>{
         const keyboardEvent = (e)=>{
             if (e.key === 'Escape') {
                 onDismiss();
             }
         };
-        document.body.appendChild(output);
         document.addEventListener('keydown', keyboardEvent, false);
         return ()=>{
-            document.body.removeChild(output);
             document.body.style.removeProperty('overflow');
             document.removeEventListener('keydown', keyboardEvent, false);
         };
     }, [
-        output,
         onDismiss
     ]);
     useEffect(()=>{
@@ -2017,7 +1989,30 @@ const Modal = ({ children, isOpen, onDismiss, size = 'sm', title })=>{
         isOpen
     ]);
     if (isOpen) {
-        return /*#__PURE__*/ createPortal(modal, output);
+        return /*#__PURE__*/ createPortal(/*#__PURE__*/ jsxs(Suspense, {
+            fallback: /*#__PURE__*/ jsx(Loader, {}),
+            children: [
+                /*#__PURE__*/ jsx(ModalOuter, {
+                    "aria-modal": true,
+                    "aria-label": title,
+                    role: "dialog",
+                    tabIndex: -1,
+                    onClick: onDismiss,
+                    children: /*#__PURE__*/ jsx(ModalDialog, {
+                        size: size,
+                        role: "document",
+                        children: /*#__PURE__*/ jsx(ModalContent, {
+                            onClick: doNotDismiss,
+                            children: /*#__PURE__*/ jsx(Card, {
+                                padding: "lg",
+                                children: children
+                            })
+                        })
+                    })
+                }),
+                /*#__PURE__*/ jsx(Overlay, {})
+            ]
+        }), document.body);
     }
     return null;
 };
@@ -2704,7 +2699,6 @@ const selectIcon = (alertType)=>{
     }
 };
 const ToastProvider = ({ children })=>{
-    const output = document.createElement('div');
     const [toasts, setToasts] = useState([]);
     const add = useCallback(({ colour, message, onDismiss })=>{
         const id = generateId();
@@ -2720,34 +2714,18 @@ const ToastProvider = ({ children })=>{
     }, [
         toasts
     ]);
-    const remove = useCallback((id)=>setToasts(toasts.filter((t)=>{
-            if (t.id === id && t.onDismiss) {
-                t.onDismiss();
+    const remove = useCallback((id)=>{
+        setToasts((value)=>{
+            const item = value.findIndex((t)=>t.id === id);
+            if (value[item]?.onDismiss) {
+                value[item].onDismiss();
             }
-            return t.id !== id;
-        })), [
-        toasts
-    ]);
-    const alerts = /*#__PURE__*/ jsx(ToastContainer, {
-        children: toasts.map(({ colour, id, message })=>/*#__PURE__*/ jsx(Alert, {
-                spacing: "lg",
-                dismissable: 5000,
-                icon: /*#__PURE__*/ jsx(FontAwesomeIcon, {
-                    icon: selectIcon(colour)
-                }),
-                colour: colour,
-                message: message,
-                onDismiss: ()=>remove(id)
-            }, id))
-    });
-    useEffect(()=>{
-        document.body.appendChild(output);
-        return ()=>{
-            document.body.removeChild(output);
-        };
-    }, [
-        output
-    ]);
+            if (item !== -1) {
+                value.splice(item, 1);
+            }
+            return value;
+        });
+    }, []);
     const value = useMemo(()=>({
             add,
             remove
@@ -2759,7 +2737,20 @@ const ToastProvider = ({ children })=>{
         value: value,
         children: [
             children,
-            /*#__PURE__*/ createPortal(alerts, output)
+            /*#__PURE__*/ createPortal(/*#__PURE__*/ jsx(ToastContainer, {
+                children: toasts.map(({ colour, id, message })=>/*#__PURE__*/ jsx(Alert, {
+                        spacing: "lg",
+                        dismissable: 5000,
+                        icon: /*#__PURE__*/ jsx(FontAwesomeIcon, {
+                            icon: selectIcon(colour)
+                        }),
+                        colour: colour,
+                        message: message,
+                        onDismiss: ()=>{
+                            remove(id);
+                        }
+                    }, id))
+            }), document.body)
         ]
     });
 };