Make osx example utilise the common example app #3055

latekvo · 2024-08-21T15:43:06Z

Description

This PR makes the MacOS example utilise the common example app.
This change will allow for more in-depth testing of MacOS functionalities.

For now, it's still work in progress

Test plan

m-bert

I hope it won't have much conflicts with #2919 😅

MacOSExample/package.json

latekvo · 2024-08-22T00:22:10Z

I hope it won't have much conflicts with #2919 😅

I hope there won't be any, App.tsx should remain minimally changed with just a couple of styles differing, while the rest of the changes should be out of scope of #2919

Regardless, this PR is still WIP, and only works on my end due to some modifications to App.tsx structure, as I'm still working out some rendering inconsistencies, which are hopefully caused by default styling differences.

…s of transitioning

latekvo · 2024-08-23T13:27:41Z

As of now, the common examples are working on MacOS, and I am still working on completely removing the MacOSExample directory, but that may prove challenging as currently we're relying on the babel.config.js to make the entire app work on MacOS, which unfortunately would prevent other platforms from using the examples if we were to naively marge both of these folders in the state that they are.

(cherry picked from commit 72fd9dd)

latekvo · 2024-09-25T09:03:04Z

Screen.Recording.2024-09-24.at.18.43.34.mov

Fixed header being squashed in these commits: e3c098d, 6a6f885, 38f861d (cherry-picked from this branch)

…in-primary-example

latekvo · 2024-09-26T11:09:59Z

Removed chevrons in 61455cf, couldn't find a way to properly load their custom font.
Tried:

the formal method of adding fonts found here
modifying react-native-asset tool to work with macos, the tool worked but the fonts still weren't present
started working on dynamic font loader based on this 2012 article and this StackOverflow answer but decided it's not worth spending too much time on this feature for now.

All other known bugs have been resolved by now as far as i know.

Please let me know if there're any other changes you'd like to see, or if it's ok to merge this PR.

…in-primary-example

change runner version from latest -> 15 for more predictability

MacOSExample/babel.config.js

MacOSExample/macos/Podfile

MacOSExample/package.json

example/App.tsx

example/src/ListWithHeader/Header.tsx

…hub.com/software-mansion/react-native-gesture-handler into @latekvo/support-osx-in-primary-example

example/src/ListWithHeader/Header.tsx

j-piasecki

Looks good, few things I noticed:

Draggable example using the old API doesn't work, I don't recall whether it did at some point (cc @m-bert), but it might be worth looking into
Pressable doesn't work, which is not ideal

Bot those can be addressed in follow-ups, as this PR has been going on for quite some time

j-piasecki · 2024-10-01T11:05:19Z

example/src/ListWithHeader/Header.tsx

+export const HEADER_HEIGHT =
+  Platform.OS === 'web' ? 64 : Platform.OS === 'macos' ? 128 : 192;


Can we make the header the same as on web? Images seem to always be stretched, it may make sense to set explicit sizes for them instead of relying on the platform to properly contain them.

Sure, I'll open a separate PR for it to avoid cluttering this one any further.

m-bert · 2024-10-01T11:39:06Z

Okay, I've looked into Draggable example and it seems to be the problem with NativeViewGestureHandler (something else than I expected). I'll dive into it later.

Also what I've noticed is that sometimes app gets stuck at bundling overlay:

j-piasecki

To sum up, I think we can merge this as-is currently (but please, use Hermes) and then create follow-up issues for:

header looking weird on macOS
Draggable example not working (for other reasons than expected)
Pressables not working on macOS
app being stuck on loading bundle screen

and keep working on these

(use Maintainer issue label to stop bot from bothering you).

…in-primary-example

m-bert

Remember to address things mentioned by @j-piasecki in follow-ups 😅

## Description There are 2 `Pressable` entries, likely as a result of merge conflicts which occurred between these two PRs: [Update examples](https://github.com/software-mansion/react-native-gesture-handler/pull/2919/files) and [Make osx example utilise the common example app](#3055)

latekvo added 13 commits August 21, 2024 13:46

prepare example-app package.json for osx support

50efeeb

fix invalid paths in app.tsx

4f533bf

rewire macos example path to the common example

c1daaab

add aliases necessary to use the common example

308b71c

add macos support to root package.json, update podfile

c44ce74

sync package versions, add missing packages

edf80e6

update podfiles, add missing macos files

8b47092

remove no-longer-existing react postinstall function

6adeffa

update pod versions to resolve RTC-Folly conflicts

ce3fcb7

enable hermes to unlock some neccessary native functionalities

0c60673

update reanimated to a version supporting turbomodules on macos

be5b0ea

disable shadow styles which are unsupported on macos

8b884c7

add necessary styles which are not default on macos

d4a0d2d

m-bert reviewed Aug 21, 2024

View reviewed changes

MacOSExample/package.json Outdated Show resolved Hide resolved

latekvo added 5 commits August 23, 2024 11:10

fix styles to correctly display example

541eafa

add macos examples to check if anything stopped working in the proces…

0d6c0b6

…s of transitioning

remove the need for react-native when building for macos

7399ccc

rename macos example folder

98b35de

move former macos examples to common example app

2fbd75a

latekvo added 8 commits August 23, 2024 15:39

cleanup package.json

f11f51a

add config overwrite to podfile, remove legacy code from podfile

5365b95

move macos module resolving to metro instead of babel

cce7491

change babel config to the one used by common example

1e9fac6

remove macos from core package dependencies

29dc2ca

fix project config to require manual intervention in one less place

02a96fa

modify metro config to use expo and reseamble the common example one

05a864d

add macos file resolver to common app metro config

fa5ce90

fix width scaling in collapsed state

38f861d

(cherry picked from commit 72fd9dd)

latekvo added 4 commits September 25, 2024 11:06

remove simpleRotate

10530ea

Merge remote-tracking branch 'origin/main' into @latekvo/support-osx-…

45c696e

…in-primary-example

fix header alignment for a wider range of window widths

35fa6f0

disable chevrons on macos

61455cf

latekvo requested review from m-bert and j-piasecki September 26, 2024 11:03

latekvo added 4 commits September 27, 2024 12:26

Merge remote-tracking branch 'origin/main' into @latekvo/support-osx-…

65715c8

…in-primary-example

Resolve merge conflicts, merge

80901f0

fix camera crashing on macos, add missing package

6f8f4bc

Update macos-build.yml

8040296

change runner version from latest -> 15 for more predictability

m-bert requested changes Sep 27, 2024

View reviewed changes

latekvo added 2 commits September 30, 2024 16:01

remove comments, fix config files, stop using hermes by default

46a46ac

Merge branch '@latekvo/support-osx-in-primary-example' of https://git…

cb1041d

…hub.com/software-mansion/react-native-gesture-handler into @latekvo/support-osx-in-primary-example

m-bert reviewed Oct 1, 2024

View reviewed changes

example/src/ListWithHeader/Header.tsx Outdated Show resolved Hide resolved

j-piasecki reviewed Oct 1, 2024

View reviewed changes

j-piasecki approved these changes Oct 1, 2024

View reviewed changes

latekvo added 2 commits October 1, 2024 17:26

enable hermes on macos

42a6a59

simplify header code

187dc15

latekvo requested a review from m-bert October 1, 2024 15:35

Merge remote-tracking branch 'origin/main' into @latekvo/support-osx-…

062445f

…in-primary-example

m-bert approved these changes Oct 1, 2024

View reviewed changes

latekvo merged commit 2183711 into main Oct 1, 2024
3 checks passed

latekvo deleted the @latekvo/support-osx-in-primary-example branch October 1, 2024 16:17

latekvo mentioned this pull request Oct 4, 2024

Remove redundant example entry in App.tsx #3138

Merged

m-bert restored the @latekvo/support-osx-in-primary-example branch October 24, 2024 12:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make osx example utilise the common example app #3055

Make osx example utilise the common example app #3055

latekvo commented Aug 21, 2024 •

edited

Loading

m-bert left a comment

latekvo commented Aug 22, 2024

latekvo commented Aug 23, 2024 •

edited

Loading

latekvo commented Sep 25, 2024

latekvo commented Sep 26, 2024

j-piasecki left a comment

j-piasecki Oct 1, 2024

latekvo Oct 1, 2024

m-bert commented Oct 1, 2024

j-piasecki left a comment

m-bert left a comment

		export const HEADER_HEIGHT =
		Platform.OS === 'web' ? 64 : Platform.OS === 'macos' ? 128 : 192;

Make osx example utilise the common example app #3055

Make osx example utilise the common example app #3055

Conversation

latekvo commented Aug 21, 2024 • edited Loading

Description

Test plan

m-bert left a comment

Choose a reason for hiding this comment

latekvo commented Aug 22, 2024

latekvo commented Aug 23, 2024 • edited Loading

latekvo commented Sep 25, 2024

latekvo commented Sep 26, 2024

j-piasecki left a comment

Choose a reason for hiding this comment

j-piasecki Oct 1, 2024

Choose a reason for hiding this comment

latekvo Oct 1, 2024

Choose a reason for hiding this comment

m-bert commented Oct 1, 2024

j-piasecki left a comment

Choose a reason for hiding this comment

m-bert left a comment

Choose a reason for hiding this comment

latekvo commented Aug 21, 2024 •

edited

Loading

latekvo commented Aug 23, 2024 •

edited

Loading