Merge pull request #151 from liveviewnative/macos

carson-katri · web-flow · commit 8db6e44de1c9 · 2023-01-26T10:02:25.000-05:00
Fix macOS build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,4 +14,12 @@ jobs:
         shell: bash
         run: |
           sudo xcode-select --switch /Applications/Xcode_14.2.app
-          xcodebuild test -scheme LiveViewNative -sdk iphonesimulator16.2 -destination "OS=16.2,name=iPhone 14 Pro"
+          xcodebuild test -scheme LiveViewNative -sdk iphonesimulator16.2 -destination "OS=16.2,name=iPhone 14 Pro"
+      - name: Build for macOS
+        shell: bash
+        run: |
+          xcodebuild -scheme LiveViewNative -sdk macosx13.1 -destination "platform=macOS"
+      - name: Build for watchOS
+        shell: bash
+        run: |
+          xcodebuild -scheme LiveViewNative -sdk watchsimulator9.1 -destination "OS=9.1,name=Apple Watch Series 8 (45mm)"
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,9 @@ import PackageDescription
 let package = Package(
     name: "LiveViewNative",
     platforms: [
-        .iOS("16.0")
+        .iOS("16.0"),
+        .macOS("13.0"),
+        .watchOS("9.0"),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
@@ -32,7 +34,8 @@ let package = Package(
             ]),
         .testTarget(
             name: "LiveViewNativeTests",
-            dependencies: ["LiveViewNative"]),
+            dependencies: ["LiveViewNative"]
+        ),
         .testTarget(
             name: "RenderingTests",
             dependencies: ["LiveViewNative"]
diff --git a/Sources/LiveViewNative/BuiltinRegistry.swift b/Sources/LiveViewNative/BuiltinRegistry.swift
@@ -58,12 +58,16 @@ struct BuiltinRegistry {
             ProgressView(element: element, context: context)
         case "divider":
             Divider()
+#if os(iOS)
         case "edit-button":
             EditButton()
+#endif
         case "toggle":
             Toggle(element: element, context: context)
+#if !os(watchOS)
         case "menu":
             Menu(element: element, context: context)
+#endif
         case "slider":
             Slider(element: element, context: context)
         case "phx-form":
diff --git a/Sources/LiveViewNative/Modifiers/ListRowSeparatorModifier.swift b/Sources/LiveViewNative/Modifiers/ListRowSeparatorModifier.swift
@@ -55,7 +55,11 @@ struct ListRowSeparatorModifier: ViewModifier, Decodable, Equatable {
     }
     
     func body(content: Content) -> some View {
+        #if !os(watchOS)
         content.listRowSeparator(visibility, edges: edges)
+        #else
+        content
+        #endif
     }
     
     private enum CodingKeys: String, CodingKey {
diff --git a/Sources/LiveViewNative/Views/Controls and Indicators/Menus/Menu.swift b/Sources/LiveViewNative/Views/Controls and Indicators/Menus/Menu.swift
@@ -4,7 +4,7 @@
 //
 //  Created by Carson Katri on 1/19/23.
 //
-
+#if !os(watchOS)
 import SwiftUI
 
 struct Menu<R: CustomRegistry>: View {
@@ -43,3 +43,4 @@ fileprivate extension View {
         }
     }
 }
+#endif
diff --git a/Sources/LiveViewNative/Views/Layout Containers/Collection Containers/List.swift b/Sources/LiveViewNative/Views/Layout Containers/Collection Containers/List.swift
@@ -45,10 +45,12 @@ private extension SwiftUI.List {
         switch element.attributeValue(for: "style") {
         case nil, "plain":
             self.listStyle(.plain)
+#if os(iOS)
         case "grouped":
             self.listStyle(.grouped)
         case "inset-grouped":
             self.listStyle(.insetGrouped)
+#endif
         default:
             fatalError("Invalid list style '\(element.attributeValue(for: "name")!)'")
         }
diff --git a/Sources/LiveViewNative/Views/Text Input and Output/SecureField.swift b/Sources/LiveViewNative/Views/Text Input and Output/SecureField.swift
@@ -26,8 +26,10 @@ struct SecureField<R: CustomRegistry>: TextFieldProtocol {
             .focused($isFocused)
             .applyTextFieldStyle(textFieldStyle)
             .applyAutocorrectionDisabled(disableAutocorrection)
+#if os(iOS) || os(tvOS)
             .textInputAutocapitalization(autocapitalization)
             .applyKeyboardType(keyboard)
+#endif
             .applySubmitLabel(submitLabel)
             .onChange(of: isFocused, perform: handleFocus)
     }
diff --git a/Sources/LiveViewNative/Views/Text Input and Output/TextField.swift b/Sources/LiveViewNative/Views/Text Input and Output/TextField.swift
@@ -22,8 +22,12 @@ struct TextField<R: CustomRegistry>: TextFieldProtocol {
             .focused($isFocused)
             .applyTextFieldStyle(textFieldStyle)
             .applyAutocorrectionDisabled(disableAutocorrection)
+#if !os(macOS)
             .textInputAutocapitalization(autocapitalization)
+#endif
+#if os(iOS) || os(tvOS)
             .applyKeyboardType(keyboard)
+#endif
             .applySubmitLabel(submitLabel)
             .onChange(of: isFocused, perform: handleFocus)
     }
diff --git a/Sources/LiveViewNative/Views/Text Input and Output/TextFieldProtocol.swift b/Sources/LiveViewNative/Views/Text Input and Output/TextFieldProtocol.swift
@@ -91,6 +91,7 @@ extension TextFieldProtocol {
         }
     }
     
+#if !os(macOS)
     var autocapitalization: TextInputAutocapitalization? {
         switch element.attributeValue(for: "autocapitalization") {
         case "sentences":
@@ -105,7 +106,9 @@ extension TextFieldProtocol {
             return nil
         }
     }
+#endif
     
+#if os(iOS) || os(tvOS)
     var keyboard: UIKeyboardType? {
         switch element.attributeValue(for: "keyboard") {
         case "ascii-capable":
@@ -134,6 +137,7 @@ extension TextFieldProtocol {
             return nil
         }
     }
+#endif
     
     var submitLabel: SubmitLabel? {
         switch element.attributeValue(for: "submit-label") {
@@ -164,8 +168,12 @@ extension TextFieldProtocol {
 enum TextFieldStyle: String {
     case automatic
     case plain
+#if !os(watchOS)
     case roundedBorder = "rounded-border"
+#endif
+#if os(macOS)
     case squareBorder = "square-border"
+#endif
 }
 
 extension View {
@@ -176,14 +184,14 @@ extension View {
             self.textFieldStyle(.automatic)
         case .plain:
             self.textFieldStyle(.plain)
+#if !os(watchOS)
         case .roundedBorder:
             self.textFieldStyle(.roundedBorder)
+#endif
+#if os(macOS)
         case .squareBorder:
-            #if os(macOS)
             self.textFieldStyle(.squareBorder)
-            #else
-            self
-            #endif
+#endif
         }
     }
     
@@ -196,6 +204,7 @@ extension View {
         }
     }
     
+#if os(iOS) || os(tvOS)
     @ViewBuilder
     func applyKeyboardType(_ keyboardType: UIKeyboardType?) -> some View {
         if let keyboardType {
@@ -204,6 +213,7 @@ extension View {
             self
         }
     }
+#endif
     
     @ViewBuilder
     func applySubmitLabel(_ submitLabel: SubmitLabel?) -> some View {
diff --git a/Tests/RenderingTests/ProgressViewTests.swift b/Tests/RenderingTests/ProgressViewTests.swift
@@ -12,14 +12,14 @@ import SwiftUI
 @MainActor
 final class ProgressViewTests: XCTestCase {
     func testValue() throws {
-        try assertMatch(#"<progressview value="0.5" />"#) {
+        try assertMatch(#"<progress-view value="0.5" />"#, size: .init(width: 200, height: 200)) {
             ProgressView(value: 0.5)
         }
     }
     
     func testTotal() throws {
-        try assertMatch(#"<progressview value="2.5" total="5" />"#) {
-            ProgressView(value: 0.5, total: 5)
+        try assertMatch(#"<progress-view value="2.5" total="5" />"#, size: .init(width: 200, height: 200)) {
+            ProgressView(value: 2.5, total: 5)
         }
     }
 }
diff --git a/Tests/RenderingTests/assertMatch.swift b/Tests/RenderingTests/assertMatch.swift
@@ -11,56 +11,71 @@ import Foundation
 @testable import LiveViewNative
 import LiveViewNativeCore
 
-@MainActor
-func assertMatch(
-    _ markup: String,
-    _ file: String = #file,
-    _ line: Int = #line,
-    _ function: StaticString = #function,
-    environment: @escaping (inout EnvironmentValues) -> () = { _ in },
-    size: CGSize? = nil,
-    @ViewBuilder _ view: () -> some View
-) throws {
-    try assertMatch(name: "\(URL(filePath: file).lastPathComponent)-\(line)-\(function)", markup, environment: environment, size: size, view)
-}
-
-@MainActor
-func assertMatch(
-    name: String,
-    _ markup: String,
-    environment: @escaping (inout EnvironmentValues) -> () = { _ in },
-    size: CGSize? = nil,
-    @ViewBuilder _ view: () -> some View
-) throws {
-    let session = LiveSessionCoordinator(URL(string: "http://localhost")!)
-    let document = try LiveViewNativeCore.Document.parse(markup)
-    let viewTree = session.rootCoordinator.builder.fromNodes(
-        document[document.root()].children(),
-        context: LiveContext(coordinator: session.rootCoordinator, url: session.url)
-    ).environment(\.coordinatorEnvironment, CoordinatorEnvironment(session.rootCoordinator, document: document))
-    
-    let markupImage = snapshot(
-        viewTree
-            .transformEnvironment(\.self, transform: environment),
-        size: size
-    )?.pngData()
-    let viewImage = snapshot(
-        view()
-            .transformEnvironment(\.self, transform: environment),
-        size: size
-    )?.pngData()
+extension XCTestCase {
+    @MainActor
+    func assertMatch(
+        _ markup: String,
+        _ file: String = #file,
+        _ line: Int = #line,
+        _ function: StaticString = #function,
+        environment: @escaping (inout EnvironmentValues) -> () = { _ in },
+        size: CGSize? = nil,
+        @ViewBuilder _ view: () -> some View
+    ) throws {
+        try assertMatch(name: "\(URL(filePath: file).lastPathComponent)-\(line)-\(function)", markup, environment: environment, size: size, view)
+    }
     
-    if markupImage == viewImage {
-        XCTAssert(true)
-    } else {
-        let markupURL = URL.temporaryDirectory.appendingPathComponent("\(name)_markup", conformingTo: .png)
-        let viewURL = URL.temporaryDirectory.appendingPathComponent("\(name)_view", conformingTo: .png)
-        try markupImage?.write(to: markupURL)
-        try viewImage?.write(to: viewURL)
-        XCTAssert(false, "Rendered views did not match. Outputs saved to \(markupURL.path()) and \(viewURL.path())")
+    @MainActor
+    func assertMatch(
+        name: String,
+        _ markup: String,
+        environment: @escaping (inout EnvironmentValues) -> () = { _ in },
+        size: CGSize? = nil,
+        @ViewBuilder _ view: () -> some View
+    ) throws {
+        #if !os(iOS)
+        fatalError("Rendering tests not supported on platforms other than iOS at this time")
+        #else
+        let session = LiveSessionCoordinator(URL(string: "http://localhost")!)
+        let document = try LiveViewNativeCore.Document.parse(markup)
+        let viewTree = session.rootCoordinator.builder.fromNodes(
+            document[document.root()].children(),
+            context: LiveContext(coordinator: session.rootCoordinator, url: session.url)
+        ).environment(\.coordinatorEnvironment, CoordinatorEnvironment(session.rootCoordinator, document: document))
+        
+        guard let markupImage = snapshot(
+            viewTree
+                .transformEnvironment(\.self, transform: environment),
+            size: size
+        )
+        else {
+            return XCTAssert(false, "Markup failed to render an image")
+        }
+        guard let viewImage = snapshot(
+            view()
+                .transformEnvironment(\.self, transform: environment),
+            size: size
+        )
+        else {
+            return XCTAssert(false, "View failed to render an image")
+        }
+        
+        self.add(XCTAttachment(image: markupImage))
+        self.add(XCTAttachment(image: viewImage))
+        
+        let markupData = markupImage.pngData()
+        let viewData = viewImage.pngData()
+        
+        if markupData == viewData {
+            XCTAssert(true)
+        } else {
+            XCTAssert(false, "Rendered views did not match. Attachments can be viewed in the Report navigator.")
+        }
+        #endif
     }
 }
 
+#if os(iOS)
 private class SnapshotWindow: UIWindow {
     override var safeAreaInsets: UIEdgeInsets {
         .zero
@@ -86,3 +101,4 @@ private func snapshot(_ view: some View, size: CGSize?) -> UIImage? {
         uiView.layer.render(in: context.cgContext)
     }
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,11 @@ struct ListRowSeparatorModifier: ViewModifier, Decodable, Equatable {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func body(content: Content) -> some View {`
	`58`	`+ #if !os(watchOS)`
`58`	`59`	`content.listRowSeparator(visibility, edges: edges)`
	`60`	`+ #else`
	`61`	`+ content`
	`62`	`+ #endif`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`private enum CodingKeys: String, CodingKey {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`//`
`5`	`5`	`// Created by Carson Katri on 1/19/23.`
`6`	`6`	`//`
`7`		`-`
	`7`	`+#if !os(watchOS)`
`8`	`8`	`import SwiftUI`
`9`	`9`
`10`	`10`	`struct Menu<R: CustomRegistry>: View {`
`@@ -43,3 +43,4 @@ fileprivate extension View {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ extension TextFieldProtocol {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
	`94`	`+#if !os(macOS)`
`94`	`95`	`var autocapitalization: TextInputAutocapitalization? {`
`95`	`96`	`switch element.attributeValue(for: "autocapitalization") {`
`96`	`97`	`case "sentences":`
`@@ -105,7 +106,9 @@ extension TextFieldProtocol {`
`105`	`106`	`return nil`
`106`	`107`	`}`
`107`	`108`	`}`
	`109`	`+#endif`
`108`	`110`
	`111`	`+#if os(iOS) \|\| os(tvOS)`
`109`	`112`	`var keyboard: UIKeyboardType? {`
`110`	`113`	`switch element.attributeValue(for: "keyboard") {`
`111`	`114`	`case "ascii-capable":`
`@@ -134,6 +137,7 @@ extension TextFieldProtocol {`
`134`	`137`	`return nil`
`135`	`138`	`}`
`136`	`139`	`}`
	`140`	`+#endif`
`137`	`141`
`138`	`142`	`var submitLabel: SubmitLabel? {`
`139`	`143`	`switch element.attributeValue(for: "submit-label") {`
`@@ -164,8 +168,12 @@ extension TextFieldProtocol {`
`164`	`168`	`enum TextFieldStyle: String {`
`165`	`169`	`case automatic`
`166`	`170`	`case plain`
	`171`	`+#if !os(watchOS)`
`167`	`172`	`case roundedBorder = "rounded-border"`
	`173`	`+#endif`
	`174`	`+#if os(macOS)`
`168`	`175`	`case squareBorder = "square-border"`
	`176`	`+#endif`
`169`	`177`	`}`
`170`	`178`
`171`	`179`	`extension View {`
`@@ -176,14 +184,14 @@ extension View {`
`176`	`184`	`self.textFieldStyle(.automatic)`
`177`	`185`	`case .plain:`
`178`	`186`	`self.textFieldStyle(.plain)`
	`187`	`+#if !os(watchOS)`
`179`	`188`	`case .roundedBorder:`
`180`	`189`	`self.textFieldStyle(.roundedBorder)`
	`190`	`+#endif`
	`191`	`+#if os(macOS)`
`181`	`192`	`case .squareBorder:`
`182`		`- #if os(macOS)`
`183`	`193`	`self.textFieldStyle(.squareBorder)`
`184`		`- #else`
`185`		`- self`
`186`		`- #endif`
	`194`	`+#endif`
`187`	`195`	`}`
`188`	`196`	`}`
`189`	`197`
`@@ -196,6 +204,7 @@ extension View {`
`196`	`204`	`}`
`197`	`205`	`}`
`198`	`206`
	`207`	`+#if os(iOS) \|\| os(tvOS)`
`199`	`208`	`@ViewBuilder`
`200`	`209`	`func applyKeyboardType(_ keyboardType: UIKeyboardType?) -> some View {`
`201`	`210`	`if let keyboardType {`
`@@ -204,6 +213,7 @@ extension View {`
`204`	`213`	`self`
`205`	`214`	`}`
`206`	`215`	`}`
	`216`	`+#endif`
`207`	`217`
`208`	`218`	`@ViewBuilder`
`209`	`219`	`func applySubmitLabel(_ submitLabel: SubmitLabel?) -> some View {`