Example Web Editor

From 2fb435bec0ba98c355e51675d1486af1cb7f8176 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 3 Oct 2021 01:15:19 +0200 Subject: chore(web): bump MUI 5 to released version --- language-web/src/main/html/index.html | 2 +- language-web/src/main/js/App.tsx | 137 +++++++++------------- language-web/src/main/js/editor/EditorButtons.tsx | 65 ++++------ language-web/src/main/js/index.tsx | 19 +-- language-web/src/main/js/makeStyles.ts | 4 - language-web/src/main/js/theme/EditorTheme.ts | 2 +- language-web/src/main/js/theme/ThemeProvider.tsx | 2 +- language-web/src/main/js/theme/ThemeStore.ts | 4 +- 8 files changed, 85 insertions(+), 150 deletions(-) delete mode 100644 language-web/src/main/js/makeStyles.ts (limited to 'language-web/src') diff --git a/language-web/src/main/html/index.html b/language-web/src/main/html/index.html index a418b0d1..f404aa8a 100644 --- a/language-web/src/main/html/index.html +++ b/language-web/src/main/html/index.html @@ -3,7 +3,7 @@ - Example Web Editor + Refinery

+ + + + + + + Refinery + + + - - - - - - - GraphSolver - - - - + - - - - - + Generate + + + + - - - + + editorStore.toggleLineNumbers()} size="small" - className={cx(classes.iconButton)} aria-label="Show line numbers" value="show-line-numbers" > - + ); }); diff --git a/language-web/src/main/js/index.tsx b/language-web/src/main/js/index.tsx index 86cb4a65..80c70f23 100644 --- a/language-web/src/main/js/index.tsx +++ b/language-web/src/main/js/index.tsx @@ -1,8 +1,6 @@ -import { CacheProvider } from '@emotion/react'; import React from 'react'; import { render } from 'react-dom'; -import CssBaseline from '@material-ui/core/CssBaseline'; -import createCache from 'tss-react/@emotion/cache'; +import CssBaseline from '@mui/material/CssBaseline'; import { App } from './App'; import { RootStore, RootStoreProvider } from './RootStore'; @@ -49,19 +47,12 @@ scope Family = 1, Person += 5..10. const rootStore = new RootStore(); rootStore.editorStore.updateValue(initialValue); -const muiCache = createCache({ - key: 'mui', - prepend: true, -}); - const app = ( - - - - - - + + + + ); diff --git a/language-web/src/main/js/makeStyles.ts b/language-web/src/main/js/makeStyles.ts deleted file mode 100644 index a80e8858..00000000 --- a/language-web/src/main/js/makeStyles.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { createMakeStyles } from 'tss-react'; -import { useTheme } from '@material-ui/core/styles'; - -export const { makeStyles } = createMakeStyles({ useTheme }); diff --git a/language-web/src/main/js/theme/EditorTheme.ts b/language-web/src/main/js/theme/EditorTheme.ts index 957f2426..1b0dd5de 100644 --- a/language-web/src/main/js/theme/EditorTheme.ts +++ b/language-web/src/main/js/theme/EditorTheme.ts @@ -1,4 +1,4 @@ -import { PaletteMode } from '@material-ui/core'; +import type { PaletteMode } from '@mui/material'; import cssVariables from '../../css/themeVariables.module.scss'; diff --git a/language-web/src/main/js/theme/ThemeProvider.tsx b/language-web/src/main/js/theme/ThemeProvider.tsx index e7574725..f5b50be1 100644 --- a/language-web/src/main/js/theme/ThemeProvider.tsx +++ b/language-web/src/main/js/theme/ThemeProvider.tsx @@ -1,5 +1,5 @@ -import { ThemeProvider as MaterialUiThemeProvider } from '@material-ui/core/styles'; import { observer } from 'mobx-react-lite'; +import { ThemeProvider as MaterialUiThemeProvider } from '@mui/material/styles'; import React from 'react'; import { useRootStore } from '../RootStore'; diff --git a/language-web/src/main/js/theme/ThemeStore.ts b/language-web/src/main/js/theme/ThemeStore.ts index 2644a96a..3bbea3a1 100644 --- a/language-web/src/main/js/theme/ThemeStore.ts +++ b/language-web/src/main/js/theme/ThemeStore.ts @@ -1,9 +1,9 @@ +import { makeAutoObservable } from 'mobx'; import { Theme, createTheme, responsiveFontSizes, -} from '@material-ui/core/styles'; -import { makeAutoObservable } from 'mobx'; +} from '@mui/material/styles'; import { EditorTheme, -- cgit v1.2.3-54-g00ecf