diff --git a/package-lock.json b/package-lock.json index 87e31ac..fbcdab3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,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", @@ -3062,8 +3062,8 @@ }, "node_modules/@gridsuite/commons-ui": { "version": "0.126.0", - "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.126.0.tgz", - "integrity": "sha512-PQKNxVOYeygiRMLsKyBdjF+u1HZKG3yZONDc4YHGpaV8rOqmtHC7721qUL6dg5EP7C8b+Wi7nlSxeMd3n/UrBg==", + "resolved": "file:../commons-ui/gridsuite-commons-ui-0.126.0.tgz", + "integrity": "sha512-LCXsqixdcX8HWDeNw8rM+VC0DZAULwht1ymx3fqlAu5v021Ao9Ko4cmusuWRKsVVbfgmikk/zPbDdOlpxXmkiQ==", "license": "MPL-2.0", "dependencies": { "@ag-grid-community/locale": "^33.3.2", diff --git a/package.json b/package.json index ab9453f..570f47e 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/components/app.tsx b/src/components/app.tsx index 6247e7c..29cc4a1 100644 --- a/src/components/app.tsx +++ b/src/components/app.tsx @@ -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*/) { diff --git a/src/module-mui.d.ts b/src/module-mui.d.ts index f1af2fd..454a9bb 100644 --- a/src/module-mui.d.ts +++ b/src/module-mui.d.ts @@ -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 {} -} - -declare module '@mui/utils/capitalize' { - export default function capitalize(string: S): Capitalize; -} +// Just to be sure that commons-ui's mui augmentation is seen by tsc +import type {} from '@gridsuite/commons-ui';