Skip to content

Fix preference bridge ownership and align preference internals #966

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 2 commits into from
Aug 2, 2026
Merged

Fix preference bridge ownership and align preference internals #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76cb932
Audit PreferenceKey and simplify type naming
Kyle-Ye Aug 2, 2026
541f4ed
Fix PreferenceBridge issue
Kyle-Ye Aug 2, 2026
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
14 changes: 7 additions & 7 deletions Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// PreferenceBridge.swift
// OpenSwiftUICore
//
// Audited for 6.0.87
// Audited for 6.5.4
// Status: Complete
// ID: A9FAE381E99529D5274BA37A9BC9B074 (SwiftUI)
// ID: DF57A19C61B44C613EB77C1D47FC679A (SwiftUICore)
Expand Down Expand Up @@ -32,9 +32,9 @@ package final class PreferenceBridge {
requestedPreferences = PreferenceKeys()
bridgedViewInputs = PropertyList()
for child in children {
let viewGraph = child.takeRetainedValue()
viewGraph.invalidatePreferenceBridge()
child.release()
child._withUnsafeGuaranteedRef { viewGraph in
viewGraph.invalidatePreferenceBridge()
}
}
viewGraph = nil
isValid = false
Expand Down Expand Up @@ -105,9 +105,9 @@ package final class PreferenceBridge {

package func removedStateDidChange() {
for child in children {
let viewGraph = child.takeUnretainedValue()
viewGraph.updateRemovedState()
child.release()
child._withUnsafeGuaranteedRef { viewGraph in
viewGraph.updateRemovedState()
}
}
}

Expand Down
8 changes: 4 additions & 4 deletions Sources/OpenSwiftUICore/Data/Preference/PreferenceCombiner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// PreferenceCombiner.swift
// OpenSwiftUICore
//
// Audited for 6.0.87
// Audited for 6.5.4
// Status: Complete
// ID: 59D15989E597719355BF0EAE6CB41FF9 (SwiftUI)
// ID: EAF68AEE5E08E2f44FEB886FE6A27001 (SwiftUICore)
// ID: EAF68AEE5E08E2F44FEB886FE6A27001 (SwiftUICore)

package import OpenAttributeGraphShims

Expand Down Expand Up @@ -108,9 +108,9 @@ private struct PairPreferenceCombiner<K>: Rule, AsyncAttribute where K: Preferen
}
}

// MARK: - PreferencesAggregator
// MARK: - PreferenceAggregator

package struct PreferencesAggregator<K>: Rule, AsyncAttribute where K: PreferenceKey {
package struct PreferenceAggregator<K>: Rule, AsyncAttribute where K: PreferenceKey {
package var attributes: [WeakAttribute<K.Value>]

package init(attributes: [Attribute<K.Value>]) {
Expand Down
7 changes: 5 additions & 2 deletions Sources/OpenSwiftUICore/Data/Preference/PreferenceKey.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// PreferenceKey.swift
// OpenSwiftUICore
//
// Audited for 6.0.87
// Audited for 6.5.4
// Status: Complete
// ID: 3D8838A231BB2CC7FC00E7880D8B2FC4 (SwiftUICore)

Expand Down Expand Up @@ -71,6 +71,9 @@ extension PreferenceKey {
if name.isEmpty {
let fullname = _typeName(Self.self, qualified: true)
let results = fullname.split(maxSplits: 1) { $0 == "." }
guard results.count >= 2 else {
return fullname
}
return String(results[1])
} else {
return name
Expand All @@ -88,7 +91,7 @@ package protocol PreferenceKeyVisitor {
mutating func visit<K>(key: K.Type) where K: PreferenceKey
}

// MARK: - PreferenceKeys [6.5.4]
// MARK: - PreferenceKeys

package struct PreferenceKeys: Equatable, RandomAccessCollection, MutableCollection {
var keys: [any PreferenceKey.Type] = []
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUICore/Data/Preference/PreferenceList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// OpenSwiftUICore
//
// Audited for 6.5.4
// Status: Copmlete
// Status: Complete
// ID: C1C63C2F6F2B9F3EB30DD747F0605FBD (SwiftUI)
// ID: 7B694C05291EA7AF22785AB458D1BC2F (SwiftUICore)

Expand Down
2 changes: 0 additions & 2 deletions Sources/OpenSwiftUICore/Data/Preference/PreferenceTransformModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ package import OpenAttributeGraphShims
/// preference key.
@available(OpenSwiftUI_v1_0, *)
@frozen
@MainActor
@preconcurrency
public struct _PreferenceTransformModifier<Key>: ViewModifier, MultiViewModifier, PrimitiveViewModifier where Key: PreferenceKey {

/// The transform function to apply to `Key`.
Expand Down
5 changes: 4 additions & 1 deletion Sources/OpenSwiftUICore/Data/Preference/PreferenceWritingModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ extension View {

/// Sets a value for the given preference.
@inlinable
public func preference<K>(key: K.Type = K.self, value: K.Value) -> some View where K : PreferenceKey {
nonisolated public func preference<K>(
key: K.Type = K.self,
value: K.Value
) -> some View where K: PreferenceKey {
modifier(_PreferenceWritingModifier<K>(value: value))
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUICore/Data/Preference/PreferencesInputs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// PreferencesInputs.swift
// OpenSwiftUICore
//
// Audited for 6.0.87
// Audited for 6.5.4
// Status: Complete

package import OpenAttributeGraphShims
Expand Down
3 changes: 2 additions & 1 deletion Sources/OpenSwiftUICore/Data/Preference/PreferencesOutputs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
// PreferencesOutputs.swift
// OpenSwiftUICore
//
// Audited for 6.5.4
// Status: Complete
// ID: 639FD567E11A491423DEEA5A95A52B4C (SwiftUICore)

package import OpenAttributeGraphShims

// MARK: - PreferencesOutputs [6.5.4]
// MARK: - PreferencesOutputs

package struct PreferencesOutputs {
private var preferences: [KeyValue]
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUICore/Data/Preference/View_Indirect.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// View_Indirect.swift
// OpenSwiftUICore
//
// Audited for 6.0.87
// Audited for 6.5.4
// Status: Complete

package import OpenAttributeGraphShims
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUICore/Render/PlatformViewFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ package struct ViewDecoders {
) where T: Decodable, T: AnyViewFactory {
registerDecodableFactoryType(
factoryType,
forID: _typeName(type, qualified: true)
forID: _typeName(type)
)
}

Expand Down
Loading