Merge pull request #32 from pbugnion/fix-accordion-widget

Fix accordion widget
pbugnion · Apr 8, 2018 · 0391603 · 0391603
2 parents 1fa0816 + a3d1156
commit 0391603
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 22 deletions.
diff --git a/ipywidgets_server/_version.py b/ipywidgets_server/_version.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.2.1'
+__version__ = '0.2.2-alpha2'
diff --git a/js/ErrorView.js b/js/ErrorView.js
@@ -1,14 +1,14 @@
 
 import { OutputAreaModel, OutputArea } from '@jupyterlab/outputarea';
-import { renderMime } from './renderMime'
+import { createSimpleRenderMimeRegistry } from './renderMime'
 
 // Output view for errors in callbacks
 export class ErrorView {
     constructor(element) {
         this._element = element
         this._outputModel = new OutputAreaModel({trusted: true})
         this._outputView = new OutputArea({
-            rendermime: renderMime,
+            rendermime: createSimpleRenderMimeRegistry(),
             model: this._outputModel,
         })
         this._element.appendChild(this._outputView.node)

diff --git a/js/WidgetApplication.js b/js/WidgetApplication.js
@@ -5,6 +5,7 @@ import { WidgetManager } from './manager'
 import { ErrorView } from './ErrorView'
 
 import 'font-awesome/css/font-awesome.css'
+import '@phosphor/widgets/style/index.css'
 import './widgets.css'
 
 
@@ -69,4 +70,4 @@ export class WidgetApplication {
         // terminate kernel process
         this._kernel.shutdown()
     }
-}
+}
diff --git a/js/manager.js b/js/manager.js
@@ -7,7 +7,8 @@ import { Signal } from '@phosphor/signaling';
 import { HTMLManager } from '@jupyter-widgets/html-manager';
 
 import * as outputWidgets from './output';
-import { ShimmedComm } from './services-shim'
+import { ShimmedComm } from './services-shim';
+import { createRenderMimeRegistryWithWidgets } from './renderMime';
 
 export class WidgetManager extends HTMLManager {
     constructor(kernel, el, loader) {
@@ -16,6 +17,7 @@ export class WidgetManager extends HTMLManager {
         this.registerWithKernel(kernel)
         this.el = el;
         this.loader = loader;
+        this.renderMime = createRenderMimeRegistryWithWidgets(this);
         this._onError = new Signal(this)
     }
 
@@ -35,8 +37,9 @@ export class WidgetManager extends HTMLManager {
     }
 
     display_view(msg, view, options) {
+        const el = options.el || this.el;
         return Promise.resolve(view).then(view => {
-            pWidget.Widget.attach(view.pWidget, this.el);
+            pWidget.Widget.attach(view.pWidget, el);
             view.on('remove', function() {
                 console.log('view removed', view);
             });

diff --git a/js/output.js b/js/output.js
@@ -9,8 +9,6 @@ import { Panel } from '@phosphor/widgets';
 
 import { OutputAreaModel, OutputArea } from '@jupyterlab/outputarea';
 
-import { renderMime } from './renderMime'
-
 const OUTPUT_WIDGET_VERSION = outputBase.OUTPUT_WIDGET_VERSION;
 
 export
@@ -114,7 +112,7 @@ class JupyterPhosphorPanelWidget extends Panel {
 export class OutputView extends outputBase.OutputView {
 
     _createElement(tagName) {
-        this.pWidget = new JupyterPhosphorPanelWidget({ view: this });
+        this.pWidget = new Panel()
         return this.pWidget.node;
     }
 
@@ -133,12 +131,11 @@ export class OutputView extends outputBase.OutputView {
     render() {
         super.render();
         this._outputView = new OutputArea({
-            rendermime: renderMime,
+            rendermime: this.model.widget_manager.renderMime,
             contentFactory: OutputArea.defaultContentFactory,
             model: this.model.outputs
         });
         this.pWidget.insertWidget(0, this._outputView);
-
         this.pWidget.addClass('jupyter-widgets');
         this.pWidget.addClass('widget-output');
         this.update(); // Set defaults.

diff --git a/js/package.json b/js/package.json
@@ -4,12 +4,12 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "@jupyter-widgets/base": "^1.1.4",
-    "@jupyter-widgets/controls": "^1.0.10",
-    "@jupyter-widgets/html-manager": "^0.10.2",
-    "@jupyter-widgets/output": "^1.0.9",
-    "@jupyterlab/outputarea": "^0.10.0",
-    "@jupyterlab/rendermime": "^0.10.0",
+    "@jupyter-widgets/base": "^1.1.8",
+    "@jupyter-widgets/controls": "^1.1.6",
+    "@jupyter-widgets/html-manager": "^0.12.0",
+    "@jupyter-widgets/output": "^1.0.15",
+    "@jupyterlab/outputarea": "^0.15.0",
+    "@jupyterlab/rendermime": "^0.15.0",
     "@jupyterlab/services": "^0.49.0",
     "@phosphor/signaling": "^1.2.2",
     "@phosphor/widgets": "^1.5.0",

diff --git a/js/renderMime.js b/js/renderMime.js
@@ -1,6 +1,23 @@
 
-import { RenderMime, defaultRendererFactories } from '@jupyterlab/rendermime';
+import { RenderMimeRegistry, standardRendererFactories } from '@jupyterlab/rendermime';
 
-export const renderMime = new RenderMime({
-    initialFactories: defaultRendererFactories
-});
+import { WIDGET_MIMETYPE, WidgetRenderer } from '@jupyter-widgets/html-manager/lib/output_renderers';
+
+export function createSimpleRenderMimeRegistry() {
+    const renderMime = new RenderMimeRegistry({
+        initialFactories: standardRendererFactories
+    });
+    return renderMime
+}
+
+export function createRenderMimeRegistryWithWidgets(manager) {
+    const renderMime = createSimpleRenderMimeRegistry()
+
+    renderMime.addFactory({
+        safe: false,
+        mimeTypes: [WIDGET_MIMETYPE],
+        createRenderer: options => new WidgetRenderer(options, manager)
+    }, 1)
+
+    return renderMime;
+}
diff --git a/js/widgets.css b/js/widgets.css
@@ -1 +1 @@
-@import "@jupyter-widgets/controls/css/widgets.css";
+@import "@jupyter-widgets/controls/css/widgets.built.css";
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@

		__version__ = '0.2.1'
		__version__ = '0.2.2-alpha2'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		@import "@jupyter-widgets/controls/css/widgets.css";
		@import "@jupyter-widgets/controls/css/widgets.built.css";