Add support for iOS based targets

Author: philptr

Package.swift

@@ -9,7 +9,8 @@ let package = Package(
         .macOS("14.0"),
         .iOS("17.0"),
         .tvOS("17.0"),
-        .watchOS("10.0")
+        .watchOS("10.0"),
+        .visionOS("1.0"),
     ],
     products: [
         .library(name: "PredicateView", targets: ["PredicateView"]),

Sources/PredicateView/Expressions/CollectionExpression.swift

@@ -144,12 +144,7 @@ public struct CollectionExpressionView<Root, C>: HierarchicalExpressionView wher
             }
 
             if isEnabled {
-                MenuButton(label: Image(systemName: "plus.circle")) {
-                    menuItems
-                }
-                .tint(.accentColor)
-                .fixedSize()
-                .menuButtonStyle(BorderlessButtonMenuButtonStyle())
+                NewItemMenuButton { menuItems }
             }
         }
     }

Sources/PredicateView/Expressions/LogicalExpression.swift

@@ -123,12 +123,7 @@ public struct LogicalExpressionView<Root>: HierarchicalExpressionView {
             }
 
             if isEnabled {
-                MenuButton(label: Image(systemName: "plus.circle")) {
-                    menuItems
-                }
-                .tint(.accentColor)
-                .fixedSize()
-                .menuButtonStyle(BorderlessButtonMenuButtonStyle())
+                NewItemMenuButton { menuItems }
             }
         }
     }

Sources/PredicateView/Views/NewItemMenuButton.swift

@@ -0,0 +1,32 @@
+//
+//  NewItemMenuButton.swift
+//  PredicateView
+//
+//  Created by Phil Zakharchenko on 9/21/24.
+//
+
+import SwiftUI
+
+struct NewItemMenuButton<Content: View>: View {
+    @ViewBuilder let menuItems: () -> Content
+    
+    var body: some View {
+#if os(macOS)
+        MenuButton(label: Image(systemName: "plus.circle")) {
+            menuItems()
+        }
+        .tint(.accentColor)
+        .fixedSize()
+        .menuButtonStyle(BorderlessButtonMenuButtonStyle())
+#else
+        Menu {
+            menuItems()
+        } label: {
+            Image(systemName: "plus.circle")
+        }
+        .tint(.accentColor)
+        .fixedSize()
+        .menuStyle(.borderlessButton)
+#endif
+    }
+}

Sources/PredicateView/Views/TokenView.swift

@@ -60,7 +60,13 @@ struct TokenView<Root, Header: View, Content: View, MenuItems: View, Widget: Vie
                     .preference(key: PredicateDeletedStatusPreferenceKey.self, value: isDeleted)
             }
         }
-        .contentShape(.rect)
+        .background {
+            shape
+                .strokeBorder(Color.accentColor.opacity(0.3), lineWidth: 1)
+                .fill(Color.accentColor.opacity(isFocused ? 0.15 : 0.1))
+        }
+        .contentShape(shape)
+        .contentShape(.contextMenuPreview, shape)
         .onTapGesture {
             isFocused = true
         }
@@ -69,11 +75,6 @@ struct TokenView<Root, Header: View, Content: View, MenuItems: View, Widget: Vie
                 menuItems
             }
         }
-        .background {
-            RoundedRectangle(cornerRadius: 6, style: .continuous)
-                .strokeBorder(Color.accentColor.opacity(0.3), lineWidth: 1)
-                .fill(Color.accentColor.opacity(isFocused ? 0.15 : 0.1))
-        }
         .disabled(!isEnabled)
     }
 
@@ -87,4 +88,8 @@ struct TokenView<Root, Header: View, Content: View, MenuItems: View, Widget: Vie
             isDeleted = true
         }
     }
+    
+    private var shape: some InsettableShape {
+        RoundedRectangle(cornerRadius: 6, style: .continuous)
+    }
 }