Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
5cf6d36
Adjust code to new API
staszekscp Jun 3, 2025
000af4c
Fix appearing native header
staszekscp Jun 3, 2025
0c996d9
Fix web errors so the app opens
staszekscp Jun 3, 2025
25c47d0
Remove unnecessary patches
staszekscp Jun 3, 2025
2a9666b
Remove unnecessary line in webpack.common.ts
staszekscp Jun 3, 2025
9f0d2df
Merge remote-tracking branch 'origin/main' into bump/react-navigation-7
staszekscp Jun 3, 2025
1c2e13c
Remove keyboardHandling patch
staszekscp Jun 3, 2025
81fede7
Fix animation on Android
staszekscp Jun 3, 2025
0891793
Fix option value for
staszekscp Jun 3, 2025
e055998
Fix wrong navigation arguments in
staszekscp Jun 3, 2025
d4564d6
Remove unnecessary patch
staszekscp Jun 4, 2025
00eb867
Remove unnecessary patches
staszekscp Jun 4, 2025
f46cd3c
Fix tabPositionAnimation by providing the correct value
staszekscp Jun 4, 2025
ad98592
Remove ios-custom-animation-transition patch
staszekscp Jun 4, 2025
0b842b5
navigation initial patch
sumo-slonik Jun 4, 2025
5115586
add stack patch
sumo-slonik Jun 4, 2025
9670918
add stack patch
sumo-slonik Jun 4, 2025
d4973f6
add stack patch
sumo-slonik Jun 4, 2025
d742147
Migrate IntegrationManager patch in @react-navigation/native-stack
staszekscp Jun 5, 2025
cc11905
Migrate patch with CustomScreenOptions
staszekscp Jun 5, 2025
fc16e5f
Start fixing type errors
staszekscp Jun 5, 2025
0ece295
fixed patch
sumo-slonik Jun 5, 2025
fa76e30
Fix typing of useNavigationBuilder
staszekscp Jun 6, 2025
b4407d7
add findFocusedRouteKey
sumo-slonik Jun 6, 2025
9cc23dd
fix createMemoryHistory
sumo-slonik Jun 6, 2025
a3cee76
fix useLinking
sumo-slonik Jun 6, 2025
acad4ff
add edge drag gesture monitor
sumo-slonik Jun 6, 2025
455cc0a
fix dont detach screen
sumo-slonik Jun 6, 2025
701d1bc
rename patch
sumo-slonik Jun 6, 2025
aaaf3d1
fix edge drag gesture
sumo-slonik Jun 9, 2025
9876731
fix edge drag gesture
sumo-slonik Jun 9, 2025
03090d5
Merge pull request #230 from software-mansion-labs/bump/react-navigat…
staszekscp Jun 9, 2025
13e1d88
Fix more type errors
staszekscp Jun 9, 2025
9c47384
Fix rest of types
staszekscp Jun 10, 2025
9ffb3e2
Merge remote-tracking branch 'origin/bump/react-navigation-7' into ch…
staszekscp Jun 10, 2025
4bf10b4
Add comments to explain disabling a TS rule for any type
staszekscp Jun 10, 2025
10ace0e
Remove unnecessary es-lint rulw for inline exports
staszekscp Jun 10, 2025
041b723
Merge pull request #231 from software-mansion-labs/chore/migrate-plat…
staszekscp Jun 10, 2025
10d0372
change logic of adaptStateIfNecessary
sumo-slonik Jun 11, 2025
229d9e8
cleanup code
sumo-slonik Jun 11, 2025
4250fb1
remove let and use const
sumo-slonik Jun 11, 2025
253ec9d
fix typescript Error
sumo-slonik Jun 11, 2025
6d18198
remove unnecessary new line
sumo-slonik Jun 11, 2025
386d65e
Fix failing Jest tests by removing type: module in lib/module/package…
staszekscp Jun 11, 2025
5b377de
Improve comment in the patch
staszekscp Jun 11, 2025
2d4798b
Add one more package to patch
staszekscp Jun 12, 2025
8f2bc30
Add useLocale mock
staszekscp Jun 12, 2025
f77e616
Simplify useLocale mock
staszekscp Jun 12, 2025
9c2d425
add log
sumo-slonik Jun 12, 2025
82b692b
Merge pull request #234 from software-mansion-labs/add_log_to_patch
sumo-slonik Jun 12, 2025
ac0bd34
Merge pull request #232 from software-mansion-labs/migrate/kuba-nowak…
sumo-slonik Jun 12, 2025
955c776
Merge pull request #233 from software-mansion-labs/fix/esmodule-jest-…
staszekscp Jun 12, 2025
c3b99d2
fix prettier
sumo-slonik Jun 12, 2025
46232e7
Merge remote-tracking branch 'origin/bump/react-navigation-7' into bu…
sumo-slonik Jun 12, 2025
b5bad91
Merge branch 'main' into bump/react-navigation-7
sumo-slonik Jun 12, 2025
587ac29
Merge branch 'main' into bump/react-navigation-7
sumo-slonik Jun 12, 2025
c0842ab
fix ts error
sumo-slonik Jun 12, 2025
e6b5aea
Bump react-native-screens to 4.11.1
staszekscp Jun 13, 2025
edf132e
Merge main
staszekscp Jun 13, 2025
a319ed3
Update @react-navigation patches details.md and move them to a separa…
staszekscp Jun 16, 2025
217d22b
Merge remote-tracking branch 'origin/main' into bump/react-navigation-7
staszekscp Jun 16, 2025
ee63b4c
Update directory name for react-navigation patches
staszekscp Jun 16, 2025
57509ac
fix getStateFromPath - first working solution
sumo-slonik Jun 16, 2025
365b2d5
fix getStateFromPath - second working solution
sumo-slonik Jun 16, 2025
1634009
Update directory name for react-navigation patches
staszekscp Jun 17, 2025
d271555
Fix details.md by adding .patch to the end of all references
staszekscp Jun 17, 2025
adb5ca2
add to .md
sumo-slonik Jun 17, 2025
6723034
add Pr & issue to .md
sumo-slonik Jun 17, 2025
0d4f3ba
Merge pull request #235 from software-mansion-labs/patching_get_state…
staszekscp Jun 17, 2025
4da9fa0
fix header text
sumo-slonik Jun 17, 2025
9b25ca8
Merge remote-tracking branch 'origin/main' into bump/react-navigation-7
staszekscp Jun 18, 2025
c1258c1
Merge branch 'bump/react-navigation-7' of https://github.com/software…
staszekscp Jun 18, 2025
357c32a
Merge remote-tracking branch 'origin/main' into bump/react-navigation-7
staszekscp Jun 18, 2025
a39652b
Fix prettier after merge
staszekscp Jun 18, 2025
905b6d4
Remove unnecessary eslint rule
staszekscp Jun 18, 2025
24f8e47
Merge remote-tracking branch 'origin/main' into bump/react-navigation-7
staszekscp Jun 23, 2025
7ce153d
Fix wrong goUp behavior after migration
staszekscp Jun 23, 2025
d0dc450
Fix prettier
staszekscp Jun 23, 2025
f0a2a60
Merge remote-tracking branch 'origin/main' into bump/react-navigation-7
staszekscp Jun 23, 2025
68c11c4
Merge remote-tracking branch 'origin/main' into bump/react-navigation-7
staszekscp Jun 24, 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: 4 additions & 3 deletions __mocks__/@react-navigation/native/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const realReactNavigation = isJestEnv ? jest.requireActual<typeof ReactNavigatio

const useIsFocused = isJestEnv ? realReactNavigation.useIsFocused : () => true;
const useTheme = isJestEnv ? realReactNavigation.useTheme : () => ({});
const useLocale = isJestEnv ? realReactNavigation.useTheme : () => ({});

const {triggerTransitionEnd, addListener} = isJestEnv
? createAddListenerMock()
Expand Down Expand Up @@ -44,14 +45,14 @@ const useLinkTo = isJestEnv ? realReactNavigation.useLinkTo : () => null;
const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => null;
const useRoute = isJestEnv ? realReactNavigation.useRoute : () => ({params: {}});
const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callback: () => void) => callback();
// eslint-disable-next-line @typescript-eslint/naming-convention
const UNSTABLE_usePreventRemove = isJestEnv ? jest.fn() : () => {};
const usePreventRemove = isJestEnv ? jest.fn() : () => {};

export {
// Overridden modules
useIsFocused,
useTheme,
useNavigation,
useLocale,
triggerTransitionEnd,

// Theme modules are left alone
Expand All @@ -68,7 +69,7 @@ export {
useScrollToTop,
useRoute,
useFocusEffect,
UNSTABLE_usePreventRemove,
usePreventRemove,
};

export type {NativeNavigationMock};
10 changes: 10 additions & 0 deletions config/webpack/webpack.common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ const includeModules = [
'react-native-web',
'react-native-webview',
'@react-native-picker',
'@react-navigation/material-top-tabs',
'@react-navigation/native',
'@react-navigation/native-stack',
'@react-navigation/stack',
'react-native-modal',
'react-native-gesture-handler',
'react-native-google-places-autocomplete',
Expand Down Expand Up @@ -160,6 +164,12 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
],
module: {
rules: [
{
test: /\.m?js$/,
resolve: {
fullySpecified: false,
},
},
// Transpiles and lints all the JS
{
test: /\.(js|ts)x?$/,
Expand Down
Loading
Loading