Skip to content

fix(VibrancyView): remove hit test override #3866

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
Saadnajmi merged 2 commits into from
Mar 10, 2025
Merged

fix(VibrancyView): remove hit test override #3866

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
7a1312f
fix(VibrancyView): remove hit test override
Saadnajmi Mar 10, 2025
208f3b4
Change files
Saadnajmi Mar 10, 2025
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-vibrancy-view-0511e685-812d-4174-955f-b2530fe2a8ab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "fix(VibrancyView): remove hit test override",
"packageName": "@fluentui-react-native/vibrancy-view",
"email": "[email protected]",
"dependentChangeType": "patch"
}
37 changes: 9 additions & 28 deletions packages/experimental/VibrancyView/macos/FixedVisualEffectView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,19 @@
import AppKit

#if USE_REACT_AS_MODULE
import React
#endif // USE_REACT_AS_MODULE
import React
#endif // USE_REACT_AS_MODULE

/// React Native macOS inherits some assumptions from React Native on iOS / UIKit.
/// This serves as an issue when we want to write our own native components derived from NSView, as we don't
/// inherit the "fixes" we need from RCTView to get views working properly.. This subclass "fixes" the minimal amount
/// so that our native component works as expected.
internal class FixedVisualEffectView: NSVisualEffectView {

/// React Native macOS uses a flipped coordinate space by default. to match the other platforms.
/// Let's stay consistent and ensure any views hosting React Native views are also flipped.
/// This helps RCTTouchHandler register clicks in the right location, and ensures `layer.geometryFlipped` is true.
override var isFlipped: Bool {
return true
}

/// This subclass is necessary due to differences' in hitTest()'s implementation between iOS and macOS
/// On iOS / UIKit, hitTest(_ point:, with event:) takes a point in the receiver's local coordinate system.
/// On macOS / AppKit, hitTest(_ point) takes a point in the reciever's superviews' coordinate system.
/// RCTView assumes the iOS implementation, so it has an override of hitTest(_ point). Let's copy the
/// implementatation to our native component, so that clicks for subviews of type RCTView are handled properly.
/// Another solution would be to add an RCTView subview that covers the full bounds of our native view
open override func hitTest(_ point: NSPoint) -> NSView? {
var pointForHitTest = point
for subview in subviews {
if let subview = subview as? RCTView {
pointForHitTest = subview.convert(point, from: superview)
}
let result = subview.hitTest(pointForHitTest)
if (result != nil) {
return result
}
}
return nil
}
/// React Native macOS uses a flipped coordinate space by default. to match the other platforms.
/// Let's stay consistent and ensure any views hosting React Native views are also flipped.
/// This helps RCTTouchHandler register clicks in the right location, and ensures `layer.geometryFlipped` is true.
override var isFlipped: Bool {
return true
}
}
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18845,8 +18845,8 @@ __metadata:
linkType: hard

"react-native-macos@npm:^0.73.0":
version: 0.73.35
resolution: "react-native-macos@npm:0.73.35"
version: 0.73.36
resolution: "react-native-macos@npm:0.73.36"
dependencies:
"@jest/create-cache-key-function": "npm:^29.6.3"
"@react-native-community/cli": "npm:12.3.6"
Expand Down Expand Up @@ -18890,7 +18890,7 @@ __metadata:
react: 18.2.0
bin:
react-native-macos: cli.js
checksum: 10c0/365b0886e810bbce800a781d4eb186e07d34b8c0daadb25efd4235d3afab4e806b36a44aceef751c586c787ae392ad1c9bee87b3f3475d8769d37de5b8dce4b5
checksum: 10c0/c58570ab2dd5836a96ccb477e60e8462a89c730d0c4ab3edae780fb0963fc6ca944dcbc321e2e8314e727c41de56a296327b3534fadc6031b62ae53bca54b226
languageName: node
linkType: hard

Expand Down
Loading