chore: added weakref precaution

CatchABus · CatchABus · commit 4b023a69b3d8 · 2025-05-31T17:41:50.000+03:00
diff --git a/packages/core/ui/core/view-base/index.ts b/packages/core/ui/core/view-base/index.ts
@@ -117,12 +117,13 @@ export interface ShowModalOptions {
  * @param criterion - The type of ancestor view we are looking for. Could be a string containing a class name or an actual type.
  * Returns an instance of a view (if found), otherwise undefined.
  */
-export function getAncestor(view: ViewBaseDefinition, criterion: string | { new () }): ViewBaseDefinition {
-	let matcher: (view: ViewBaseDefinition) => boolean = null;
+export function getAncestor<T extends ViewBaseDefinition = ViewBaseDefinition>(view: T, criterion: string | { new () }): T {
+	let matcher: (view: ViewBaseDefinition) => view is T;
+
 	if (typeof criterion === 'string') {
-		matcher = (view: ViewBaseDefinition) => view.typeName === criterion;
+		matcher = (view: ViewBaseDefinition): view is T => view.typeName === criterion;
 	} else {
-		matcher = (view: ViewBaseDefinition) => view instanceof criterion;
+		matcher = (view: ViewBaseDefinition): view is T => view instanceof criterion;
 	}
 
 	for (let parent = view.parent; parent != null; parent = parent.parent) {
diff --git a/packages/core/ui/frame/frame-common.ts b/packages/core/ui/frame/frame-common.ts
@@ -17,6 +17,8 @@ import { NavigationData } from '.';
 export { NavigationType } from './frame-interfaces';
 export type { AndroidActivityCallbacks, AndroidFragmentCallbacks, AndroidFrame, BackstackEntry, NavigationContext, NavigationEntry, NavigationTransition, TransitionState, ViewEntry, iOSFrame } from './frame-interfaces';
 
+const FRAME_ENTRY_LOADED_EVENT = '_frameEntryLoaded';
+
 function buildEntryFromArgs(arg: any): NavigationEntry {
 	let entry: NavigationEntry;
 	if (typeof arg === 'string') {
@@ -76,13 +78,13 @@ export class FrameBase extends CustomLayoutView {
 			return true;
 		} else if (top) {
 			let parentFrameCanGoBack = false;
-			let parentFrame = <FrameBase>getAncestor(top, 'Frame');
+			let parentFrame = getAncestor(top, 'Frame');
 
 			while (parentFrame && !parentFrameCanGoBack) {
 				if (parentFrame && parentFrame.canGoBack()) {
 					parentFrameCanGoBack = true;
 				} else {
-					parentFrame = <FrameBase>getAncestor(parentFrame, 'Frame');
+					parentFrame = getAncestor(parentFrame, 'Frame');
 				}
 			}
 
@@ -127,14 +129,29 @@ export class FrameBase extends CustomLayoutView {
 		super.onLoaded();
 
 		if (parentFrame?.isLoadingSubviews) {
-			parentFrame.once('frameEntryLoaded', () => {
-				this.onFrameLoaded();
+			const frameRef = new WeakRef(this);
+
+			parentFrame.once(FRAME_ENTRY_LOADED_EVENT, () => {
+				const frame = frameRef.deref();
+				if (frame) {
+					frame.onFrameLoaded();
+				}
 			});
 		} else {
 			this.onFrameLoaded();
 		}
 	}
 
+	@profile
+	public onUnloaded() {
+		super.onUnloaded();
+
+		// This is a precaution in case the method is called asynchronously during the loading procedure
+		if (this.hasListeners(FRAME_ENTRY_LOADED_EVENT)) {
+			this.off(FRAME_ENTRY_LOADED_EVENT);
+		}
+	}
+
 	public onFrameLoaded(): void {
 		this._processNextNavigationEntry();
 		this._notifyFrameEntryLoaded();
@@ -338,15 +355,16 @@ export class FrameBase extends CustomLayoutView {
 
 	protected _notifyFrameEntryLoaded(): void {
 		this.notify({
-			eventName: 'frameEntryLoaded',
+			eventName: FRAME_ENTRY_LOADED_EVENT,
 			object: this,
 		});
 	}
 
 	private isNestedWithin(parentFrameCandidate: FrameBase): boolean {
-		let frameAncestor: FrameBase = this;
+		let frameAncestor = this as FrameBase;
+
 		while (frameAncestor) {
-			frameAncestor = <FrameBase>getAncestor(frameAncestor, FrameBase);
+			frameAncestor = getAncestor(frameAncestor, FrameBase);
 			if (frameAncestor === parentFrameCandidate) {
 				return true;
 			}
