Skip to content
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4555310
init the metro starts but having troubles with build
patrycjakalinska Sep 17, 2025
770aa20
going further
patrycjakalinska Sep 22, 2025
07f7f29
it kinda works but smth is sus
patrycjakalinska Sep 22, 2025
62f6ab8
workaround
patrycjakalinska Sep 22, 2025
5345c4c
promotion support
patrycjakalinska Sep 22, 2025
7570147
Add patch to react-native-macos
patrycjakalinska Sep 25, 2025
d28b86b
Merge branch 'main' into @patrycjakalinska/macos-example-bump-0.79
patrycjakalinska Sep 30, 2025
c4ddb39
clang format
patrycjakalinska Sep 30, 2025
f32b396
enabled animation
patrycjakalinska Sep 30, 2025
56cb4f0
stylistic
patrycjakalinska Sep 30, 2025
43c3cde
itll build at last
patrycjakalinska Oct 1, 2025
78ccd95
macos 13
patrycjakalinska Oct 1, 2025
fff62a0
pro-motion adjust
patrycjakalinska Oct 7, 2025
b59ed44
Merge branch 'main' into @patrycjakalinska/macos-example-bump-0.79
patrycjakalinska Oct 7, 2025
a1da50c
review changes
patrycjakalinska Oct 7, 2025
25df1e7
some if got away, but it must be there to prevent the error
patrycjakalinska Oct 8, 2025
aea6b0a
negation
patrycjakalinska Oct 8, 2025
eab43fe
format
patrycjakalinska Oct 8, 2025
2c4614d
review changes
patrycjakalinska Oct 10, 2025
6ce8915
unify cocoapods
patrycjakalinska Oct 10, 2025
0039214
Merge branch 'main' into @patrycjakalinska/macos-example-bump-0.79
patrycjakalinska Oct 16, 2025
ca16fed
review changes
patrycjakalinska Oct 16, 2025
8bc46b7
forgot the bool
patrycjakalinska Oct 16, 2025
ac0fbfa
good catch of undeclared value
patrycjakalinska Oct 16, 2025
ea7c141
Merge branch 'main' into @patrycjakalinska/macos-example-bump-0.79
patrycjakalinska Oct 16, 2025
d1c9760
run macos-build?
patrycjakalinska Oct 16, 2025
c8d3388
integration after merge
patrycjakalinska Oct 16, 2025
51bd8fb
select scheme for yml
patrycjakalinska Oct 16, 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
17 changes: 17 additions & 0 deletions .yarn/patches/react-native-macos-npm-0.79.0-449930c6bc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/React/Base/macOS/RCTPlatformDisplayLink.m b/React/Base/macOS/RCTPlatformDisplayLink.m
index 6ee09fde67a60082ac45764f6c66b7c4ca97e5b9..f639c7b980a7ebe917c472d4c2a134bfc8114a09 100644
--- a/React/Base/macOS/RCTPlatformDisplayLink.m
+++ b/React/Base/macOS/RCTPlatformDisplayLink.m
@@ -134,11 +134,7 @@ - (BOOL)isPaused

- (NSTimeInterval)timestamp
{
- CVTimeStamp now;
- now.version = 0;
- memset(&now, 0 , sizeof(now));
- CVDisplayLinkGetCurrentTime(_displayLink, &now);
- return (NSTimeInterval)now.hostTime / (NSTimeInterval)CVGetHostClockFrequency();
+ return CACurrentMediaTime();
}

- (NSTimeInterval)duration
80 changes: 41 additions & 39 deletions apps/common-app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,44 +38,50 @@ export default function App() {
);
}

const RootApp = IS_MACOS ? ReanimatedApp : Navigator;

return (
<NukeContext value={() => setNuked(true)}>
<SafeAreaProvider>
<GestureHandlerRootView style={flex.fill}>
<NavigationContainer
initialState={navigationState}
linking={{
getPathFromState: (state, options) =>
getPathFromState(state, options).replace(/%2F/g, '/'),
getStateFromPath: (path) => {
const chunks = path.split('/').filter(Boolean);
if (chunks.length === 0) return { routes: [] };

const drawerRoute = chunks[0];
const stackRoutes = chunks.slice(1).map((_, index, array) => ({
name: array.slice(0, index + 1).join('/'),
}));

return {
routes: [
{
name: drawerRoute,
state: {
routes: stackRoutes,
},
<GestureHandlerRootView style={flex.fill}>
<NavigationContainer
initialState={navigationState}
linking={{
getPathFromState: (state, options) =>
getPathFromState(state, options).replace(/%2F/g, '/'),
getStateFromPath: (path) => {
const chunks = path.split('/').filter(Boolean);
if (chunks.length === 0) return { routes: [] };

const drawerRoute = chunks[0];
const stackRoutes = chunks.slice(1).map((_, index, array) => ({
name: array.slice(0, index + 1).join('/'),
}));

return {
routes: [
{
name: drawerRoute,
state: {
routes: stackRoutes,
},
],
};
},
prefixes: [],
}}
onStateChange={updateNavigationState}>
<PortalProvider>
<Navigator />
</PortalProvider>
</NavigationContainer>
</GestureHandlerRootView>
</SafeAreaProvider>
},
],
};
},
prefixes: [],
}}
onStateChange={updateNavigationState}>
<PortalProvider>
{IS_MACOS ? (
<RootApp />
) : (
<SafeAreaProvider>
<RootApp />
</SafeAreaProvider>
)}
</PortalProvider>
</NavigationContainer>
</GestureHandlerRootView>
</NukeContext>
);
}
Expand All @@ -92,10 +98,6 @@ const SCREENS = [
];

function Navigator() {
if (IS_MACOS) {
return <ReanimatedApp />;
}

const Drawer = createDrawerNavigator();
const screens = IS_WEB ? SCREENS : SCREENS.reverse();

Expand Down
8 changes: 8 additions & 0 deletions apps/macos-example/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,11 @@ ruby ">= 2.6.10"
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
gem 'concurrent-ruby', '< 1.3.4'

# Ruby 3.4.0 has removed some libraries from the standard library.
gem 'bigdecimal'
gem 'logger'
gem 'benchmark'
gem 'mutex_m'
48 changes: 27 additions & 21 deletions apps/macos-example/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GEM
base64
nkf
rexml
activesupport (7.2.2.1)
activesupport (7.2.2.2)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -23,14 +23,14 @@ GEM
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
benchmark (0.4.0)
bigdecimal (3.1.9)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.3)
claide (1.1.0)
cocoapods (1.16.2)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.16.2)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -44,8 +44,8 @@ GEM
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.27.0, < 2.0)
cocoapods-core (1.16.2)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -65,11 +65,11 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.3.5)
connection_pool (2.5.1)
drb (2.2.1)
concurrent-ruby (1.3.3)
connection_pool (2.5.4)
drb (2.2.3)
escape (0.0.4)
ethon (0.16.0)
ethon (0.15.0)
ffi (>= 1.15.0)
ffi (1.17.2)
fourflusher (2.3.1)
Expand All @@ -79,40 +79,46 @@ GEM
mutex_m
i18n (1.14.7)
concurrent-ruby (~> 1.0)
json (2.10.2)
json (2.13.2)
logger (1.7.0)
minitest (5.25.5)
molinillo (0.8.0)
mutex_m (0.3.0)
nanaimo (0.4.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.4.2)
rexml (3.4.4)
ruby-macho (2.5.1)
securerandom (0.4.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
typhoeus (1.5.0)
ethon (>= 0.9.0, < 0.16.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.27.0)
xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
nanaimo (~> 0.3.0)
rexml (>= 3.3.6, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 6.1.7.5, != 7.1.0)
benchmark
bigdecimal
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
concurrent-ruby (< 1.3.4)
logger
mutex_m
xcodeproj (< 1.26.0)

RUBY VERSION
ruby 3.3.6p108
ruby 3.2.0p0

BUNDLED WITH
2.6.3
2.6.9
7 changes: 6 additions & 1 deletion apps/macos-example/macos/MacOSExample-macOS/AppDelegate.mm
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification
// You can add your custom initial props in the dictionary below.
// They will be passed down to the ViewController used by React Native.
self.initialProps = @{};

return [super applicationDidFinishLaunching:notification];
}

- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
{
return [self bundleURL];
}

- (NSURL *)bundleURL
{
#if DEBUG
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
Expand Down
Loading
Loading