Skip to content

Fix missing defaultAnimation in AnimatableAttributeHelper #636

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
Nov 22, 2025
Merged

Fix missing defaultAnimation in AnimatableAttributeHelper #636

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
4 changes: 3 additions & 1 deletion Sources/OpenSwiftUICore/Animation/Animatable/AnimatableAttribute.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ package struct AnimatableAttributeHelper<Value> where Value: Animatable {
@inline(__always)
private mutating func updateAnimatorStateIfNeeded(
value: (value: Value, changed: Bool),
defaultAnimation: Animation?,
animationTime: inout Time,
environment: Attribute<EnvironmentValues>,
sampleCollector: (Value.AnimatableData, Time) -> Void
Expand All @@ -243,7 +244,7 @@ package struct AnimatableAttributeHelper<Value> where Value: Animatable {
return
}
let transaction: Transaction = Graph.withoutUpdate { self.transaction }
guard let animation = transaction.effectiveAnimation else {
guard let animation = transaction.effectiveAnimation ?? defaultAnimation else {
return
}
var interval = modelData
Expand Down Expand Up @@ -324,6 +325,7 @@ package struct AnimatableAttributeHelper<Value> where Value: Animatable {
}
updateAnimatorStateIfNeeded(
value: value,
defaultAnimation: defaultAnimation,
animationTime: &animationTime,
environment: environment,
sampleCollector: sampleCollector
Expand Down
Loading