fix: editor disappear when closing a maximized panel (#287)

DTStack · Jul 29, 2021 · 7b32028 · 7b32028
1 parent d8a6e43
commit 7b32028
Showing 1 changed file with 27 additions and 18 deletions.
diff --git a/src/workbench/workbench.tsx b/src/workbench/workbench.tsx
@@ -45,6 +45,32 @@ export function WorkbenchView(props: IWorkbench & ILayout & ILayoutController) {
         horizontalSplitPanePos,
     } = props;
 
+    const getContent = (panelMaximized: boolean, panelHidden: boolean) => {
+        const editor = (
+            <Pane
+                initialSize={panelHidden ? '100%' : horizontalSplitPanePos[0]}
+                maxSize="100%"
+                minSize="10%"
+            >
+                <EditorView />
+            </Pane>
+        );
+
+        const panel = (
+            <Pane>
+                <PanelView />
+            </Pane>
+        );
+
+        if (panelHidden) {
+            return editor;
+        }
+        if (panelMaximized) {
+            return panel;
+        }
+        return [editor, panel];
+    };
+
     return (
         <div id={ID_APP} className={appClassName} tabIndex={0}>
             <div className={workbenchClassName}>
@@ -75,24 +101,7 @@ export function WorkbenchView(props: IWorkbench & ILayout & ILayoutController) {
                             // react-split-pane onChange: (newSizes: [size, ratio]) => void；
                             onChange={onHorizontalPaneSizeChange as any}
                         >
-                            {!panel.panelMaximized ? (
-                                <Pane
-                                    initialSize={
-                                        panel.hidden
-                                            ? '100%'
-                                            : horizontalSplitPanePos[0]
-                                    }
-                                    maxSize="100%"
-                                    minSize="10%"
-                                >
-                                    <EditorView />
-                                </Pane>
-                            ) : null}
-                            {!panel.hidden ? (
-                                <Pane>
-                                    <PanelView />
-                                </Pane>
-                            ) : null}
+                            {getContent(!!panel.panelMaximized, !!panel.hidden)}
                         </SplitPane>
                     </SplitPane>
                 </div>