feat(toast): port upstream close buttons (#2023)#67
Merged
Conversation
Co-authored-by: Julius Marminge <julius0216@outlook.com> (cherry picked from commit 542dda095a958c2f5ff856af7584233ee460bf4e)
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
Ports upstream #2023 toast refactor — adds visible X close buttons,
ToastBodyContentextraction, and expandable body fields (expandableContent,expandableLabels,expandableDescriptionTrigger).Conflicts resolved
apps/web/src/components/ui/toast.tsx: Took upstream's version wholesale (492 → 719 lines). Upstream already re-integrated ourCopyErrorButton(line 93) on error toasts, so nothing to hand-merge there.apps/web/src/components/Sidebar.tsx: Preserved MarCode's richer "Delete anyway" warning toast inSidebarProjectItem— action button, deferred close,api.dialogs.confirm(...)with thread-count messaging,removeProject(..., { force: true }), and inline error toast on failure. Migrated the outer toast calls to the newstackedThreadToast(...)helper for layout consistency with the rest of the file and the error-toast path that upstream already migrated.Why this is isolated
Dedicated branch on top of
origin/main— intentionally not mixed into PR #66 because:toast.tsxis a large refactor (+227 net lines) and deserves its own review window.Test plan
bun run typecheckcleanapps/webfull test suite — 1088/1088 passing (incl.toast.logic.test.ts10/10)oxlint— 0 errors (67 pre-existing warnings)