fix: layout

opensumi · Sep 23, 2024 · 4837ef3 · 4837ef3
1 parent aef7a97
commit 4837ef3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/packages/core-browser/src/components/layout/default-layout.tsx b/packages/core-browser/src/components/layout/default-layout.tsx
@@ -6,7 +6,7 @@ import { BoxPanel } from './box-panel';
 import { SplitPanel } from './split-panel';
 
 export interface ILayoutConfigCache {
-  [key: string]: { size: number; currentId: string };
+  [key: string]: { size?: number; currentId?: string };
 }
 
 export const getStorageValue = () => {
@@ -26,7 +26,7 @@ export const getStorageValue = () => {
   } catch (err) {}
 
   return {
-    layout: savedLayout,
+    layout: fixLayout(savedLayout),
     colors: savedColors,
   };
 };
@@ -75,3 +75,21 @@ export function ToolbarActionBasedLayout(
     </BoxPanel>
   );
 }
+
+/**
+ * if layout has currentId, but its size is zero
+ * we cannot acknowledge the currentId, so we should remove it
+ */
+export function fixLayout(layout: ILayoutConfigCache) {
+  const newLayout = { ...layout };
+  for (const key in layout) {
+    if (!layout[key]) {
+      continue;
+    }
+
+    if (!layout[key].size) {
+      newLayout[key].currentId = '';
+    }
+  }
+  return newLayout;
+}
diff --git a/packages/main-layout/src/browser/layout.service.ts b/packages/main-layout/src/browser/layout.service.ts
@@ -18,6 +18,7 @@ import {
   WithEventBus,
   slotRendererRegistry,
 } from '@opensumi/ide-core-browser';
+import { fixLayout } from '@opensumi/ide-core-browser/lib/components';
 import { LAYOUT_STATE, LayoutState } from '@opensumi/ide-core-browser/lib/layout/layout-state';
 import { ComponentRegistryInfo } from '@opensumi/ide-core-browser/lib/layout/layout.interface';
 import {
@@ -170,7 +171,7 @@ export class LayoutService extends WithEventBus implements IMainLayoutService {
   }
 
   restoreTabbarService = async (service: TabbarService) => {
-    this.state = this.layoutState.getState(LAYOUT_STATE.MAIN, defaultLayoutState);
+    this.state = fixLayout(this.layoutState.getState(LAYOUT_STATE.MAIN, defaultLayoutState));
 
     const { currentId, size } = this.state[service.location] || {};
     service.prevSize = size;