Skip to content
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.

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

Update Preference to 2024 #129

Merged
merged 1 commit into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion Sources/OpenSwiftUI/Core/Graph/GraphHost.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
internal import COpenSwiftUICore
internal import OpenGraphShims
@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
@_spi(Private) import OpenSwiftUICore

private let waitingForPreviewThunks = EnvironmentHelper.bool(for: "XCODE_RUNNING_FOR_PREVIEWS")
private var blockedGraphHosts: [Unmanaged<GraphHost>] = []
Expand Down Expand Up @@ -170,7 +171,7 @@ class GraphHost {
}

final func updatePreferences() -> Bool {
let seed = hostPreferenceValues.value?.mergedSeed ?? .empty
let seed = hostPreferenceValues.value?.seed ?? .empty
let lastSeed = lastHostPreferencesSeed
let didUpdate = seed.isInvalid || lastSeed.isInvalid /*|| (seed != lastSeed)*/
lastHostPreferencesSeed = seed
Expand Down
19 changes: 0 additions & 19 deletions Sources/OpenSwiftUI/Data/Preference/AnyPreferenceKey.swift

This file was deleted.

45 changes: 0 additions & 45 deletions Sources/OpenSwiftUI/Data/Preference/HostPreferencesKey.swift

This file was deleted.

2 changes: 1 addition & 1 deletion Sources/OpenSwiftUI/Data/Preference/PreferenceBridge.swift
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ private struct MergePreferenceKeys: Rule, AsyncAttribute {
guard let rhs else {
return result
}
result.merge(rhs)
// result.merge(rhs)
return result
}
}
56 changes: 0 additions & 56 deletions Sources/OpenSwiftUI/Data/Preference/PreferenceKey.swift

This file was deleted.

10 changes: 0 additions & 10 deletions Sources/OpenSwiftUI/Data/Preference/PreferenceKeyVisitor.swift

This file was deleted.

85 changes: 0 additions & 85 deletions Sources/OpenSwiftUI/Data/Preference/PreferenceKeys.swift

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ struct HostPreferencesCombiner: Rule, AsyncAttribute {
continue
}
guard let values = child.$values,
let listValue = values.value.valueIfPresent(key) else {
let listValue = values.value.valueIfPresent(for: key) else {
continue
}
if initialValue {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ struct PreferencesInputs {

@inline(__always)
mutating func merge(_ preferenceKeys: PreferenceKeys) {
keys.merge(preferenceKeys)
// keys.merge(preferenceKeys)
}
}
16 changes: 16 additions & 0 deletions Sources/OpenSwiftUI/Data/Preference/PreferencesOutputs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,19 @@ extension PreferencesOutputs {
#endif
}
}

extension _ViewOutputs {
@inline(__always)
var hostPreferences: Attribute<PreferenceList>? {
get { self[HostPreferencesKey.self] }
set { self[HostPreferencesKey.self] = newValue }
}
}

extension PreferencesOutputs {
@inline(__always)
var hostPreferences: Attribute<PreferenceList>? {
get { self[HostPreferencesKey.self] }
set { self[HostPreferencesKey.self] = newValue }
}
}
3 changes: 3 additions & 0 deletions Sources/OpenSwiftUI/Data/Preference/View_Preference.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
// Status: Complete
// ID: 6C396F98EFDD04A6B58F2F9112448013

@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
@_spi(Private) import OpenSwiftUICore

extension View {
/// Sets a value for the given preference.
@inlinable
Expand Down
Loading
Loading