Skip to content

Commit 7ed9fcd

Browse files
authored
Remove force unwrap (#177)
1 parent fa41b70 commit 7ed9fcd

File tree

5 files changed

+21
-3
lines changed

5 files changed

+21
-3
lines changed

DemoApp/DemoApp/TestViews/PreviewVariants.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ extension NamedViewModifier {
6969
.init(name: "XXL Text Size", value: { $0.dynamicTypeSize(.xxxLarge) })
7070
}
7171

72+
@available(macOS, unavailable)
73+
@available(watchOS, unavailable)
74+
@available(visionOS, unavailable)
75+
@available(tvOS, unavailable)
7276
static var accessibility: NamedViewModifier {
7377
.init(name: "Accessibility", value: { $0.emergeAccessibility(true) })
7478
}
@@ -81,6 +85,10 @@ extension NamedViewModifier {
8185
extension [NamedViewModifier] {
8286
/// The default named view modifiers in a ``PreviewVariants``.
8387
static var previewDefault: [NamedViewModifier] {
88+
#if os(iOS)
8489
[.unmodified, .darkMode, .xxlTextSize, .rtl, .accessibility, .landscape]
90+
#else
91+
[.unmodified, .darkMode, .rtl]
92+
#endif
8593
}
8694
}

DemoApp/DemoApp/TestViews/RideShareButton.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ struct RideShareButtonView_Previews: PreviewProvider {
3636
.previewDisplayName("Ride Share Button View - Light")
3737
// This should never show as a diff
3838
.emergeSnapshotPrecision(0.0)
39+
#if os(iOS)
3940
.emergeRenderingMode(.coreAnimation)
41+
#endif
4042

4143
RideShareButtonView(title: "Request Ride") {
4244
print("Button tapped")
@@ -52,7 +54,9 @@ struct RideShareButtonView_Previews: PreviewProvider {
5254
.previewLayout(.sizeThatFits)
5355
.padding()
5456
.previewDisplayName("Ride Share Button View - Light")
57+
#if os(iOS)
5558
.emergeRenderingMode(.coreAnimation)
5659
.emergeAccessibility(true)
60+
#endif
5761
}
5862
}

Sources/SnapshotPreferences/AccessibiltyPreference.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ struct AccessibilityPreferenceKey: PreferenceKey {
1919
}
2020

2121
extension View {
22-
@available(iOS 15, *)
22+
@available(macOS, unavailable)
23+
@available(watchOS, unavailable)
24+
@available(visionOS, unavailable)
25+
@available(tvOS, unavailable)
2326
public func emergeAccessibility(_ enabled: Bool?) -> some View {
2427
preference(key: AccessibilityPreferenceKey.self, value: enabled)
2528
}

Sources/SnapshotPreferences/RenderingModePreference.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ struct RenderingModePreferenceKey: PreferenceKey {
1818
}
1919

2020
extension View {
21-
@available(iOS 15, *)
21+
@available(macOS, unavailable)
22+
@available(watchOS, unavailable)
23+
@available(visionOS, unavailable)
24+
@available(tvOS, unavailable)
2225
public func emergeRenderingMode(_ renderingMode: EmergeRenderingMode?) -> some View {
2326
preference(key: RenderingModePreferenceKey.self, value: renderingMode?.rawValue)
2427
}

Sources/SnapshotPreviewsCore/AppKitRenderingStrategy.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ final class AppKitContainer: NSHostingController<EmergeModifierView>, ScrollExpa
133133

134134
if !supportsExpansion {
135135
// Reset the scroll point
136-
(firstScrollView as! NSScrollView).documentView!.scroll(NSPoint(x: 0, y: 0))
136+
(firstScrollView as? NSScrollView)?.documentView?.scroll(NSPoint(x: 0, y: 0))
137137
}
138138

139139
updateHeight {

0 commit comments

Comments
 (0)