Support jupyter widget interactive

.changeset/clean-feet-mate.md

@@ -0,0 +1,33 @@
+---
+"@difizen/libro-cofine-editor-contribution": patch
+"@difizen/libro-cofine-editor-core": patch
+"@difizen/libro-search-code-cell": patch
+"@difizen/libro-cofine-textmate": patch
+"@difizen/libro-language-client": patch
+"@difizen/libro-cofine-editor": patch
+"@difizen/libro-markdown-cell": patch
+"@difizen/libro-shared-model": patch
+"@difizen/libro-code-editor": patch
+"@difizen/libro-prompt-cell": patch
+"@difizen/libro-virtualized": patch
+"@difizen/libro-codemirror": patch
+"@difizen/libro-rendermime": patch
+"@difizen/libro-code-cell": patch
+"@difizen/libro-markdown": patch
+"@difizen/libro-raw-cell": patch
+"@difizen/libro-terminal": patch
+"@difizen/libro-jupyter": patch
+"@difizen/libro-common": patch
+"@difizen/libro-kernel": patch
+"@difizen/libro-output": patch
+"@difizen/libro-search": patch
+"@difizen/libro-widget": patch
+"@difizen/libro-core": patch
+"@difizen/libro-l10n": patch
+"@difizen/libro-lab": patch
+"@difizen/libro-lsp": patch
+"@difizen/libro-toc": patch
+"@difizen/libro-docs": patch
+---
+
+Enhance widgets underlying capabilities

.changeset/gold-lions-deny.md

@@ -0,0 +1,33 @@
+---
+"@difizen/libro-cofine-editor-contribution": patch
+"@difizen/libro-cofine-editor-core": patch
+"@difizen/libro-search-code-cell": patch
+"@difizen/libro-cofine-textmate": patch
+"@difizen/libro-language-client": patch
+"@difizen/libro-cofine-editor": patch
+"@difizen/libro-markdown-cell": patch
+"@difizen/libro-shared-model": patch
+"@difizen/libro-code-editor": patch
+"@difizen/libro-prompt-cell": patch
+"@difizen/libro-virtualized": patch
+"@difizen/libro-codemirror": patch
+"@difizen/libro-rendermime": patch
+"@difizen/libro-code-cell": patch
+"@difizen/libro-markdown": patch
+"@difizen/libro-raw-cell": patch
+"@difizen/libro-terminal": patch
+"@difizen/libro-jupyter": patch
+"@difizen/libro-common": patch
+"@difizen/libro-kernel": patch
+"@difizen/libro-output": patch
+"@difizen/libro-search": patch
+"@difizen/libro-widget": patch
+"@difizen/libro-core": patch
+"@difizen/libro-l10n": patch
+"@difizen/libro-lab": patch
+"@difizen/libro-lsp": patch
+"@difizen/libro-toc": patch
+"@difizen/libro-docs": patch
+---
+
+Support widget interactive!

packages/libro-core/src/cell/libro-cell-view.tsx

@@ -1,4 +1,5 @@
 import type { ViewComponent } from '@difizen/mana-app';
+import { Deferred } from '@difizen/mana-app';
 import { useInject, watch } from '@difizen/mana-app';
 import { BaseView, view, ViewInstance, ViewOption } from '@difizen/mana-app';
 import { inject } from '@difizen/mana-app';
@@ -36,7 +37,22 @@ export class LibroCellView extends BaseView implements CellView {
   model: CellModel;
   protected cellService: CellService;
   override view: ViewComponent = LibroCellComponent;
-  parent: NotebookView;
+
+  protected _parent: NotebookView;
+
+  get parent() {
+    return this._parent;
+  }
+  set parent(value: NotebookView) {
+    this._parent = value;
+    this.parentDefer.resolve(this.parent);
+  }
+
+  protected parentDefer = new Deferred<NotebookView>();
+
+  get parentReady() {
+    return this.parentDefer.promise;
+  }
 
   @prop()
   override className?: string | undefined = 'libro-cell-view-container';

packages/libro-core/src/index.tsx

@@ -22,3 +22,4 @@ export * from './settings/index.js';
 export * from './virtualized-manager.js';
 export * from './virtualized-manager-helper.js';
 export * from './libro-workspace-service.js';
+export * from './libro-context-key.js';

packages/libro-core/src/output/output-area.tsx

@@ -35,15 +35,26 @@ const LibroOutputAreaRender = forwardRef<HTMLDivElement>(
     useEffect(() => {
       outputArea.onUpdateEmitter.fire();
     }, [outputArea.onUpdateEmitter, outputArea.outputs]);
-
+    const childrenCannotClear = [];
+    const children = [];
+    for (const output of outputArea.outputs) {
+      if (output.allowClear === false) {
+        childrenCannotClear.push(output);
+      } else {
+        children.push(output);
+      }
+    }
     return (
       <div
         className="libro-output-area"
         ref={ref}
         //设置最小高度，用于优化长文本输出再次执行时的页面的滚动控制
         // style={{ minHeight: `${executing ? outputArea.lastOutputContainerHeight + 'px' : 'unset'}` }}
       >
-        {outputArea.outputs.map((output) => {
+        {childrenCannotClear.map((output) => {
+          return <ViewRender view={output} key={output.id} />;
+        })}
+        {children.map((output) => {
           return <ViewRender view={output} key={output.id} />;
         })}
       </div>
@@ -103,10 +114,10 @@ export class LibroOutputArea extends BaseView implements BaseOutputArea {
     });
   }
   add = async (output: IOutput): Promise<number> => {
-    // if (this.clearNext) {
-    //   this.clear();
-    //   this.clearNext = false;
-    // }
+    if (this.clearNext) {
+      this.clear();
+      this.clearNext = false;
+    }
     // Consolidate outputs if they are stream outputs of the same kind.
     if (
       isStream(output) &&
@@ -141,13 +152,28 @@ export class LibroOutputArea extends BaseView implements BaseOutputArea {
     } else {
       this.lastStream = '';
     }
-    return this.outputs.push(await outputModel);
+    const model = await outputModel;
+    model.onDisposed(() => {
+      this.remove(model);
+    });
+    return this.outputs.push(model);
   };
+
+  protected remove(model: BaseOutputView) {
+    let outputs = [...this.outputs];
+    outputs = outputs.filter((item) => item !== model);
+    this.outputs = outputs;
+  }
+
   set = async (index: number, output: IOutput) => {
     const outputModel = this.doCreateOutput(output);
     const current = this.outputs[index];
     current.dispose();
-    this.outputs[index] = await outputModel;
+    const model = await outputModel;
+    model.onDisposed(() => {
+      this.remove(model);
+    });
+    this.outputs[index] = model;
   };
   clear(wait?: boolean | undefined) {
     this.lastStream = '';
@@ -158,7 +184,6 @@ export class LibroOutputArea extends BaseView implements BaseOutputArea {
     this.outputs.forEach((output) => {
       output.dispose();
     });
-    this.outputs = [];
   }
   fromJSON = async (values: IOutput[]) => {
     if (!values) {

packages/libro-core/src/output/output-model.tsx

@@ -26,6 +26,10 @@ export class LibroOutputView extends BaseView implements BaseOutputView {
 
   @prop()
   raw: IOutput;
+
+  @prop()
+  allowClear = true;
+
   @prop()
   data: JSONObject;
   @prop()
@@ -45,7 +49,7 @@ export class LibroOutputView extends BaseView implements BaseOutputView {
   render: FC<{ output: BaseOutputView }> = LibroOutputModelRender;
 
   override dispose() {
-    //
+    super.dispose();
   }
   toJSON() {
     return this.raw;

packages/libro-core/src/output/output-protocol.ts

@@ -126,6 +126,11 @@ export interface BaseOutputView extends View {
    * Depending on the implementation of the mime model,
    */
   setData(options: ISetDataOptions): void;
+
+  /**
+   * undefined is considered allowed
+   */
+  allowClear?: boolean;
 }
 
 /**

packages/libro-jupyter/package.json

@@ -60,7 +60,6 @@
     "@difizen/libro-markdown-cell": "^0.1.33",
     "@difizen/libro-raw-cell": "^0.1.33",
     "@difizen/libro-language-client": "^0.1.33",
-    "@difizen/libro-widget": "^0.1.33",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "@ant-design/colors": "^7.0.0",

packages/libro-jupyter/src/cell/jupyter-code-cell-view.tsx

@@ -39,7 +39,16 @@ const JupyterCodeCellComponent = forwardRef<HTMLDivElement>(
 @transient()
 @view('jupyter-code-cell-view')
 export class JupyterCodeCellView extends LibroCodeCellView {
-  declare parent: LibroJupyterView;
+  protected declare _parent: LibroJupyterView;
+
+  override get parent() {
+    return this._parent;
+  }
+  override set parent(value: LibroJupyterView) {
+    this._parent = value;
+    this.parentDefer.resolve(this.parent);
+  }
+
   override view = JupyterCodeCellComponent;
   declare model: JupyterCodeCellModel;
 

packages/libro-jupyter/src/index.ts

@@ -32,3 +32,4 @@ export * from './toolbar/index.js';
 export * from './file/index.js';
 export * from './libro-jupyter-view.js';
 export * from './config/index.js';
+export * from './widget/index.js';

packages/libro-jupyter/src/module.ts

@@ -25,7 +25,6 @@ import {
 import { RawCellModule } from '@difizen/libro-raw-cell';
 import { LibroSearchModule } from '@difizen/libro-search';
 import { SearchCodeCellModule } from '@difizen/libro-search-code-cell';
-import { WidgetModule } from '@difizen/libro-widget';
 import { ManaModule } from '@difizen/mana-app';
 
 import { LibroBetweenCellModule } from './add-between-cell/index.js';
@@ -57,7 +56,7 @@ import {
   LibroJupyterToolbarContribution,
   SaveFileErrorContribution,
 } from './toolbar/index.js';
-import { LibroWidgetMimeContribution } from './widget/index.js';
+import { WidgetModule } from './widget/index.js';
 
 export const LibroJupyterModule = ManaModule.create()
   .register(
@@ -76,7 +75,6 @@ export const LibroJupyterModule = ManaModule.create()
     LibroJupyterSettingContribution,
     JupyterServerLaunchManager,
     LibroJupyterView,
-    LibroWidgetMimeContribution,
     {
       token: CellExecutionTimeProvider,
       useValue: CellExecutionTip,