@difizen/libro-core 0.1.0 → 0.1.2

package/src/libro-protocol.ts

@@ -8,11 +8,12 @@ import type {
   INotebookMetadata,
 } from '@difizen/libro-common';
 import type { ISharedNotebook } from '@difizen/libro-shared-model';
-import { View } from '@difizen/mana-app';
 import type { Disposable, Event } from '@difizen/mana-app';
+import type { View } from '@difizen/mana-app';
 
 import type { LibroCell } from './cell/index.js';
 import type { LibroView } from './libro-view.js';
+import type { VirtualizedManager } from './virtualized-manager.js';
 
 export const LibroContextKeys = {
   active: 'active',
@@ -38,16 +39,30 @@ export interface NotebookOption extends Options {
   [key: string]: any;
 }
 
+export const PerformaceStatisticOption = Symbol('PerformaceStatisticOption');
+export type PerformaceStatisticOption = Options;
+
 export const ModelFactory = Symbol('ModelFactory');
 export type ModelFactory<T = NotebookOption> = (options: T) => NotebookModel;
 
 export const NotebookModel = Symbol('NotebookModel');
 
+export enum EditorStatus {
+  NOTLOADED = 'not loaded',
+  LOADING = 'loading',
+  LOADED = 'loaded',
+}
+
 export type Options = {
   id?: string;
   [key: string]: any;
 };
 
+export interface ScrollParams {
+  cellIndex: number;
+  lineIndex?: number;
+}
+
 export type NotebookModel = BaseNotebookModel & DndListModel;
 export interface BaseNotebookModel {
   id: string;
@@ -85,6 +100,10 @@ export interface BaseNotebookModel {
 
   onContentChanged: Event<boolean>;
 
+  onSourceChanged: Event<boolean>;
+
+  onCellViewChanged: Event<CellViewChange>;
+
   getCells: () => CellView[];
 
   /**
@@ -154,6 +173,8 @@ export interface BaseNotebookModel {
 
   onChange?: () => void;
 
+  onSourceChange?: () => void;
+
   interrupt?: () => void;
 
   canRun?: () => boolean;
@@ -175,6 +196,12 @@ export interface BaseNotebookModel {
   setCustomKey: (key: string, val: any) => void;
 
   libroViewClass: string;
+
+  onScrollToCellView: Event<ScrollParams>;
+
+  scrollToCellView: (params: ScrollParams) => void;
+
+  disposeScrollToCellViewEmitter: () => void;
 }
 
 export const notebookViewFactoryId = 'notebook-view-factory';
@@ -207,9 +234,38 @@ export interface CellView extends View {
   toJSON: () => ICell;
 
   toJSONWithoutId: () => ICell;
+
+  editorAreaHeight?: number;
+
+  cellViewTopPos?: number;
+
+  noEditorAreaHeight: number;
+
+  editorStatus?: EditorStatus;
+
+  calcEditorAreaHeight?: () => number;
+
+  calcEditorOffset?: () => number;
+
+  renderEditorIntoVirtualized?: boolean;
+}
+function isView(data: object): data is View {
+  return (
+    !!data &&
+    typeof data === 'object' &&
+    'id' in data &&
+    'view' in data &&
+    typeof data['view'] === 'function'
+  );
 }
 export function isCellView(view: View): view is CellView {
-  return View.is(view) && 'model' in view;
+  return (
+    isView(view) &&
+    'model' in view &&
+    'parent' in view &&
+    'run' in view &&
+    'toJSON' in view
+  );
 }
 
 export const CellOptions = Symbol('CellOptions');
@@ -232,12 +288,19 @@ export interface CellViewOptions {
   [key: string]: any;
 }
 
+export interface CellViewChange {
+  insert?: { cells: CellView[]; index: number };
+  delete?: { index: number; number: number };
+}
+
 export interface CellModel extends IModel, Disposable {
   /**
    * A unique identifier for the cell.
    */
   id: string;
 
+  source: string;
+
   /**
    * The type of the cell.
    */
@@ -268,8 +331,8 @@ export interface CellModel extends IModel, Disposable {
    * 输出时的字段顺序也要保持稳定
    */
   toJSON: () => Omit<ICell, 'outputs'>;
-  options: CellOptions;
 
+  options: CellOptions;
   // run: () => Promise<boolean>;
 }
 
@@ -286,11 +349,12 @@ export interface NotebookService {
 export const DragAreaKey = Symbol('DragAreaKey');
 
 export type MouseMode = 'multipleSelection' | 'mouseDown' | 'drag';
+
 export interface DndListModel {
   mouseMode?: MouseMode;
   active?: CellView | undefined;
   hover?: CellView | undefined;
-  selectCell: (cell: CellView) => void;
+  selectCell: (cell?: CellView) => void;
   addCell: (cell: CellView, position?: number, mode?: string) => void;
   insertCells: (cells: CellView[], position?: number, mode?: string) => void;
   invertCell: (toAddcell: CellView, position: number) => void;
@@ -320,3 +384,16 @@ export interface DndItemProps {
   isMouseOverDragArea?: boolean;
 }
 //#endregion
+
+export interface VirtualizedManagerOption {
+  libroModel: NotebookModel;
+}
+export const VirtualizedManagerOption = Symbol('VirtualizedManagerOption');
+
+export const VirtualizedManagerOptionFactory = Symbol(
+  'VirtualizedManagerOptionFactory',
+);
+
+export type VirtualizedManagerOptionFactory = (
+  meta: VirtualizedManagerOption,
+) => VirtualizedManager;

package/src/libro-service.ts

@@ -13,27 +13,18 @@ import { LibroViewTracker } from './libro-view-tracker.js';
 
 @singleton({ contrib: NotebookService })
 export class LibroService implements NotebookService {
-  protected libroModelFactory: ModelFactory;
-  protected viewManager: ViewManager;
-  protected libroViewTracker: LibroViewTracker;
-
+  @inject(ModelFactory) protected libroModelFactory: ModelFactory;
+  @inject(ViewManager) protected viewManager: ViewManager;
+  @inject(LibroViewTracker) protected libroViewTracker: LibroViewTracker;
   protected themeService: ThemeService;
   @prop()
   themeMode: string;
-  constructor(
-    @inject(ThemeService) themeService: ThemeService,
-    @inject(ModelFactory) libroModelFactory: ModelFactory,
-    @inject(ViewManager) viewManager: ViewManager,
-    @inject(LibroViewTracker) libroViewTracker: LibroViewTracker,
-  ) {
+  constructor(@inject(ThemeService) themeService: ThemeService) {
     this.themeService = themeService;
     this.themeMode = this.themeService.getCurrentTheme().type;
     this.themeService.onDidColorThemeChange((e) => {
       this.themeMode = e.newTheme.type;
     });
-    this.libroModelFactory = libroModelFactory;
-    this.viewManager = viewManager;
-    this.libroViewTracker = libroViewTracker;
   }
 
   @prop() protected _active?: NotebookView;

package/src/{configuration/libro-configuration-contribution.ts → libro-setting-contribution.ts}

@@ -1,19 +1,18 @@
-import { ConfigurationContribution } from '@difizen/mana-app';
-import { singleton } from '@difizen/mana-app';
+import { singleton, ConfigurationContribution } from '@difizen/mana-app';
 
 import {
+  AutoInsertWhenNoCell,
   CellSideToolbarVisible,
   CellTopToolbarSetting,
-  HeaderToolbarVisible,
-  AutoInsertWhenNoCell,
+  CollapserClickActive,
   EnterEditModeWhenAddCell,
-  CollapserActive,
+  HeaderToolbarVisible,
   MultiSelectionWhenShiftClick,
   RightContentFixed,
-} from './libro-configuration.js';
+} from './libro-setting.js';
 
 @singleton({ contrib: ConfigurationContribution })
-export class LibroConfigurationContribution implements ConfigurationContribution {
+export class LibroSettingContribution implements ConfigurationContribution {
   registerConfigurations() {
     return [
       HeaderToolbarVisible,
@@ -21,7 +20,7 @@ export class LibroConfigurationContribution implements ConfigurationContribution
       CellSideToolbarVisible,
       AutoInsertWhenNoCell,
       EnterEditModeWhenAddCell,
-      CollapserActive,
+      CollapserClickActive,
       MultiSelectionWhenShiftClick,
       RightContentFixed,
     ];

package/src/{configuration/libro-configuration.ts → libro-setting.ts}

@@ -13,7 +13,7 @@ export const HeaderToolbarVisible: ConfigurationNode<boolean> = {
 };
 
 export const CellTopToolbarSetting: ConfigurationNode<boolean> = {
-  id: 'libro.cell.top-toolbar',
+  id: 'libro.cell.toptoolbar',
   description: l10n.t('是否显示cell顶部工具栏'),
   title: l10n.t('cell顶部工具栏'),
   type: 'checkbox',
@@ -24,7 +24,7 @@ export const CellTopToolbarSetting: ConfigurationNode<boolean> = {
 };
 
 export const CellSideToolbarVisible: ConfigurationNode<boolean> = {
-  id: 'libro.cell.side-toolbar',
+  id: 'libro.cell.sidetoolbar',
   description: l10n.t('是否显示cell侧边工具栏'),
   title: l10n.t('cell侧边工具栏'),
   type: 'checkbox',
@@ -35,7 +35,7 @@ export const CellSideToolbarVisible: ConfigurationNode<boolean> = {
 };
 
 export const AutoInsertWhenNoCell: ConfigurationNode<boolean> = {
-  id: 'libro.command.insert-cell-below',
+  id: 'libro.command.insertcellbelow',
   description: l10n.t('没有cell时是否默认创建cell'),
   title: l10n.t('默认创建cell'),
   type: 'checkbox',
@@ -46,7 +46,7 @@ export const AutoInsertWhenNoCell: ConfigurationNode<boolean> = {
 };
 
 export const EnterEditModeWhenAddCell: ConfigurationNode<boolean> = {
-  id: 'libro.command.enter-edit-mode-when-add-cell',
+  id: 'libro.command.entereditmodewhenaddcell',
   description: l10n.t('增加cell操作默认进入编辑态'),
   title: l10n.t('默认进入编辑态'),
   type: 'checkbox',
@@ -55,8 +55,8 @@ export const EnterEditModeWhenAddCell: ConfigurationNode<boolean> = {
     type: 'boolean',
   },
 };
-export const CollapserActive: ConfigurationNode<boolean> = {
-  id: 'libro.command.collapser-active',
+export const CollapserClickActive: ConfigurationNode<boolean> = {
+  id: 'libro.command.collapserclickactive',
   description: l10n.t('点击左侧长条是否可以隐藏与显示cell'),
   title: l10n.t('默认点击长条可以隐藏与显示cell'),
   type: 'checkbox',
@@ -66,7 +66,7 @@ export const CollapserActive: ConfigurationNode<boolean> = {
   },
 };
 export const MultiSelectionWhenShiftClick: ConfigurationNode<boolean> = {
-  id: 'libro.command.multiselection-when-shift-click',
+  id: 'libro.command.multiselectionwhenshiftclick',
   description: l10n.t('按住shift键并点击拖拽区域可以进行多选'),
   title: l10n.t('默认按住shift键并点击拖拽区域可以进行多选'),
   type: 'checkbox',
@@ -86,3 +86,14 @@ export const RightContentFixed: ConfigurationNode<boolean> = {
     type: 'boolean',
   },
 };
+
+export const OutputScrollBtnVisiable: ConfigurationNode<boolean> = {
+  id: 'libro.cell.output.scroll.button.visiable',
+  description: l10n.t('cell输出区域高度固定按钮是否显示'),
+  title: l10n.t('cell输出区域高度固定按钮是否显示'),
+  type: 'checkbox',
+  defaultValue: true,
+  schema: {
+    type: 'boolean',
+  },
+};