Fix ForEach Collection change rendered View correctness

Examples/Bundler.toml

@@ -64,3 +64,8 @@ version = '0.1.0'
 identifier = 'dev.swiftcrossui.HoverExample'
 product = 'HoverExample'
 version = '0.1.0'
+
+[apps.ForEachExample]
+identifier = 'dev.swiftcrossui.ForEachExample'
+product = 'ForEachExample'
+version = '0.1.0'

Examples/Package.swift

@@ -76,6 +76,10 @@ let package = Package(
         .executableTarget(
             name: "HoverExample",
             dependencies: exampleDependencies
-        )
+		),
+		.executableTarget(
+            name: "ForEachExample",
+            dependencies: exampleDependencies
+		)
     ]
 )

Examples/Sources/ForEachExample/ForEachApp.swift

@@ -0,0 +1,92 @@
+import DefaultBackend
+import Foundation
+import SwiftCrossUI
+
+#if canImport(SwiftBundlerRuntime)
+    import SwiftBundlerRuntime
+#endif
+
+@main
+@HotReloadable
+struct ForEachApp: App {
+    @State var items = (0..<20).map { Item("\($0)") }
+    @State var biggestValue = 19
+    @State var insertionPosition = 10
+
+    var body: some Scene {
+        WindowGroup("ForEach") {
+            #hotReloadable {
+                ScrollView {
+                    VStack {
+                        Button("Append") {
+                            biggestValue += 1
+                            items.append(.init("\(biggestValue)"))
+                        }
+
+                        #if !os(tvOS)
+                            Button(
+                                "Insert in front of current item at position \(insertionPosition)"
+                            ) {
+                                biggestValue += 1
+                                items.insert(.init("\(biggestValue)"), at: insertionPosition)
+                            }
+
+                            Slider($insertionPosition, minimum: 0, maximum: items.count - 1)
+                                .onChange(of: items.count) {
+                                    let upperLimit = max(items.count - 1, 0)
+                                    insertionPosition = min(insertionPosition, upperLimit)
+                                }
+                        #endif
+
+                        ForEach(Array(items.enumerated()), id: \.element.id) { (index, item) in
+                            ItemRow(
+                                item: item,
+                                isFirst: index == 0,
+                                isLast: index == items.count - 1
+                            ) {
+                                items.remove(at: index)
+                            } moveUp: {
+                                guard index != items.startIndex else { return }
+                                items.swapAt(index, index - 1)
+                            } moveDown: {
+                                guard index != items.endIndex else { return }
+                                items.swapAt(index, index + 1)
+                            }
+                        }
+                    }
+                    .padding(10)
+                }
+            }
+        }
+        .defaultSize(width: 400, height: 800)
+    }
+}
+
+struct ItemRow: View {
+    var item: Item
+    let isFirst: Bool
+    let isLast: Bool
+    var remove: () -> Void
+    var moveUp: () -> Void
+    var moveDown: () -> Void
+
+    var body: some View {
+        HStack {
+            Text(item.value)
+            Button("Delete") { remove() }
+            Button("⌃") { moveUp() }
+                .disabled(isFirst)
+            Button("⌄") { moveDown() }
+                .disabled(isLast)
+        }
+    }
+}
+
+struct Item: Identifiable {
+    let id = UUID()
+    var value: String
+
+    init(_ value: String) {
+        self.value = value
+    }
+}

Examples/Sources/GreetingGeneratorExample/GreetingGeneratorApp.swift

@@ -38,7 +38,7 @@ struct GreetingGeneratorApp: App {
                                 .padding(.top, 20)
 
                             ScrollView {
-                                ForEach(greetings.reversed()[1...]) { greeting in
+                                ForEach(greetings.reversed()[1...], id: \.self) { greeting in
                                     Text(greeting)
                                 }
                             }

Examples/Sources/StressTestExample/StressTestApp.swift

@@ -43,12 +43,11 @@ struct StressTestApp: App {
                             for _ in 0..<1000 {
                                 values.append(Self.options.randomElement()!)
                             }
-
                             self.values[tab!] = values
                         }
                         if let values = values[tab!] {
                             ScrollView {
-                                ForEach(values) { value in
+                                ForEach(values, id: \.self) { value in
                                     Text(value)
                                 }
                             }.frame(minWidth: 300)

Examples/Sources/WebViewExample/WebViewApp.swift

@@ -29,10 +29,14 @@ struct WebViewApp: App {
                     }
                     .padding()
 
-                    WebView($url)
-                        .onChange(of: url) {
-                            urlInput = url.absoluteString
-                        }
+                    #if !os(tvOS)
+                        WebView($url)
+                            .onChange(of: url) {
+                                urlInput = url.absoluteString
+                            }
+                    #else
+                        Text("WebView isn't supported on tvOS")
+                    #endif
                 }
             }
         }

Package.swift

@@ -122,6 +122,10 @@ let package = Package(
             url: "https://github.com/stackotter/swift-winui",
             revision: "1695ee3ea2b7a249f6504c7f1759e7ec7a38eb86"
         ),
+        .package(
+            url: "https://github.com/apple/swift-collections.git",
+            .upToNextMinor(from: "1.2.1")
+        ),
         .package(
             url: "https://github.com/stackotter/swift-benchmark",
             .upToNextMinor(from: "0.2.0")
@@ -145,6 +149,7 @@ let package = Package(
             dependencies: [
                 "HotReloadingMacrosPlugin",
                 .product(name: "ImageFormats", package: "swift-image-formats"),
+                .product(name: "OrderedCollections", package: "swift-collections")
             ],
             exclude: [
                 "Builders/ViewBuilder.swift.gyb",