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

fix: preserve heights order when adding new toasts #8

Merged
merged 2 commits into from
Apr 1, 2024
Merged

fix: preserve heights order when adding new toasts #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e70197
fix: preserve heights order when changing positions
tutkli Apr 1, 2024
ff2c50e
refactor: rename toast-position pipe to toast-filter
tutkli Apr 1, 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
4 changes: 2 additions & 2 deletions ...nner/src/lib/pipes/toast-position.pipe.ts → ...sonner/src/lib/pipes/toast-filter.pipe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Pipe, PipeTransform } from '@angular/core';
import { Position, ToastT } from '../types';

@Pipe({ name: 'toastPosition', standalone: true })
export class ToastPositionPipe implements PipeTransform {
@Pipe({ name: 'toastFilter', standalone: true })
export class ToastFilterPipe implements PipeTransform {
transform(toasts: ToastT[], index: number, position: Position): ToastT[] {
return toasts.filter(
toast => (!toast.position && index === 0) || toast.position === position
Expand Down
6 changes: 5 additions & 1 deletion libs/ngx-sonner/src/lib/state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,13 @@ function createToastState() {
}

function addHeight(height: HeightT) {
heights.update(prev => [height, ...prev]);
heights.update(prev => [height, ...prev].sort(sortHeights));
}

const sortHeights = (a: HeightT, b: HeightT) =>
toasts().findIndex(t => t.id === a.toastId) -
toasts().findIndex(t => t.id === b.toastId);

function reset() {
toasts.set([]);
heights.set([]);
Expand Down
6 changes: 3 additions & 3 deletions libs/ngx-sonner/src/lib/toaster.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from '@angular/core';
import { IconComponent } from './icon.component';
import { LoaderComponent } from './loader.component';
import { ToastPositionPipe } from './pipes/toast-position.pipe';
import { ToastFilterPipe } from './pipes/toast-filter.pipe';
import { toastState } from './state';
import { ToastComponent } from './toast.component';
import { Position, Theme, ToasterProps } from './types';
Expand All @@ -41,7 +41,7 @@ const GAP = 14;
@Component({
selector: 'ngx-sonner-toaster',
standalone: true,
imports: [ToastComponent, ToastPositionPipe, IconComponent, LoaderComponent],
imports: [ToastComponent, ToastFilterPipe, IconComponent, LoaderComponent],
template: `
@if (toasts().length > 0) {
<section
Expand All @@ -67,7 +67,7 @@ const GAP = 14;
(pointerup)="interacting.set(false)"
[style]="toasterStyles()">
@for (
toast of toasts() | toastPosition: $index : pos;
toast of toasts() | toastFilter: $index : pos;
track toast.id
) {
<ngx-sonner-toast
Expand Down
Loading