1 files changed, 48 insertions, 39 deletions
diff --git a/src/components/Portal.tsx b/src/components/Portal.tsx
index 1813d9e05..d696f986b 100644
--- a/src/components/Portal.tsx
+++ b/src/components/Portal.tsx
@@ -12,45 +12,54 @@ type ComponentMap = {
   [id: string]: Component
 }
 
-export const Context = React.createContext<ContextType>({
-  outlet: null,
-  append: () => {},
-  remove: () => {},
-})
-
-export function Provider(props: React.PropsWithChildren<{}>) {
-  const map = React.useRef<ComponentMap>({})
-  const [outlet, setOutlet] = React.useState<ContextType['outlet']>(null)
-
-  const append = React.useCallback<ContextType['append']>((id, component) => {
-    if (map.current[id]) return
-    map.current[id] = <React.Fragment key={id}>{component}</React.Fragment>
-    setOutlet(<>{Object.values(map.current)}</>)
-  }, [])
-
-  const remove = React.useCallback<ContextType['remove']>(id => {
-    delete map.current[id]
-    setOutlet(<>{Object.values(map.current)}</>)
-  }, [])
-
-  return (
-    <Context.Provider value={{outlet, append, remove}}>
-      {props.children}
-    </Context.Provider>
-  )
-}
+export function createPortalGroup() {
+  const Context = React.createContext<ContextType>({
+    outlet: null,
+    append: () => {},
+    remove: () => {},
+  })
 
-export function Outlet() {
-  const ctx = React.useContext(Context)
-  return ctx.outlet
-}
+  function Provider(props: React.PropsWithChildren<{}>) {
+    const map = React.useRef<ComponentMap>({})
+    const [outlet, setOutlet] = React.useState<ContextType['outlet']>(null)
+
+    const append = React.useCallback<ContextType['append']>((id, component) => {
+      if (map.current[id]) return
+      map.current[id] = <React.Fragment key={id}>{component}</React.Fragment>
+      setOutlet(<>{Object.values(map.current)}</>)
+    }, [])
+
+    const remove = React.useCallback<ContextType['remove']>(id => {
+      delete map.current[id]
+      setOutlet(<>{Object.values(map.current)}</>)
+    }, [])
 
-export function Portal({children}: React.PropsWithChildren<{}>) {
-  const {append, remove} = React.useContext(Context)
-  const id = React.useId()
-  React.useEffect(() => {
-    append(id, children as Component)
-    return () => remove(id)
-  }, [id, children, append, remove])
-  return null
+    return (
+      <Context.Provider value={{outlet, append, remove}}>
+        {props.children}
+      </Context.Provider>
+    )
+  }
+
+  function Outlet() {
+    const ctx = React.useContext(Context)
+    return ctx.outlet
+  }
+
+  function Portal({children}: React.PropsWithChildren<{}>) {
+    const {append, remove} = React.useContext(Context)
+    const id = React.useId()
+    React.useEffect(() => {
+      append(id, children as Component)
+      return () => remove(id)
+    }, [id, children, append, remove])
+    return null
+  }
+
+  return {Provider, Outlet, Portal}
 }
+
+const DefaultPortal = createPortalGroup()
+export const Provider = DefaultPortal.Provider
+export const Outlet = DefaultPortal.Outlet
+export const Portal = DefaultPortal.Portal