Fix registry context

Exelord · May 10, 2023 · 847a299 · 847a299
1 parent df4dcad
commit 847a299
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/context.ts b/src/context.ts
@@ -15,12 +15,16 @@ export type RegistryProviderProps = {
 export const ServiceRegistryContext = createContext<Registry>();
 
 export const ServiceRegistry: FlowComponent<RegistryProviderProps> = (props) => {
+  let registry: Registry | undefined;
+
   return createComponent(ServiceRegistryContext.Provider, {
-    value: createRegistry({
-      get expose() {
-        return props.expose;
-      },
-    }),
+    get value() {
+      return (registry ??= createRegistry({
+        get expose() {
+          return props.expose;
+        },
+      }));
+    },
 
     get children() {
       return props.children;

diff --git a/src/registry.ts b/src/registry.ts
@@ -94,9 +94,10 @@ export class Registry {
       return parentRegistry.register(initializer);
     }
 
-    const registration = this.#owner
-      ? runInSubRoot(() => this.initializeService(initializer), this.#owner)
-      : this.initializeService(initializer);
+    const registration = runInSubRoot(
+      () => this.initializeService(initializer),
+      this.#owner
+    );
 
     this.#cache.set(initializer, registration);
 
@@ -114,12 +115,12 @@ export class Registry {
   }
 
   private getParentRegistry(): Registry | undefined {
-    return this.#owner
+    return this.#owner?.owner
       ? runInSubRoot((dispose) => {
           const context = useContext(ServiceRegistryContext);
           dispose();
           return context;
-        }, this.#owner)
+        }, this.#owner.owner)
       : undefined;
   }