Move Frame classnames inline

Shopify · Apr 10, 2024 · 7f80da0 · 7f80da0
1 parent ed8142f
commit 7f80da0
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/polaris-react/src/components/Frame/Frame.tsx b/polaris-react/src/components/Frame/Frame.tsx
@@ -23,7 +23,6 @@ import type {
 } from '../../utilities/frame';
 import {UseTheme} from '../../utilities/use-theme';
 import {UseFeatures} from '../../utilities/features';
-import type {FeaturesConfig} from '../../utilities/features';
 
 import {
   ToastManager,
@@ -240,18 +239,6 @@ class FrameInner extends PureComponent<CombinedProps, State> {
         }
       : {};
 
-    const getFrameClassName = (features: FeaturesConfig) =>
-      classNames(
-        styles.Frame,
-        features?.dynamicTopBarAndReframe && styles['Frame-TopBarAndReframe'],
-        navigation && styles.hasNav,
-        topBar && styles.hasTopBar,
-        sidebar && styles.hasSidebar,
-        sidebar &&
-          features?.dynamicTopBarAndReframe &&
-          styles['hasSidebar-TopBarAndReframe'],
-      );
-
     const contextualSaveBarMarkup = (
       <UseFeatures>
         {({dynamicTopBarAndReframe}) =>
@@ -299,7 +286,17 @@ class FrameInner extends PureComponent<CombinedProps, State> {
         <UseFeatures>
           {(features) => (
             <div
-              className={getFrameClassName(features)}
+              className={classNames(
+                styles.Frame,
+                features?.dynamicTopBarAndReframe &&
+                  styles['Frame-TopBarAndReframe'],
+                navigation && styles.hasNav,
+                topBar && styles.hasTopBar,
+                sidebar && styles.hasSidebar,
+                sidebar &&
+                  features?.dynamicTopBarAndReframe &&
+                  styles['hasSidebar-TopBarAndReframe'],
+              )}
               {...layer.props}
               {...navigationAttributes}
             >