macOS Support #2588

HeroBanana · 2023-09-14T13:34:51Z

Description

Contains osx (MacOS) support, not completed but partly. Would be nice if we can build on top of this PR.

In order to make Gesture Handler work on macOS, we needed to:

rename ios/ directory to apple/ directory - this makes native modules visible both on iOS and macOS
use NSGestureRecognizer on macOS instead of UIGestureRecognizer - the main difference here is different subclasses, which are listed in Apple documentation page

Test plan

In theory every component made in example (ios) should work for osx, a few are ported to MacOSExample to test gestures.

This PR has been tested both on iOS (example app) and macOS (MacOSExample app).

Screen.Recording.2023-11-08.at.15.03.44.mov

Screen.Recording.2023-11-08.at.15.04.03.mov

HeroBanana · 2023-10-25T08:25:32Z

@jfedak thanks for participating and contributing. What else need to be done to make this ready?

jfedak · 2023-10-25T11:38:46Z

Hi @HeroBanana. First of all, thanks a lot for your PR. It took me some time to learn about gesture handlers on macOS and to review this PR, but in the end I made some changes that should fix everything. My changes include:

refactor of apple/ directory - basically I made code more similar to our react-native-reanimated repo, which makes it easier to maintain in a future
fix of some issues with building repo and handlers logic etc.
new MacOSExample app - I'm going to commit those changes today, as I wanted this app to show all of working handlers

I also plan to test it a bit more, both on macOS and iOS (to make sure everything works fine) and to do the final review.

m-bert · 2023-11-29T14:40:23Z

I also don't know if we want to deal with it in this PR. This is very closely related to my next task (right click support for macOS). Imo it will be better to solve this in another PR as I don't want to do the same thing twice 😃. What do u think?

While it feels like it is something that should be done quickly, I agree that we can leave it for another PR. This one is already pretty big 😅.

m-bert

Few more comments.

m-bert · 2023-11-28T10:33:56Z

apple/RNGestureHandler.m

+  return [RNGestureHandlerEventExtraData
+            forPosition:[recognizer locationInView:recognizer.view]
+            withAbsolutePosition:[recognizer locationInView:recognizer.view.window.contentView]
+            withNumberOfTouches:1 ];


I haven't heard the conversation that you're referring to, but do we really have information only about one pointer?

information about the number of pointers doesn't make any sense on mac, as we only have one pointer.

So how does rotation work if that's the case? Isn't there any option to get how many pointers are currently on touchpad?

m-bert · 2023-11-29T14:49:15Z

apple/Handlers/RNPanHandler.m

+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
+{
+  [self interactionsBegan:touches withEvent:event];
+}


Then please add a comment explaining why it is called in another place.

I know that I probably asked twice about the same super (first why we move it into other function, and then why we move it back), sorry for that. I simply didn't see that it was brought back to interactionsBegan since all of those touches... functions have this call.

apple/Handlers/RNPinchHandler.m

apple/Handlers/RNRotationHandler.m

src/handlers/FlingGestureHandler.ts

src/handlers/LongPressGestureHandler.ts

j-piasecki

(plz wait for @m-bert (and @tomekzaw?) to also approve 🙏)

tomekzaw · 2023-12-07T11:51:01Z

it's gonna take me a while

m-bert

Good job!

tomekzaw

LGTM, left some minor comments. This was a tough one!

MacOSExample/README.md

MacOSExample/src/App.tsx

MacOSExample/src/basic/draggable/index.tsx

MacOSExample/src/basic/tap/index.tsx

apple/Handlers/RNForceTouchHandler.m

apple/Handlers/RNPanHandler.m

tomekzaw

Congrats on this PR! 🎉

HeroBanana · 2023-12-14T10:34:38Z

Thank you @jfedak for your incredible work on this PR.

HeroBanana and others added 11 commits September 14, 2023 13:59

add support for osx pan gesture.

55df064

add macos example project.

79df1b2

add support for yarn berry

d508cc6

add support for osx pinch and rotation gestures.

9b3e011

add support for tap gesture.

275ff2c

make root view gesture simpeler.

8aa2eef

fix yarn.lock

3053c75

fix MacOSExample

ec1baa2

Fix pan gesture example

78885f3

Refactor apple handlers

59109d9

Refactor v2

f53aff2

Fix ios build

5af5002

HeroBanana marked this pull request as draft October 26, 2023 13:58

correct pragma mark definition.

ee67ef2

HeroBanana force-pushed the main branch 3 times, most recently from 249e95f to ee67ef2 Compare October 26, 2023 14:58

jfedak added 5 commits November 3, 2023 14:05

Fix macos

c117347

Add stack to macos example

ea23d45

Merge remote-tracking branch 'upstream/main'

34879b3

Merge remote-tracking branch 'upstream/main'

46ff275

Fix ios

b6aba91

jfedak marked this pull request as ready for review November 8, 2023 11:26

jfedak requested review from j-piasecki, tomekzaw and m-bert November 8, 2023 11:26

Add previous examples

6564d35

tomekzaw changed the title ~~MacOS Support~~ macOS Support Nov 8, 2023

m-bert reviewed Nov 29, 2023

View reviewed changes

jfedak added 7 commits November 29, 2023 17:21

Fix pragma mark

fbaedc3

Put setMinimumNumberOfTouches method inside if statement

4027027

Warnings v2

38731f7

Add endif comments

c672092

Add super call comments

1e98aff

Put pointinside and hittest inside conditional

ce878e2

Delete ScrollView from tap example

fabc8aa

jfedak requested review from j-piasecki and m-bert December 6, 2023 15:34

j-piasecki approved these changes Dec 7, 2023

View reviewed changes

m-bert approved these changes Dec 7, 2023

View reviewed changes

tomekzaw reviewed Dec 11, 2023

View reviewed changes

jfedak added 3 commits December 13, 2023 15:07

Update readme in macos example app

9812017

Fix linter for macos example app

f19f26d

Add some newlines

a683261

jfedak requested a review from tomekzaw December 13, 2023 16:38

tomekzaw approved these changes Dec 13, 2023

View reviewed changes

Merge remote-tracking branch 'upstream/main'

52b9d48

jfedak merged commit f89b1bf into software-mansion:main Dec 14, 2023
6 checks passed

jfedak mentioned this pull request Dec 15, 2023

Force touch warnings #2701

Closed

This was referenced May 21, 2024

[Snyk] Upgrade react-native-gesture-handler from 2.1.3 to 2.16.1 ColeCoffman/JBApp#88

Open

[Snyk] Upgrade react-native-gesture-handler from 2.1.3 to 2.16.1 ColeCoffman/JBApp#93

Open

Abellache-Rabah mentioned this pull request May 25, 2024

[Snyk] Upgrade react-native-gesture-handler from 2.9.0 to 2.16.1 Abellache-Rabah/frontend-hawasli#39

Open

ColeCoffman mentioned this pull request Jun 6, 2024

[Snyk] Upgrade react-native-gesture-handler from 2.1.3 to 2.16.2 ColeCoffman/JBApp#98

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

macOS Support #2588

macOS Support #2588

HeroBanana commented Sep 14, 2023 •

edited by jfedak

Loading

HeroBanana commented Oct 25, 2023

jfedak commented Oct 25, 2023

m-bert commented Nov 29, 2023

m-bert left a comment

m-bert Nov 28, 2023

m-bert Nov 29, 2023

j-piasecki left a comment •

edited

Loading

tomekzaw commented Dec 7, 2023

m-bert left a comment

tomekzaw left a comment

tomekzaw left a comment

HeroBanana commented Dec 14, 2023

macOS Support #2588

macOS Support #2588

Conversation

HeroBanana commented Sep 14, 2023 • edited by jfedak Loading

Description

Test plan

HeroBanana commented Oct 25, 2023

jfedak commented Oct 25, 2023

m-bert commented Nov 29, 2023

m-bert left a comment

Choose a reason for hiding this comment

m-bert Nov 28, 2023

Choose a reason for hiding this comment

m-bert Nov 29, 2023

Choose a reason for hiding this comment

j-piasecki left a comment • edited Loading

Choose a reason for hiding this comment

tomekzaw commented Dec 7, 2023

m-bert left a comment

Choose a reason for hiding this comment

tomekzaw left a comment

Choose a reason for hiding this comment

tomekzaw left a comment

Choose a reason for hiding this comment

HeroBanana commented Dec 14, 2023

HeroBanana commented Sep 14, 2023 •

edited by jfedak

Loading

j-piasecki left a comment •

edited

Loading