feat(design): replace daff-map-deep-get with daff-map-get

graycoreio · Dec 13, 2024 · 4adf2ce · 4adf2ce
1 parent f8fab1e
commit 4adf2ce
Show file tree

Hide file tree

Showing 55 changed files with 240 additions and 368 deletions.
diff --git a/...affio/src/app/content/why-pwa/components/feature-comparison/feature-comparison-theme.scss b/...affio/src/app/content/why-pwa/components/feature-comparison/feature-comparison-theme.scss
@@ -3,8 +3,8 @@
 
 @mixin daffio-feature-comparison-theme($theme){
     $secondary: map.get($theme, secondary);
-    $base: daff-theme.daff-map-deep-get($theme, "core.base");
-    $base-contrast: daff-theme.daff-map-deep-get($theme, "core.base-contrast");
+    $base: daff-theme.daff-map-get($theme, 'core', 'base');
+    $base-contrast: daff-theme.daff-map-get($theme, 'core','base-contrast');
 
     .feature-comparison {
         background: $base;

diff --git a/apps/daffio/src/app/core/footer/footer/footer-theme.scss b/apps/daffio/src/app/core/footer/footer/footer-theme.scss
@@ -2,9 +2,9 @@
 @use 'sass:map';
 
 @mixin daffio-footer-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: daff-theme.daff-map-deep-get($theme, 'core.base-contrast');
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 	$secondary: map.get($theme, secondary);
 
 	.daffio-footer {

diff --git a/apps/daffio/src/app/core/footer/simple-footer/simple-footer-theme.scss b/apps/daffio/src/app/core/footer/simple-footer/simple-footer-theme.scss
@@ -1,9 +1,9 @@
 @use 'theme' as daff-theme;
 
 @mixin daffio-simple-footer-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: daff-theme.daff-map-deep-get($theme, 'core.base-contrast');
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 
 	.daffio-simple-footer {
 		border-top: 1px solid daff-theme.daff-illuminate($base, $neutral, 2);

diff --git a/apps/daffio/src/app/core/sidebar/components/sidebar-footer/sidebar-footer-theme.scss b/apps/daffio/src/app/core/sidebar/components/sidebar-footer/sidebar-footer-theme.scss
@@ -2,9 +2,9 @@
 @use 'theme' as daff-theme;
 
 @mixin daffio-sidebar-footer-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: daff-theme.daff-map-deep-get($theme, 'core.base-contrast');
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 	$primary: map.get($theme, primary);
 
 	.daffio-sidebar-footer {
@@ -14,4 +14,4 @@
 			background: daff-theme.daff-illuminate($base, $neutral, 3);
 		}
 	}
-}
+}
diff --git a/apps/daffio/src/app/design/device/iphone/iphone.component.scss b/apps/daffio/src/app/design/device/iphone/iphone.component.scss
@@ -1,7 +1,7 @@
 // @import 'theme';
 // @use 'utilities' as *;
 
-// $phoneColor: daff-map-deep-get($theme, "core.base");
+// $phoneColor: daff-map-get($theme, "core", "base");
 // $phoneShadow: daff-illuminate($phoneColor, $daff-neutral, 3);
 
 // .iphone {

diff --git a/apps/daffio/src/app/docs/api/components/api-list-section/api-list-section-theme.scss b/apps/daffio/src/app/docs/api/components/api-list-section/api-list-section-theme.scss
@@ -1,9 +1,9 @@
 @use 'theme' as daff-theme;
 
 @mixin daffio-api-list-section-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, "core.base");
-	$base-contrast: daff-theme.daff-map-deep-get($theme, "core.base-contrast");
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 
 	.daffio-api-list-section {
 		&__item {

diff --git a/apps/daffio/src/app/docs/api/components/api-list/api-list-theme.scss b/apps/daffio/src/app/docs/api/components/api-list/api-list-theme.scss
@@ -1,9 +1,9 @@
 @use 'theme' as daff-theme;
 
 @mixin daffio-api-list-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, "core.base");
-	$base-contrast: daff-theme.daff-map-deep-get($theme, "core.base-contrast");
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 
 	.daffio-api-list {
 		&__package-name {

diff --git a/apps/daffio/src/app/docs/api/components/api-package/api-package-theme.scss b/apps/daffio/src/app/docs/api/components/api-package/api-package-theme.scss
@@ -1,9 +1,9 @@
 @use 'theme' as daff-theme;
 
 @mixin daffio-api-package-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, "core.base");
-	$base-contrast: daff-theme.daff-map-deep-get($theme, "core.base-contrast");
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 
 	.daffio-api-package {
 		&__subpackage-name {

diff --git a/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents-theme.scss b/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents-theme.scss
@@ -1,9 +1,9 @@
 @use 'theme' as daff-theme;
 
 @mixin daffio-table-of-contents-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, "core.base");
-	$base-contrast: daff-theme.daff-map-deep-get($theme, "core.base-contrast");
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 
 	.daffio-table-of-contents {
 		&__item {

diff --git a/apps/daffio/src/app/newsletter/newsletter-theme.scss b/apps/daffio/src/app/newsletter/newsletter-theme.scss
@@ -1,9 +1,9 @@
 @use 'theme' as daff-theme;
 
 @mixin daffio-newsletter-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: daff-theme.daff-map-deep-get($theme, 'core.base-contrast');
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 
 	.newsletter {
 		&__input {

diff --git a/apps/daffio/src/scss/type-descriptors/_mixins.scss b/apps/daffio/src/scss/type-descriptors/_mixins.scss
@@ -5,8 +5,12 @@
 $primary: map.get(daff-theme.$theme, primary);
 $secondary: map.get(daff-theme.$theme, secondary);
 $tertiary: map.get(daff-theme.$theme, tertiary);
-$base: daff-theme.daff-map-deep-get(daff-theme.$theme, 'core.base');
-$base-contrast: daff-theme.daff-map-deep-get(daff-theme.$theme, 'core.base-contrast');
+$base: daff-theme.daff-map-get(daff-theme.$theme, 'core', 'base');
+$base-contrast: daff-theme.daff-map-get(
+	daff-theme.$theme,
+	'core',
+	'base-contrast'
+);
 
 @mixin type-theming($color) {
 	background: $color;

diff --git a/apps/demo/src/scss/demo-theme.scss b/apps/demo/src/scss/demo-theme.scss
@@ -7,6 +7,6 @@ $tertiary: daff-theme.daff-configure-palette(daff-theme.$daff-turquoise, 60);
 
 $theme: daff-theme.daff-configure-theme($primary, $secondary, $tertiary, 'light');
 
-$black: daff-theme.daff-map-deep-get($theme, 'core.black');
-$white: daff-theme.daff-map-deep-get($theme, 'core.white');
-$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
+$black: daff-theme.daff-map-get($theme, 'core', 'black');
+$white: daff-theme.daff-map-get($theme, 'core', 'white');
+$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
diff --git a/apps/design-land/src/app/core/code-preview/component/code-preview-theme.scss b/apps/design-land/src/app/core/code-preview/component/code-preview-theme.scss
@@ -1,12 +1,11 @@
 @use 'sass:map';
 @use 'theme' as daff-theme;
 
-
 @mixin code-preview-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, 'core.base');
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
 	$primary: map.get(daff-theme.$theme, primary);
-	$font-color: daff-theme.daff-map-deep-get($theme, 'core.font-color');
+	$font-color: daff-theme.daff-map-get($theme, 'core', 'font-color');
 	$border: 1px solid daff-theme.daff-illuminate($base, $neutral, 2);
 
 	.design-land-code-preview {
@@ -28,4 +27,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/apps/design-land/src/app/core/sidebar-viewport/sidebar-viewport-theme.scss b/apps/design-land/src/app/core/sidebar-viewport/sidebar-viewport-theme.scss
@@ -2,9 +2,9 @@
 @use 'theme' as daff-theme;
 
 @mixin sidebar-viewport-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: daff-theme.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: daff-theme.daff-map-deep-get($theme, 'core.base-contrast');
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: daff-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast');
 	$primary: map.get($theme, primary);
 
 	.design-land-sidebar-viewport {
@@ -25,4 +25,4 @@
 			color: $base;
 		}
 	}
-}
+}
diff --git a/apps/design-land/src/app/foundations/color/color-theme.scss b/apps/design-land/src/app/foundations/color/color-theme.scss
@@ -1,21 +1,21 @@
 @use 'theme' as daff-theme;
 
 @mixin color-theme($theme) {
-	$white: daff-theme.daff-map-deep-get($theme, 'core.white');
-	$black: daff-theme.daff-map-deep-get($theme, 'core.black');
+	$white: daff-theme.daff-map-get($theme, 'core', 'white');
+	$black: daff-theme.daff-map-get($theme, 'core', 'black');
 
 	.dl-color {
 		&__palette {
 			> * {
-				&:nth-child(n+6) {
+				&:nth-child(n + 6) {
 					color: daff-theme.$white;
 				}
 			}
-	
+
 			&.brand-yellow {
 				> * {
 					color: daff-theme.$black;
-					
+
 					&:last-child {
 						color: daff-theme.$white;
 					}

diff --git a/apps/design-land/src/app/typography/typography-theme.scss b/apps/design-land/src/app/typography/typography-theme.scss
@@ -2,16 +2,16 @@
 @use 'theme' as daff-theme;
 
 @mixin typography-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
 
 	.dl-typography {
 		&__typescale-card {
 			border: 1px solid daff-theme.daff-color($neutral, 20);
 		}
-		
+
 		&__desktop-subheading,
 		&__mobile-subheading {
 			color: daff-theme.daff-color($neutral);
 		}
-	}	
-}
+	}
+}
diff --git a/libs/branding/src/lib/logo/logo-theme.scss b/libs/branding/src/lib/logo/logo-theme.scss
@@ -2,9 +2,9 @@
 @use 'theme' as daff-theme;
 
 @mixin daff-logo-theme($theme) {
-	$neutral: daff-theme.daff-map-deep-get($theme, 'core.neutral');
-	$base: branding-theme.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: branding-theme.daff-map-deep-get($theme, 'core.base-contrast');
+	$neutral: daff-theme.daff-map-get($theme, 'core', 'neutral');
+	$base: branding-theme.daff-map-get($theme, 'core', 'base');
+	$base-contrast: branding-theme.daff-map-get($theme, 'core', 'base-contrast');
 
 	.daff-branding-logo {
 		fill: daff-theme.daff-illuminate($base-contrast, $neutral, 1);

diff --git a/libs/branding/src/scss/branding-theme.scss b/libs/branding/src/scss/branding-theme.scss
@@ -13,5 +13,5 @@ $tertiary-dark: daff-theme.daff-configure-palette(daff-theme.$daff-turquoise, 50
 
 $theme-dark: daff-theme.daff-configure-theme($primary-dark, $secondary-dark, $tertiary-dark, 'dark');
 
-$black: daff-theme.daff-map-deep-get($theme, 'core.black');
-$white: daff-theme.daff-map-deep-get($theme, 'core.white');
+$black: daff-theme.daff-map-get($theme, 'core', 'black');
+$white: daff-theme.daff-map-get($theme, 'core', 'white');
diff --git a/libs/design/accordion/src/accordion-theme.scss b/libs/design/accordion/src/accordion-theme.scss
@@ -3,8 +3,8 @@
 @use '../../scss/theming';
 
 @mixin daff-accordion-theme($theme) {
-	$neutral: core.daff-map-deep-get($theme, 'core.neutral');
-	$base: core.daff-map-deep-get($theme, 'core.base');
+	$neutral: core.daff-map-get($theme, 'core', 'neutral');
+	$base: core.daff-map-get($theme, 'core', 'base');
 
 	.daff-accordion-item {
 		border-top: 1px solid theming.daff-illuminate($base, $neutral, 2);

diff --git a/libs/design/article/src/article-theme.scss b/libs/design/article/src/article-theme.scss
@@ -7,11 +7,11 @@
 	$primary: map.get($theme, primary);
 	$secondary: map.get($theme, secondary);
 	$tertiary: map.get($theme, tertiary);
-	$base: core.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: core.daff-map-deep-get($theme, 'core.base-contrast');
-	$white: core.daff-map-deep-get($theme, 'core.white');
-	$black: core.daff-map-deep-get($theme, 'core.black');
-	$neutral: core.daff-map-deep-get($theme, 'core.neutral');
+	$base: core.daff-map-get($theme, 'core', 'base');
+	$base-contrast: core.daff-map-get($theme, 'core', 'base-contrast');
+	$white: core.daff-map-get($theme, 'core', 'white');
+	$black: core.daff-map-get($theme, 'core', 'black');
+	$neutral: core.daff-map-get($theme, 'core', 'neutral');
 
 	$text-color: theming.daff-illuminate($base-contrast, $neutral, 2);
 	$table-border-color: theming.daff-illuminate($base, $neutral, 2);

diff --git a/libs/design/breadcrumb/src/breadcrumb-theme.scss b/libs/design/breadcrumb/src/breadcrumb-theme.scss
@@ -3,9 +3,9 @@
 @use '../../scss/theming';
 
 @mixin daff-breadcrumb-theme($theme) {
-	$base: core.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: core.daff-map-deep-get($theme, 'core.base-contrast');
-	$neutral: core.daff-map-deep-get($theme, 'core.neutral');
+	$base: core.daff-map-get($theme, 'core', 'base');
+	$base-contrast: core.daff-map-get($theme, 'core', 'base-contrast');
+	$neutral: core.daff-map-get($theme, 'core', 'neutral');
 
 	.daff-breadcrumb__item {
 		color: theming.daff-illuminate($base-contrast, $neutral, 4);

diff --git a/libs/design/button/src/button/basic/button-theme.scss b/libs/design/button/src/button/basic/button-theme.scss
@@ -35,11 +35,11 @@
 	$warn: map.get($theme, warn);
 	$critical: map.get($theme, critical);
 	$success: map.get($theme, success);
-	$base: core.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: core.daff-map-deep-get($theme, 'core.base-contrast');
-	$white: core.daff-map-deep-get($theme, 'core.white');
-	$black: core.daff-map-deep-get($theme, 'core.black');
-	$neutral: core.daff-map-deep-get($theme, 'core.neutral');
+	$base: core.daff-map-get($theme, 'core', 'base');
+	$base-contrast: core.daff-map-get($theme, 'core', 'base-contrast');
+	$white: core.daff-map-get($theme, 'core', 'white');
+	$black: core.daff-map-get($theme, 'core', 'black');
+	$neutral: core.daff-map-get($theme, 'core', 'neutral');
 
 	.daff-button {
 		@include daff-button-theme-variant(

diff --git a/libs/design/button/src/button/flat/flat-theme.scss b/libs/design/button/src/button/flat/flat-theme.scss
@@ -2,10 +2,7 @@
 @use '../../../../scss/theming';
 @use '../../../../scss/core';
 
-@mixin daff-flat-button-theme-variant(
-	$base-color,
-	$active-color
-) {
+@mixin daff-flat-button-theme-variant($base-color, $active-color) {
 	color: $base-color;
 
 	&::after {
@@ -33,11 +30,11 @@
 	$warn: map.get($theme, warn);
 	$critical: map.get($theme, critical);
 	$success: map.get($theme, success);
-	$base: core.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: core.daff-map-deep-get($theme, 'core.base-contrast');
-	$white: core.daff-map-deep-get($theme, 'core.white');
-	$black: core.daff-map-deep-get($theme, 'core.black');
-	$neutral: core.daff-map-deep-get($theme, 'core.neutral');
+	$base: core.daff-map-get($theme, 'core', 'base');
+	$base-contrast: core.daff-map-get($theme, 'core', 'base-contrast');
+	$white: core.daff-map-get($theme, 'core', 'white');
+	$black: core.daff-map-get($theme, 'core', 'black');
+	$neutral: core.daff-map-get($theme, 'core', 'neutral');
 
 	.daff-flat-button {
 		color: currentColor;
@@ -54,7 +51,9 @@
 
 		&:hover,
 		&:active {
-			color: theming.daff-text-contrast(theming.daff-illuminate($base, $neutral, 2));
+			color: theming.daff-text-contrast(
+				theming.daff-illuminate($base, $neutral, 2)
+			);
 		}
 
 		&.daff-primary {

diff --git a/libs/design/button/src/button/icon/icon-theme.scss b/libs/design/button/src/button/icon/icon-theme.scss
@@ -13,8 +13,7 @@
 		color: $hover-color;
 		@if $base-color == currentColor {
 			opacity: 0.8;
-		}
-		@else {
+		} @else {
 			opacity: 1;
 		}
 	}
@@ -32,11 +31,11 @@
 	$warn: map.get($theme, warn);
 	$critical: map.get($theme, critical);
 	$success: map.get($theme, success);
-	$base: core.daff-map-deep-get($theme, 'core.base');
-	$base-contrast: core.daff-map-deep-get($theme, 'core.base-contrast');
-	$white: core.daff-map-deep-get($theme, 'core.white');
-	$black: core.daff-map-deep-get($theme, 'core.black');
-	$neutral: core.daff-map-deep-get($theme, 'core.neutral');
+	$base: core.daff-map-get($theme, 'core', 'base');
+	$base-contrast: core.daff-map-get($theme, 'core', 'base-contrast');
+	$white: core.daff-map-get($theme, 'core', 'white');
+	$black: core.daff-map-get($theme, 'core', 'black');
+	$neutral: core.daff-map-get($theme, 'core', 'neutral');
 
 	.daff-icon-button {
 		@include daff-icon-button-theme-variant(