Return workspace views to Settings from the back arrow - #7191
Merged
Conversation
✅ Deploy Preview for anarlog ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
ComputelessComputer
force-pushed
the
fix/settings-workspace-back
branch
2 times, most recently
from
August 31, 2026 05:34
35b5818 to
60378c8
Compare
- Use the existing return-origin path from the sidebar back arrow - Share that navigation with Escape so settings-opened workspace views go back instead of home
folders is not a TabInput on this branch, so the parameterized test failed desktop typecheck.
ComputelessComputer
force-pushed
the
fix/settings-workspace-back
branch
from
August 31, 2026 06:56
8ed3bb8 to
fddc039
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Problem: Opening Folders, Calendar, Contacts, or Templates from Settings replaced the whole view, and the sidebar back arrow dismissed it to home instead of returning to Settings.
Fix: The sidebar back arrow now uses the same return-origin path as Escape, so those workspace views go back to Settings when they were opened from there.
Verification
pnpm exec dprint fmt/dprint checkon the changed filespnpm -F desktop typecheckpnpm exec oxlint --quiet --format=github apps/desktop/src/pnpm -F desktop exec vitest run src/sidebar/custom-sidebar-header.test.tsx src/store/zustand/tabs/basic.test.ts src/main/useShortcuts.test.tsxNote
Low Risk
Desktop tab navigation and UI only; behavior is centralized and covered by unit tests with no auth or data changes.
Overview
Sidebar back no longer always jumps to home. It now follows the same leave overlay path as Escape, so Folders, Calendar, Contacts, and Templates opened from Settings return to the Settings tab when
returnToSlotId/returnToTabIdpoint there.That behavior lives in a new shared
leaveOverlayTab()helper (resolve origin tab,goBackwhen appropriate, otherwise select or open an empty home tab).useMainEscapeShortcutActionandCustomSidebarHeaderboth call it instead of duplicating or using the older back handler that only selected home.Tests cover sidebar back for those workspace types from Settings and assert
openNewrecords Settings as the return origin for calendar, contacts, and templates.Reviewed by Cursor Bugbot for commit fddc039. Bugbot is set up for automated code reviews on this repo. Configure here.