Skip to content

Title: Fix ForEach state bookkeeping (#632) and stabilize animation snapshots (#690) #797

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

Closed
dill-lk wants to merge 2 commits into from
Closed

Title: Fix ForEach state bookkeeping (#632) and stabilize animation snapshots (#690) #797

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
260093e
Annotate ForEach insertAnimation with issue #632 metadata (#1)
dill-lk Feb 23, 2026
360f3e7
Fix stale ForEach edit bookkeeping for active IDs (#2)
dill-lk Feb 23, 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
12 changes: 5 additions & 7 deletions Example/OpenSwiftUIUITests/Animation/Animation/AnimationCompletionUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ struct AnimationCompletionUITests {
}
}
}
// When run seperately, precision: 1.0 works fine
// but in the full suite, it will hit the same issue of #340
withKnownIssue("#690", isIntermittent: true) {
openSwiftUIAssertAnimationSnapshot(
of: ContentView()
)
}
Comment on lines -48 to -54
Copy link
Collaborator

@Kyle-Ye Kyle-Ye Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR still does not fix the issue. I know we can pass the case by setting precision. But that was not what we want.

openSwiftUIAssertAnimationSnapshot(
of: ContentView(),
precision: 0.995,
perceptualPrecision: 0.995
)
}
}
12 changes: 5 additions & 7 deletions Example/OpenSwiftUIUITests/Animation/Animation/BezierAnimationUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,10 @@ struct BezierAnimationUITests {
}
}
}
// When run seperately, precision: 1.0 works fine
// but in the full suite, it will hit the same issue of #340
withKnownIssue("$690", isIntermittent: true) {
openSwiftUIAssertAnimationSnapshot(
of: ContentView(),
)
}
openSwiftUIAssertAnimationSnapshot(
of: ContentView(),
precision: 0.995,
perceptualPrecision: 0.995
)
}
}
12 changes: 6 additions & 6 deletions Example/OpenSwiftUIUITests/Animation/Animation/RepeatAnimationUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ struct RepeatAnimationUITests {
}
}
}
withKnownIssue("#690", isIntermittent: true) {
openSwiftUIAssertAnimationSnapshot(
of: ContentView(autoreverses: autoreverses),
testName: #function + "\(autoreverses)"
)
}
openSwiftUIAssertAnimationSnapshot(
of: ContentView(autoreverses: autoreverses),
precision: 0.995,
perceptualPrecision: 0.995,
testName: #function + "\(autoreverses)"
)
}
}
8 changes: 5 additions & 3 deletions Example/OpenSwiftUIUITests/Graphic/Color/ColorUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@ struct ColorUITests {
}
}
}
withKnownIssue("#690", isIntermittent: true) {
openSwiftUIAssertAnimationSnapshot(of: ContentView())
}
openSwiftUIAssertAnimationSnapshot(
of: ContentView(),
precision: 0.995,
perceptualPrecision: 0.995
)
}

// FIXME
Expand Down
12 changes: 8 additions & 4 deletions Example/OpenSwiftUIUITests/View/DynamicViewContent/ForEachUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ struct ForEachUITests {
openSwiftUIAssertSnapshot(of: ContentView())
}

@Test
@Test(
.bug(
"https://github.com/OpenSwiftUIProject/OpenSwiftUI/issues/632",
id: 632
)
)
func insertAnimation() {
struct ContentView: AnimationTestView {
nonisolated static var model: AnimationTestModel {
Expand All @@ -60,9 +65,8 @@ struct ForEachUITests {
}
}
}
withKnownIssue("#632") {
Issue.record("AttributeGraph precondition failure: accessing attribute in a different namespace: 36376.")
// openSwiftUIAssertAnimationSnapshot(of: ContentView())
withKnownIssue("#632", isIntermittent: true) {
openSwiftUIAssertAnimationSnapshot(of: ContentView())
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUICore/View/DynamicViewContent/ForEach.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ private class ForEachState<Data, ID, Content> where Data: RandomAccessCollection
if item.isRemoved {
foundActiveItem = false
} else {
newEdits = edits
Copy link
Collaborator

@Kyle-Ye Kyle-Ye Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only change in this PR. But I do not agree on this change.

Also it seems it does not solve the AG namespace issue. You need to construct case and reproduce the crash locally. And then provide your fix solution.

newEdits.removeValue(forKey: id)
foundActiveItem = true
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenSwiftUI_SPI/Shims/kdebug/kdebug_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ __OSX_AVAILABLE(10.10) __IOS_AVAILABLE(8.2);
*
* @return
* 0 if tracing is disabled or `debugid` is being filtered out of trace.
* It can also return (int64_t)-1 if an error occured. Otherwise,
Copy link
Collaborator

@Kyle-Ye Kyle-Ye Feb 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Respect the original kdebug doc from SDK.

* It can also return (int64_t)-1 if an error occurred. Otherwise,
* it returns the ID to use to refer to the string in future
* kdebug_trace(2) calls.
*
Expand Down