Add AnnotationNodeMark

li3zhen1 · li3zhen1 · commit 37b7480f068f · 2025-01-13T11:20:55.000-08:00
diff --git a/Examples/ForceDirectedGraphExample/ForceDirectedGraphExample/MermaidVisualization.swift b/Examples/ForceDirectedGraphExample/ForceDirectedGraphExample/MermaidVisualization.swift
@@ -84,13 +84,9 @@ struct MermaidVisualization: View {
         let parsedGraph = model.parsedGraph
         ForceDirectedGraph {
             Series(parsedGraph.0) { node in
-                NodeMark(id: node)
-                    .symbol(.circle)
-                    .symbolSize(radius: 16)
-                    .foregroundStyle(Color(white: 1.0, opacity: 0.0))
-                    .annotation(node, alignment: .center, offset: .zero) {
-                        getLabel(node)
-                    }
+                AnnotationNodeMark(id: node, radius: 16) {
+                    getLabel(node)
+                }
             }
             Series(parsedGraph.1) { link in
                 LinkMark(from: link.0, to: link.1)
@@ -115,11 +111,11 @@ struct MermaidVisualization: View {
                 }
         })
         .ignoresSafeArea()
-        #if !os(visionOS)
+#if !os(visionOS)
         .inspector(isPresented: .constant(true)) {
             MermaidInspector(model: model)
         }
-        #endif
+#endif
     }
 }
 
@@ -180,7 +176,7 @@ let mermaidLinkRegex = Regex {
         "<-"
         "→"
     }
-
+    
     OneOrMore(.whitespace)
     singleNodeRegex
 }
diff --git a/Sources/Grape/Contents/AnyGraphContent.swift b/Sources/Grape/Contents/AnyGraphContent.swift
@@ -9,6 +9,11 @@ public struct AnyGraphContent<NodeID: Hashable>: GraphContent {
         self.storage = storage
     }
 
+    @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
+
     @inlinable
     public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
         storage._attachToGraphRenderingContext(&context)
diff --git a/Sources/Grape/Contents/CompositedGraphContent.swift b/Sources/Grape/Contents/CompositedGraphContent.swift
@@ -1,7 +1,5 @@
-public protocol GraphComponent<NodeID>: GraphContent {
+public protocol GraphComponent<NodeID>: GraphContent where Body: GraphContent<NodeID> {
 
-    associatedtype Body: GraphContent<NodeID>
-    
     @inlinable
     @GraphContentBuilder<Body.NodeID>
     var body: Body { get }
diff --git a/Sources/Grape/Contents/GraphContent.swift b/Sources/Grape/Contents/GraphContent.swift
@@ -3,7 +3,20 @@ import SwiftUI
 
 public protocol GraphContent<NodeID> {
     associatedtype NodeID: Hashable
+    associatedtype Body: GraphContent<NodeID>
 
     @inlinable
     func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>)
+
+    @inlinable
+    var body: Body { get }
 }
+
+
+extension GraphContent {
+
+    @inlinable
+    public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
+        body._attachToGraphRenderingContext(&context)
+    }
+}
diff --git a/Sources/Grape/Contents/LinkMark.swift b/Sources/Grape/Contents/LinkMark.swift
@@ -3,6 +3,10 @@ import SwiftUI
 
 public struct LinkMark<NodeID: Hashable>: GraphContent & Identifiable {
 
+    @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
     // public enum LabelDisplayStrategy {
     //     case auto
     //     case specified(Bool)
diff --git a/Sources/Grape/Contents/ModifiedGraphContent.swift b/Sources/Grape/Contents/ModifiedGraphContent.swift
@@ -49,4 +49,9 @@ extension ModifiedGraphContent: GraphContent {
         content._attachToGraphRenderingContext(&context)
         modifier._exit(&context)
     }
+
+        @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
 }
diff --git a/Sources/Grape/Contents/NodeMark.swift b/Sources/Grape/Contents/NodeMark.swift
@@ -1,5 +1,6 @@
 import SwiftUI
 import simd
+import Charts
 
 public struct NodeMark<NodeID: Hashable>: GraphContent, Identifiable, Equatable {
 
@@ -12,6 +13,11 @@ public struct NodeMark<NodeID: Hashable>: GraphContent, Identifiable, Equatable
         self.id = id
     }
 
+    @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
+
     @inlinable
     public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
         context.nodeOperations.append(
@@ -28,9 +34,31 @@ public struct NodeMark<NodeID: Hashable>: GraphContent, Identifiable, Equatable
     }
 }
 
-extension NodeMark: CustomDebugStringConvertible {
+public struct AnnotationNodeMark<NodeID: Hashable>: GraphContent, Identifiable {
+
+    public var id: NodeID
+
+    @usableFromInline
+    var radius: CGFloat
+
+    @usableFromInline
+    var annotation: AnyView
+
+    @inlinable
+    public init(id: NodeID, radius: CGFloat, @ViewBuilder annnotation: () -> some View) {
+        self.id = id 
+        self.radius = radius
+        self.annotation = AnyView(annnotation())
+    }
+
     @inlinable
-    public var debugDescription: String {
-        return "Node(id: \(id))"
+    public var body: some GraphContent<NodeID> {
+        NodeMark(id: id)
+            .symbolSize(radius: radius)
+            .foregroundStyle(.clear)
+            .annotation("\(id)", alignment: .center, offset: .zero) {
+                annotation
+            }
     }
-}
+
+}
diff --git a/Sources/Grape/Contents/Series.swift b/Sources/Grape/Contents/Series.swift
@@ -15,6 +15,11 @@ where Data: RandomAccessCollection, Content: GraphContent<NodeID>, NodeID: Hasha
         self.data = data
         self.content = graphContent
     }
+
+    @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
 }
 
 extension Series: GraphContent {
diff --git a/Sources/Grape/Contents/_ArrayGraphContent.swift b/Sources/Grape/Contents/_ArrayGraphContent.swift
@@ -13,6 +13,11 @@ where C: GraphContent {
         self.storage = storage
     }
 
+    @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
+    
     @inlinable
     public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
         for content in storage {
diff --git a/Sources/Grape/Contents/_ConditionalGraphContent.swift b/Sources/Grape/Contents/_ConditionalGraphContent.swift
@@ -18,6 +18,11 @@ where C1: GraphContent, C2: GraphContent, C1.NodeID == C2.NodeID {
         self.storage = storage
     }
 
+        @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
+
     @inlinable
     public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
         switch storage {
diff --git a/Sources/Grape/Contents/_EmptyGraphContent.swift b/Sources/Grape/Contents/_EmptyGraphContent.swift
@@ -7,5 +7,10 @@ struct _EmptyGraphContent<NodeID: Hashable>: GraphContent {
     @inlinable
     public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
         
+    }
+
+        @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
     }
 }
diff --git a/Sources/Grape/Contents/_ForEach+GraphContent.swift b/Sources/Grape/Contents/_ForEach+GraphContent.swift
diff --git a/Sources/Grape/Contents/_IdentifiableNever.swift b/Sources/Grape/Contents/_IdentifiableNever.swift
@@ -0,0 +1,13 @@
+public enum _IdentifiableNever<ID: Hashable> { }
+
+extension _IdentifiableNever: GraphContent {
+    public typealias NodeID = ID
+    
+    public var body: Self {
+        fatalError()
+    }
+    
+    public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
+        fatalError()
+    }
+}
diff --git a/Sources/Grape/Contents/_OptionalGraphContent.swift b/Sources/Grape/Contents/_OptionalGraphContent.swift
@@ -23,4 +23,9 @@ where C: GraphContent {
             content._attachToGraphRenderingContext(&context)
         }
     }
+
+        @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
 }
diff --git a/Sources/Grape/Contents/_PairedGraphContent.swift b/Sources/Grape/Contents/_PairedGraphContent.swift
@@ -19,4 +19,10 @@ where C1: GraphContent, C2: GraphContent, NodeID: Hashable, C1.NodeID == NodeID,
         first._attachToGraphRenderingContext(&context)
         second._attachToGraphRenderingContext(&context)
     }
-}
+
+
+    @inlinable
+    public var body: _IdentifiableNever<NodeID> {
+        fatalError()
+    }
+}
diff --git a/Sources/Grape/Views/ForceDirectedGraph+View.swift b/Sources/Grape/Views/ForceDirectedGraph+View.swift

Original file line number	Diff line number	Diff line change
`@@ -84,13 +84,9 @@ struct MermaidVisualization: View {`
`84`	`84`	`let parsedGraph = model.parsedGraph`
`85`	`85`	`ForceDirectedGraph {`
`86`	`86`	`Series(parsedGraph.0) { node in`
`87`		`- NodeMark(id: node)`
`88`		`- .symbol(.circle)`
`89`		`- .symbolSize(radius: 16)`
`90`		`- .foregroundStyle(Color(white: 1.0, opacity: 0.0))`
`91`		`- .annotation(node, alignment: .center, offset: .zero) {`
`92`		`- getLabel(node)`
`93`		`- }`
	`87`	`+ AnnotationNodeMark(id: node, radius: 16) {`
	`88`	`+ getLabel(node)`
	`89`	`+ }`
`94`	`90`	`}`
`95`	`91`	`Series(parsedGraph.1) { link in`
`96`	`92`	`LinkMark(from: link.0, to: link.1)`
`@@ -115,11 +111,11 @@ struct MermaidVisualization: View {`
`115`	`111`	`}`
`116`	`112`	`})`
`117`	`113`	`.ignoresSafeArea()`
`118`		`- #if !os(visionOS)`
	`114`	`+#if !os(visionOS)`
`119`	`115`	`.inspector(isPresented: .constant(true)) {`
`120`	`116`	`MermaidInspector(model: model)`
`121`	`117`	`}`
`122`		`- #endif`
	`118`	`+#endif`
`123`	`119`	`}`
`124`	`120`	`}`
`125`	`121`
`@@ -180,7 +176,7 @@ let mermaidLinkRegex = Regex {`
`180`	`176`	`"<-"`
`181`	`177`	`"→"`
`182`	`178`	`}`
`183`		`-`
	`179`	`+`
`184`	`180`	`OneOrMore(.whitespace)`
`185`	`181`	`singleNodeRegex`
`186`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,9 @@ extension ModifiedGraphContent: GraphContent {`
`49`	`49`	`content._attachToGraphRenderingContext(&context)`
`50`	`50`	`modifier._exit(&context)`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+ @inlinable`
	`54`	`+ public var body: _IdentifiableNever<NodeID> {`
	`55`	`+ fatalError()`
	`56`	`+ }`
`52`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,11 @@ where Data: RandomAccessCollection, Content: GraphContent<NodeID>, NodeID: Hasha`
`15`	`15`	`self.data = data`
`16`	`16`	`self.content = graphContent`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ @inlinable`
	`20`	`+ public var body: _IdentifiableNever<NodeID> {`
	`21`	`+ fatalError()`
	`22`	`+ }`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`extension Series: GraphContent {`