Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,26 @@ extension _UIHostingView: ViewRendererHost {

// MARK: - ViewRendererHost conformance

package var currentTimestamp: Time {
get { base.currentTimestamp }
set { base.currentTimestamp = newValue }
}

package var propertiesNeedingUpdate: ViewRendererHostProperties {
get { base.propertiesNeedingUpdate }
set { base.propertiesNeedingUpdate = newValue }
}

package var renderingPhase: ViewRenderingPhase {
get { base.renderingPhase }
set { base.renderingPhase = newValue }
}

package var externalUpdateCount: Int {
get { base.externalUpdateCount }
set { base.externalUpdateCount = newValue }
}

package func updateRootView() {
let rootView = makeRootView()
viewGraph.setRootView(rootView)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,6 @@ open class _UIHostingView<Content>: UIView, XcodeViewDebugDataProvider where Con
final package let renderer = DisplayList.ViewRenderer(platform: .init(definition: UIViewPlatformViewDefinition.self))

// final package let eventBindingManager: EventBindingManager

package var currentTimestamp: Time = .zero

package var propertiesNeedingUpdate: ViewRendererHostProperties = .all

package var renderingPhase: ViewRenderingPhase {
get { base.renderingPhase }
set { base.renderingPhase = newValue }
}

package var externalUpdateCount: Int {
get { base.externalUpdateCount }
set { base.externalUpdateCount = newValue }
}

var allowUIKitAnimations: Int32 = .zero

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ package class UIHostingViewBase {
if let renderedTime {
if renderedTime.seconds.isFinite {
let delay = max(renderedTime - currentTimestamp, 1e-6)
requestUpdate(after: delay)
host.requestUpdate(after: delay)
}
if viewGraph.updateRequiredMainThread {
displayLink?.cancelAsyncRendering()
Expand Down
4 changes: 3 additions & 1 deletion Sources/OpenSwiftUICore/Graph/GraphHost.swift
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,8 @@ extension GraphHost {
}
}

// MARK: GraphHost + preference [6.5.4]

@_spi(ForOpenSwiftUIOnly)
extension GraphHost {
package final func addPreference<K>(_ key: K.Type) where K: HostPreferenceKey {
Expand Down Expand Up @@ -561,7 +563,7 @@ extension GraphHost {
package final func updatePreferences() -> Bool {
let seed = hostPreferenceValues.value?.seed ?? .empty
let lastSeed = lastHostPreferencesSeed
let didUpdate = !seed.isInvalid || lastSeed.isInvalid || (seed.value != lastSeed.value)
let didUpdate = !seed.isInvalid && !lastSeed.isInvalid && (seed.value != lastSeed.value)
lastHostPreferencesSeed = seed
return didUpdate
}
Expand Down
Loading