Merge branch 'base-route-url-radix' of github.com:inertiaui/modal int…

…o base-route-url-radix
inertiaui · Oct 22, 2024 · 162964a · 162964a
2 parents ad26b79 + 93e5f3d
commit 162964a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 33 deletions.
diff --git a/react/src/HeadlessModal.jsx b/react/src/HeadlessModal.jsx
@@ -73,18 +73,18 @@ const HeadlessModal = forwardRef(({ name, children, ...props }, ref) => {
             <>
                 {typeof children === 'function'
                     ? children({
-                        afterLeave: modalContext.afterLeave,
-                        close: modalContext.close,
-                        emit: modalContext.emit,
-                        getChildModal: modalContext.getChildModal,
-                        getParentModal: modalContext.getParentModal,
-                        index: modalContext.index,
-                        isOpen: modalContext.open,
-                        modalContext,
-                        modalProps,
-                        reload: modalContext.reload,
-                        setOpen: modalContext.setOpen,
-                    })
+                          afterLeave: modalContext.afterLeave,
+                          close: modalContext.close,
+                          emit: modalContext.emit,
+                          getChildModal: modalContext.getChildModal,
+                          getParentModal: modalContext.getParentModal,
+                          index: modalContext.index,
+                          isOpen: modalContext.open,
+                          modalContext,
+                          modalProps,
+                          reload: modalContext.reload,
+                          setOpen: modalContext.setOpen,
+                      })
                     : children}
 
                 {/* Next modal in the stack */}

diff --git a/react/src/ModalRenderer.jsx b/react/src/ModalRenderer.jsx
@@ -20,12 +20,14 @@ const ModalRenderer = ({ index }) => {
     }, [stack, index])
 
     return (
-        modalContext?.component && <ModalIndexContext.Provider value={index}>
-            <modalContext.component
-                {...modalContext.componentProps}
-                onModalEvent={(...args) => modalContext.emit(...args)}
-            />
-        </ModalIndexContext.Provider>
+        modalContext?.component && (
+            <ModalIndexContext.Provider value={index}>
+                <modalContext.component
+                    {...modalContext.componentProps}
+                    onModalEvent={(...args) => modalContext.emit(...args)}
+                />
+            </ModalIndexContext.Provider>
+        )
     )
 }
 

diff --git a/react/src/ModalRoot.jsx b/react/src/ModalRoot.jsx
@@ -29,9 +29,12 @@ export const ModalStackProvider = ({ children }) => {
                     return true
                 }
 
-                return newStack.map((modal) => ({ id: modal.id, shouldRender: modal.shouldRender }))
-                    .reverse()
-                    .find((modal) => modal.shouldRender)?.id === modalId
+                return (
+                    newStack
+                        .map((modal) => ({ id: modal.id, shouldRender: modal.shouldRender }))
+                        .reverse()
+                        .find((modal) => modal.shouldRender)?.id === modalId
+                )
             }
 
             newStack.forEach((modal, index) => {
@@ -57,7 +60,6 @@ export const ModalStackProvider = ({ children }) => {
                     // Find the first open modal after this one
                     return newStack.slice(index + 1).find((modal) => modal.open)
                 }
-
             })
 
             return newStack
@@ -259,16 +261,17 @@ export const ModalStackProvider = ({ children }) => {
         return modal
     }
 
-    const visitModal = (url, options = {}) => visit(
-        url,
-        options.method ?? 'get',
-        options.data ?? {},
-        options.headers ?? {},
-        options.config ?? {},
-        options.onClose,
-        options.onAfterLeave,
-        options.queryStringArrayFormat ?? 'brackets',
-    )
+    const visitModal = (url, options = {}) =>
+        visit(
+            url,
+            options.method ?? 'get',
+            options.data ?? {},
+            options.headers ?? {},
+            options.config ?? {},
+            options.onClose,
+            options.onAfterLeave,
+            options.queryStringArrayFormat ?? 'brackets',
+        )
 
     const visit = (
         href,
@@ -305,7 +308,6 @@ export const ModalStackProvider = ({ children }) => {
                 'X-InertiaUI-Modal-Use-Router': useInertiaRouter ? 1 : 0,
             }
 
-
             if (useInertiaRouter) {
                 // Pushing the modal to the stack will be handled by the ModalRoot...
                 return router.visit(url, {