Skip to content

fix: adding new themes to themeprovider #768

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
cscheffauer merged 2 commits into from
Mar 18, 2025
Merged

fix: adding new themes to themeprovider #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec500ea
fix: adding new themes to themeprovider
cscheffauer Mar 17, 2025
56ce026
test: update themeprovider snapshot
cscheffauer Mar 17, 2025
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@
"@react-aria/button": "3.4.3",
"@types/node": "22.7.4",
"@momentum-design/icons": "0.10.0",
"@momentum-design/tokens": "0.3.2"
"@momentum-design/tokens": "0.5.0"
},
"dependencies": {
"@babel/runtime": "^7.0.0",
"@momentum-design/animations": "^0.0.4",
"@momentum-design/components": "0.33.2",
"@momentum-design/fonts": "0.0.8",
"@momentum-design/icons": "0.10.0",
"@momentum-design/tokens": "0.3.2",
"@momentum-design/tokens": "0.5.0",
"@momentum-ui/design-tokens": "^0.0.63",
"@momentum-ui/icons": "8.28.4",
"@momentum-ui/tokens": "^1.7.1",
Expand Down
20 changes: 10 additions & 10 deletions src/components/ThemeProvider/ThemeProvider.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ const STYLE = {

// Some themes are disabled until tokens are properly imported.
const THEME_NAMES = {
// DARK_BRONZE: 'darkBronze',
// DARK_INDIGO: 'darkIndigo',
// DARK_JADE: 'darkJade',
// DARK_LAVENDER: 'darkLavender',
// DARK_ROSE: 'darkRose',
DARK_BRONZE: 'darkBronzeWebex',
DARK_INDIGO: 'darkIndigoWebex',
DARK_JADE: 'darkJadeWebex',
DARK_LAVENDER: 'darkLavenderWebex',
DARK_ROSE: 'darkRoseWebex',
DARK_WEBEX: 'darkWebex',
// LIGHT_BRONZE: 'lightBronze',
// LIGHT_INDIGO: 'lightIndigo',
// LIGHT_JADE: 'lightJade',
// LIGHT_LAVENDER: 'lightLavender',
// LIGHT_ROSE: 'lightRose',
LIGHT_BRONZE: 'lightBronzeWebex',
LIGHT_INDIGO: 'lightIndigoWebex',
LIGHT_JADE: 'lightJadeWebex',
LIGHT_LAVENDER: 'lightLavenderWebex',
LIGHT_ROSE: 'lightRoseWebex',
LIGHT_WEBEX: 'lightWebex',
};

Expand Down
12 changes: 12 additions & 0 deletions src/components/ThemeProvider/ThemeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,19 @@ import '@momentum-design/tokens/dist/css/typography/complete.css';

// import Momentum theme tokens:
import '@momentum-design/tokens/dist/css/theme/webex/dark-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/dark-bronze-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/dark-indigo-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/dark-jade-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/dark-lavender-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/dark-rose-stable.css';

import '@momentum-design/tokens/dist/css/theme/webex/light-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/light-bronze-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/light-indigo-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/light-jade-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/light-lavender-stable.css';
import '@momentum-design/tokens/dist/css/theme/webex/light-rose-stable.css';

import {
ThemeProvider as MdcThemeProvider,
IconProvider as MdcIconProvider,
Expand Down
8 changes: 4 additions & 4 deletions src/components/ThemeProvider/ThemeProvider.unit.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

exports[`<ThemeProvider /> snapshot should match snapshot 1`] = `
<ThemeProvider
theme="darkWebex"
theme="darkBronzeWebex"
>
<ThemeProvider
className="md-theme-darkWebex mds-typography"
themeclass="mds-theme-stable-darkWebex"
className="md-theme-darkBronzeWebex mds-typography"
themeclass="mds-theme-stable-darkBronzeWebex"
>
<mdc-themeprovider
class="md-theme-darkWebex mds-typography"
class="md-theme-darkBronzeWebex mds-typography"
suppressHydrationWarning={true}
>
<IconProvider>
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2940,10 +2940,10 @@ __metadata:
languageName: node
linkType: hard

"@momentum-design/tokens@npm:0.3.2":
version: 0.3.2
resolution: "@momentum-design/tokens@npm:0.3.2"
checksum: 738b7eecc03ba151fe2562a7147105c8dbdfc75f7ac8f9767e8b3b95c33f48f34e0164105c46bdbdbce4e6b607ff9d935b28088233a95dc8ec79e9b615afceb7
"@momentum-design/tokens@npm:0.5.0":
version: 0.5.0
resolution: "@momentum-design/tokens@npm:0.5.0"
checksum: db11bcb07f369fa08df84520cd1788202330a1d978166fb8b12668c605d6c48ad6f472bf49c7286c4f9f1abc69a3f191dd9ddc5d64ae372001a41bdf65da1cd0
languageName: node
linkType: hard

Expand Down Expand Up @@ -2987,7 +2987,7 @@ __metadata:
"@momentum-design/components": 0.33.2
"@momentum-design/fonts": 0.0.8
"@momentum-design/icons": 0.10.0
"@momentum-design/tokens": 0.3.2
"@momentum-design/tokens": 0.5.0
"@momentum-ui/design-tokens": ^0.0.63
"@momentum-ui/icons": 8.28.4
"@momentum-ui/tokens": ^1.7.1
Expand Down
Loading