Add AttributeReference to missing areas (#1181)

* Add AttributeReference to missing areas

* Extend list to more SwiftUI types

* Cleanup imports

Author: carson-katri

Sources/LiveViewNative/ModifierStack.swift

@@ -9,21 +9,24 @@ import SwiftUI
 import LiveViewNativeStylesheet
 
 @ParseableExpression
-struct _FocusScopeModifier: ViewModifier {
-    static let name = "focusScope"
-
-    @Environment(\.namespaces) private var namespaces
+struct _FocusScopeModifier<R: RootRegistry>: ViewModifier {
+    static var name: String { "focusScope" }
+    
+    let namespace: AttributeReference<String>
 
-    let namespace: String
+    @ObservedElement private var element
+    @LiveContext<R> private var context
+    
+    @Environment(\.namespaces) private var namespaces
 
     @available(watchOS 7.0,macOS 12.0,tvOS 14.0, *)
-    init(_ namespace: String) {
+    init(_ namespace: AttributeReference<String>) {
         self.namespace = namespace
     }
 
     func body(content: Content) -> some View {
         #if os(watchOS) || os(macOS) || os(tvOS)
-        content.focusScope(namespaces[namespace]!)
+        content.focusScope(namespaces[namespace.resolve(on: element, in: context)]!)
         #else
         content
         #endif

Sources/LiveViewNative/Stylesheets/Modifiers/Overrides/FocusScopeModifier.swift

@@ -13,22 +13,25 @@ struct _PrefersDefaultFocusModifier<R: RootRegistry>: ViewModifier {
     static var name: String { "prefersDefaultFocus" }
 
     let prefersDefaultFocus: AttributeReference<Bool>
-    let namespace: String
+    let namespace: AttributeReference<String>
 
     @ObservedElement private var element
     @LiveContext<R> private var context
     @Environment(\.namespaces) private var namespaces
 
     @available(tvOS 14.0,macOS 12.0,watchOS 7.0, *)
-    init(_ prefersDefaultFocus: AttributeReference<Swift.Bool>, in namespace: String) {
+    init(_ prefersDefaultFocus: AttributeReference<Bool>, in namespace: AttributeReference<String>) {
         self.prefersDefaultFocus = prefersDefaultFocus
         self.namespace = namespace
     }
 
     func body(content: Content) -> some View {
         #if os(tvOS) || os(macOS) || os(watchOS)
         content
-            .prefersDefaultFocus(prefersDefaultFocus.resolve(on: element, in: context), in: namespaces[namespace]!)
+            .prefersDefaultFocus(
+                prefersDefaultFocus.resolve(on: element, in: context),
+                in: namespaces[namespace.resolve(on: element, in: context)]!
+            )
         #else
         content
         #endif

Sources/LiveViewNative/Stylesheets/Modifiers/Overrides/PrefersDefaultFocusModifier.swift

@@ -11,16 +11,25 @@ import LiveViewNativeStylesheet
 // manual implementation
 // `axis` is a tuple type, which cannot conform to `ParseableModifierValue`.
 @ParseableExpression
-struct _Rotation3DEffectModifier: ViewModifier {
-    static let name = "rotation3DEffect"
+struct _Rotation3DEffectModifier<R: RootRegistry>: ViewModifier {
+    static var name: String { "rotation3DEffect" }
 
     let angle: Angle
     let axis: _3DAxis
     let anchor: UnitPoint
-    let anchorZ: CGFloat
-    let perspective: CGFloat
+    let anchorZ: AttributeReference<CGFloat>
+    let perspective: AttributeReference<CGFloat>
 
-    init(_ angle: Angle, axis: _3DAxis, anchor: UnitPoint = .center, anchorZ: CGFloat = 0, perspective: CGFloat = 1) {
+    @ObservedElement private var element
+    @LiveContext<R> private var context
+    
+    init(
+        _ angle: Angle,
+        axis: _3DAxis,
+        anchor: UnitPoint = .center,
+        anchorZ: AttributeReference<CGFloat> = .init(storage: .constant(0)),
+        perspective: AttributeReference<CGFloat> = .init(storage: .constant(1))
+    ) {
         self.angle = angle
         self.axis = axis
         self.anchor = anchor
@@ -33,8 +42,8 @@ struct _Rotation3DEffectModifier: ViewModifier {
             angle,
             axis: (x: axis.x, y: axis.y, z: axis.z),
             anchor: anchor,
-            anchorZ: anchorZ,
-            perspective: perspective
+            anchorZ: anchorZ.resolve(on: element, in: context),
+            perspective: perspective.resolve(on: element, in: context)
         )
     }
 

Sources/LiveViewNative/Stylesheets/Modifiers/Overrides/Rotation3DEffectModifier.swift

@@ -11,31 +11,34 @@ import LiveViewNativeStylesheet
 // manual implementation
 // The `token` method requires a type conforming to `Identifiable`, which becomes ambiguous with `String`.
 @ParseableExpression
-struct _SearchCompletionModifier: ViewModifier {
-    static let name = "searchCompletion"
+struct _SearchCompletionModifier<R: RootRegistry>: ViewModifier {
+    static var name: String { "searchCompletion" }
 
     enum Completion {
-        case completion(String)
+        case completion(AttributeReference<String>)
         #if os(iOS) || os(macOS) || os(visionOS)
         case token(Token)
         #endif
     }
     let completion: Completion
 
+    @ObservedElement private var element
+    @LiveContext<R> private var context
+    
     #if os(iOS) || os(macOS) || os(visionOS)
     init(_ token: AtomString) {
         self.completion = .token(.init(id: token.value))
     }
     #endif
 
-    init(_ completion: String) {
+    init(_ completion: AttributeReference<String>) {
         self.completion = .completion(completion)
     }
 
     func body(content: Content) -> some View {
         switch completion {
         case .completion(let string):
-            content.searchCompletion(string)
+            content.searchCompletion(string.resolve(on: element, in: context))
         #if os(iOS) || os(macOS) || os(visionOS)
         case .token(let token):
             content.searchCompletion(token)

Sources/LiveViewNative/Stylesheets/Modifiers/Overrides/SearchCompletionModifier.swift

@@ -9,21 +9,24 @@ import SwiftUI
 import LiveViewNativeStylesheet
 
 @ParseableExpression
-struct _StrokeModifier: ShapeFinalizerModifier {
-    static let name = "stroke"
+struct _StrokeModifier<R: RootRegistry>: ShapeFinalizerModifier {
+    static var name: String { "stroke" }
 
     enum Storage {
-        case _0(content: AnyShapeStyle, style: StrokeStyle, antialiased: Bool)
-        case _1(content: AnyShapeStyle, lineWidth: CGFloat, antialiased: Bool)
+        case _0(content: AnyShapeStyle, style: StrokeStyle, antialiased: AttributeReference<Bool>)
+        case _1(content: AnyShapeStyle, lineWidth: AttributeReference<CGFloat>, antialiased: AttributeReference<Bool>)
     }
 
     let storage: Storage
 
-    init(_ content: AnyShapeStyle, style: StrokeStyle, antialiased: Bool = true) {
+    @ObservedElement private var element
+    @LiveContext<R> private var context
+    
+    init(_ content: AnyShapeStyle, style: StrokeStyle, antialiased: AttributeReference<Bool> = .init(storage: .constant(true))) {
         self.storage = ._0(content: content, style: style, antialiased: antialiased)
     }
 
-    init(_ content: AnyShapeStyle, lineWidth: CGFloat = 1, antialiased: Bool = true) {
+    init(_ content: AnyShapeStyle, lineWidth: AttributeReference<CGFloat> = .init(storage: .constant(1)), antialiased: AttributeReference<Bool> = .init(storage: .constant(true))) {
         self.storage = ._1(content: content, lineWidth: lineWidth, antialiased: antialiased)
     }
 
@@ -32,15 +35,15 @@ struct _StrokeModifier: ShapeFinalizerModifier {
         switch storage {
         case ._0(let content, let style, let antialiased):
             if #available(iOS 17.0, macOS 14.0, tvOS 17.0, watchOS 10.0, *) {
-                shape.stroke(content, style: style, antialiased: antialiased)
+                shape.stroke(content, style: style, antialiased: antialiased.resolve(on: element, in: context))
             } else {
                 shape.stroke(content, style: style)
             }
         case ._1(let content, let lineWidth, let antialiased):
             if #available(iOS 17.0, macOS 14.0, tvOS 17.0, watchOS 10.0, *) {
-                shape.stroke(content, lineWidth: lineWidth, antialiased: antialiased)
+                shape.stroke(content, lineWidth: lineWidth.resolve(on: element, in: context), antialiased: antialiased.resolve(on: element, in: context))
             } else {
-                shape.stroke(content, lineWidth: lineWidth)
+                shape.stroke(content, lineWidth: lineWidth.resolve(on: element, in: context))
             }
         }
     }

Sources/LiveViewNative/Stylesheets/Modifiers/Shapes/StrokeModifier.swift

@@ -0,0 +1,15 @@
+//
+//  Angle.swift
+//
+//
+//  Created by Carson Katri on 12/14/23.
+//
+
+import SwiftUI
+import LiveViewNativeCore
+
+extension Angle: AttributeDecodable {
+    public init(from attribute: LiveViewNativeCore.Attribute?) throws {
+        self.init(degrees: try Double.init(from: attribute))
+    }
+}