Skip to content

[Flat Nav R3.1] Collapse the nav bar into a skinny sidebar - #106570

Merged
mountiny merged 13 commits into
Expensify:mainfrom
software-mansion-labs:jmgraa/flat-nav-r3.1-collapse
Nov 13, 2026
Merged

mountiny merged 13 commits into
Expensify:mainfrom
software-mansion-labs:jmgraa/flat-nav-r3.1-collapse

Conversation

@jmgraa

@jmgraa jmgraa commented Nov 11, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

As part of the Flat Navigation project (behind the flatNav beta on wide web layouts), this PR implements Release 3.1: collapsing FlatNavigationBar into a skinny icon rail (60px) and expanding it back to full width (232px). Because Release 2 removes the Spend column along with its collapse button, the flat navigation bar needs its own dedicated collapse control while sharing the same persisted state so both surfaces collapse simultaneously.

This PR implements the collapsible navigation bar by:

  • Dedicated Collapse Toggle: Adding FlatNavCollapseToggle in the flat navigation bar header next to the Expensify wordmark, using CONST.SENTRY_LABEL.NAVIGATION_TAB_BAR.COLLAPSE and hit-slop expansion. When the bar is shown on wide layouts, the duplicate toggle in SearchSidebar is hidden.
  • Surface-Scoped Hover Peek: Extending SearchSidebarCollapseStore from a single global boolean to track peekingSurface (COLLAPSE_SURFACE.NAVIGATION_BAR vs COLLAPSE_SURFACE.SEARCH_SIDEBAR). Hovering over a collapsed navigation bar peeks only the navigation bar over the content without triggering expansion of the adjacent Spend sidebar, and vice versa.
  • Keyboard Focus Peek: Supporting keyboard accessibility by peeking the bar open when focus moves into navigation items via Tab (:focus-visible), maintaining the peek while tabbing between items inside, and collapsing back on blur.
  • Layout vs. Visual Separation (Zero Layout Shifts): Separating the outer layout spacer (which reserves 60px when collapsed and eases smoothly with CSS transitions) from the absolutely positioned visual layer (stickToLeft + zIndex1). When peeking, the navigation bar expands to 232px with a drop shadow overlay (flatNavigationBarPeekShadow), floating above adjacent content without shifting the layout.
  • Icon Alignment & Compact Elements: Fixing the icon column at x=20 in both states (row inset 8px + padding 12px) so icons remain perfectly static during transitions. Adding isCompact support to FlatNavCreateButton: the green button keeps filling its container, so it narrows together with the bar from a full-width pill into a 32px circular "+" centered in the 60px rail (60px rail − 2 × 14px inset = 32px button height), instead of snapping to a circle. Moving the collapse fade inside FlatNavAccountStatus to eliminate phantom spacing, and fading the Expensify wordmark in place while maintaining accessible tab index / aria-hidden states.
  • Create Menu Peeking Lock: Lifting create menu visibility state up to FlatNavigationBar so the bar remains pinned in the peeking state while the popup create menu is open, smoothly releasing peek once the menu closes.
  • Performance & Onyx Subscriptions: Scoping useNavigationBarWidth to select only isCollapsed from ONYXKEYS.NVP_SEARCH_SIDEBAR, ensuring layout width subscribers (TabNavigatorBar, central pane offset) do not re-render during hover peek transitions.
  • Persisted State: Reusing NVP_SEARCH_SIDEBAR.isCollapsed (device-local Onyx key preserved across sign-out) so collapse state survives page reloads.

Fixed Issues

$ #105627
PROPOSAL: #105175

Tests

  1. On a wide web window, turn on flatNav.
  2. Click the collapse toggle next to the logo; verify the bar collapses into a skinny 60px rail, icons remain aligned, and the Create button smoothly shrinks together with the bar from a pill into a circular "+" (and grows back into a pill when expanding), without snapping.
  3. Hover over the collapsed bar; verify it peeks to full width over the content without shifting the layout.
  4. While the bar is peeking (or click the compact "+" directly):
    • Click the + (Create) button; verify the FAB create menu popover opens correctly right below it.
    • Move the mouse across the create menu options; verify the navigation bar stays pinned in its expanded peeking state and does not collapse.
    • Close the menu (click outside or press Escape) and move the mouse away; verify the bar smoothly collapses back to 60px.
  5. Navigate to the Spend tab:
    • Verify the duplicate collapse button in the Spend sidebar is hidden.
    • Verify both the navigation bar and the Spend column are collapsed simultaneously.
    • Hover over the Spend sidebar; verify only the Spend sidebar peeks open (the navigation bar stays collapsed), and vice versa.
  6. Tab through the navigation bar using the keyboard; verify it peeks open while focused and collapses back on blur.
  7. Click the toggle again (or reload the page); verify the state persists and both surfaces expand back.
  8. Turn off flatNav and verify the standard navigation bar and Spend toggle are restored.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified any copy / text that was added to the app is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

MacOS: Chrome / Safari
web.mov

@codecov

codecov Bot commented Nov 11, 2026 •

Copy link
Copy Markdown

@jmgraa
jmgraa force-pushed the jmgraa/flat-nav-r3.1-collapse branch from 24f2f90 to 04b1814 Compare November 11, 2026 21:53
@sumo-slonik

Copy link
Copy Markdown
Contributor

The "Done when" in #105627 says the collapsed state should carry over to another device, but setCollapsed is only a local Onyx.merge, so it stays on one device. Should we add a backend write, or update the issue to "survives a reload"?

@jmgraa

jmgraa commented Nov 13, 2026

Copy link
Copy Markdown
Contributor Author

About this comment: my suggestion would be to update the issue to "survives a reload" rather than adding a backend write.

Sidebar collapse feels heavily screen-size dependent (e.g., collapsed on a 13" laptop vs. expanded on an external monitor), so syncing it globally across devices could hurt UX. Keeping it device-local in Onyx also stays consistent with SearchSidebar.

@shawnborton what do you think?

@shawnborton

Copy link
Copy Markdown
Contributor

I'm cool with keeping it device-local, that makes sense to me.

…1-collapse

# Conflicts:
#	src/components/Navigation/FlatNavigationBar/index.tsx
@jmgraa

jmgraa commented Nov 13, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 13, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-13T10:56:01.131223Z dc510d6 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@shawnborton

Copy link
Copy Markdown
Contributor

Let me know when this is ready for a build so I can test!

@jmgraa
jmgraa marked this pull request as ready for review November 13, 2026 10:29
@jmgraa
jmgraa requested review from a team as code owners November 13, 2026 10:29
@melvin-bot
melvin-bot Bot requested review from Krishna2323 and removed request for a team November 13, 2026 10:29
@melvin-bot

melvin-bot Bot commented Nov 13, 2026

Copy link
Copy Markdown

@Krishna2323 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot requested review from heyjennahay and removed request for a team November 13, 2026 10:29

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dc510d687e

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/styles/index.ts Resolved
@github-actions

Copy link
Copy Markdown
Contributor

🚧 shawnborton has triggered a test Expensify/App build. You can view the workflow run here.

@JmillsExpensify
JmillsExpensify self-requested a review November 13, 2026 12:29
@github-actions

This comment has been minimized.

@JmillsExpensify JmillsExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks sooo good!

Copy link
Copy Markdown
Contributor

@Krishna2323 please prioritize this PR today. I'd like to aim to get it merged so we can focus on breaking up Spend next week.

@Krishna2323

Copy link
Copy Markdown
Contributor

Reviewing...

@Krishna2323

Copy link
Copy Markdown
Contributor
  • Sidebar flickers when create menu is closed with Escape
Monosnap.screencast.2026-11-13.21-20-27.mp4

@jmgraa

jmgraa commented Nov 13, 2026

Copy link
Copy Markdown
Contributor Author

Flickering fixed 🔧

@Krishna2323

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
Monosnap.screencast.2026-11-13.23-11-17.mp4

@Krishna2323

Copy link
Copy Markdown
Contributor
  • There's a flicker when I open the Create menu by tabbing to it and pressing Enter.
Monosnap.screencast.2026-11-13.23-14-55.mp4

@Krishna2323 Krishna2323 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@melvin-bot
melvin-bot Bot requested a review from mountiny November 13, 2026 18:14
@jmgraa

jmgraa commented Nov 13, 2026

Copy link
Copy Markdown
Contributor Author

About this issue: It feels like a rare edge case with an unclear cause, so I'd leave it as-is for now and just monitor if it comes back.

@JmillsExpensify

Copy link
Copy Markdown
Contributor

@mountiny can you review/merge to keep the party going?

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@mountiny
mountiny merged commit c88818f into Expensify:main Nov 13, 2026
37 of 41 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions

Copy link
Copy Markdown
Contributor

🚧 mountiny has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

Copy link
Copy Markdown
Contributor

@jmgraa
jmgraa deleted the jmgraa/flat-nav-r3.1-collapse branch November 15, 2026 13:15
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.5.40-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — the collapsible navigation changes remain behind the flatNav beta, and no non-beta change makes an existing article inaccurate.


view run

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker #107061 was identified to be related to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants