Merge remote-tracking branch 'origin/OutputWidget-enhancements' into combine_v1

Author: Alan

packages/controls/css/widgets-base.css

@@ -125,6 +125,14 @@
   flex-direction: column;
 }
 
+.jupyter-widget-output {
+  box-sizing: border-box;
+  display: flex;
+  margin: 0;
+  overflow: auto;
+  flex-direction: column;
+}
+
 /* General Tags Styling */
 
 .jupyter-widget-tagsinput {
@@ -907,7 +915,7 @@
   flex: 1 1 var(--jp-widgets-inline-width-short);
   outline: none !important;
   overflow: auto;
-  height: inherit;
+  height: 100%;
 
   /* Because Firefox defines the baseline of a select as the bottom of the
     control, we align the entire control to the top and add padding to the

python/jupyterlab_widgets/package.json

@@ -66,6 +66,7 @@
     "@jupyterlab/translation": "^3.0.0 || ^4.0.0",
     "@lumino/coreutils": "^1.11.1 || ^2.1",
     "@lumino/disposable": "^1.10.1 || ^2.1",
+    "@lumino/messaging": "^2.0.3",
     "@lumino/properties": "^2.0.1",
     "@lumino/signaling": "^1.10.1 || ^2.1",
     "@lumino/widgets": "^1.30.0 || ^2.1",

python/jupyterlab_widgets/src/output.ts

@@ -3,22 +3,24 @@
 
 import * as outputBase from '@jupyter-widgets/output';
 
-import { JupyterLuminoPanelWidget } from '@jupyter-widgets/base';
-
-import { Panel } from '@lumino/widgets';
-
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 
 import { KernelWidgetManager } from './manager';
 
-import { OutputAreaModel, OutputArea } from '@jupyterlab/outputarea';
+import {
+  OutputArea,
+  SimplifiedOutputArea,
+  OutputAreaModel,
+} from '@jupyterlab/outputarea';
 
 import * as nbformat from '@jupyterlab/nbformat';
 
 import { KernelMessage } from '@jupyterlab/services';
 
 import $ from 'jquery';
 
+import type { Message } from '@lumino/messaging';
+
 export const OUTPUT_WIDGET_VERSION = outputBase.OUTPUT_WIDGET_VERSION;
 
 export class OutputModel extends outputBase.OutputModel {
@@ -105,7 +107,15 @@ export class OutputModel extends outputBase.OutputModel {
 
 export class OutputView extends outputBase.OutputView {
   _createElement(tagName: string): HTMLElement {
-    this.luminoWidget = new JupyterLuminoPanelWidget({ view: this });
+    this.luminoWidget = new JupyterOutputArea({
+      view: this,
+      rendermime: OutputModel.rendermime,
+      contentFactory: OutputArea.defaultContentFactory,
+      model: this.model.outputs,
+      promptOverlay: false,
+    });
+    this.luminoWidget.addClass('jupyter-widgets');
+    this.luminoWidget.addClass('jupyter-widget-output');
     return this.luminoWidget.node;
   }
 
@@ -119,34 +129,41 @@ export class OutputView extends outputBase.OutputView {
     this.$el = $(this.luminoWidget.node);
   }
 
-  /**
-   * Called when view is rendered.
-   */
-  render(): void {
-    super.render();
-    this._outputView = new OutputArea({
-      rendermime: OutputModel.rendermime,
-      contentFactory: OutputArea.defaultContentFactory,
-      model: this.model.outputs,
-    });
-
-    // TODO: why is this a readonly property now?
-    // this._outputView.model = this.model.outputs;
-    // TODO: why is this on the model now?
-    // this._outputView.trusted = true;
-    this.luminoWidget.insertWidget(0, this._outputView);
+  model: OutputModel;
+  luminoWidget: JupyterOutputArea;
+}
 
-    this.luminoWidget.addClass('jupyter-widgets');
-    this.luminoWidget.addClass('widget-output');
-    this.update(); // Set defaults.
+class JupyterOutputArea extends SimplifiedOutputArea {
+  constructor(options: JupyterOutputArea.IOptions & OutputArea.IOptions) {
+    const view = options.view;
+    delete (options as any).view;
+    super(options);
+    this._view = view;
   }
 
-  remove(): any {
-    this._outputView.dispose();
-    return super.remove();
+  processMessage(msg: Message): void {
+    super.processMessage(msg);
+    this._view?.processLuminoMessage(msg);
+  }
+  /**
+   * Dispose the widget.
+   *
+   * This causes the view to be destroyed as well with 'remove'
+   */
+  dispose(): void {
+    if (this.isDisposed) {
+      return;
+    }
+    super.dispose();
+    this._view?.remove();
+    this._view = null!;
   }
 
-  model: OutputModel;
-  _outputView: OutputArea;
-  luminoWidget: Panel;
+  private _view: OutputView;
+}
+
+export namespace JupyterOutputArea {
+  export interface IOptions {
+    view: OutputView;
+  }
 }

yarn.lock

@@ -1041,6 +1041,7 @@ __metadata:
     "@jupyterlab/translation": ^3.0.0 || ^4.0.0
     "@lumino/coreutils": ^1.11.1 || ^2.1
     "@lumino/disposable": ^1.10.1 || ^2.1
+    "@lumino/messaging": ^2.0.3
     "@lumino/properties": ^2.0.1
     "@lumino/signaling": ^1.10.1 || ^2.1
     "@lumino/widgets": ^1.30.0 || ^2.1