Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions packages/toolpad-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@
"@mui/icons-material": "6.1.3",
"@mui/lab": "6.0.0-beta.11",
"@mui/material": "6.1.3",
"@mui/system": "6.1.3",
"@mui/types": "7.2.18",
"@mui/utils": "6.1.3",
"@mui/x-charts": "7.20.0",
"@mui/x-data-grid": "7.20.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-studio/src/ThemeContext.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { PaletteMode, ScopedCssBaseline } from '@mui/material';
import { ThemeProvider as MuiThemeProvider, createTheme } from '@mui/material/styles';
import { deepmerge } from '@mui/utils';
import deepmerge from '@mui/utils/deepmerge';
import useMediaQuery from '@mui/material/useMediaQuery';
import { getDesignTokens, getMetaThemeColor, getThemedComponents } from './theme';
import useLocalStorageState from './utils/useLocalStorageState';
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-studio/src/runtime/AppThemeProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { createTheme, Theme, ThemeProvider, ThemeOptions } from '@mui/material';
import { deepmerge } from '@mui/utils';
import deepmerge from '@mui/utils/deepmerge';
import * as appDom from '@toolpad/studio-runtime/appDom';

declare module '@mui/material/styles' {
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-studio/src/runtime/api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { queryClient } from '@toolpad/studio-runtime';
// TODO: move this rpc logic to @mui/utils
// TODO: move this rpc logic to @toolpad/utils
// eslint-disable-next-line import/no-restricted-paths
import { ApiClient, createRpcApi } from '../rpcClient';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from '@toolpad/studio-runtime';
import { ExactEntriesOf } from '@toolpad/utils/types';
import * as appDom from '@toolpad/studio-runtime/appDom';
import Box from '@mui/system/Box';
import Box from '@mui/material/Box';
import NodeAttributeEditor from './NodeAttributeEditor';
import { usePageEditorState } from './PageEditorProvider';
import { useToolpadComponent } from '../toolpadComponents';
Expand Down
14 changes: 4 additions & 10 deletions pnpm-lock.yaml

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

Loading