feat: Separate UI product and custom views support

Author: maximkrouk

Example/Example.xcodeproj/project.pbxproj

@@ -7,14 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		E1AE5A5C2796ED6A00EA911E /* DynamicForms in Frameworks */ = {isa = PBXBuildFile; productRef = E1AE5A5B2796ED6A00EA911E /* DynamicForms */; };
-		E1AE5A5E2796EEDD00EA911E /* DynamicForms in Frameworks */ = {isa = PBXBuildFile; productRef = E1AE5A5D2796EEDD00EA911E /* DynamicForms */; };
+		E196B8E127A002F100E03F7F /* DynamicFormsUI in Frameworks */ = {isa = PBXBuildFile; productRef = E196B8E027A002F100E03F7F /* DynamicFormsUI */; };
 		E1CF381C279347B400315374 /* ExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1CF37F4279347B300315374 /* ExampleApp.swift */; };
 		E1CF381D279347B400315374 /* ExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1CF37F4279347B300315374 /* ExampleApp.swift */; };
 		E1CF381E279347B400315374 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1CF37F5279347B300315374 /* ContentView.swift */; };
 		E1CF381F279347B400315374 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1CF37F5279347B300315374 /* ContentView.swift */; };
 		E1CF3820279347B400315374 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E1CF37F6279347B400315374 /* Assets.xcassets */; };
 		E1CF3821279347B400315374 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E1CF37F6279347B400315374 /* Assets.xcassets */; };
+		E1F24A5D27A006FB007C4DF3 /* DynamicFormsUI in Frameworks */ = {isa = PBXBuildFile; productRef = E1F24A5C27A006FB007C4DF3 /* DynamicFormsUI */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -50,15 +50,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E1AE5A5C2796ED6A00EA911E /* DynamicForms in Frameworks */,
+				E1F24A5D27A006FB007C4DF3 /* DynamicFormsUI in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		E1CF37FE279347B400315374 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E1AE5A5E2796EEDD00EA911E /* DynamicForms in Frameworks */,
+				E196B8E127A002F100E03F7F /* DynamicFormsUI in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -142,7 +142,7 @@
 			);
 			name = "Example (iOS)";
 			packageProductDependencies = (
-				E1AE5A5B2796ED6A00EA911E /* DynamicForms */,
+				E1F24A5C27A006FB007C4DF3 /* DynamicFormsUI */,
 			);
 			productName = "Example (iOS)";
 			productReference = E1CF37FB279347B400315374 /* Example.app */;
@@ -162,7 +162,7 @@
 			);
 			name = "Example (macOS)";
 			packageProductDependencies = (
-				E1AE5A5D2796EEDD00EA911E /* DynamicForms */,
+				E196B8E027A002F100E03F7F /* DynamicFormsUI */,
 			);
 			productName = "Example (macOS)";
 			productReference = E1CF3801279347B400315374 /* Example.app */;
@@ -681,13 +681,13 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		E1AE5A5B2796ED6A00EA911E /* DynamicForms */ = {
+		E196B8E027A002F100E03F7F /* DynamicFormsUI */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = DynamicForms;
+			productName = DynamicFormsUI;
 		};
-		E1AE5A5D2796EEDD00EA911E /* DynamicForms */ = {
+		E1F24A5C27A006FB007C4DF3 /* DynamicFormsUI */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = DynamicForms;
+			productName = DynamicFormsUI;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

Example/Shared/ContentView.swift

@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import DynamicForms
+import DynamicFormsUI
 
 struct ContentView: View {
   @State
@@ -19,14 +19,12 @@ struct ContentView: View {
         DynamicText("Initial")
       }
       DynamicStack(.horizontal) {
-        DynamicButton(
-          DynamicText("OK"),
-          action: "content.ok"
-        )
-        DynamicButton(
-          DynamicText("Cancel"),
-          action: "content.cancel"
-        )
+        DynamicButton(action: "content.ok") {
+          DynamicText("OK")
+        }
+        DynamicButton(action: "content.cancel") {
+          DynamicText("Cancel")
+        }
       }
     }
   }
@@ -36,7 +34,7 @@ struct ContentView: View {
 
   var body: some View {
     ZStack {
-      DynamicFormView($form)
+      DynamicViews.Form($form)
       VStack {
         Spacer()
         ScrollView(.vertical, showsIndicators: false) {

Package.swift

@@ -13,6 +13,10 @@ let package = Package(
       name: "DynamicForms",
       targets: ["DynamicForms"]
     ),
+    .library(
+      name: "DynamicFormsUI",
+      targets: ["DynamicFormsUI"]
+    ),
   ],
   dependencies: [
     .package(
@@ -58,6 +62,12 @@ let package = Package(
         )
       ]
     ),
+    .target(
+      name: "DynamicFormsUI",
+      dependencies: [
+        .target(name: "DynamicForms")
+      ]
+    ),
     .testTarget(
       name: "DynamicFormsTests",
       dependencies: [

README.md

@@ -29,7 +29,6 @@
 - **To-think-about**
   - API improvements for state management
   - API improvements for action handling
-  - API for custom views
   - Helper for derived (optional/collection) `Binding`s
   - Separate `DynamicForms` target into `DynamicForms` and `DynamicFormsUI` targets
 
@@ -138,7 +137,7 @@ If you use SwiftPM for your project, you can add StandardClients to your package
 .package(
   name: "swiftui-dynamic-forms",
   url: "https://github.com/capturecontext/swiftui-dynamic-forms.git", 
-  .branch("0.0.1")
+  .branch("0.1.0")
 )
 ```
 

Sources/DynamicForms/Components/DynamicSpacer.swift

@@ -3,7 +3,7 @@ import Foundation
 public struct DynamicSpacer: Equatable, DynamicElement, Identifiable {
   public init(
     id: DynamicElementIdentifier = .uuid(),
-    minLength: Double?
+    minLength: Double? = nil
   ) {
     self.id = id
     self.minLength = minLength

Sources/DynamicForms/Components/DynamicText.swift

@@ -56,10 +56,10 @@ import SwiftUI
 public struct DynamicText: Equatable, Hashable, Identifiable {
   public var id: DynamicElementIdentifier
 
-  fileprivate let storage: Storage
-  fileprivate var modifiers: [Modifier] = []
+  public let storage: Storage
+  public var modifiers: [Modifier] = []
 
-  fileprivate init(
+  public init(
     storage: Storage,
     modifiers: [Modifier] = []
   ) {
@@ -68,7 +68,7 @@ public struct DynamicText: Equatable, Hashable, Identifiable {
     self.id = .uuid()
   }
 
-  fileprivate enum Modifier: Equatable, Hashable {
+  public enum Modifier: Equatable, Hashable {
     case accessibilityHeading(AccessibilityHeadingLevel)
     case accessibilityLabel(DynamicText)
     case accessibilityTextContentType(AccessibilityTextContentType)
@@ -84,12 +84,12 @@ public struct DynamicText: Equatable, Hashable, Identifiable {
     case underline(active: Bool, color: Color?)
   }
 
-  fileprivate enum Storage: Equatable, Hashable {
+  public enum Storage: Equatable, Hashable {
     indirect case concatenated(DynamicText, DynamicText)
     case localized(LocalizedStringKey, tableName: String?, bundle: Bundle?, comment: StaticString?)
     case verbatim(String)
 
-    static func == (lhs: Self, rhs: Self) -> Bool {
+    public static func == (lhs: Self, rhs: Self) -> Bool {
       switch (lhs, rhs) {
       case let (.concatenated(l1, l2), .concatenated(r1, r2)):
         return l1 == r1 && l2 == r2
@@ -111,7 +111,7 @@ public struct DynamicText: Equatable, Hashable, Identifiable {
       }
     }
 
-    func hash(into hasher: inout Hasher) {
+    public func hash(into hasher: inout Hasher) {
       enum Key {
         case concatenated
         case localized
@@ -225,41 +225,10 @@ extension DynamicText {
 extension DynamicText {
   public enum AccessibilityTextContentType: String, Equatable, Hashable {
     case console, fileSystem, messaging, narrative, plain, sourceCode, spreadsheet, wordProcessing
-    
-#if compiler(>=5.5.1)
-    @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-    var toSwiftUI: SwiftUI.AccessibilityTextContentType {
-      switch self {
-      case .console: return .console
-      case .fileSystem: return .fileSystem
-      case .messaging: return .messaging
-      case .narrative: return .narrative
-      case .plain: return .plain
-      case .sourceCode: return .sourceCode
-      case .spreadsheet: return .spreadsheet
-      case .wordProcessing: return .wordProcessing
-      }
-    }
-#endif
   }
 
   public enum AccessibilityHeadingLevel: String, Equatable, Hashable {
     case h1, h2, h3, h4, h5, h6, unspecified
-    
-#if compiler(>=5.5.1)
-    @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-    var toSwiftUI: SwiftUI.AccessibilityHeadingLevel {
-      switch self {
-      case .h1: return .h1
-      case .h2: return .h2
-      case .h3: return .h3
-      case .h4: return .h4
-      case .h5: return .h5
-      case .h6: return .h6
-      case .unspecified: return .unspecified
-      }
-    }
-#endif
   }
 }
 
@@ -300,84 +269,6 @@ extension DynamicText {
   }
 }
 
-extension Text {
-  public init(_ state: DynamicText) {
-    let text: Text
-    switch state.storage {
-    case let .concatenated(first, second):
-      text = Text(first) + Text(second)
-    case let .localized(content, tableName, bundle, comment):
-      text = .init(content, tableName: tableName, bundle: bundle, comment: comment)
-    case let .verbatim(content):
-      text = .init(verbatim: content)
-    }
-    self = state.modifiers.reduce(text) { text, modifier in
-      switch modifier {
-#if compiler(>=5.5.1)
-      case let .accessibilityHeading(level):
-        if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
-          return text.accessibilityHeading(level.toSwiftUI)
-        } else {
-          return text
-        }
-      case let .accessibilityLabel(value):
-        if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
-          switch value.storage {
-          case let .verbatim(string):
-            return text.accessibilityLabel(string)
-          case let .localized(key, tableName, bundle, comment):
-            return text.accessibilityLabel(
-              Text(key, tableName: tableName, bundle: bundle, comment: comment))
-          case .concatenated(_, _):
-            assertionFailure("`.accessibilityLabel` does not support contcatenated `DynamicText`")
-            return text
-          }
-        } else {
-          return text
-        }
-      case let .accessibilityTextContentType(type):
-        if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
-          return text.accessibilityTextContentType(type.toSwiftUI)
-        } else {
-          return text
-        }
-#else
-      case .accessibilityHeading,
-          .accessibilityLabel,
-          .accessibilityTextContentType:
-        return text
-#endif
-      case let .baselineOffset(baselineOffset):
-        return text.baselineOffset(baselineOffset)
-      case .bold:
-        return text.bold()
-      case let .font(font):
-        return text.font(font)
-      case let .fontWeight(weight):
-        return text.fontWeight(weight)
-      case let .foregroundColor(color):
-        return text.foregroundColor(color)
-      case .italic:
-        return text.italic()
-      case let .kerning(kerning):
-        return text.kerning(kerning)
-      case let .strikethrough(active, color):
-        return text.strikethrough(active, color: color)
-      case let .tracking(tracking):
-        return text.tracking(tracking)
-      case let .underline(active, color):
-        return text.underline(active, color: color)
-      }
-    }
-  }
-}
-
-extension DynamicText: View {
-  public var body: some View {
-    Text(self)
-  }
-}
-
 extension String {
   public init(state: DynamicText, locale: Locale? = nil) {
     switch state.storage {