Updated redwood theme's default density to 'comfortable' (#366)

* Updated default density of redwood to comfortable * Updated changelogs * Swapped condition order
cerner · Jan 24, 2024 · 2327a39 · 2327a39
1 parent aef9e83
commit 2327a39
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/packages/terra-application/CHANGELOG.md b/packages/terra-application/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Added
+  * Added the default density of the redwood theme to be 'comfortable'.
+
 ## 1.57.0 - (January 17, 2024)
 
 * Changed

diff --git a/packages/terra-application/src/application-base/ApplicationBase.jsx b/packages/terra-application/src/application-base/ApplicationBase.jsx
@@ -122,12 +122,17 @@ const ApplicationBase = ({
 
   const { localeOverride, themeOverride } = useTestOverrides(); // Allows us to test deployed applications in different locales.
 
+  let density = themeDensity || themeConfig?.density;
+  if (themeName === 'redwood-theme' && !density) {
+    density = 'comfortable';
+  }
+
   const theme = useMemo(() => ({
     // If the theme class name is undefined or an empty string, that indicates we have the root theme and should apply the root theme name.
     name: themeOverride || themeName || rootThemeName,
     className: themeOverride || themeName,
-    density: themeDensity || themeConfig?.density,
-  }), [themeOverride, themeName, themeDensity]);
+    density,
+  }), [themeOverride, themeName, density]);
 
   return (
     <div data-terra-application-base className={cx('application-base', { fill: !fitToParentIsDisabled })}>

diff --git a/packages/terra-dev-site/CHANGELOG.md b/packages/terra-dev-site/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Added
+  * Added the default density of the redwood theme to be 'comfortable'.
+
 ## 7.12.0 - (January 17, 2024)
 
 * Changed

diff --git a/packages/terra-dev-site/src/modals/_SettingsModal.jsx b/packages/terra-dev-site/src/modals/_SettingsModal.jsx
@@ -125,6 +125,7 @@ const SettingsModal = () => {
               });
             }}
             options={[{ value: 'compact', display: 'compact' }, { value: 'comfortable', display: 'comfortable' }, { value: 'spacious', display: 'spacious' }]}
+            defaultValue="comfortable"
           />
         </Field>
         {directions.length > 1 ? (

diff --git a/terra-theme.config.js b/terra-theme.config.js
@@ -2,6 +2,7 @@ const themeConfig = {
   scoped: [
     'clinical-lowlight-theme',
     'orion-fusion-theme',
+    'redwood-theme',
   ],
 };