Rename label and richLabel modifiers to annotation

Author: li3zhen1

Examples/ForceDirectedGraphExample/ForceDirectedGraphExample/MermaidVisualization.swift

@@ -88,7 +88,7 @@ struct MermaidVisualization: View {
                     .symbol(.circle)
                     .symbolSize(radius: 16)
                     .foregroundStyle(Color(white: 1.0, opacity: 0.0))
-                    .richLabel(node, alignment: .center, offset: .zero) {
+                    .annotation(node, alignment: .center, offset: .zero) {
                         getLabel(node)
                     }
             }

Examples/ForceDirectedGraphExample/ForceDirectedGraphExample/Miserables.swift

@@ -52,10 +52,10 @@ struct MiserableGraph: View {
                     .symbolSize(radius: 8.0)
                     .foregroundStyle(colors[node.group % colors.count])
                     .stroke()
-                    .richLabel(node.id, offset: .zero) {
-                        if (graphData.links.filter({ l in
-                            return l.source == node.id || l.target == node.id}
-                                                  ).count > 12) {
+                    .annotation(node.id, offset: .zero) {
+                        let connections = graphData.links.count { $0.source == node.id || $0.target == node.id }
+                        
+                        if connections > 12 {
                             self.getLabel(node.id)
                         }
                     }
@@ -73,6 +73,10 @@ struct MiserableGraph: View {
                 stiffness: .weightedByDegree { _, _ in 1.0}
             )
         }
+        .graphOverlay(content: { proxy in
+            Rectangle().fill(.clear).contentShape(Rectangle())
+                .withGraphDragGesture(proxy, of: String.self)
+        })
         .ignoresSafeArea()
         .toolbar {
             GraphStateToggle(graphStates: stateMixin)

Sources/Grape/Modifiers/Effects/GrapeEffect.Label.swift

@@ -3,7 +3,7 @@ import SwiftUI
 
 extension GraphContentEffect {
     @usableFromInline
-    internal struct Label {
+    internal struct TextAnnotation {
 
         @usableFromInline
         let text: Text?
@@ -27,7 +27,7 @@ extension GraphContentEffect {
     }
 
     @usableFromInline
-    internal struct RichLabel {
+    internal struct ViewAnnotation {
 
         @usableFromInline
         let view: AnyView
@@ -57,7 +57,7 @@ extension GraphContentEffect {
 
 }
 
-extension GraphContentEffect.Label: GraphContentModifier {
+extension GraphContentEffect.TextAnnotation: GraphContentModifier {
     @inlinable
     public func _into<NodeID>(
         _ context: inout _GraphRenderingContext<NodeID>
@@ -89,7 +89,7 @@ extension GraphContentEffect.Label: GraphContentModifier {
     }
 }
 
-extension GraphContentEffect.RichLabel: GraphContentModifier {
+extension GraphContentEffect.ViewAnnotation: GraphContentModifier {
     @inlinable
     public func _into<NodeID>(
         _ context: inout _GraphRenderingContext<NodeID>

Sources/Grape/Modifiers/GraphContent+GraphContentModifiers.swift

@@ -50,82 +50,52 @@ extension GraphContent {
     }
 
     @inlinable
-    @available(*, deprecated, message: "use foregroundStyle(_:)")
-    public func fill(_ shading: GraphicsContext.Shading) -> some GraphContent<NodeID> {
-        return ModifiedGraphContent(self, GraphContentEffect.Shading(shading))
-    }
-
-    @inlinable
-    public func label(
+    public func annotation(
         _ text: Text?, alignment: Alignment = .bottom, offset: CGVector = .zero
     ) -> some GraphContent<NodeID> {
-
         return ModifiedGraphContent(
-            self, GraphContentEffect.Label(text, alignment: alignment, offset: offset))
+            self, GraphContentEffect.TextAnnotation(text, alignment: alignment, offset: offset))
     }
 
     @inlinable
-    public func label(
+    public func annotation(
         _ text: Text?, alignment: Alignment = .bottom, offset: SIMD2<Double> = .zero
     ) -> some GraphContent<NodeID> {
-
-        return label(text, alignment: alignment, offset: offset.cgVector)
+        return annotation(text, alignment: alignment, offset: offset.cgVector)
     }
 
     @inlinable
-    public func label(
+    public func annotation(
         _ string: String?, alignment: Alignment = .bottom, offset: CGVector = .zero
     ) -> some GraphContent<NodeID> {
         return ModifiedGraphContent(
-            self, GraphContentEffect.Label(nil, alignment: alignment, offset: offset))
-    }
-
-    @inlinable
-    public func label(
-        _ string: String?, alignment: Alignment = .bottom, offset: SIMD2<Double> = .zero
-    ) -> some GraphContent<NodeID> {
-        return label(string, alignment: alignment, offset: offset.cgVector)
+            self, GraphContentEffect.TextAnnotation(nil, alignment: alignment, offset: offset))
     }
 
     @inlinable
-    public func label(
-        _ alignment: Alignment = .bottom, offset: CGVector = .zero,
+    public func annotation(
+        alignment: Alignment = .bottom, 
+        offset: CGVector = .zero,
         @ViewBuilder _ content: () -> Text?
     ) -> some GraphContent<NodeID> {
-
         return ModifiedGraphContent(
-            self, GraphContentEffect.Label(content(), alignment: alignment, offset: offset))
+            self, GraphContentEffect.TextAnnotation(content(), alignment: alignment, offset: offset))
     }
 
-    @inlinable
-    public func label(
-        alignment: Alignment = .bottom, offset: SIMD2<Double> = .zero,
-        @ViewBuilder _ content: () -> Text?
-    ) -> some GraphContent<NodeID> {
-        return label(alignment, offset: offset.cgVector, content)
-    }
 
     @inlinable
-    public func richLabel(
+    @_disfavoredOverload
+    public func annotation(
         _ tag: String,
-        _ alignment: Alignment = .bottom,
+        alignment: Alignment = .bottom,
         offset: CGVector = .zero,
         @ViewBuilder _ content: () -> some View
     ) -> some GraphContent<NodeID> {
         return ModifiedGraphContent(
-            self, GraphContentEffect.RichLabel(tag, content(), alignment: alignment, offset: offset)
+            self, GraphContentEffect.ViewAnnotation(tag, content(), alignment: alignment, offset: offset)
         )
     }
 
-    @inlinable
-    public func richLabel(
-        _ tag: String,
-        alignment: Alignment = .bottom,
-        offset: SIMD2<Double> = .zero,
-        @ViewBuilder _ content: () -> some View
-    ) -> some GraphContent<NodeID> {
-        return richLabel(tag, alignment, offset: offset.cgVector, content)
-    }
 
     /// Sets the stroke style for this graph content.
     ///
@@ -134,6 +104,7 @@ extension GraphContent {
     /// - When a `.clip` color is applied to link marks, the stroke will not be drawn.
     /// - When a `nil` stroke style is applied to node marks, the stroke style will be the same as the default stroke style.
     @inlinable
+    @_disfavoredOverload
     public func stroke(
         _ color: StrokeColor = .clip,
         _ strokeStyle: StrokeStyle? = nil

Sources/Grape/Views/ForceDirectedGraphModel.findNode.swift

@@ -6,7 +6,7 @@ import simd
 extension ForceDirectedGraphModel {
 
     @inlinable 
-    internal func findNodeFromRichLabel(
+    internal func findNodeFromViewAnnotation(
         at locationInSimulationCoordinate: SIMD2<Double>
     ) -> GraphRenderingStates<NodeID>.StateID? {
         for (symbolID, box) in rasterizedSymbols {

Sources/Grape/Views/ForceDirectedGraphModel.swift

@@ -46,11 +46,11 @@ extension ForceDirectedGraphModel: _AnyGraphProxyProtocol {
     @inlinable
     public func node(at locationInViewportCoordinate: CGPoint) -> AnyHashable? {
 
-        // Find from rich label first
-        if let nodeIDFromRichLabel = findNodeFromRichLabel(
+        // Find from view annotation first
+        if let nodeIDFromViewAnnotation = findNodeFromViewAnnotation(
             at: finalTransform.invert(locationInViewportCoordinate.simd)
         ) {
-            if case .node(let nodeID) = nodeIDFromRichLabel {
+            if case .node(let nodeID) = nodeIDFromViewAnnotation {
                 return AnyHashable(nodeID)
             }
         }
@@ -784,7 +784,7 @@ extension ForceDirectedGraphModel {
             )
         }
         debugPrint(
-            "Graph state revived. Note this might cause expensive rerendering when combined with `richLabel` with unstable id."
+            "Graph state revived. Note this might cause expensive rerendering when combined with `annotation` with non-text views and unstable id."
         )
     }