javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-14 10:01:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(visionos): multi-scene improvements (#10653)

Browse Source
This commit is contained in:
Nathan Walker
2024-11-18 19:42:34 -08:00
committed by GitHub
parent e5caa2cc53
commit d6922b9896
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/core/platforms/ios/src/NativeScriptMainWindow.swift
View File

@ -2,6 +2,14 @@ import SwiftUI
import NativeScriptEmbedder
import UIKit
// Ensure runtime phases are called only once per app lifecycle
// In multi-scene apps, we need to ensure runtime doesn't reinit alongside main window
// For example, if @State is used to drive @Environment at the root level, we need to ensure
// a rerender of the main body doesn't cause runtime to cycle again
var hasMainInit = false
var hasMainBoot = false
var hasMainSetMainScene = false
@available(iOS 14.0, *)
struct NativeScriptMainWindow: Scene {
@ -18,12 +26,18 @@ struct NativeScriptMainWindow: Scene {
// windowStyle is only supported on visionOS
WindowGroup {
NativeScriptAppView(found: { windowScene in
NativeScriptEmbedder.sharedInstance().setWindowScene(windowScene)
if (!hasMainSetMainScene) {
hasMainSetMainScene = true
NativeScriptEmbedder.sharedInstance().setWindowScene(windowScene)
}
}).onAppear {
// print("NativeScriptAppView onAppear")
DispatchQueue.main.async {
NativeScriptEmbedder.boot()
}
if (!hasMainBoot) {
hasMainBoot = true
DispatchQueue.main.async {
NativeScriptEmbedder.boot()
}
}
}.onReceive(NotificationCenter.default
.publisher(for: NSNotification.Name("NativeScriptWindowOpen")), perform: { obj in
let info = parseWindowInfo(obj: obj)
@ -68,9 +82,12 @@ struct NativeScriptMainWindow: Scene {
}
init() {
NativeScriptViewFactory.initShared()
NativeScriptEmbedder.sharedInstance().setDelegate(NativeScriptViewFactory.shared)
NativeScriptEmbedder.setup()
if (!hasMainInit) {
hasMainInit = true
NativeScriptViewFactory.initShared()
NativeScriptEmbedder.sharedInstance().setDelegate(NativeScriptViewFactory.shared)
NativeScriptEmbedder.setup()
}
}
#if os(visionOS)