From 8dd0cfb8ea023fecee218e4adf03d7475fa30706 Mon Sep 17 00:00:00 2001 From: alex_ Date: Thu, 19 Dec 2024 11:23:01 +0100 Subject: [PATCH 1/4] bem refactor toast Refs: #7036 --- .../src/components/toaster/shadow.tsx | 4 +-- .../src/components/toaster/style.scss | 9 ++++--- .../ToastItem/ToastItem.tsx | 4 +-- .../__snapshots__/snapshot.test.tsx.snap | 4 +-- .../ToastItem/tests/snapshot.test.tsx | 2 +- .../src/components/toast-container.scss | 10 ++++--- .../ecl-ec/components/toast-container.scss | 18 +++++++------ .../ecl-eu/components/toast-container.scss | 26 ++++++++++--------- .../src/components/toast-container.scss | 17 ++++++------ 9 files changed, 51 insertions(+), 43 deletions(-) diff --git a/packages/components/src/components/toaster/shadow.tsx b/packages/components/src/components/toaster/shadow.tsx index b6df0f6de1..55803ce3c7 100644 --- a/packages/components/src/components/toaster/shadow.tsx +++ b/packages/components/src/components/toaster/shadow.tsx @@ -114,11 +114,11 @@ export class KolToastContainer implements ToasterAPI { public render(): JSX.Element { return ( - + {this.state._toastStates.length > 1 && ( { void this.closeAll(); diff --git a/packages/components/src/components/toaster/style.scss b/packages/components/src/components/toaster/style.scss index 142e72bc10..48364a427e 100644 --- a/packages/components/src/components/toaster/style.scss +++ b/packages/components/src/components/toaster/style.scss @@ -2,9 +2,8 @@ @import '../style'; @import '../@shared/kol-alert-mixin'; -@include kol-alert-styles; - @layer kol-component { + @include kol-alert-styles; :host { display: flex; flex-direction: column; @@ -13,7 +12,9 @@ z-index: 200; } - .close-all { - align-self: flex-end; + .kol-toast { + &__close-all { + align-self: flex-end; + } } } diff --git a/packages/components/src/functional-components/ToastItem/ToastItem.tsx b/packages/components/src/functional-components/ToastItem/ToastItem.tsx index e4713c23bd..4444af079c 100644 --- a/packages/components/src/functional-components/ToastItem/ToastItem.tsx +++ b/packages/components/src/functional-components/ToastItem/ToastItem.tsx @@ -15,9 +15,9 @@ const ToastItemFc: FC = ({ status, toast, onClose, ...other }) = const { type, label, description, variant, alertVariant } = toast; return ( -
+
-