Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
215 changes: 84 additions & 131 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,11 @@
"@react-native-firebase/app": "^22.2.1",
"@react-native-google-signin/google-signin": "^10.0.1",
"@react-native-picker/picker": "2.11.3",
"@react-navigation/material-top-tabs": "7.2.13",
"@react-navigation/native": "7.1.10",
"@react-navigation/native-stack": "7.3.14",
"@react-navigation/stack": "7.3.3",
"@react-navigation/core": "7.16.1",
"@react-navigation/material-top-tabs": "7.4.19",
"@react-navigation/native": "7.1.33",
"@react-navigation/native-stack": "7.14.5",
"@react-navigation/stack": "7.8.5",
"@react-ng/bounds-observer": "^0.2.1",
"@rnmapbox/maps": "10.1.44",
"@sentry/react-native": "8.2.0",
Expand Down Expand Up @@ -191,7 +192,7 @@
"react-native-screens": "4.15.4",
"react-native-share": "11.0.2",
"react-native-svg": "15.12.1",
"react-native-tab-view": "^4.1.0",
"react-native-tab-view": "^4.3.0",
"react-native-url-polyfill": "^2.0.0",
"react-native-view-shot": "4.0.0",
"react-native-vision-camera": "^4.7.2",
Expand Down Expand Up @@ -238,8 +239,7 @@
"@react-native-community/cli-platform-ios": "20.0.0",
"@react-native/babel-preset": "0.83.1",
"@react-native/metro-config": "0.83.1",
"@react-navigation/core": "7.10.0",
"@react-navigation/devtools": "^6.0.10",
"@react-navigation/devtools": "7.0.52",
"@rock-js/platform-android": "0.12.10",
"@rock-js/platform-ios": "0.12.10",
"@rock-js/plugin-metro": "0.12.10",
Expand Down
8 changes: 4 additions & 4 deletions patches/react-native-tab-view/details.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# `react-native-tab-view` patches

### [react-native-tab-view+4.1.0+001+fix-tab-animation.patch](react-native-tab-view+4.1.0+001+fix-tab-animation.patch)
### [react-native-tab-view+4.3.0+001+fix-tab-animation.patch](react-native-tab-view+4.3.0+001+fix-tab-animation.patch)

- Reason:

Expand All @@ -13,7 +13,7 @@
- E/App issue: 🛑
- PR Introducing Patch: [#39854](https://github.com/Expensify/App/pull/39854)

### [react-native-tab-view+4.1.0+002+fix-glitching-on-initial-load.patch](react-native-tab-view+4.1.0+002+fix-glitching-on-initial-load.patch)
### [react-native-tab-view+4.3.0+002+fix-glitching-on-initial-load.patch](react-native-tab-view+4.3.0+002+fix-glitching-on-initial-load.patch)

- Reason:
```
Expand All @@ -24,7 +24,7 @@
- E/App issue: https://github.com/Expensify/App/issues/62346
- PR Introducing Patch: [#63570](https://github.com/Expensify/App/pull/63570)

### [react-native-tab-view+4.1.0+003+fix-web-onTabSelect-on-mount.patch](react-native-tab-view+4.1.0+003+fix-web-onTabSelect-on-mount.patch)
### [react-native-tab-view+4.3.0+003+fix-web-onTabSelect-on-mount.patch](react-native-tab-view+4.3.0+003+fix-web-onTabSelect-on-mount.patch)

- Reason:
```
Expand All @@ -35,7 +35,7 @@
- E/App issue: https://github.com/Expensify/App/issues/71913#issuecomment-3584103273
- PR Introducing Patch: [#76586](https://github.com/Expensify/App/pull/76586)

### [react-native-tab-view+4.1.0+004+fix-native-onTabSelect-on-mount.patch](react-native-tab-view+4.1.0+004+fix-native-onTabSelect-on-mount.patch)
### [react-native-tab-view+4.3.0+004+fix-native-onTabSelect-on-mount.patch](react-native-tab-view+4.3.0+004+fix-native-onTabSelect-on-mount.patch)

- Reason:
```
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/react-native-tab-view/src/PagerViewAdapter.tsx b/node_modules/react-native-tab-view/src/PagerViewAdapter.tsx
index d4a0a0e..d66b0cb 100644
index d4a0a0e..0000001 100644
--- a/node_modules/react-native-tab-view/src/PagerViewAdapter.tsx
+++ b/node_modules/react-native-tab-view/src/PagerViewAdapter.tsx
@@ -134,9 +134,10 @@ export function PagerViewAdapter<T extends Route>({
Expand All @@ -14,7 +14,10 @@ index d4a0a0e..d66b0cb 100644
);

return children({
@@ -166,6 +167,8 @@ export function PagerViewAdapter<T extends Route>({
@@ -163,9 +164,11 @@ export function PagerViewAdapter<T extends Route>({
],
{ useNativeDriver }
)}
onPageSelected={(e) => {
const index = e.nativeEvent.position;
indexRef.current = index;
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/react-native-tab-view/lib/module/PanResponderAdapter.js b/node_modules/react-native-tab-view/lib/module/PanResponderAdapter.js
index fdb8c83729f..7ae690b297f 100644
index 0000002..0000003 100644
--- a/node_modules/react-native-tab-view/lib/module/PanResponderAdapter.js
+++ b/node_modules/react-native-tab-view/lib/module/PanResponderAdapter.js
@@ -39,6 +39,7 @@ export function PanResponderAdapter({
Expand All @@ -10,15 +10,14 @@ index fdb8c83729f..7ae690b297f 100644
const swipeVelocityThreshold = 0.15;
const swipeDistanceThreshold = layout.width / 1.75;
const jumpToIndex = useLatestCallback((index, animate = animationEnabled) => {
@@ -94,6 +95,7 @@ export function PanResponderAdapter({
@@ -94,5 +95,6 @@ export function PanResponderAdapter({
setPosition(null);
// eslint-disable-next-line @eslint-react/hooks-extra/no-direct-set-state-in-use-effect
setTranslateX(null);
+ hasCalledInitialTabSelectRef.current = false;
return;
}

@@ -110,6 +112,12 @@ export function PanResponderAdapter({
@@ -110,5 +112,11 @@ export function PanResponderAdapter({
outputRange: [-maxTranslate, 0],
extrapolate: 'clamp'
}), layoutDirection === 'rtl' ? -1 : 1));
Expand All @@ -30,4 +29,3 @@ index fdb8c83729f..7ae690b297f 100644
+ }
}, [layout.width, panX, routes.length, layoutDirection]);
React.useEffect(() => {
if (keyboardDismissMode === 'auto') {
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
diff --git a/node_modules/react-native-tab-view/src/PagerViewAdapter.tsx b/node_modules/react-native-tab-view/src/PagerViewAdapter.tsx
index d66b0cb..a1b2c3d 100644
index 0000001..01e208c 100644
--- a/node_modules/react-native-tab-view/src/PagerViewAdapter.tsx
+++ b/node_modules/react-native-tab-view/src/PagerViewAdapter.tsx
@@ -57,3 +57,5 @@ export function PagerViewAdapter<T extends Route>({
@@ -57,14 +57,28 @@ export function PagerViewAdapter<T extends Route>({
const pagerRef = React.useRef<ViewPager>(null);
const indexRef = React.useRef<number>(index);
const navigationStateRef = React.useRef(navigationState);
+ const onTabSelectRef = React.useRef(onTabSelect);
+ const hasCalledInitialTabSelectRef = React.useRef(false);
@@ -64,3 +66,15 @@ export function PagerViewAdapter<T extends Route>({

const position = useAnimatedValue(index);
const offset = useAnimatedValue(0);

React.useEffect(() => {
navigationStateRef.current = navigationState;
+ onTabSelectRef.current = onTabSelect;
});
+
+ React.useEffect(() => {
+ if (hasCalledInitialTabSelectRef.current) {
+ return;
Expand All @@ -24,3 +27,7 @@ index d66b0cb..a1b2c3d 100644
+ onTabSelectRef.current?.({index: navigationStateRef.current.index});
+ });
+ }, []);
+
const jumpTo = useLatestCallback((key: string) => {
const index = navigationStateRef.current.routes.findIndex(
(route: { key: string }) => route.key === key
Loading
Loading