@difizen/libro-core 0.1.1 → 0.1.3

package/src/cell/libro-cell-view.tsx

@@ -23,11 +23,20 @@ export class LibroCellView extends BaseView implements CellView {
   protected override toDispose = new DisposableCollection();
   options: CellViewOptions;
 
+  @prop()
+  noEditorAreaHeight = 0;
+
+  @prop()
+  cellViewTopPos = 0;
+
+  @prop()
+  renderEditorIntoVirtualized = false;
+
   @prop()
   model: CellModel;
   protected cellService: CellService;
   override view: ViewComponent = LibroCellComponent;
-  parent!: NotebookView;
+  parent: NotebookView;
 
   @prop()
   override className?: string | undefined = 'libro-cell-view-container';
@@ -49,7 +58,6 @@ export class LibroCellView extends BaseView implements CellView {
     this.cellService = cellService;
     this.options = options;
     this.hasInputHidden = false;
-
     const model = cellService.getModelFromCache(options.parentId, options.modelId);
     if (!model) {
       console.warn('cell model does not exist');
@@ -63,11 +71,13 @@ export class LibroCellView extends BaseView implements CellView {
     this.toDispose.push(
       watch(this.model, 'value', () => {
         this.parent.model.onChange?.();
+        this.parent.model.onSourceChange?.();
       }),
     );
     this.toDispose.push(
       watch(this.model, 'type', () => {
         this.parent.model.onChange?.();
+        this.parent.model.onSourceChange?.();
       }),
     );
     if (ExecutableCellModel.is(this.model)) {
@@ -79,6 +89,11 @@ export class LibroCellView extends BaseView implements CellView {
     }
   }
 
+  // 计算编辑器区相对于编辑器区垂直方向的偏移量
+  calcEditorOffset() {
+    return 16 + 1;
+  }
+
   hasCellHidden() {
     return this.hasInputHidden;
   }
@@ -88,7 +103,7 @@ export class LibroCellView extends BaseView implements CellView {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  shouldEnterEditorMode(_e: React.FocusEvent<HTMLElement>) {
+  shouldEnterEditorMode(e: React.FocusEvent<HTMLElement>) {
     return false;
   }
 
@@ -96,17 +111,14 @@ export class LibroCellView extends BaseView implements CellView {
     //
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  focus(_isEdit: boolean) {
+  focus(isEdit: boolean) {
     //
   }
 
   disposed = false;
   override dispose() {
-    if (!this.disposed) {
-      this.toDispose.dispose();
-      super.dispose();
-    }
-    this.disposed = true;
+    this.toDispose.dispose();
+    super.dispose();
   }
   toJSON(): LibroCell {
     const meta = { ...(this.model.toJSON() as LibroCell) };

package/src/cell/libro-edit-cell-view.tsx

@@ -1,7 +1,8 @@
-import type { IEditor, IRange } from '@difizen/libro-code-editor';
+import type { IEditor } from '@difizen/libro-code-editor';
 import { prop } from '@difizen/mana-app';
+import type { ReactNode } from 'react';
 
-import type { CellView } from '../libro-protocol.js';
+import type { CellView, EditorStatus } from '../libro-protocol.js';
 import { isCellView } from '../libro-protocol.js';
 
 import { LibroCellView } from './libro-cell-view.js';
@@ -12,11 +13,8 @@ export interface EditorCellView extends CellView {
   redo: () => void;
 
   undo: () => void;
-  getSelections: () => IRange[];
-  getSelectionsOffsetAt: (selection: IRange) => {
-    start: number;
-    end: number;
-  };
+
+  renderEditor: () => ReactNode;
 }
 
 export const EditorCellView = {
@@ -44,8 +42,11 @@ export abstract class LibroEditorCellView
   @prop()
   editor: IEditor | undefined;
 
-  abstract getSelections: () => IRange[];
-  abstract getSelectionsOffsetAt: (selection: IRange) => { start: number; end: number };
+  @prop()
+  editorStatus: EditorStatus;
+
+  renderEditor: () => ReactNode;
+
   get wrapperCls() {
     return '';
   }

package/src/cell/libro-executable-cell-view.ts

@@ -14,6 +14,8 @@ interface ExecutableCellView extends EditorCellView {
   clearExecution: () => void;
 
   outputArea: BaseOutputArea;
+
+  noEditorAreaHeight: number;
 }
 
 export const ExecutableCellView = {
@@ -40,7 +42,9 @@ export abstract class LibroExecutableCellView
 {
   declare model: CellModel & ExecutableCellModel;
 
-  declare outputArea: BaseOutputArea;
+  outputArea: BaseOutputArea;
+
+  declare noEditorAreaHeight: number;
 
   constructor(
     @inject(ViewOption) options: CellViewOptions,
@@ -54,6 +58,7 @@ export abstract class LibroExecutableCellView
     //
   };
 
+  // TODO: 性能！
   override hasCellHidden() {
     if (
       !ExecutableCellModel.is(this.model) ||

package/src/collapse-service.ts

@@ -63,7 +63,7 @@ export class DefaultCollapseService implements CollapseService {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  getCollapsibleChildNumber(_cell: CellView) {
+  getCollapsibleChildNumber(cell: CellView) {
     return 0;
   }
 }

package/src/command/document-commands.ts

@@ -1,10 +1,7 @@
 import { SaveOutlined, SettingOutlined } from '@ant-design/icons';
 import type { Command } from '@difizen/mana-app';
 
-export const DocumentCommands: Record<
-  string,
-  Command & { keybind?: string | string[] | undefined; when?: string | undefined }
-> = {
+export const DocumentCommands: Record<string, Command & { keybind?: string }> = {
   Save: {
     id: 'document:save',
     icon: SaveOutlined,
@@ -12,7 +9,8 @@ export const DocumentCommands: Record<
     keybind: 'ctrlcmd+s',
   },
   OpenSettings: {
-    id: 'document:setting',
+    id: 'document.notebook.open_setting',
     icon: SettingOutlined,
+    label: 'Setting',
   },
 };

package/src/command/kernel-command.ts

@@ -31,6 +31,9 @@ export const KernelCommands: Record<string, Command & { keybind?: string }> = {
     id: 'notebook:shutdown-kernel',
     label: `Shutdown Kernel`,
   },
+  ShowKernelStatus: {
+    id: 'notebook:show-kernel-status',
+  },
   // TODO: remove this command
   ShowKernelStatusAndSelector: {
     id: 'notebook:show-kernel-status-and-selector',