Merge remote-tracking branch 'GitHub/main' into feature/macro-extraction

# Conflicts: # .github/workflows/build-all-targets.yml
elgatosf · Feb 28, 2024 · 787b54f · 787b54f
2 parents 61d2889 + 2966b78
commit 787b54f
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 26 deletions.
diff --git a/.github/workflows/build-all-targets.yml b/.github/workflows/build-all-targets.yml
@@ -17,8 +17,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build Simulator
-        run:  |
-          set -o pipefail && xcodebuild -scheme StreamDeckSimulator -destination "platform=iOS Simulator,name=iPad Air (5th generation),OS=latest" -skipMacroValidation | xcpretty
+        run: set -o pipefail && xcodebuild -scheme StreamDeckSimulator -destination "platform=iOS Simulator,name=iPad Air (5th generation),OS=latest" -skipMacroValidation | xcpretty
 
       - name: Build Example 
         run: |

diff --git a/Sources/StreamDeckKit/Layout/StreamDeckLayout.swift b/Sources/StreamDeckKit/Layout/StreamDeckLayout.swift
@@ -58,21 +58,20 @@ public struct StreamDeckLayout<KeyArea: View, WindowArea: View>: View {
         let caps = context.device.capabilities
 
         VStack(alignment: .leading, spacing: 0) {
-            if let keyAreaSize = caps.keyAreaRect?.size {
-                let keyAreaContext = context.with(
-                    dirtyMarker: .screen,
-                    size: keyAreaSize,
-                    index: -1
-                )
+            let keyAreaSize = caps.keyAreaRect?.size ?? .zero
+            let keyAreaContext = context.with(
+                dirtyMarker: .screen,
+                size: keyAreaSize,
+                index: -1
+            )
 
-                keyArea()
-                    .frame(width: keyAreaSize.width, height: keyAreaSize.height)
-                    .padding(.top, caps.keyAreaTopSpacing)
-                    .padding(.leading, caps.keyAreaLeadingSpacing)
-                    .padding(.trailing, caps.keyAreaTrailingSpacing)
-                    .padding(.bottom, caps.keyAreaBottomSpacing)
-                    .environment(\.streamDeckViewContext, keyAreaContext)
-            }
+            keyArea()
+                .frame(width: keyAreaSize.width, height: keyAreaSize.height)
+                .padding(.top, caps.keyAreaTopSpacing)
+                .padding(.leading, caps.keyAreaLeadingSpacing)
+                .padding(.trailing, caps.keyAreaTrailingSpacing)
+                .padding(.bottom, caps.keyAreaBottomSpacing)
+                .environment(\.streamDeckViewContext, keyAreaContext)
 
             if let windowRect = caps.windowRect {
                 let windowSize = windowRect.size

diff --git a/Sources/StreamDeckKit/Layout/StreamDeckLayoutRenderer.swift b/Sources/StreamDeckKit/Layout/StreamDeckLayoutRenderer.swift
@@ -37,16 +37,10 @@ final class StreamDeckLayoutRenderer {
 
     init() {}
 
-    @MainActor
-    init<Content: View>(content: Content, device: StreamDeck) {
-        render(content, on: device)
-    }
-
     @MainActor
     func render<Content: View>(_ content: Content, on device: StreamDeck) {
         cancellable?.cancel()
-
-        dirtyViews = .init([.screen])
+        dirtyViews = [.screen]
 
         let context = StreamDeckViewContext(
             device: device,
@@ -90,7 +84,7 @@ final class StreamDeckLayoutRenderer {
 
         defer { dirtyViews.removeAll(keepingCapacity: true) }
 
-        log("requires updates of \(Array(dirtyViews))")
+        log("requires updates of \(dirtyViews)")
 
         guard !dirtyViews.contains(.screen) else {
             log("complete screen required")

diff --git a/Sources/StreamDeckKit/Layout/StreamDeckViewContext.swift b/Sources/StreamDeckKit/Layout/StreamDeckViewContext.swift
@@ -61,6 +61,7 @@ public struct StreamDeckViewContext {
 
     @MainActor
     public func updateRequired() {
+        guard size != .zero else { return } // Pedal
         device.renderer.updateRequired(dirtyMarker)
     }
 

diff --git a/Tests/StreamDeckSDKTests/Helper/StreamDeckRobot.swift b/Tests/StreamDeckSDKTests/Helper/StreamDeckRobot.swift
@@ -63,15 +63,18 @@ final class StreamDeckRobot {
     func use<Content: View>(
         _ product: StreamDeckProduct,
         rendering content: Content,
+        waitForLayout: Bool = true,
         file: StaticString = #file,
         line: UInt = #line
     ) async throws {
         use(product)
 
         await device.render(content)
 
-        try await recorder.$screens.waitFor(file: file, line: line) {
-            !$0.isEmpty
+        if waitForLayout {
+            try await recorder.$screens.waitFor(file: file, line: line) {
+                !$0.isEmpty
+            }
         }
     }
 

diff --git a/Tests/StreamDeckSDKTests/StreamDeckLayoutTests.swift b/Tests/StreamDeckSDKTests/StreamDeckLayoutTests.swift
@@ -134,4 +134,39 @@ final class StreamDeckLayoutTests: XCTestCase {
             await robot.assertSnapshot(\.windowImages[section].image, as: .image, named: "section_\(section)")
         }
     }
+
+    // MARK: Pedal
+
+    func test_key_events_on_pedal() async throws {
+        var events = [(index: Int, pressed: Bool)]()
+
+        try await robot.use(.pedal, rendering: StreamDeckLayout(keyArea: {
+            StreamDeckKeyAreaLayout { context in
+                StreamDeckKeyView { pressed in
+                    events.append((index: context.index, pressed: pressed))
+                } content: { EmptyView() }
+            }
+        }), waitForLayout: false)
+
+        for key in 0 ..< 3 {
+            try await robot.keyPress(key, pressed: true, waitForLayout: false)
+            try await robot.keyPress(key, pressed: false, waitForLayout: false)
+        }
+
+        await robot.digest()
+
+        robot.assertEqual(\.screens.count, 0)
+        robot.assertEqual(\.keys.count, 0)
+
+        XCTAssertEqual(events.count, 6)
+
+        for key in 0 ..< 3 {
+            XCTAssertEqual(events[key * 2].index, key)
+            XCTAssertEqual(events[key * 2 + 1].index, key)
+
+            XCTAssertTrue(events[key * 2].pressed)
+            XCTAssertFalse(events[key * 2 + 1].pressed)
+        }
+    }
+
 }