improvements

erparshwa · May 15, 2023 · 5175d8b · 5175d8b
1 parent fb4968f
commit 5175d8b
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/patches/@react-navigation+stack+6.3.16.patch b/patches/@react-navigation+stack+6.3.16.patch
@@ -1,3 +1,33 @@
+diff --git a/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx b/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx
+index 1e9ee0e..d85c7b4 100644
+--- a/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx
++++ b/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx
+@@ -105,14 +105,14 @@ function CardContainer({
+ const handleOpen = () => {
+ const { route } = scene.descriptor;
+
+- onTransitionEnd({ route }, false);
++ onTransitionEnd({ route }, false, scene.descriptor.navigation.getState());
+ onOpenRoute({ route });
+ };
+
+ const handleClose = () => {
+ const { route } = scene.descriptor;
+
+- onTransitionEnd({ route }, true);
++ onTransitionEnd({ route }, true, scene.descriptor.navigation.getState());
+ onCloseRoute({ route });
+ };
+
+@@ -120,7 +120,7 @@ function CardContainer({
+ const { route } = scene.descriptor;
+
+ onPageChangeStart();
+- onGestureStart({ route });
++ onGestureStart({ route }, scene.descriptor.navigation.getState());
+ };
+
+ const handleGestureCanceled = () => {
 diff --git a/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx b/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx
 index 6bbce10..5139382 100644
 --- a/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx

diff --git a/tests/utils/LHNTestUtils.js b/tests/utils/LHNTestUtils.js
@@ -6,6 +6,7 @@ import {LocaleContextProvider} from '../../src/components/withLocalize';
 import SidebarLinks from '../../src/pages/home/sidebar/SidebarLinks';
 import CONST from '../../src/CONST';
 import DateUtils from '../../src/libs/DateUtils';
+import {CurrentReportIdContextProvider} from '../../src/components/withCurrentReportId';
 
 // we have to mock `useIsFocused` because it's used in the SidebarLinks component
 const mockedNavigate = jest.fn();
@@ -16,6 +17,11 @@ jest.mock('@react-navigation/native', () => {
  useIsFocused: () => ({
  navigate: mockedNavigate,
  }),
+ useNavigation: () => ({
+ navigate: jest.fn(),
+ addListener: jest.fn(),
+ }),
+ createNavigationContainerRef: jest.fn(),
  };
 });
 
@@ -156,6 +162,7 @@ function getDefaultRenderedSidebarLinks(reportIDFromRoute = '') {
  components={[
  OnyxProvider,
  LocaleContextProvider,
+ CurrentReportIdContextProvider,
  ]}
  >
  <ErrorBoundary>