fix(runtime): handle lazy-instance promises for connected & disconnec…

…ted callbacks
rindojs · Dec 3, 2023 · f9cf35f · f9cf35f
1 parent e35899f
commit f9cf35f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/runtime/connected-callback.ts b/src/runtime/connected-callback.ts
@@ -106,7 +106,11 @@ export const connectedCallback = (elm: d.HostElement) => {
       addHostEventListeners(elm, hostRef, cmpMeta.$listeners$, false);
 
       // fire off connectedCallback() on component instance
-      fireConnectedCallback(hostRef.$lazyInstance$);
+      if (hostRef?.$lazyInstance$) {
+        fireConnectedCallback(hostRef.$lazyInstance$);
+      } else if (hostRef?.$onReadyPromise$) {
+        hostRef.$onReadyPromise$.then(() => fireConnectedCallback(hostRef.$lazyInstance$));
+      }
     }
 
     endConnected();

diff --git a/src/runtime/disconnected-callback.ts b/src/runtime/disconnected-callback.ts
@@ -5,10 +5,18 @@ import type * as d from '../declarations';
 import { PLATFORM_FLAGS } from './runtime-constants';
 import { safeCall } from './update-component';
 
-export const disconnectedCallback = (elm: d.HostElement) => {
+const disconnectInstance = (instance: any) => {
+  if (BUILD.lazyLoad && BUILD.disconnectedCallback) {
+    safeCall(instance, 'disconnectedCallback');
+  }
+  if (BUILD.cmpDidUnload) {
+    safeCall(instance, 'componentDidUnload');
+  }
+};
+
+export const disconnectedCallback = async (elm: d.HostElement) => {
   if ((plt.$flags$ & PLATFORM_FLAGS.isTmpDisconnected) === 0) {
     const hostRef = getHostRef(elm);
-    const instance: any = BUILD.lazyLoad ? hostRef.$lazyInstance$ : elm;
 
     if (BUILD.hostListener) {
       if (hostRef.$rmListeners$) {
@@ -17,11 +25,12 @@ export const disconnectedCallback = (elm: d.HostElement) => {
       }
     }
 
-    if (BUILD.lazyLoad && BUILD.disconnectedCallback) {
-      safeCall(instance, 'disconnectedCallback');
-    }
-    if (BUILD.cmpDidUnload) {
-      safeCall(instance, 'componentDidUnload');
+    if (!BUILD.lazyLoad) {
+      disconnectInstance(elm);
+    } else if (hostRef?.$lazyInstance$) {
+      disconnectInstance(hostRef.$lazyInstance$);
+    } else if (hostRef?.$onReadyPromise$) {
+      hostRef.$onReadyPromise$.then(() => disconnectInstance(hostRef.$lazyInstance$));
     }
   }
 };