From 1effe63ec5e2820999b0736edcfe8e881419eb3a Mon Sep 17 00:00:00 2001
From: Andrey Morozov <amje@yandex-team.ru>
Date: Wed, 13 Sep 2023 13:51:23 +0300
Subject: [PATCH] fix(ThemeProvider): fix scoped CSS classes

---
 src/components/theme/ThemeProvider.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/theme/ThemeProvider.tsx b/src/components/theme/ThemeProvider.tsx
index 43ef7c4a55..6714b7ac53 100644
--- a/src/components/theme/ThemeProvider.tsx
+++ b/src/components/theme/ThemeProvider.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {block} from '../utils/cn';
+import {block, blockNew} from '../utils/cn';
 
 import {ThemeContext} from './ThemeContext';
 import {ThemeSettingsContext} from './ThemeSettingsContext';
@@ -10,6 +10,7 @@ import {updateBodyClassName} from './updateBodyClassName';
 import {useSystemTheme} from './useSystemTheme';
 
 const b = block(ROOT_CLASS_NAME);
+const bNew = blockNew(ROOT_CLASS_NAME);
 
 interface ThemeProviderExternalProps {}
 
@@ -65,13 +66,10 @@ export function ThemeProvider({
             <ThemeSettingsContext.Provider value={themeSettingsContext}>
                 {scoped ? (
                     <div
-                        className={b(
-                            {
-                                theme: themeValue,
-                                'native-scrollbar': nativeScrollbar,
-                            },
+                        className={bNew({theme: themeValue, 'native-scrollbar': nativeScrollbar}, [
+                            b({theme: themeValue, 'native-scrollbar': nativeScrollbar}),
                             rootClassName,
-                        )}
+                        ])}
                     >
                         {children}
                     </div>