fix(ThemeProvider): fix style injection and removal in case multiple …

…ThemeProviders are used (#5732)
SAP · Apr 19, 2024 · ed6298a · ed6298a
1 parent cf67d3a
commit ed6298a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/main/src/components/ThemeProvider/index.tsx b/packages/main/src/components/ThemeProvider/index.tsx
@@ -5,6 +5,7 @@ import { attachThemeLoaded, detachThemeLoaded } from '@ui5/webcomponents-base/di
 import {
   getStyleContext,
   ThemingParameters,
+  useIsomorphicId,
   useIsomorphicLayoutEffect,
   useStylesheet
 } from '@ui5/webcomponents-react-base';
@@ -16,7 +17,8 @@ import { ModalsProvider } from '../Modals/ModalsProvider.js';
 import { styleData } from './ThemeProvider.css.js';
 
 function ThemeProviderStyles() {
-  useStylesheet(styleData, ThemeProvider.displayName);
+  const uniqueId = useIsomorphicId();
+  useStylesheet(styleData, `${ThemeProvider.displayName}-${uniqueId}`);
   return null;
 }