wip updates

src/mainmenu/index.ts

@@ -2,12 +2,8 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  ArrayExt.findFirstIndex, ArrayExt.firstIndexOf, ArrayExt.upperBound
-} from 'phosphor/lib/algorithm/searching';
-
-import {
-  Vector
-} from 'phosphor/lib/collections/vector';
+  ArrayExt
+} from '@phosphor/algorithm';
 
 import {
   Token
@@ -19,7 +15,7 @@ import {
 
 import {
   MenuBar
-} from '@phosphor/widgetsbar';
+} from '@phosphor/widgets';
 
 
 /* tslint:disable */
@@ -75,7 +71,7 @@ class MainMenu extends MenuBar implements IMainMenu {
     // Upon disposal, remove the menu and its rank reference.
     menu.disposed.connect(this._onMenuDisposed, this);
 
-    this._items.insert(index, rankItem);
+    ArrayExt.insert(this._items, index, rankItem);
     this.insertMenu(index, menu);
   }
 
@@ -86,11 +82,11 @@ class MainMenu extends MenuBar implements IMainMenu {
     this.removeMenu(menu);
     let index = ArrayExt.findFirstIndex(this._items, item => item.menu === menu);
     if (index !== -1) {
-      this._items.removeAt(index);
+      ArrayExt.removeAt(this._items, index);
     }
   }
 
-  private _items = new Vector<Private.IRankItem>();
+  private _items: Private.IRankItem[] = [];
 }
 
 

src/mainmenu/plugin.ts

@@ -32,7 +32,7 @@ const plugin: JupyterLabPlugin<IMainMenu> = {
   id: 'jupyter.services.main-menu',
   provides: IMainMenu,
   activate: (app: JupyterLab): IMainMenu => {
-    let menu = new MainMenu({ keymap: app.keymap });
+    let menu = new MainMenu();
     menu.id = 'jp-MainMenu';
 
     let logo = new Widget();

src/markdownwidget/widget.ts

@@ -108,7 +108,7 @@ class MarkdownWidget extends Widget {
     let mimeModel = new MimeModel({ data, trusted: false });
     let widget = this._rendermime.render(mimeModel);
     if (layout.widgets.length) {
-      layout.widgets.at(0).dispose();
+      layout.widgets[0].dispose();
     }
     layout.addWidget(widget);
   }

src/notebook/widget.ts

@@ -34,8 +34,8 @@ import {
 } from '@phosphor/dragdrop';
 
 import {
-  scrollIntoViewIfNeeded
-} from 'phosphor/lib/dom/query';
+  ElementExt
+} from '@phosphor/domutils';
 
 import {
   PanelLayout
@@ -850,7 +850,7 @@ class Notebook extends StaticNotebook {
    */
   scrollToActiveCell(): void {
     if (this.activeCell) {
-      scrollIntoViewIfNeeded(this.node, this.activeCell.node);
+      ElementExt.scrollIntoViewIfNeeded(this.node, this.activeCell.node);
     }
   }
 

src/rendermime/rendermime.ts

@@ -6,25 +6,17 @@ import {
 } from '@jupyterlab/services';
 
 import {
-  IIterable, map, toArray
+  ArrayExt, ArrayIterator, IIterable, find, map, toArray
 } from '@phosphor/algorithm';
 
 import {
   JSONObject
 } from '@phosphor/coreutils';
 
-import {
-  find
-} from 'phosphor/lib/algorithm/searching';
-
 import {
   IDisposable
 } from '@phosphor/disposable';
 
-import {
-  Vector
-} from 'phosphor/lib/collections/vector';
-
 import {
   Widget
 } from '@phosphor/widgets';
@@ -75,7 +67,7 @@ class RenderMime {
   constructor(options: RenderMime.IOptions = {}) {
     if (options.items) {
       for (let item of options.items) {
-        this._order.pushBack(item.mimeType);
+        this._order.push(item.mimeType);
         this._renderers[item.mimeType] = item.renderer;
       }
     }
@@ -112,7 +104,7 @@ class RenderMime {
    * mimeType is used.
    */
   mimeTypes(): IIterable<string> {
-    return this._order.iter();
+    return new ArrayIterator(this._order);
   }
 
   /**
@@ -194,12 +186,12 @@ class RenderMime {
    */
   addRenderer(item: RenderMime.IRendererItem, index = 0): void {
     let { mimeType, renderer } = item;
-    let orig = this._order.remove(mimeType);
+    let orig = ArrayExt.removeFirstOf(this._order, mimeType);
     if (orig !== -1 && orig < index) {
       index -= 1;
     }
     this._renderers[mimeType] = renderer;
-    this._order.insert(index, mimeType);
+    ArrayExt.insert(this._order, index, mimeType);
   }
 
   /**
@@ -209,7 +201,7 @@ class RenderMime {
    */
   removeRenderer(mimeType: string): void {
     delete this._renderers[mimeType];
-    this._order.remove(mimeType);
+    ArrayExt.removeFirstOf(this._order, mimeType);
   }
 
   /**
@@ -241,7 +233,7 @@ class RenderMime {
   }
 
   private _renderers: { [key: string]: RenderMime.IRenderer } = Object.create(null);
-  private _order = new Vector<string>();
+  private _order: string[] = [];
   private _sanitizer: ISanitizer;
   private _resolver: RenderMime.IResolver | null;
   private _handler: RenderMime.ILinkHandler | null;

src/running/index.ts

@@ -14,8 +14,8 @@ import {
 } from '@phosphor/signaling';
 
 import {
-  hitTest
-} from 'phosphor/lib/dom/query';
+  ElementExt
+} from '@phosphor/domutils';
 
 import {
   Widget
@@ -311,7 +311,7 @@ class RunningSessions extends Widget {
     let clientY = event.clientY;
 
     // Check for a refresh.
-    if (hitTest(refresh, clientX, clientY)) {
+    if (ElementExt.hittest(refresh, clientX, clientY)) {
       return;
     }
 
@@ -321,7 +321,7 @@ class RunningSessions extends Widget {
       let node = termList.children[index] as HTMLLIElement;
       let shutdown = renderer.getTerminalShutdown(node);
       let model = this._runningTerminals[index];
-      if (hitTest(shutdown, clientX, clientY)) {
+      if (ElementExt.hittest(shutdown, clientX, clientY)) {
         this._manager.terminals.shutdown(model.name);
         return;
       }
@@ -334,7 +334,7 @@ class RunningSessions extends Widget {
       let node = sessionList.children[index] as HTMLLIElement;
       let shutdown = renderer.getSessionShutdown(node);
       let model = this._runningSessions[index];
-      if (hitTest(shutdown, clientX, clientY)) {
+      if (ElementExt.hittest(shutdown, clientX, clientY)) {
         this._manager.sessions.shutdown(model.id);
         return;
       }

src/toolbar/index.ts

@@ -2,13 +2,9 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  IIterator, map
+  IIterator, find, map
 } from '@phosphor/algorithm';
 
-import {
-  find
-} from 'phosphor/lib/algorithm/searching';
-
 import {
   Message
 } from '@phosphor/messaging';