Skip to content

feat(theming): add base theme config #35220

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+1,693 −455
Open

feat(theming): add base theme config #35220

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01678b3
feat(theming): add base theme config
gabotorresruiz Sep 19, 2025
1559605
feat(theming): simplify and unify base/system theme logic
gabotorresruiz Sep 22, 2025
d4eb799
fix(theming): address PR comments + some fixes and improvements
gabotorresruiz Sep 23, 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
2 changes: 1 addition & 1 deletion superset-frontend/packages/superset-ui-core/src/components/Typography/Typography.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe('Typography Component', () => {

it('renders strong text', () => {
render(<Typography.Text strong>Strong Text</Typography.Text>);
expect(screen.getByText('Strong Text')).toHaveStyle('font-weight: 500');
expect(screen.getByText('Strong Text')).toHaveStyle('font-weight: 600');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why this test needed to change, from my understanding we just moved the default base theme from the frontend to the backend.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test changed because fontWeightStrong: 500 theme token was moved from the frontend (Theme.tsx) to the backend (config.py). During unit tests, the backend config isn't available, so Ant Design's default (600) is used instead. The test now reflects this fallback behavior.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, then I'm surprised we don't have more unit tests failing. Noting this test doesn't seem to use the spec/helpers/ render (which renders with a theme provider), it does import '@testing-library/jest-dom'; instead of @superset-ui/core/spec, wondering if it has something to do with it.

Sidetrack (outside the scope of this PR): It's a bit of a mess around this, might be good to not allow importing @testing-library directly so we're always providing a theme context. It's a bit confusing since each library might have slightly different helpers (useRedux:true in main app for instance).

Not sure what to do with all this, maybe it's just out-of-scope of this PR and this change is ok.

});

it('renders underlined text', () => {
Expand Down
12 changes: 12 additions & 0 deletions superset-frontend/packages/superset-ui-core/src/theme/GlobalStyles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/

// @fontsource/* v5.1+ doesn't play nice with eslint-import plugin v2.31+
/* eslint-disable import/extensions */
import '@fontsource/inter/200.css';
import '@fontsource/inter/400.css';
import '@fontsource/inter/500.css';
import '@fontsource/inter/600.css';
import '@fontsource/fira-code/400.css';
import '@fontsource/fira-code/500.css';
import '@fontsource/fira-code/600.css';
/* eslint-enable import/extensions */

import { css, useTheme, Global } from '@emotion/react';

export const GlobalStyles = () => {
Expand Down
Loading
Loading