Skip to content

Fix rotate effect merging for OpenSwiftUI renderer #879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kyle-Ye merged 2 commits into from
May 27, 2026
Merged

Fix rotate effect merging for OpenSwiftUI renderer #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f2cf5
Fix rotate issue
Kyle-Ye May 27, 2026
4c634be
Enable OSUI rotate UI tests
Kyle-Ye May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Example/OpenSwiftUIUITests/Layout/Stack/ZStackIndexUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Testing
import SnapshotTesting

@MainActor
@Suite(.snapshots(record: .never, diffTool: diffTool), .disabled(if: viewRendererVendor == .osui, "rotate is not supported"))
@Suite(.snapshots(record: .never, diffTool: diffTool))
struct ZStackIndexUITests {
@Test
func rotateOverlap() {
Expand Down
2 changes: 1 addition & 1 deletion Example/OpenSwiftUIUITests/Render/GeometryEffect/Rotation3DEffectUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Testing
import SnapshotTesting

@MainActor
@Suite(.snapshots(record: .never, diffTool: diffTool), .disabled(if: viewRendererVendor == .osui, "rotate is not supported"))
@Suite(.snapshots(record: .never, diffTool: diffTool))
struct Rotation3DEffectUITests {
@Test
func rotation3DEffect() {
Expand Down
2 changes: 1 addition & 1 deletion Example/OpenSwiftUIUITests/Render/GeometryEffect/RotationEffectUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Testing
import SnapshotTesting

@MainActor
@Suite(.snapshots(record: .never, diffTool: diffTool), .disabled(if: viewRendererVendor == .osui, "rotate is not supported"))
@Suite(.snapshots(record: .never, diffTool: diffTool))
struct RotationEffectUITests {
@Test
func rotationEffect() {
Expand Down
20 changes: 7 additions & 13 deletions Sources/OpenSwiftUICore/Render/DisplayList/DisplayListViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,20 +168,14 @@ extension DisplayList.ViewUpdater {
into state: inout State,
requirements: inout MergedViewRequirements
) {
switch transform {
case let .affine(transform):
state.adjust(for: transform)
state.transform = transform.concatenating(state.transform)
if let affineTransform = transform.affineTransform {
state.transform = affineTransform.concatenating(state.transform)
state.adjust(for: affineTransform)
Copy link
Copy Markdown

@augmentcode augmentcode Bot May 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

transform.affineTransform now includes .rotation, so state.adjust(for:) will run for arbitrary rotation matrices. adjust(for:) derives a scale factor from CGSize(width: 1, height: 1).applying(transform).width, which can be 0/negative for pure rotations (e.g. 45°/90°) and may blow up/flip inherited shadow/blur radii.

Severity: medium

Fix This in Augment

🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.

state.versions.transform.combine(with: item.version)
requirements.insert(.visibleContent)
case let .projection(transform) where transform.isAffine:
let affine = CGAffineTransform(transform)
state.adjust(for: affine)
state.transform = affine.concatenating(state.transform)
state.versions.transform.combine(with: item.version)
requirements.insert(.visibleContent)
default:
requirements.formUnion([.inheritedView, .visibleContent])
} else if let projectionTransform = transform.projectionTransform {
if !projectionTransform.isIdentity {
requirements.insert(.itemView)
}
}
}

Expand Down
Loading