Skip to content

Fix UIHostingView environment resolution #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kyle-Ye merged 1 commit into from
Jun 22, 2026
+22 −2
Merged

Fix UIHostingView environment resolution #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ package class UIHostingViewBase {
}
var result = traitCollection.resolvedEnvironment(base: EnvironmentValues(environment.plist))
result.configureForPlatform(traitCollection: traitCollection)
return environment
return result
}

package func endUpdateEnvironment(_ environment: EnvironmentValues) {
Expand Down
22 changes: 21 additions & 1 deletion Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewBaseTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,34 @@
#if os(iOS) || os(visionOS)
import Foundation
import Testing
@testable import OpenSwiftUI
import OpenSwiftUI
@_spi(ForOpenSwiftUIOnly)
import OpenSwiftUICore
import UIKit
import OpenSwiftUITestsSupport

@MainActor
struct UIHostingViewBaseTests {
@Test
func startUpdateEnvironmentReturnsResolvedTraitEnvironment() {
let uiView = UIView()
let base = UIHostingViewBase(rootViewType: EmptyView.self, options: [])
base.uiView = uiView
base.traitCollectionOverride = UITraitCollection(traitsFrom: [

Check warning on line 21 in Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewBaseTests.swift

View workflow job for this annotation

GitHub Actions / Execute tests on iOS (macos-15, 26.3, 2024, 18.5) 

'init(traitsFrom:)' was deprecated in iOS 17.0: Use UITraitCollection.init(mutations:) and UITraitCollection.modifyingTraits(_:) to create and modify trait collections
UITraitCollection(layoutDirection: .rightToLeft),
UITraitCollection(displayScale: 3.0),
])

var inheritedEnvironment = EnvironmentValues()
inheritedEnvironment.layoutDirection = .leftToRight
inheritedEnvironment.displayScale = 1.0
base.inheritedEnvironment = inheritedEnvironment

let environment = base.startUpdateEnvironment()
#expect(environment.layoutDirection == .rightToLeft)
#expect(environment.displayScale == 3.0)
}

@Test(.bug(id: "#406"))
func uiWindowSceneDeallocIssue() async throws {
struct ContentView: View {
Expand Down
Loading