fix(application): explicitly pass rootView to initRootView (#10345)

jcassidyav · web-flow · commit bd8e1b8e79f9 · 2023-07-18T17:47:50.000+02:00
fixes occasional crashes when resuming the app.
diff --git a/packages/core/application/application-common.ts b/packages/core/application/application-common.ts
@@ -364,8 +364,8 @@ export class ApplicationCommon {
 		// rest of implementation is platform specific
 	}
 
-	initRootView() {
-		this.setRootViewCSSClasses(this.getRootView());
+	initRootView(rootView: View) {
+		this.setRootViewCSSClasses(rootView);
 		initAccessibilityCssHelper();
 		initAccessibilityFontScale();
 	}
diff --git a/packages/core/application/application.ios.ts b/packages/core/application/application.ios.ts
@@ -157,7 +157,7 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication
 			visibleVC.presentViewControllerAnimatedCompletion(controller, true, null);
 		}
 
-		this.initRootView();
+		this.initRootView(rootView);
 		this.notifyAppStarted();
 	}
 
@@ -349,7 +349,7 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication
 			this._window.makeKeyAndVisible();
 		}
 
-		this.initRootView();
+		this.initRootView(rootView);
 
 		rootView.on(IOSHelper.traitCollectionColorAppearanceChangedEvent, () => {
 			const userInterfaceStyle = controller.traitCollection.userInterfaceStyle;
diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
@@ -1378,7 +1378,7 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
 		this._rootView = rootView;
 
 		// sets root classes once rootView is ready...
-		Application.initRootView();
+		Application.initRootView(rootView);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -364,8 +364,8 @@ export class ApplicationCommon {`
`364`	`364`	`// rest of implementation is platform specific`
`365`	`365`	`}`
`366`	`366`
`367`		`- initRootView() {`
`368`		`- this.setRootViewCSSClasses(this.getRootView());`
	`367`	`+ initRootView(rootView: View) {`
	`368`	`+ this.setRootViewCSSClasses(rootView);`
`369`	`369`	`initAccessibilityCssHelper();`
`370`	`370`	`initAccessibilityFontScale();`
`371`	`371`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication`
`157`	`157`	`visibleVC.presentViewControllerAnimatedCompletion(controller, true, null);`
`158`	`158`	`}`
`159`	`159`
`160`		`- this.initRootView();`
	`160`	`+ this.initRootView(rootView);`
`161`	`161`	`this.notifyAppStarted();`
`162`	`162`	`}`
`163`	`163`
`@@ -349,7 +349,7 @@ export class iOSApplication extends ApplicationCommon implements IiOSApplication`
`349`	`349`	`this._window.makeKeyAndVisible();`
`350`	`350`	`}`
`351`	`351`
`352`		`- this.initRootView();`
	`352`	`+ this.initRootView(rootView);`
`353`	`353`
`354`	`354`	`rootView.on(IOSHelper.traitCollectionColorAppearanceChangedEvent, () => {`
`355`	`355`	`const userInterfaceStyle = controller.traitCollection.userInterfaceStyle;`
Original file line number	Diff line number	Diff line change
`@@ -1378,7 +1378,7 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {`
`1378`	`1378`	`this._rootView = rootView;`
`1379`	`1379`
`1380`	`1380`	`// sets root classes once rootView is ready...`
`1381`		`- Application.initRootView();`
	`1381`	`+ Application.initRootView(rootView);`
`1382`	`1382`	`}`
`1383`	`1383`	`}`
`1384`	`1384`