Skip to content

chore: Adds theme optimisation and default theme layer #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pan-kot merged 3 commits into from
Apr 26, 2026
Merged

chore: Adds theme optimisation and default theme layer #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fad444
chore: Adds theme optimisation and default theme layer
pan-kot Apr 15, 2026
7f60831
additional optimisation
pan-kot Apr 15, 2026
941270e
Merge branch 'main' into layered-themes
pan-kot Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 9 additions & 43 deletions src/browser/__tests__/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,10 @@ exports[`applyTheme > with baseThemeId > attaches one style node containing over
--shadow-css:orange;
--boxShadow-css:var(--brown-css);
}}
.secondary-theme.secondary-theme .navigation:not(#\\9){
.secondary-theme.secondary-theme .navigation:not(#\\9),.navigation.navigation.secondary-theme:not(#\\9){
--shadow-css:pink;
}
.navigation.navigation.secondary-theme:not(#\\9){
--shadow-css:pink;
}
@media not print {.dark.dark.secondary-theme .navigation:not(#\\9){
--shadow-css:var(--grey-css);
--buttonShadow-css:green;
}}
@media not print {.dark.dark.navigation.secondary-theme:not(#\\9){
@media not print {.dark.dark.secondary-theme .navigation:not(#\\9),.dark.dark.navigation.secondary-theme:not(#\\9){
--shadow-css:var(--grey-css);
--buttonShadow-css:green;
}}"
Expand All @@ -48,11 +41,7 @@ exports[`applyTheme > with secondary theme > attaches one style node containing
--shadow-css:pink;
--boxShadow-css:purple;
}
@media not print {.dark.dark .navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}
@media not print {.dark.dark.navigation:not(#\\9){
@media not print {.dark.dark .navigation:not(#\\9),.dark.dark.navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}"
Expand All @@ -76,11 +65,7 @@ exports[`applyTheme > with targetDocument > attaches one style node containing o
--shadow-css:pink;
--boxShadow-css:purple;
}
@media not print {.dark.dark .navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}
@media not print {.dark.dark.navigation:not(#\\9){
@media not print {.dark.dark .navigation:not(#\\9),.dark.dark.navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}"
Expand All @@ -104,11 +89,7 @@ exports[`applyTheme > without secondary theme > attaches one style node containi
--shadow-css:pink;
--boxShadow-css:purple;
}
@media not print {.dark.dark .navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}
@media not print {.dark.dark.navigation:not(#\\9){
@media not print {.dark.dark .navigation:not(#\\9),.dark.dark.navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}"
Expand All @@ -128,17 +109,10 @@ exports[`generateThemeStylesheet > with baseThemeId > creates override styles 1`
--shadow-css:orange;
--boxShadow-css:var(--brown-css);
}}
.secondary-theme.secondary-theme .navigation:not(#\\9){
--shadow-css:pink;
}
.navigation.navigation.secondary-theme:not(#\\9){
.secondary-theme.secondary-theme .navigation:not(#\\9),.navigation.navigation.secondary-theme:not(#\\9){
--shadow-css:pink;
}
@media not print {.dark.dark.secondary-theme .navigation:not(#\\9){
--shadow-css:var(--grey-css);
--buttonShadow-css:green;
}}
@media not print {.dark.dark.navigation.secondary-theme:not(#\\9){
@media not print {.dark.dark.secondary-theme .navigation:not(#\\9),.dark.dark.navigation.secondary-theme:not(#\\9){
--shadow-css:var(--grey-css);
--buttonShadow-css:green;
}}"
Expand Down Expand Up @@ -169,11 +143,7 @@ exports[`generateThemeStylesheet > with secondary theme > creates override style
--shadow-css:pink;
--boxShadow-css:purple;
}
@media not print {.dark.dark .navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}
@media not print {.dark.dark.navigation:not(#\\9){
@media not print {.dark.dark .navigation:not(#\\9),.dark.dark.navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}"
Expand All @@ -197,11 +167,7 @@ exports[`generateThemeStylesheet > without secondary theme > creates override st
--shadow-css:pink;
--boxShadow-css:purple;
}
@media not print {.dark.dark .navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}
@media not print {.dark.dark.navigation:not(#\\9){
@media not print {.dark.dark .navigation:not(#\\9),.dark.dark.navigation:not(#\\9){
--shadow-css:var(--brown-css);
--buttonShadow-css:green;
}}"
Expand Down
34 changes: 17 additions & 17 deletions src/build/__tests__/__snapshots__/internal.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`builds internal themed components without errors 1`] = `
":root {
--font-family-base-91xi75:"Amazon Ember", "Helvetica Neue", Roboto, Arial, sans-serif;
--color-orange-500-vz48fa:#ec7211;
--color-orange-700-sk82ji:#dd6b10;
--color-background-button-primary-default-nhput1:var(--color-orange-500-vz48fa);
--color-background-button-primary-active-xbf2p5:var(--color-orange-700-sk82ji);
--space-xxs-c0i4qj:4px;
--space-xs-djjbsd:8px;
--space-scaled-xs-yqelf2:var(--space-xs-djjbsd);
}

.compact-mode:not(#\\9) {
--space-scaled-xs-yqelf2:var(--space-xxs-c0i4qj);
}

.dark-mode:not(#\\9) {
--color-background-button-primary-active-xbf2p5:var(--color-orange-500-vz48fa);
"@layer cloudscape-base-theme {
:root {
--font-family-base-91xi75:"Amazon Ember", "Helvetica Neue", Roboto, Arial, sans-serif;
--color-orange-500-vz48fa:#ec7211;
--color-orange-700-sk82ji:#dd6b10;
--color-background-button-primary-default-nhput1:var(--color-orange-500-vz48fa);
--color-background-button-primary-active-xbf2p5:var(--color-orange-700-sk82ji);
--space-xxs-c0i4qj:4px;
--space-xs-djjbsd:8px;
--space-scaled-xs-yqelf2:var(--space-xs-djjbsd);
}
.compact-mode:not(#\\9) {
--space-scaled-xs-yqelf2:var(--space-xxs-c0i4qj);
}
.dark-mode:not(#\\9) {
--color-background-button-primary-active-xbf2p5:var(--color-orange-500-vz48fa);
}
}"
`;
114 changes: 55 additions & 59 deletions src/build/__tests__/__snapshots__/public-secondary.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,64 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`Build-time theming of main theme with matching baseThemeId generates the correct css files 1`] = `
"body {
--font-family-base-rpbu7d:"Amazon Ember", "Helvetica Neue", Roboto, Arial, sans-serif;
--color-orange-500-25sm1g:#ec7211;
--color-orange-700-2auf4j:#dd6b10;
--color-background-button-primary-default-cqohzr:#aaaaaa;
--color-background-button-primary-active-h8she0:var(--color-orange-700-2auf4j);
--space-xxs-ihlmrd:4px;
--space-xs-xhls0c:8px;
--space-scaled-xs-26ut8b:var(--space-xs-xhls0c);
}

.compact-mode:not(#\\9) {
--space-scaled-xs-26ut8b:var(--space-xxs-ihlmrd);
}

.dark-mode:not(#\\9) {
--color-background-button-primary-default-cqohzr:#bbbbbb;
--color-background-button-primary-active-h8she0:var(--color-orange-500-25sm1g);
}

.secondary:not(#\\9) {
--color-orange-500-25sm1g:#ec72aa;
--color-orange-700-2auf4j:#dd6baa;
--color-background-button-primary-default-cqohzr:var(--color-orange-500-25sm1g);
--color-background-button-primary-active-h8she0:var(--color-orange-700-2auf4j);
}

.dark-mode.secondary:not(#\\9) {
--color-background-button-primary-default-cqohzr:var(--color-orange-700-2auf4j);
--color-background-button-primary-active-h8she0:var(--color-orange-500-25sm1g);
"@layer cloudscape-base-theme {
body {
--font-family-base-rpbu7d:"Amazon Ember", "Helvetica Neue", Roboto, Arial, sans-serif;
--color-orange-500-25sm1g:#ec7211;
--color-orange-700-2auf4j:#dd6b10;
--color-background-button-primary-default-cqohzr:#aaaaaa;
--color-background-button-primary-active-h8she0:var(--color-orange-700-2auf4j);
--space-xxs-ihlmrd:4px;
--space-xs-xhls0c:8px;
--space-scaled-xs-26ut8b:var(--space-xs-xhls0c);
}
.compact-mode:not(#\\9) {
--space-scaled-xs-26ut8b:var(--space-xxs-ihlmrd);
}
.dark-mode:not(#\\9) {
--color-background-button-primary-default-cqohzr:#bbbbbb;
--color-background-button-primary-active-h8she0:var(--color-orange-500-25sm1g);
}
.secondary:not(#\\9) {
--color-orange-500-25sm1g:#ec72aa;
--color-orange-700-2auf4j:#dd6baa;
--color-background-button-primary-default-cqohzr:var(--color-orange-500-25sm1g);
--color-background-button-primary-active-h8she0:var(--color-orange-700-2auf4j);
}
.dark-mode.secondary:not(#\\9) {
--color-background-button-primary-default-cqohzr:var(--color-orange-700-2auf4j);
--color-background-button-primary-active-h8she0:var(--color-orange-500-25sm1g);
}
}"
`;

exports[`Build-time theming of secondary theme generates the correct css files 1`] = `
"body {
--font-family-base-rpbu7d:"Amazon Ember", "Helvetica Neue", Roboto, Arial, sans-serif;
--color-orange-500-25sm1g:#ec7211;
--color-orange-700-2auf4j:#dd6b10;
--color-background-button-primary-default-l567s3:var(--color-orange-500-25sm1g);
--color-background-button-primary-active-h8she0:var(--color-orange-700-2auf4j);
--space-xxs-ihlmrd:4px;
--space-xs-xhls0c:8px;
--space-scaled-xs-26ut8b:var(--space-xs-xhls0c);
}

.compact-mode:not(#\\9) {
--space-scaled-xs-26ut8b:var(--space-xxs-ihlmrd);
}

.dark-mode:not(#\\9) {
--color-background-button-primary-active-h8she0:var(--color-orange-500-25sm1g);
}

.secondary:not(#\\9) {
--color-orange-500-25sm1g:#ec72aa;
--color-orange-700-2auf4j:#dd6baa;
--color-background-button-primary-default-l567s3:#aaaaaa;
--color-background-button-primary-active-h8she0:var(--color-orange-700-2auf4j);
}

.dark-mode.secondary:not(#\\9) {
--color-background-button-primary-default-l567s3:#bbbbbb;
--color-background-button-primary-active-h8she0:var(--color-orange-500-25sm1g);
"@layer cloudscape-base-theme {
body {
--font-family-base-rpbu7d:"Amazon Ember", "Helvetica Neue", Roboto, Arial, sans-serif;
--color-orange-500-25sm1g:#ec7211;
--color-orange-700-2auf4j:#dd6b10;
--color-background-button-primary-default-l567s3:var(--color-orange-500-25sm1g);
--color-background-button-primary-active-h8she0:var(--color-orange-700-2auf4j);
--space-xxs-ihlmrd:4px;
--space-xs-xhls0c:8px;
--space-scaled-xs-26ut8b:var(--space-xs-xhls0c);
}
.compact-mode:not(#\\9) {
--space-scaled-xs-26ut8b:var(--space-xxs-ihlmrd);
}
.dark-mode:not(#\\9) {
--color-background-button-primary-active-h8she0:var(--color-orange-500-25sm1g);
}
.secondary:not(#\\9) {
--color-orange-500-25sm1g:#ec72aa;
--color-orange-700-2auf4j:#dd6baa;
--color-background-button-primary-default-l567s3:#aaaaaa;
--color-background-button-primary-active-h8she0:var(--color-orange-700-2auf4j);
}
.dark-mode.secondary:not(#\\9) {
--color-background-button-primary-default-l567s3:#bbbbbb;
--color-background-button-primary-active-h8she0:var(--color-orange-500-25sm1g);
}
}"
`;
55 changes: 18 additions & 37 deletions src/shared/declaration/__tests__/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`renderDeclarations > does not render unnecessary declarations 1`] = `
":global body{
"@layer cloudscape-base-theme {
:global body{
--fontFamilyBase-css:"Helvetica Neue", Arial, sans-serif;
}
}"
`;

exports[`renderDeclarations > includes secondary theme 1`] = `
"body{
"@layer cloudscape-base-theme {
body{
--fontFamilyBase-css:"Helvetica Neue", Arial, sans-serif;
--fontFamilyBody-css:var(--fontFamilyBase-css);
--black-css:black;
Expand Down Expand Up @@ -41,37 +44,27 @@ exports[`renderDeclarations > includes secondary theme 1`] = `
--buttonShadow-css:var(--shadow-css);
--lineShadow-css:var(--buttonShadow-css);
}
@media not print {.dark .navigation{
--shadow-css:var(--brown-css);
--lineShadow-css:var(--boxShadow-css);
}}
@media not print {.dark.navigation{
@media not print {.dark .navigation,.dark.navigation{
--shadow-css:var(--brown-css);
--lineShadow-css:var(--boxShadow-css);
}}
.secondary-theme{
--black-css:purple;
--brown-css:black;
}
.secondary-theme .navigation{
--boxShadow-css:var(--shadow-css);
}
.navigation.secondary-theme{
.secondary-theme .navigation,.navigation.secondary-theme{
--boxShadow-css:var(--shadow-css);
}
@media not print {.dark.secondary-theme .navigation{
@media not print {.dark.secondary-theme .navigation,.dark.navigation.secondary-theme{
--shadow-css:var(--grey-css);
--boxShadow-css:var(--brown-css);
}}
@media not print {.dark.navigation.secondary-theme{
--shadow-css:var(--grey-css);
--boxShadow-css:var(--brown-css);
--lineShadow-css:var(--boxShadow-css);
}}"
}"
`;

exports[`renderDeclarations > renders declarations for theme with :root selector and context 1`] = `
":global body{
"@layer cloudscape-base-theme {
:global body{
--fontFamilyBase-css:"Helvetica Neue", Arial, sans-serif;
--fontFamilyBody-css:var(--fontFamilyBase-css);
--black-css:black;
Expand Down Expand Up @@ -105,18 +98,16 @@ exports[`renderDeclarations > renders declarations for theme with :root selector
--buttonShadow-css:var(--shadow-css);
--lineShadow-css:var(--buttonShadow-css);
}
@media not print {:global .dark .navigation{
@media not print {:global .dark .navigation,:global .dark.navigation{
--shadow-css:var(--brown-css);
--lineShadow-css:var(--boxShadow-css);
}}
@media not print {:global .dark.navigation{
--shadow-css:var(--brown-css);
--lineShadow-css:var(--boxShadow-css);
}}"
}"
`;

exports[`renderDeclarations > renders declarations for theme with non :root selector 1`] = `
".secondary-theme{
"@layer cloudscape-base-theme {
.secondary-theme{
--fontFamilyBase-css:"Helvetica Neue", Arial, sans-serif;
--fontFamilyBody-css:var(--fontFamilyBase-css);
--black-css:purple;
Expand Down Expand Up @@ -144,26 +135,16 @@ exports[`renderDeclarations > renders declarations for theme with non :root sele
.disabled-motion.secondary-theme{
--appear-css:0;
}
.secondary-theme .navigation{
.secondary-theme .navigation,.navigation.secondary-theme{
--shadow-css:var(--black-css);
--buttonShadow-css:var(--shadow-css);
--boxShadow-css:var(--shadow-css);
--lineShadow-css:var(--buttonShadow-css);
}
.navigation.secondary-theme{
--shadow-css:var(--black-css);
--buttonShadow-css:var(--shadow-css);
--boxShadow-css:var(--shadow-css);
--lineShadow-css:var(--buttonShadow-css);
}
@media not print {.dark.secondary-theme .navigation{
@media not print {.dark.secondary-theme .navigation,.dark.navigation.secondary-theme{
--shadow-css:var(--grey-css);
--boxShadow-css:var(--brown-css);
--lineShadow-css:var(--boxShadow-css);
}}
@media not print {.dark.navigation.secondary-theme{
--shadow-css:var(--grey-css);
--boxShadow-css:var(--brown-css);
--lineShadow-css:var(--boxShadow-css);
}}"
}"
`;
Loading
Loading