refactor(Toaster): remove ToasterPortal

gravity-ui · Dec 25, 2024 · 68ba993 · 68ba993
1 parent 2e4fb5f
commit 68ba993
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 30 deletions.
diff --git a/src/components/Toaster/ToasterComponent/ToasterComponent.tsx b/src/components/Toaster/ToasterComponent/ToasterComponent.tsx
@@ -2,19 +2,21 @@
 
 import React from 'react';
 
+import {Portal} from '../../Portal';
 import {useMobile} from '../../mobile';
+import {block} from '../../utils/cn';
 import {ToastsContext} from '../Provider/ToastsContext';
 import {ToastList} from '../ToastList/ToastList';
 import {useToaster} from '../hooks/useToaster';
 
-import {ToasterPortal} from './ToasterPortal';
-
 interface Props {
     className?: string;
     mobile?: boolean;
     hasPortal?: boolean;
 }
 
+const b = block('toaster');
+
 export function ToasterComponent({className, mobile, hasPortal = true}: Props) {
     const defaultMobile = useMobile();
     const {remove} = useToaster();
@@ -29,9 +31,11 @@ export function ToasterComponent({className, mobile, hasPortal = true}: Props) {
     }
 
     return (
-        <ToasterPortal className={className || ''} mobile={mobile ?? defaultMobile}>
-            {toaster}
-        </ToasterPortal>
+        <Portal>
+            <div className={b({mobile: mobile ?? defaultMobile}, className)} aria-live="assertive">
+                {toaster}
+            </div>
+        </Portal>
     );
 }
 

diff --git a/src/components/Toaster/ToasterComponent/ToasterPortal.tsx b/src/components/Toaster/ToasterComponent/ToasterPortal.tsx