Fix ViewGraphNode layout caching; fixes fixedSize (+tests)

Author: stackotter

Sources/SwiftCrossUI/ViewGraph/ViewGraphNode.swift

@@ -226,16 +226,18 @@ public class ViewGraphNode<NodeView: View, Backend: AppBackend> {
             // If the view has already been updated this update cycle and claims
             // to be fixed size (maximumSize == minimumSize) then reuse the current
             // result.
-            let maximumSize = SIMD2(
-                currentLayout.size.maximumWidth,
-                currentLayout.size.maximumHeight
-            )
-            let minimumSize = SIMD2(
-                Double(currentLayout.size.minimumWidth),
-                Double(currentLayout.size.minimumHeight)
-            )
-            if maximumSize == minimumSize {
-                return currentLayout
+            if lastProposedSize.concrete != nil && proposedSize.concrete != nil {
+                let maximumSize = SIMD2(
+                    currentLayout.size.maximumWidth,
+                    currentLayout.size.maximumHeight
+                )
+                let minimumSize = SIMD2(
+                    Double(currentLayout.size.minimumWidth),
+                    Double(currentLayout.size.minimumHeight)
+                )
+                if maximumSize == minimumSize {
+                    return currentLayout
+                }
             }
         }
 

Tests/SwiftCrossUITests/SwiftCrossUITests.swift

@@ -83,6 +83,14 @@ final class SwiftCrossUITests: XCTestCase {
             )
             backend.setChild(ofWindow: window, to: viewGraph.rootNode.widget.into())
 
+            // We have to run this twice due to the computeLayout/commit change
+            // to the View protocol. This should get neater once ViewGraph uses
+            // computeLayout/commit as well instead of updates with dryRun.
+            _ = viewGraph.update(
+                proposedSize: SIMD2(200, 200),
+                environment: environment,
+                dryRun: true
+            )
             let result = viewGraph.update(
                 proposedSize: SIMD2(200, 200),
                 environment: environment,
@@ -104,6 +112,76 @@ final class SwiftCrossUITests: XCTestCase {
             )
         }
 
+        func testTextLayout() {
+            let backend = AppKitBackend()
+            let text = Text("Lorem ipsum dolor sit amet")
+            let widget = text.asWidget(backend: backend)
+            let environment = EnvironmentValues(backend: backend)
+            let children = text.children(backend: backend, snapshots: nil, environment: environment)
+            let idealLayout = text.computeLayout(
+                widget,
+                children: children,
+                proposedSize: .ideal,
+                environment: environment,
+                backend: backend
+            )
+            let fixedHeightLayout = text.computeLayout(
+                widget,
+                children: children,
+                proposedSize: SizeProposal(idealLayout.size.size.x / 2, nil),
+                environment: environment,
+                backend: backend
+            )
+            let layout = text.computeLayout(
+                widget,
+                proposedSize: SizeProposal(idealLayout.size.size.x / 2, 1000),
+                environment: environment,
+                backend: backend
+            )
+            XCTAssert(
+                idealLayout.size.size.y != fixedHeightLayout.size.size.y,
+                "Halving text width didn't affect text height"
+            )
+            XCTAssertEqual(fixedHeightLayout.size, layout.size, "Excess height changed text size")
+        }
+
+        func testFixedSizeLayout() {
+            let backend = AppKitBackend()
+            let text = Text("Lorem ipsum dolor sit amet")
+                .fixedSize(horizontal: false, vertical: true)
+            let window = backend.createWindow(withDefaultSize: SIMD2(200, 200))
+            let environment = EnvironmentValues(backend: backend)
+                .with(\.window, window)
+            let children = text.children(backend: backend, snapshots: nil, environment: environment)
+            let widget = text.asWidget(children, backend: backend)
+            let idealLayout = text.computeLayout(
+                widget,
+                children: children,
+                proposedSize: .ideal,
+                environment: environment,
+                backend: backend
+            )
+            let fixedHeightLayout = text.computeLayout(
+                widget,
+                children: children,
+                proposedSize: SizeProposal(idealLayout.size.size.x / 2, nil),
+                environment: environment,
+                backend: backend
+            )
+            let layout = text.computeLayout(
+                widget,
+                children: children,
+                proposedSize: SizeProposal(idealLayout.size.size.x / 2, 1000),
+                environment: environment,
+                backend: backend
+            )
+            XCTAssert(
+                idealLayout.size.size.y != fixedHeightLayout.size.size.y,
+                "Halving text width didn't affect text height"
+            )
+            XCTAssertEqual(fixedHeightLayout.size, layout.size, "Excess height changed text size")
+        }
+
         static func snapshotView(_ view: NSView) throws -> Data {
             view.wantsLayer = true
             view.layer?.backgroundColor = CGColor.white