Skip to content
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.

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

SwiftUI View Extension: Improve pointer interaction #1961

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions ios/FluentUI/Core/SwiftUI+ViewModifiers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ extension View {
/// Enables iPad Pointer interaction for the view if available.
/// - Parameter isEnabled: Whether the pointer interaction should be enabled.
/// - Returns: The modified view.
func pointerInteraction(_ isEnabled: Bool) -> AnyView {
if isEnabled {
return AnyView(self.hoverEffect())
@ViewBuilder func pointerInteraction(_ isEnabled: Bool) -> some View {
if #available(iOS 17.0, *) {
hoverEffect(isEnabled: isEnabled)
} else if isEnabled {
hoverEffect()
} else {
self
}

return AnyView(self)
}

/// Measures the size of a view, monitors when its size is updated, and takes a closure to be called when it does
Expand Down