Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toast: Correct merge resolution to enable dismissal #720

Merged
merged 8 commits into from
Mar 14, 2024
+6 −4
Merged

Toast: Correct merge resolution to enable dismissal #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29d9acc
chore(release): re-add dropped code from bad merge of PR #472
michael-iden Mar 14, 2024
a64691f
chore(release): correct merge of PR #481 and reverts recent "correcti…
michael-iden Mar 14, 2024
d2814c5
chore(release): add dropped code from toast
ymouzakis Mar 14, 2024
4edd6e2
Merge branch 'fix-merge-regressions' of https://github.com/ithaka/pha…
ymouzakis Mar 14, 2024
d470d6f
chore(release): re-add js file extension
michael-iden Mar 14, 2024
c6373be
chore(release): re-add return element focus call
michael-iden Mar 14, 2024
8288659
chore(release): revert file extensions once more
michael-iden Mar 14, 2024
ffca293
chore(release): add changeset
michael-iden Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/happy-hounds-peel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@ithaka/pharos": patch
---

Re-add change to toast dismissal from PR #475 that was dropped in a tricky merge resolution
5 changes: 1 addition & 4 deletions packages/pharos/src/components/toast/pharos-toaster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,7 @@ export class PharosToaster extends ScopedRegistryMixin(PharosElement) {

private _closeToast(event: CustomEvent): void {
const { id } = <ToastCloseDetail>(<CustomEvent>event).detail || {};
const toast = document.getElementById(this._getToastID(id));
if (toast) {
this.removeChild(toast);
}
this._toasts = this._toasts.filter((toast) => toast.id !== id);
this._focusOnReturnElements(this.returnElements);
}

Expand Down
Loading