From ec500ea54fd1c2fc33d763eb9b13d8fd0ed81721 Mon Sep 17 00:00:00 2001 From: Christoph Scheffauer Date: Mon, 17 Mar 2025 17:21:47 +0100 Subject: [PATCH 1/2] fix: adding new themes to themeprovider --- package.json | 4 ++-- .../ThemeProvider/ThemeProvider.constants.ts | 20 +++++++++---------- .../ThemeProvider/ThemeProvider.tsx | 12 +++++++++++ yarn.lock | 10 +++++----- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 02c742273..16a61a3e6 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "@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", @@ -108,7 +108,7 @@ "@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", diff --git a/src/components/ThemeProvider/ThemeProvider.constants.ts b/src/components/ThemeProvider/ThemeProvider.constants.ts index 524f2f5ca..7a29fc6f5 100644 --- a/src/components/ThemeProvider/ThemeProvider.constants.ts +++ b/src/components/ThemeProvider/ThemeProvider.constants.ts @@ -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', }; diff --git a/src/components/ThemeProvider/ThemeProvider.tsx b/src/components/ThemeProvider/ThemeProvider.tsx index 853d53915..8ec275a15 100644 --- a/src/components/ThemeProvider/ThemeProvider.tsx +++ b/src/components/ThemeProvider/ThemeProvider.tsx @@ -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, diff --git a/yarn.lock b/yarn.lock index 644dda7b1..5f2c55db7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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 @@ -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 From 56ce02694f7be95c6645dbf8995e6eb0b0bc9ad0 Mon Sep 17 00:00:00 2001 From: Christoph Scheffauer Date: Mon, 17 Mar 2025 18:25:18 +0100 Subject: [PATCH 2/2] test: update themeprovider snapshot --- .../ThemeProvider/ThemeProvider.unit.test.tsx.snap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ThemeProvider/ThemeProvider.unit.test.tsx.snap b/src/components/ThemeProvider/ThemeProvider.unit.test.tsx.snap index 8b986200a..d82d08347 100644 --- a/src/components/ThemeProvider/ThemeProvider.unit.test.tsx.snap +++ b/src/components/ThemeProvider/ThemeProvider.unit.test.tsx.snap @@ -2,14 +2,14 @@ exports[` snapshot should match snapshot 1`] = `