Skip to content

Commit

Permalink
feat: move dialogs to MUI
Browse files Browse the repository at this point in the history
  • Loading branch information
zoomchik committed Oct 31, 2023
2 parents 64fdd47 + 7bc6abb commit b403b38
Show file tree
Hide file tree
Showing 11 changed files with 597 additions and 679 deletions.
379 changes: 196 additions & 183 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@exabyte-io/wave.js": "2023.9.14-1",
"@exabyte-io/cove.js": "2023.10.14-0",
"@exabyte-io/cove.js": "2023.10.27-0",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.9",
"@mui/styles": "^5.11.7",
Expand All @@ -52,7 +52,6 @@
"node-sass": "^4.11.0",
"prop-types": "^15.8.0",
"react-bootstrap": "0.32.4",
"react-full-screen": "^0.2.2",
"react-jss": "^8.6.1",
"react-redux": "^4.4.8",
"react-s-alert": "^1.4.1",
Expand Down
4 changes: 2 additions & 2 deletions src/MaterialsDesigner.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import ThemeProvider from "@exabyte-io/cove.js/dist/theme/provider";
import { DarkMaterialUITheme } from "@exabyte-io/cove.js/dist/theme";
import { StyledEngineProvider } from "@mui/material/styles";
import FullscreenComponentMixin from "@exabyte-io/cove.js/dist/other/fullscreen";
import setClass from "classnames";
import { mix } from "mixwith";
import PropTypes from "prop-types";
Expand All @@ -12,7 +13,6 @@ import { ThreeDEditorFullscreen } from "./components/3d_editor/ThreeDEditorFulls
import EditorSelectionInfo from "./components/3d_editor_selection_info/EditorSelectionInfo";
import HeaderMenuToolbar from "./components/header_menu/HeaderMenuToolbar";
import DefaultImportModalDialog from "./components/include/DefaultImportModalDialog";
import { FullscreenComponentMixin } from "./components/include/FullscreenComponentMixin";
import ItemsList from "./components/items_list/ItemsList";
import SourceEditor from "./components/source_editor/SourceEditor";
import { Material } from "./material";
Expand Down Expand Up @@ -96,7 +96,7 @@ class MaterialsDesigner extends mix(React.Component).with(FullscreenComponentMix
onUpdate={this.props.onUpdate}
/>
</Grid>
<Grid item xs={12} md={6}>
<Grid item xs={12} md={6} sx={{ position: "relative" }}>
<ThreeDEditorFullscreen
editable
material={this.props.material}
Expand Down
3 changes: 1 addition & 2 deletions src/components/3d_editor/ThreeDEditorFullscreen.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import FullscreenComponentMixin from "@exabyte-io/cove.js/dist/other/fullscreen";
import { ThreeDEditor } from "@exabyte-io/wave.js";
import FullscreenIcon from "@mui/icons-material/Fullscreen";
import setClass from "classnames";
import { mix } from "mixwith";
import PropTypes from "prop-types";
import React from "react";

import { FullscreenComponentMixin } from "../include/FullscreenComponentMixin";

export class ThreeDEditorFullscreen extends mix(ThreeDEditor).with(FullscreenComponentMixin) {
getToolbarConfig() {
const clsInstance = this;
Expand Down
Loading

0 comments on commit b403b38

Please sign in to comment.