fixed override method

jupyterlab · Jun 4, 2019 · e6f5f2d · e6f5f2d
1 parent 80b24ec
commit e6f5f2d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/packages/application/package.json b/packages/application/package.json
@@ -38,6 +38,7 @@
     "@jupyterlab/rendermime": "^1.0.0-alpha.6",
     "@jupyterlab/rendermime-interfaces": "^1.3.0-alpha.6",
     "@jupyterlab/services": "^4.0.0-alpha.6",
+    "@jupyterlab/ui-components": "^1.0.0-alpha.6",
     "@phosphor/algorithm": "^1.1.2",
     "@phosphor/application": "^1.6.0",
     "@phosphor/commands": "^1.6.1",
@@ -46,6 +47,7 @@
     "@phosphor/messaging": "^1.2.2",
     "@phosphor/properties": "^1.1.2",
     "@phosphor/signaling": "^1.2.2",
+    "@phosphor/virtualdom": "^1.1.2",
     "@phosphor/widgets": "^1.6.0",
     "font-awesome": "~4.7.0"
   },

diff --git a/packages/application/tsconfig.json b/packages/application/tsconfig.json
@@ -23,6 +23,9 @@
     },
     {
       "path": "../services"
+    },
+    {
+      "path": "../ui-components"
     }
   ]
 }
diff --git a/packages/filebrowser/src/listing.ts b/packages/filebrowser/src/listing.ts
@@ -1756,18 +1756,13 @@ export namespace DirListing {
             kind: 'listing'
           });
 
-          // filthy hack to get the tab icons
-          for (let iconNode of document.getElementsByClassName(
-            ['p-TabBar-tabIcon', fileType.iconClass].join(' ')
-          ) as HTMLCollectionOf<HTMLElement>) {
-            defaultIconRegistry.icon({
-              name: fileType.iconName,
-              title: fileType.iconLabel,
-              container: iconNode,
-              center: true,
-              kind: 'tab'
-            });
-          }
+          // filthy hack to get the topbar tab icons
+          defaultIconRegistry.override({
+            name: fileType.iconName,
+            className: ['p-TabBar-tabIcon', fileType.iconClass].join(' '),
+            center: true,
+            kind: 'tab'
+          });
         } else {
           // add icon as CSS background image. Can't be styled using CSS
           icon.textContent = fileType.iconLabel || '';

diff --git a/packages/ui-components/src/icon/icon.tsx b/packages/ui-components/src/icon/icon.tsx
@@ -129,14 +129,17 @@ export class IconRegistry {
     );
   }
 
-  override(props: { name: string; className: string } & IIconStyle) {
-    const { name, className, ...propsStyle } = props;
+  override(
+    props: { name: string; className: string; title?: string } & IIconStyle
+  ) {
+    const { name, className, title, ...propsStyle } = props;
 
     for (let container of document.getElementsByClassName(
       className
     ) as HTMLCollectionOf<HTMLElement>) {
-      defaultIconRegistry.icon({
+      this.icon({
         name: name,
+        title: title,
         container: container,
         ...propsStyle
       });