fix: move toast buttons style condition to toast component

tutkli · Mar 7, 2024 · 1ca7986 · 1ca7986
1 parent b5e199d
commit 1ca7986
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/libs/ngx-sonner/src/lib/toast.component.ts b/libs/ngx-sonner/src/lib/toast.component.ts
@@ -182,7 +182,7 @@ const defaultClasses: ToastClassnames = {
           <button
             data-button
             data-cancel
-            [style]="cancelButtonStyle()"
+            [style]="cancelButtonStyle() ?? toast().cancelButtonStyle ?? ''"
             [class]="cn(classes().cancelButton, toast().classes?.cancelButton)"
             (click)="onCancelClick()">
             {{ cancel.label }}
@@ -191,7 +191,7 @@ const defaultClasses: ToastClassnames = {
         @if (toast().action; as action) {
           <button
             data-button
-            [style]="actionButtonStyle()"
+            [style]="actionButtonStyle() ?? toast().actionButtonStyle ?? ''"
             [class]="cn(classes().actionButton, toast().classes?.actionButton)"
             (click)="onActionClick($event)">
             {{ action.label }}

diff --git a/libs/ngx-sonner/src/lib/toaster.component.ts b/libs/ngx-sonner/src/lib/toaster.component.ts
@@ -80,16 +80,8 @@ const GAP = 14;
                 [position]="position()"
                 [expandByDefault]="expand()"
                 [expanded]="expanded()"
-                [actionButtonStyle]="
-                  toastOptions().actionButtonStyle ??
-                  toast.actionButtonStyle ??
-                  ''
-                "
-                [cancelButtonStyle]="
-                  toastOptions().cancelButtonStyle ??
-                  toast.cancelButtonStyle ??
-                  ''
-                "
+                [actionButtonStyle]="toastOptions().actionButtonStyle"
+                [cancelButtonStyle]="toastOptions().cancelButtonStyle"
                 [class]="toastOptions().class ?? ''"
                 [descriptionClass]="toastOptions().descriptionClass ?? ''"
                 [classes]="toastOptions().classes ?? {}"