Skip to content

[Bug Fix] Fix index issue in DynamicContainer #670

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
Dec 13, 2025
Merged

[Bug Fix] Fix index issue in DynamicContainer #670

Show file tree
Hide file tree
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
48 changes: 48 additions & 0 deletions Example/OpenSwiftUIUITests/View/DynamicViewContent/ForEachUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,52 @@ struct ForEachUITests {
// openSwiftUIAssertAnimationSnapshot(of: ContentView())
}
}

@Test(
.bug(
"https://github.com/OpenSwiftUIProject/OpenSwiftUI/issues/669",
id: 669
)
)
func dynamicContainerIndex() {
struct ContentView1: View {
var body: some View {
VStack {
Color.red
Color.green
ForEach(0 ..< 1) { index in
Color.red.frame(width: 20, height: 20)
Spacer()
Color.blue.frame(width: 20, height: 20)
}
}
}
}
struct ContentView2: View {
var body: some View {
VStack {
Color.red
Color.green
ForEach(0 ..< 1) { index in
Spacer()
Color.blue
}
}
}
}
struct ContentView3: View {
var body: some View {
VStack {
Color.red.frame(width: 10, height: 10)
Color.green.frame(width: 20, height: 20)
ForEach(0 ..< 1) { index in
Color.blue.frame(width: 40, height: 40)
}
}
}
}
openSwiftUIAssertSnapshot(of: ContentView1(), named: "1")
openSwiftUIAssertSnapshot(of: ContentView2(), named: "2")
openSwiftUIAssertSnapshot(of: ContentView3(), named: "3")
}
}
5 changes: 3 additions & 2 deletions Sources/OpenSwiftUICore/Layout/Dynamic/DynamicContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ package struct DynamicContainer {
fileprivate(set) var seed: UInt32 = .zero

func viewIndex(id: ID) -> Int? {
guard let value = indexMap[id.uniqueId] else {
guard let index = indexMap[id.uniqueId] else {
return nil
}
return value + Int(id.viewIndex)
let item = items[index]
return Int(item.precedingViewCount + id.viewIndex)
}

func item(for subgraph: Subgraph) -> ItemInfo? {
Expand Down
Loading