Refactor RuntimeObjectsList from AllRuntimeObjectsView

Author: leptos-null

HeaderViewer.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		FA53C69F2B8BF82000FC1A15 /* GatherScreenshots.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA53C69E2B8BF82000FC1A15 /* GatherScreenshots.swift */; };
+		FA6BEDCB2BD5941500D20C6F /* RuntimeObjectsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6BEDCA2BD5941500D20C6F /* RuntimeObjectsView.swift */; };
 		FA9687E92B8338E100123476 /* NamedNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA9687E82B8338E100123476 /* NamedNode.swift */; };
 		FA9687EB2B833C1700123476 /* RuntimeObjectType.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA9687EA2B833C1700123476 /* RuntimeObjectType.swift */; };
 		FA9687ED2B833C3200123476 /* RuntimeObjectDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA9687EC2B833C3200123476 /* RuntimeObjectDetail.swift */; };
@@ -73,6 +74,7 @@
 		FA53C6932B8BF70200FC1A15 /* HeaderViewerUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HeaderViewerUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		FA53C69E2B8BF82000FC1A15 /* GatherScreenshots.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GatherScreenshots.swift; sourceTree = "<group>"; };
 		FA53C6A02B8BFC0E00FC1A15 /* HeaderViewerUITests.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HeaderViewerUITests.entitlements; sourceTree = "<group>"; };
+		FA6BEDCA2BD5941500D20C6F /* RuntimeObjectsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuntimeObjectsView.swift; sourceTree = "<group>"; };
 		FA9687E72B82E37E00123476 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		FA9687E82B8338E100123476 /* NamedNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NamedNode.swift; sourceTree = "<group>"; };
 		FA9687EA2B833C1700123476 /* RuntimeObjectType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuntimeObjectType.swift; sourceTree = "<group>"; };
@@ -144,6 +146,7 @@
 			children = (
 				FAD661F72B81D1210000D2A6 /* HeaderViewerApp.swift */,
 				FAD661F92B81D1210000D2A6 /* ContentView.swift */,
+				FA6BEDCA2BD5941500D20C6F /* RuntimeObjectsView.swift */,
 				FAAA8C162B8B072100BD85B4 /* ListView.swift */,
 				FAAA8C122B857A1300BD85B4 /* RuntimeListings.swift */,
 				FAAA8C0E2B85788700BD85B4 /* ImageClassPicker.swift */,
@@ -308,6 +311,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FA6BEDCB2BD5941500D20C6F /* RuntimeObjectsView.swift in Sources */,
 				FAAA8C0F2B85788700BD85B4 /* ImageClassPicker.swift in Sources */,
 				FA9687E92B8338E100123476 /* NamedNode.swift in Sources */,
 				FA9687F32B8433B900123476 /* SemanticStringView.swift in Sources */,

HeaderViewer/ContentView.swift

@@ -59,29 +59,6 @@ struct ContentRootView: View {
     }
 }
 
-private enum RuntimeTypeSearchScope: Hashable {
-    case all
-    case classes
-    case protocols
-}
-
-private extension RuntimeTypeSearchScope {
-    var includesClasses: Bool {
-        switch self {
-        case .all: true
-        case .classes: true
-        case .protocols: false
-        }
-    }
-    var includesProtocols: Bool {
-        switch self {
-        case .all: true
-        case .classes: false
-        case .protocols: true
-        }
-    }
-}
-
 private class AllRuntimeObjectsViewModel: ObservableObject {
     let runtimeListings: RuntimeListings = .shared
 
@@ -137,20 +114,9 @@ private struct AllRuntimeObjectsView: View {
     }
 
     var body: some View {
-        let runtimeObjects = viewModel.runtimeObjects
-        ListView(runtimeObjects, selection: $selectedObject) { runtimeObject in
-            RuntimeObjectRow(type: runtimeObject)
-        }
-        .id(runtimeObjects) // don't try to diff the List
-        .searchable(text: $viewModel.searchString)
-        .autocorrectionDisabled() // turn of auto-correct for the search field
-        .searchScopes($viewModel.searchScope) {
-            Text("All")
-                .tag(RuntimeTypeSearchScope.all)
-            Text("Classes")
-                .tag(RuntimeTypeSearchScope.classes)
-            Text("Protocols")
-                .tag(RuntimeTypeSearchScope.protocols)
-        }
+        RuntimeObjectsList(
+            runtimeObjects: viewModel.runtimeObjects, selectedObject: $selectedObject,
+            searchString: $viewModel.searchString, searchScope: $viewModel.searchScope
+        )
     }
 }

HeaderViewer/RuntimeObjectsView.swift

@@ -0,0 +1,56 @@
+//
+//  RuntimeObjectsView.swift
+//  HeaderViewer
+//
+//  Created by Leptos on 4/21/24.
+//
+
+import SwiftUI
+
+enum RuntimeTypeSearchScope: Hashable {
+    case all
+    case classes
+    case protocols
+}
+
+extension RuntimeTypeSearchScope {
+    var includesClasses: Bool {
+        switch self {
+        case .all: true
+        case .classes: true
+        case .protocols: false
+        }
+    }
+    var includesProtocols: Bool {
+        switch self {
+        case .all: true
+        case .classes: false
+        case .protocols: true
+        }
+    }
+}
+
+struct RuntimeObjectsList: View {
+    let runtimeObjects: [RuntimeObjectType] // caller's responsibility to filter this
+    
+    @Binding var selectedObject: RuntimeObjectType?
+    @Binding var searchString: String
+    @Binding var searchScope: RuntimeTypeSearchScope
+    
+    var body: some View {
+        ListView(runtimeObjects, selection: $selectedObject) { runtimeObject in
+            RuntimeObjectRow(type: runtimeObject)
+        }
+        .id(runtimeObjects) // don't try to diff the List
+        .searchable(text: $searchString)
+        .autocorrectionDisabled() // turn of auto-correct for the search field
+        .searchScopes($searchScope) {
+            Text("All")
+                .tag(RuntimeTypeSearchScope.all)
+            Text("Classes")
+                .tag(RuntimeTypeSearchScope.classes)
+            Text("Protocols")
+                .tag(RuntimeTypeSearchScope.protocols)
+        }
+    }
+}