Rebuild commond bar component

This commit is contained in:
2022-04-26 16:42:02 +08:00
parent ec3aaa5e3a
commit 23ebbeb120
6 changed files with 133 additions and 90 deletions
@@ -1,4 +1,6 @@
import { Component, ReactNode } from "react";
import { DndProvider } from 'react-dnd'
import { HTML5Backend } from 'react-dnd-html5-backend'
import { SettingProvider, Setting, Platform } from "@Context/Setting";
import { Theme, BackgroundLevel, FontLevel } from "@Component/Theme/Theme";
import { ISimulatorAPI } from "@Electron/SimulatorAPI";
@@ -9,10 +11,10 @@ import { initializeIcons } from '@fluentui/font-icons-mdl2';
import { RootContainer } from "@Component/Container/RootContainer";
import { LayoutDirection } from "@Context/Layout";
import { CommandBar } from "@Component/CommandBar/CommandBar";
import { LoadFile } from "@Component/LoadFile/LoadFile";
import { HeaderBar } from "@Component/HeaderBar/HeaderBar";
import { Popup } from "@Component/Popup/Popup";
import { Entry } from "../Entry/Entry";
import { Group } from "@Model/Group";
import "./SimulatorDesktop.scss";
initializeIcons("./font-icon/");
@@ -89,7 +91,9 @@ class SimulatorDesktop extends Component {
return <SettingProvider value={this.setting}>
<StatusProvider value={this.status}>
<ElectronProvider value={this.electron}>
{this.renderContent()}
<DndProvider backend={HTML5Backend}>
{this.renderContent()}
</DndProvider>
</ElectronProvider>
</StatusProvider>
</SettingProvider>
@@ -102,13 +106,15 @@ class SimulatorDesktop extends Component {
fontLevel={FontLevel.Level3}
>
<Popup/>
<HeaderBar height={35}/>
<div className="app-root-space" style={{
height: `calc( 100% - ${35}px)`
}}>
<CommandBar/>
<RootContainer/>
</div>
<LoadFile>
<HeaderBar height={35}/>
<div className="app-root-space" style={{
height: `calc( 100% - ${35}px)`
}}>
<CommandBar/>
<RootContainer/>
</div>
</LoadFile>
</Theme>
}
}