Skip to content

Fix custom theme variables used #153

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 1 commit into
base: main
Choose a base branch
from
Open

Fix custom theme variables used #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1",
"@gridsuite/commons-ui": "0.126.0",
"@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.126.0.tgz",
"@hookform/resolvers": "^4.1.3",
"@mui/icons-material": "^5.18.0",
"@mui/lab": "5.0.0-alpha.175",
Expand Down
2 changes: 0 additions & 2 deletions src/components/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,11 @@ const lightTheme = createTheme({
palette: {
mode: 'light',
},
mapboxStyle: 'mapbox://styles/mapbox/light-v9',
});
const darkTheme = createTheme({
palette: {
mode: 'dark',
},
mapboxStyle: 'mapbox://styles/mapbox/dark-v9',
});

function getMuiTheme(theme: GsTheme, locale: string /*TODO GsLangUser*/) {
Expand Down
33 changes: 2 additions & 31 deletions src/module-mui.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,5 @@
*/
/* eslint-disable spaced-comment */

// https://mui.com/material-ui/customization/theming/#typescript
// eslint-disable-next-line import/no-extraneous-dependencies -- lib from MUI
import { CSSObject } from '@mui/styled-engine';
import type { Property } from 'csstype';
// import { Theme as MuiTheme, ThemeOptions as MuiThemeOptions } from '@mui/material/styles/createTheme';

declare module '@mui/material/styles' {
type ThemeExtension = {
arrow: CSSObject;
arrow_hover: CSSObject;
circle: CSSObject;
circle_hover: CSSObject;
link: CSSObject;
row: CSSObject;
aggrid: {
theme: 'ag-theme-alpine' | 'ag-theme-alpine-dark';
highlightColor: Property.Color;
};
agGridBackground: CSSObject;
mapboxStyle: string;
};

export interface Theme extends /*MuiTheme,*/ ThemeExtension {}

// allow configuration using `createTheme`
export interface ThemeOptions extends /*MuiThemeOptions,*/ Partial<ThemeExtension> {}
}

declare module '@mui/utils/capitalize' {
export default function capitalize<S extends string>(string: S): Capitalize<S>;
}
// Just to be sure that commons-ui's mui augmentation is seen by tsc
import type {} from '@gridsuite/commons-ui';
Loading