Skip to content

fix: broken screen animation during navigation transition #76343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Valforte merged 6 commits into from
Dec 17, 2025
Merged

fix: broken screen animation during navigation transition #76343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
181e372
fix: broken screen animation during navigation transition
mdneyazahmad Nov 29, 2025
800d10e
Revert "fix: broken screen animation during navigation transition"
mdneyazahmad Dec 8, 2025
816979f
fix: disable swipe gesture on material top tab navigator to resolve a…
mdneyazahmad Dec 8, 2025
c2f5d79
chore: resolve linting issues
mdneyazahmad Dec 9, 2025
5520388
chore: fix lint errors
mdneyazahmad Dec 9, 2025
9057baa
Merge branch 'main' of github.com:Expensify/App into fix/74735-naviga…
mdneyazahmad Dec 9, 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
6 changes: 1 addition & 5 deletions src/libs/Navigation/OnyxTabNavigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ type OnyxTabNavigatorProps = ChildrenProps & {
/** Whether to show the label when the tab is inactive */
shouldShowLabelWhenInactive?: boolean;

/** Disable swipe between tabs */
disableSwipe?: boolean;

/** Determines whether the product training tooltip should be displayed to the user. */
shouldShowProductTrainingTooltip?: boolean;

Expand Down Expand Up @@ -102,7 +99,6 @@ function OnyxTabNavigator({
onTabSelected = () => {},
screenListeners,
shouldShowLabelWhenInactive = true,
disableSwipe = false,
shouldShowProductTrainingTooltip,
renderProductTrainingTooltip,
lazyLoadEnabled = false,
Expand Down Expand Up @@ -193,7 +189,7 @@ function OnyxTabNavigator({
}}
screenOptions={{
...defaultScreenOptions,
swipeEnabled: !disableSwipe,
swipeEnabled: false,
lazy: lazyLoadEnabled,
lazyPlaceholder: LazyPlaceholder,
}}
Expand Down
6 changes: 0 additions & 6 deletions src/pages/NewChatSelectorPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@ import type {AnimatedTextInputRef} from '@components/RNTextInput';
import ScreenWrapper from '@components/ScreenWrapper';
import TabSelector from '@components/TabSelector/TabSelector';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import {setNewRoomFormLoading} from '@libs/actions/Report';
import Navigation from '@libs/Navigation/Navigation';
import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Navigation/OnyxTabNavigator';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import NewChatPage from './NewChatPage';
import WorkspaceNewRoomPage from './workspace/WorkspaceNewRoomPage';

Expand All @@ -23,8 +20,6 @@ function NewChatSelectorPage() {
const [headerWithBackBtnContainerElement, setHeaderWithBackButtonContainerElement] = useState<HTMLElement | null>(null);
const [tabBarContainerElement, setTabBarContainerElement] = useState<HTMLElement | null>(null);
const [activeTabContainerElement, setActiveTabContainerElement] = useState<HTMLElement | null>(null);
const [formState] = useOnyx(ONYXKEYS.FORMS.NEW_ROOM_FORM, {canBeMissing: true});
const {shouldUseNarrowLayout} = useResponsiveLayout();
const chatPageInputRef = useRef<AnimatedTextInputRef | null>(null);
const roomPageInputRef = useRef<AnimatedTextInputRef | null>(null);

Expand Down Expand Up @@ -84,7 +79,6 @@ function NewChatSelectorPage() {
tabBar={TabSelector}
onTabBarFocusTrapContainerElementChanged={setTabBarContainerElement}
onActiveTabFocusTrapContainerElementChanged={onTabFocusTrapContainerElementChanged}
disableSwipe={!!formState?.isLoading && shouldUseNarrowLayout}
onTabSelect={onTabSelectFocusHandler}
>
<TopTab.Screen name={CONST.TAB.NEW_CHAT}>
Expand Down
3 changes: 0 additions & 3 deletions src/pages/iou/request/IOURequestStartPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import usePolicy from '@hooks/usePolicy';
import usePrevious from '@hooks/usePrevious';
import useThemeStyles from '@hooks/useThemeStyles';
import {dismissProductTraining} from '@libs/actions/Welcome';
import {isMobile} from '@libs/Browser';
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
import getPlatform from '@libs/getPlatform';
Expand Down Expand Up @@ -280,8 +279,6 @@ function IOURequestStartPage({
shouldShowProductTrainingTooltip={shouldShowProductTrainingTooltip}
renderProductTrainingTooltip={renderProductTrainingTooltip}
lazyLoadEnabled
// We're disabling swipe on mWeb fo the Per Diem tab because the keyboard will hang on the other tab after switching
disableSwipe={(isMultiScanEnabled && selectedTab === CONST.TAB_REQUEST.SCAN) || (selectedTab === CONST.TAB_REQUEST.PER_DIEM && isMobile())}
>
<TopTab.Screen name={CONST.TAB_REQUEST.MANUAL}>
{() => (
Expand Down
Loading