feat(code): TanStack Router architectural cleanup #2456
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,8 +11,6 @@ out/ | |
| storybook-static | ||
| bin/ | ||
|
|
||
|
|
||
| # Environment | ||
| .env | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| src/renderer/routeTree.gen.ts linguist-generated=true |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,318 +1,47 @@ | ||
| import { useSettingsDialogStore } from "@features/settings/stores/settingsDialogStore"; | ||
| import { useEffect } from "react"; | ||
| import { SettingsPanel } from "./SettingsPanel"; | ||
|
|
||
| // Modal/overlay form of the settings UI. Used in pre-router shells (e.g. | ||
| // `AiApprovalScreen`) where the routed `/settings/$category` page isn't | ||
| // available because RouterProvider hasn't mounted yet. Inside the main app, | ||
| // settings is a real route — `routes/settings/$category.tsx` renders | ||
| // `<SettingsPanel/>` directly. | ||
| export function SettingsDialog() { | ||
| const isOpen = useSettingsDialogStore((s) => s.isOpen); | ||
| const close = useSettingsDialogStore((s) => s.close); | ||
|
|
||
| useEffect(() => { | ||
| if (!isOpen) return; | ||
| const handlePopState = () => { | ||
| if (!window.history.state?.settingsOpen) { | ||
| useSettingsDialogStore.setState({ isOpen: false }); | ||
| } | ||
| }; | ||
| window.addEventListener("popstate", handlePopState); | ||
| return () => window.removeEventListener("popstate", handlePopState); | ||
| }, [isOpen]); | ||
|
|
||
| useEffect(() => { | ||
| if (!isOpen) return; | ||
| const handleEscape = (e: KeyboardEvent) => { | ||
| if (e.key === "Escape") { | ||
| e.preventDefault(); | ||
| close(); | ||
| } | ||
| }; | ||
| window.addEventListener("keydown", handleEscape); | ||
| return () => window.removeEventListener("keydown", handleEscape); | ||
| }, [isOpen, close]); | ||
|
Comment on lines
+25
to
+35
Contributor
There was a problem hiding this comment.
Prompt To Fix With AIThis is a comment left during a code review.
Path: apps/code/src/renderer/features/settings/components/SettingsDialog.tsx
Line: 25-35
Comment:
**Redundant Escape handler — `SettingsPanel` already owns it**
`SettingsPanel` now registers `useHotkeys("escape", close, { enabled: true, ... })` unconditionally while it is mounted. When the overlay is open, `SettingsPanel` is rendered inside `SettingsDialog`, so Escape already fires `close()` via the hotkey. This second listener on `window` fires a duplicate `close()` call immediately after. The guard `if (!wasOpen) return` in `close()` makes it harmless, but it violates the OnceAndOnlyOnce rule. This `keydown` effect can be dropped from `SettingsDialog`.
How can I resolve this? If you propose a fix, please make it concise. |
||
|
|
||
| if (!isOpen) return null; | ||
|
|
||
| return ( | ||
| <div | ||
| className="fixed inset-0 z-[100] flex bg-(--color-background)" | ||
| data-overlay="settings" | ||
| > | ||
| <SettingsPanel /> | ||
| </div> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
open()no longer callswindow.history.pushState({ settingsOpen: true }), sowindow.history.state?.settingsOpenis alwaysundefined/ falsy. The condition!window.history.state?.settingsOpenis therefore alwaystrue, meaning anypopstateevent while the overlay is open (e.g. the user pressing Electron's back button inAiApprovalScreen) will unconditionally close the dialog — which was never the original intent.Either remove this handler entirely (the overlay is now the only remaining caller and there's no pushed state to guard against), or replace the condition with one that reflects the current behaviour.
Prompt To Fix With AI