Create a specialized MimeDocument document widget type.

jupyterlab · May 12, 2018 · 1107f69 · 1107f69
1 parent 3fc6bde
commit 1107f69
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/packages/application/src/mimerenderers.ts b/packages/application/src/mimerenderers.ts
@@ -6,7 +6,7 @@ import {
 } from '@jupyterlab/apputils';
 
 import {
-  IDocumentWidget, MimeDocumentFactory, DocumentRegistry, MimeContent
+  MimeDocumentFactory, DocumentRegistry, MimeDocument
 } from '@jupyterlab/docregistry';
 
 import {
@@ -104,7 +104,7 @@ function createRendermimePlugin(item: IRenderMime.IExtension): JupyterLabPlugin<
 
         const factoryName = factory.name;
         const namespace = `${factoryName}-renderer`;
-        const tracker = new InstanceTracker<IDocumentWidget<MimeContent>>({ namespace });
+        const tracker = new InstanceTracker<MimeDocument>({ namespace });
 
         // Handle state restoration.
         restorer.restore(tracker, {

diff --git a/packages/docregistry/src/mimedocument.ts b/packages/docregistry/src/mimedocument.ts
@@ -30,7 +30,7 @@ import {
 } from './default';
 
 import {
-  DocumentRegistry, IDocumentWidget
+  DocumentRegistry
 } from './registry';
 
 
@@ -216,12 +216,15 @@ namespace MimeContent {
   }
 }
 
+export
+class MimeDocument extends DocumentWidget<MimeContent> {
+}
 
 /**
  * An implementation of a widget factory for a rendered mimetype document.
  */
 export
-class MimeDocumentFactory extends ABCWidgetFactory<IDocumentWidget<MimeContent>, DocumentRegistry.IModel> {
+class MimeDocumentFactory extends ABCWidgetFactory<MimeDocument, DocumentRegistry.IModel> {
   /**
    * Construct a new markdown widget factory.
    */
@@ -236,7 +239,7 @@ class MimeDocumentFactory extends ABCWidgetFactory<IDocumentWidget<MimeContent>,
   /**
    * Create a new widget given a context.
    */
-  protected createNewWidget(context: DocumentRegistry.Context): IDocumentWidget<MimeContent> {
+  protected createNewWidget(context: DocumentRegistry.Context): MimeDocument {
     const ft = this._fileType;
     const mimeType = ft.mimeTypes.length ? ft.mimeTypes[0] : 'text/plain';
 
@@ -256,7 +259,7 @@ class MimeDocumentFactory extends ABCWidgetFactory<IDocumentWidget<MimeContent>,
     content.title.iconClass = ft.iconClass;
     content.title.iconLabel = ft.iconLabel;
 
-    const widget = new DocumentWidget({ content, context });
+    const widget = new MimeDocument({ content, context });
 
     return widget;
   }

diff --git a/packages/markdownviewer-extension/src/index.ts b/packages/markdownviewer-extension/src/index.ts
@@ -10,7 +10,7 @@ import {
 } from '@jupyterlab/apputils';
 
 import {
-  MimeDocumentFactory, MimeContent, IDocumentWidget
+  MimeDocumentFactory, MimeDocument
 } from '@jupyterlab/docregistry';
 
 import {
@@ -58,7 +58,7 @@ function activate(app: JupyterLab, restorer: ILayoutRestorer, rendermime: IRende
     });
     const { commands } = app;
     const namespace = 'rendered-markdown';
-    const tracker = new InstanceTracker<IDocumentWidget<MimeContent>>({ namespace });
+    const tracker = new InstanceTracker<MimeDocument>({ namespace });
 
     app.docRegistry.addWidgetFactory(factory);