fix: adding new classes in rootClassName before removing (#1411)

gravity-ui · Mar 12, 2024 · e29cde1 · e29cde1
1 parent 4dbfdf9
commit e29cde1
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/components/theme/dom-helpers.ts b/src/components/theme/dom-helpers.ts
@@ -23,15 +23,6 @@ export function updateBodyClassName({
         bodyEl.classList.add(rootClassName);
     }
 
-    if (className) {
-        const parsedCustomRootClassNames = className.split(' ');
-        parsedCustomRootClassNames.forEach((cls) => {
-            if (cls && !bodyEl.classList.contains(cls)) {
-                bodyEl.classList.add(cls);
-            }
-        });
-    }
-
     if (prevClassName) {
         const parsedPrevCustomRootClassNames = prevClassName.split(' ');
         parsedPrevCustomRootClassNames.forEach((cls) => {
@@ -41,6 +32,15 @@ export function updateBodyClassName({
         });
     }
 
+    if (className) {
+        const parsedCustomRootClassNames = className.split(' ');
+        parsedCustomRootClassNames.forEach((cls) => {
+            if (cls && !bodyEl.classList.contains(cls)) {
+                bodyEl.classList.add(cls);
+            }
+        });
+    }
+
     [...bodyEl.classList].forEach((cls) => {
         if (cls.startsWith(modsClassName(b({theme: true})))) {
             bodyEl.classList.remove(cls);