@difizen/libro-lab 0.1.13 → 0.1.15

package/src/kernel-and-terminal-panel/panel-command.tsx

@@ -0,0 +1,57 @@
+import { ReloadOutlined } from '@ant-design/icons';
+import type { CommandRegistry, ToolbarRegistry } from '@difizen/mana-app';
+import { ViewManager } from '@difizen/mana-app';
+import {
+  CommandContribution,
+  inject,
+  MenuContribution,
+  singleton,
+  ToolbarContribution,
+} from '@difizen/mana-app';
+
+import { KernelAndTerminalPanelView } from './kernel-and-terminal-panel-view.js';
+
+export const PanelCommand = {
+  REFRESH: {
+    id: 'panel.command.refresh',
+    label: '刷新',
+  },
+};
+
+@singleton({
+  contrib: [CommandContribution, MenuContribution, ToolbarContribution],
+})
+export class PanelCommandContribution
+  implements CommandContribution, ToolbarContribution
+{
+  protected viewManager: ViewManager;
+
+  @inject(KernelAndTerminalPanelView)
+  kernelAndTerminalPanelView: KernelAndTerminalPanelView;
+
+  constructor(@inject(ViewManager) viewManager: ViewManager) {
+    this.viewManager = viewManager;
+  }
+
+  registerCommands(command: CommandRegistry): void {
+    command.registerCommand(PanelCommand.REFRESH, {
+      execute: async (view) => {
+        if (view instanceof KernelAndTerminalPanelView) {
+          this.kernelAndTerminalPanelView.refresh();
+        }
+      },
+      isVisible: (view) => {
+        return view instanceof KernelAndTerminalPanelView;
+      },
+    });
+  }
+
+  registerToolbarItems(toolbarRegistry: ToolbarRegistry): void {
+    toolbarRegistry.registerItem({
+      id: PanelCommand.REFRESH.id,
+      command: PanelCommand.REFRESH.id,
+      icon: <ReloadOutlined />,
+      tooltip: '刷新',
+    });
+  }
+}

package/src/layout/layout-service.ts

@@ -1,5 +1,6 @@
 import { LibroNavigatableView, LibroService } from '@difizen/libro-jupyter';
 import type { View, ViewOpenHandlerOptions, ViewOpenOption } from '@difizen/mana-app';
+import { SideTabView } from '@difizen/mana-app';
 import { observable } from '@difizen/mana-app';
 import {
   DefaultSlotView,
@@ -32,6 +33,7 @@ export class LayoutService {
 
   @prop()
   serverSatus: StatusType = 'loading';
+
   @prop()
   visibilityMap: VisibilityMap = {
     [LibroLabLayoutSlots.header]: true,
@@ -76,6 +78,10 @@ export class LayoutService {
     await this.slotViewManager.addView(view, slot, viewOpenOption);
   }
 
+  getAllSlotView(slot: LibroLabLayoutSlotsType) {
+    return this.slotViewManager.getSlotView(slot);
+  }
+
   getActiveView(slot: LibroLabLayoutSlotsType) {
     if (this.isAreaVisible(slot)) {
       const slotView = this.slotViewManager.getSlotView(slot);
@@ -96,6 +102,17 @@ export class LayoutService {
     return undefined;
   }
 
+  shouldRenderNavigatorContent(): boolean {
+    if (!this.visibilityMap[LibroLabLayoutSlots.navigator]) {
+      return false;
+    }
+    const slotView = this.slotViewManager.getSlotView(LibroLabLayoutSlots.navigator);
+    if (slotView instanceof SideTabView) {
+      return !!slotView.showTabContent;
+    }
+    return false;
+  }
+
   async onOpenSlotActiveChange() {
     if (this.isAreaVisible(LibroLabLayoutSlots.content)) {
       const slotView = await this.slotViewManager.getOrCreateSlotView(

package/src/layout/main.tsx

@@ -10,6 +10,18 @@ import { LibroLabLayoutSlots } from './protocol.js';
 export const LibroLabLayoutMainComponent = forwardRef(
   function LibroLabLayoutMainComponent() {
     const layoutService = useInject(LayoutService);
+    const navigatorSize = layoutService.shouldRenderNavigatorContent()
+      ? {
+          minSize: 40,
+          defaultSize: 300,
+          maxSize: undefined,
+        }
+      : {
+          minSize: 40,
+          defaultSize: 40,
+          maxSize: 40,
+          noResize: true,
+        };
 
     return (
       <SplitPanel id="libro-lab-content-layout">
@@ -17,7 +29,7 @@ export const LibroLabLayoutMainComponent = forwardRef(
           <SplitPanel.Pane
             id="libro-lab-content-layout-left"
             className="libro-lab-content-layout-left"
-            defaultSize={300}
+            {...navigatorSize}
           >
             <Slot name={LibroLabLayoutSlots.navigator} />
           </SplitPanel.Pane>

package/src/module.tsx

@@ -15,6 +15,7 @@ import { CodeEditorViewerModule } from './editor-viewer/index.js';
 import { GithubLinkView } from './github-link/index.js';
 import { ImageViewerModule } from './image-viewer/index.js';
 // import { KernelManagerView } from './kernel-manager/index.js';
+import { LibroKernelAndTerminalPanelModule } from './kernel-and-terminal-panel/module.js';
 import { LibroLabApp } from './lab-app.js';
 import { ContentBottomTabView } from './layout/content-bottom-tab-view.js';
 import {
@@ -71,6 +72,7 @@ export const LibroLabModule = ManaModule.create()
       slot: LibroLabLayoutSlots.navigator,
       options: {
         sort: true,
+        contentToggable: true,
       },
     }),
     createViewPreference({
@@ -99,6 +101,7 @@ export const LibroLabModule = ManaModule.create()
     LibroLabLayoutModule,
     LibroLabHeaderMenuModule,
     LibroLabTocModule,
+    LibroKernelAndTerminalPanelModule,
     LibroPromptCellModule,
     TerminalModule,
     ImageViewerModule,