Make SwiftUI Logic Also use RenderingError enum #210
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NicoHinderling
commented
Nov 21, 2024
| import UIKit | ||
| import AccessibilitySnapshotCore | ||
| import SnapshotSharedModels | ||
| import CoreFoundation | ||
|
|
||
| public enum RenderingError: Error { | ||
| case failedRendering(CGSize) | ||
| case maxSize(CGSize) | ||
| case expandingViewTimeout(CGSize) | ||
| } |
There was a problem hiding this comment.
Moved this outside of the #if canImport(UIKit) && !os(visionOS) && !os(watchOS) && !os(tvOS) block. I had to import CoreFoundation to get CGSize, but I think that's fine for both UIKit / AppKit purposes
lmk otherwise
NicoHinderling
force-pushed
the
nico-swiftui-error-test
branch
from
f5e4501
to
b0ddd87
Compare
noahsmartin
reviewed
Nov 21, 2024
| @@ -41,7 +37,7 @@ public class SwiftUIRenderingStrategy: RenderingStrategy { | |||
| if let image { | |||
| completion(SnapshotResult(image: .success(image), precision: wrappedView.precision, accessibilityEnabled: wrappedView.accessibilityEnabled, accessibilityMarkers: [], colorScheme: colorScheme, appStoreSnapshot: wrappedView.appStoreSnapshot)) | |||
| } else { | |||
| completion(SnapshotResult(image: .failure(SwiftUIRenderingError.renderingError), precision: wrappedView.precision, accessibilityEnabled: wrappedView.accessibilityEnabled, accessibilityMarkers: [], colorScheme: colorScheme, appStoreSnapshot: wrappedView.appStoreSnapshot)) | |||
| completion(SnapshotResult(image: .failure(RenderingError.failedRendering(image?.size ?? .zero)), precision: wrappedView.precision, accessibilityEnabled: wrappedView.accessibilityEnabled, accessibilityMarkers: [], colorScheme: colorScheme, appStoreSnapshot: wrappedView.appStoreSnapshot)) | |||
There was a problem hiding this comment.
image is always null here because this is in the else block of the if let so we can just use .zero?
noahsmartin
approved these changes
Nov 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We had an issue where some mac previews were failing to render, and it was unclear why. We should have had the "zero width" situation handled, but it was only configured for UIKit rendering, not AppKit rendering.
I went ahead and made the AppKit/SwiftUI rendering use the same error enum type. Our backend/web should then parse this correctly