Get rid of LogStore.shared singleton

Author: ole

Sources/LayoutInspector/DebugLayout.swift

@@ -4,7 +4,7 @@ import SwiftUI
 extension View {
     /// Inspect the layout for this subtree.
     public func inspectLayout() -> some View {
-        self.modifier(InspectLayout())
+        modifier(InspectLayout())
     }
 
     /// Monitor the layout proposals and responses for this view and add them
@@ -14,12 +14,6 @@ extension View {
         file: StaticString = #fileID,
         line: UInt = #line
     ) -> some View {
-        DebugLayout(label: label) {
-            self
-        }
-        .onAppear {
-            LogStore.shared.registerViewLabelAndWarnIfNotUnique(label, file: file, line: line)
-        }
-        .modifier(DebugLayoutSelectionHighlight(viewID: label))
+        modifier(DebugLayoutModifier(label: label, file: file, line: line))
     }
 }

Sources/LayoutInspector/DebugLayoutImpl.swift

@@ -2,15 +2,15 @@ import SwiftUI
 
 @available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
 struct InspectLayout: ViewModifier {
+    @StateObject private var logStore: LogStore = .init()
     @State private var selectedView: String? = nil
     @State private var generation: Int = 0
     @State private var frame: CGRect = CGRect(x: 0, y: 0, width: 300, height: 300)
-    @ObservedObject private var logStore = LogStore.shared
 
     private static let coordSpaceName = "InspectLayout"
 
     func body(content: Content) -> some View {
-        ClearDebugLayoutLog {
+        ClearDebugLayoutLog(logStore: logStore) {
             content
                 .id(generation)
                 .environment(\.debugLayoutSelectedViewID, selectedView)
@@ -39,6 +39,7 @@ struct InspectLayout: ViewModifier {
                 .offset(x: frame.minX, y: frame.minY)
                 .coordinateSpace(name: Self.coordSpaceName)
         }
+        .environmentObject(logStore)
     }
 }
 
@@ -160,21 +161,40 @@ struct Draggable: ViewModifier {
     }
 }
 
+@available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
+struct DebugLayoutModifier: ViewModifier {
+    var label: String
+    var file: StaticString
+    var line: UInt
+    @EnvironmentObject private var logStore: LogStore
+
+    func body(content: Content) -> some View {
+        DebugLayout(label: label, logStore: logStore) {
+            content
+        }
+        .onAppear {
+            logStore.registerViewLabelAndWarnIfNotUnique(label, file: file, line: line)
+        }
+        .modifier(DebugLayoutSelectionHighlight(viewID: label))
+    }
+}
+
 /// A custom layout that saves the layout proposals and responses for a view
 /// to a log.
 @available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
 struct DebugLayout: Layout {
     var label: String
+    var logStore: LogStore
 
     func sizeThatFits(
         proposal: ProposedViewSize,
         subviews: Subviews,
         cache: inout ()
     ) -> CGSize {
         assert(subviews.count == 1)
-        logLayoutStep(label, step: .proposal(proposal))
+        logStore.logLayoutStep(label, step: .proposal(proposal))
         let response = subviews[0].sizeThatFits(proposal)
-        logLayoutStep(label, step: .response(response))
+        logStore.logLayoutStep(label, step: .response(response))
         return response
     }
 
@@ -192,15 +212,17 @@ struct DebugLayout: Layout {
 /// placed in the view tree.
 @available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
 struct ClearDebugLayoutLog: Layout {
+    var logStore: LogStore
+
     func sizeThatFits(
         proposal: ProposedViewSize,
         subviews: Subviews,
         cache: inout ()
     ) -> CGSize {
         assert(subviews.count == 1)
         DispatchQueue.main.async {
-            LogStore.shared.log.removeAll()
-            LogStore.shared.viewLabels.removeAll()
+            logStore.log.removeAll()
+            logStore.viewLabels.removeAll()
         }
         return subviews[0].sizeThatFits(proposal)
     }
@@ -216,59 +238,56 @@ struct ClearDebugLayoutLog: Layout {
     }
 }
 
-@available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
-func logLayoutStep(_ label: String, step: LogEntry.Step) {
-    DispatchQueue.main.async {
-        guard let prevEntry = LogStore.shared.log.last else {
-            // First log entry → start at indent 0.
-            LogStore.shared.log.append(LogEntry(label: label, step: step, indent: 0))
-            return
-        }
-
-        var newEntry = LogEntry(label: label, step: step, indent: prevEntry.indent)
-        let isSameView = prevEntry.label == label
-        switch (isSameView, prevEntry.step, step) {
-        case (true, .proposal(let prop), .response(let resp)):
-            // Response follows immediately after proposal for the same view.
-            // → We want to display them in a single row.
-            // → Coalesce both layout steps.
-            LogStore.shared.log.removeLast()
-            newEntry = prevEntry
-            newEntry.step = .proposalAndResponse(proposal: prop, response: resp)
-            LogStore.shared.log.append(newEntry)
-
-        case (_, .proposal, .proposal):
-            // A proposal follows a proposal → nested view → increment indent.
-            newEntry.indent += 1
-            LogStore.shared.log.append(newEntry)
-
-        case (_, .response, .response),
-            (_, .proposalAndResponse, .response):
-            // A response follows a response → last child returns to parent → decrement indent.
-            newEntry.indent -= 1
-            LogStore.shared.log.append(newEntry)
-
-        default:
-            // Keep current indentation.
-            LogStore.shared.log.append(newEntry)
-        }
-    }
-}
-
 @available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
 public final class LogStore: ObservableObject {
-    public static let shared: LogStore = .init()
-
     @Published public var log: [LogEntry] = []
     var viewLabels: Set<String> = []
 
     func registerViewLabelAndWarnIfNotUnique(_ label: String, file: StaticString, line: UInt) {
-        DispatchQueue.main.async {
-            if self.viewLabels.contains(label) {
+        DispatchQueue.main.async { [self] in
+            if viewLabels.contains(label) {
                 let message: StaticString = "Duplicate view label '%s' detected. Use unique labels in layoutStep() calls"
                 runtimeWarning(message, [label], file: file, line: line)
             }
-            self.viewLabels.insert(label)
+            viewLabels.insert(label)
+        }
+    }
+
+    func logLayoutStep(_ label: String, step: LogEntry.Step) {
+        DispatchQueue.main.async { [self] in
+            guard let prevEntry = log.last else {
+                // First log entry → start at indent 0.
+                log.append(LogEntry(label: label, step: step, indent: 0))
+                return
+            }
+
+            var newEntry = LogEntry(label: label, step: step, indent: prevEntry.indent)
+            let isSameView = prevEntry.label == label
+            switch (isSameView, prevEntry.step, step) {
+            case (true, .proposal(let prop), .response(let resp)):
+                // Response follows immediately after proposal for the same view.
+                // → We want to display them in a single row.
+                // → Coalesce both layout steps.
+                log.removeLast()
+                newEntry = prevEntry
+                newEntry.step = .proposalAndResponse(proposal: prop, response: resp)
+                log.append(newEntry)
+
+            case (_, .proposal, .proposal):
+                // A proposal follows a proposal → nested view → increment indent.
+                newEntry.indent += 1
+                log.append(newEntry)
+
+            case (_, .response, .response),
+                (_, .proposalAndResponse, .response):
+                // A response follows a response → last child returns to parent → decrement indent.
+                newEntry.indent -= 1
+                log.append(newEntry)
+
+            default:
+                // Keep current indentation.
+                log.append(newEntry)
+            }
         }
     }
 }