Merge branch 'main' of github.com:liveviewnative/liveview-client-swiftui into naming-convention

Author: carson-katri

.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run tests on iOS Simulator
+        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"

Package.resolved

@@ -46,7 +46,7 @@ struct Image: View {
     }
 
     private var symbolScale: SwiftUI.Image.Scale? {
-        switch element.attributeValue(for: "symbol-scasle") {
+        switch element.attributeValue(for: "symbol-scale") {
         case nil:
             return nil
         case "small":

Sources/LiveViewNative/Views/Images/Image.swift

@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  LinkTests.swift
 //  
 //
 //  Created by Carson Katri on 1/17/23.

Tests/RenderingTests/LinkTests.swift

@@ -0,0 +1,30 @@
+//
+//  TextFieldTests.swift
+//
+//
+//  Created by Carson Katri on 1/19/23.
+//
+
+import XCTest
+import SwiftUI
+@testable import LiveViewNative
+
+@MainActor
+final class TextFieldTests: XCTestCase {
+    func testSimple() throws {
+        try assertMatch(#"<textfield placeholder="Type here" />"#) {
+            TextField("Type here", text: .constant(""))
+        }
+        try assertMatch(#"<securefield placeholder="Password" />"#) {
+            SecureField("Password", text: .constant(""))
+        }
+    }
+    func testPrompt() throws {
+        try assertMatch(#"<textfield placeholder="Placeholder" prompt="Prompt" />"#) {
+            TextField("Placeholder", text: .constant(""), prompt: Text("Prompt"))
+        }
+        try assertMatch(#"<securefield placeholder="Placeholder" prompt="Prompt" />"#) {
+            SecureField("Placeholder", text: .constant(""), prompt: Text("Prompt"))
+        }
+    }
+}

Tests/RenderingTests/TextFieldTests.swift

@@ -96,14 +96,14 @@ This is some markdown text [click me](apple.com)
     }
 
     func testFormat() throws {
-        try assertMatch(#"<text format="date-time" value="2023-01-17" />"#) {
-            Text(Date(timeIntervalSince1970: 1673931600.0), format: .dateTime)
+        try assertMatch(#"<text format="date-time" value="0001-01-01T00:00:00.000Z" />"#) {
+            Text(Date.distantPast, format: .dateTime)
         }
         try assertMatch(#"<text format="url">apple.com</text>"#) {
             Text(URL(string: "apple.com")!, format: .url)
         }
-        try assertMatch(#"<text format="iso8601" value="2023-01-17T14:55:01.326Z" />"#) {
-            Text(Date(timeIntervalSince1970: 1673967301.325973), format: .iso8601)
+        try assertMatch(#"<text format="iso8601" value="0001-01-01T00:00:00.000Z" />"#) {
+            Text(Date.distantPast, format: .iso8601)
         }
         try assertMatch(#"<text format="number" value="0.42" />"#) {
             Text(0.42, format: .number)

Tests/RenderingTests/TextTests.swift

@@ -38,8 +38,17 @@ func assertMatch(
         document[document.root()].children(),
         context: LiveContext(coordinator: session.rootCoordinator, url: session.url)
     ).environment(\.coordinatorEnvironment, CoordinatorEnvironment(session.rootCoordinator, document: document))
-    let markupImage = ImageRenderer(content: viewTree.transformEnvironment(\.self, transform: environment).frame(width: size?.width, height: size?.height)).uiImage?.pngData()
-    let viewImage = ImageRenderer(content: view().transformEnvironment(\.self, transform: environment).frame(width: size?.width, height: size?.height)).uiImage?.pngData()
+    
+    let markupImage = snapshot(
+        viewTree
+            .transformEnvironment(\.self, transform: environment),
+        size: size
+    )?.pngData()
+    let viewImage = snapshot(
+        view()
+            .transformEnvironment(\.self, transform: environment),
+        size: size
+    )?.pngData()
 
     if markupImage == viewImage {
         XCTAssert(true)
@@ -51,3 +60,29 @@ func assertMatch(
         XCTAssert(false, "Rendered views did not match. Outputs saved to \(markupURL.path()) and \(viewURL.path())")
     }
 }
+
+private class SnapshotWindow: UIWindow {
+    override var safeAreaInsets: UIEdgeInsets {
+        .zero
+    }
+}
+
+@MainActor
+private func snapshot(_ view: some View, size: CGSize?) -> UIImage? {
+    
+    let controller = UIHostingController(rootView: view)
+    
+    let uiView = controller.view!
+    uiView.bounds = .init(origin: .zero, size: size ?? uiView.intrinsicContentSize)
+    uiView.backgroundColor = .clear
+    
+    let window = SnapshotWindow(frame: uiView.bounds)
+    window.rootViewController = controller
+    window.isHidden = false
+    window.makeKeyAndVisible()
+
+    let renderer = UIGraphicsImageRenderer(size: uiView.bounds.size)
+    return renderer.image { context in
+        uiView.layer.render(in: context.cgContext)
+    }
+}