Skip to content

Return workspace views to Settings from the back arrow - #7191

Merged
ComputelessComputer merged 2 commits into
mainfrom
fix/settings-workspace-back
Aug 31, 2026
Merged

Return workspace views to Settings from the back arrow#7191
ComputelessComputer merged 2 commits into
mainfrom
fix/settings-workspace-back

Conversation

@ComputelessComputer

@ComputelessComputer ComputelessComputer commented Aug 31, 2026

Copy link
Copy Markdown
Collaborator

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 check on the changed files
  • pnpm -F desktop typecheck
  • pnpm 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.tsx
  • Manual: Settings → Folders or Calendar → sidebar back arrow should return to Settings

Note

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 / returnToTabId point there.

That behavior lives in a new shared leaveOverlayTab() helper (resolve origin tab, goBack when appropriate, otherwise select or open an empty home tab). useMainEscapeShortcutAction and CustomSidebarHeader both 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 openNew records 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.

@netlify

netlify Bot commented Aug 31, 2026

Copy link
Copy Markdown

Deploy Preview for anarlog ready!

Name Link
🔨 Latest commit fddc039
🔍 Latest deploy log https://app.netlify.com/projects/anarlog/deploys/6a9525ae7fbe5200083d5f4a
😎 Deploy Preview https://deploy-preview-7191--anarlog.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

@ComputelessComputer
ComputelessComputer force-pushed the fix/settings-workspace-back branch 2 times, most recently from 35b5818 to 60378c8 Compare August 31, 2026 05:34
- 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
ComputelessComputer force-pushed the fix/settings-workspace-back branch from 8ed3bb8 to fddc039 Compare August 31, 2026 06:56
@ComputelessComputer
ComputelessComputer merged commit 6f42439 into main Aug 31, 2026
21 checks passed
@ComputelessComputer
ComputelessComputer deleted the fix/settings-workspace-back branch August 31, 2026 07:55
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.

1 participant