progress

jupyterlab · Dec 27, 2019 · 4c31686 · 4c31686
1 parent bc433b7
commit 4c31686
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 45 deletions.
diff --git a/packages/apputils-extension/src/index.ts b/packages/apputils-extension/src/index.ts
@@ -25,7 +25,7 @@ import { URLExt } from '@jupyterlab/coreutils';
 
 import { IStateDB, StateDB } from '@jupyterlab/statedb';
 
-import { defaultIconRegistry } from '@jupyterlab/ui-components';
+import { jupyterFaviconIcon } from '@jupyterlab/ui-components';
 
 import { PromiseDelegate } from '@lumino/coreutils';
 
@@ -149,8 +149,7 @@ const splash: JupyterFrontEndPlugin<ISplashScreen> = {
     galaxy.id = 'galaxy';
     logo.id = 'main-logo';
 
-    defaultIconRegistry.icon({
-      name: 'jupyter-favicon',
+    jupyterFaviconIcon.element({
       container: logo,
       center: true,
       kind: 'splash'

diff --git a/packages/filebrowser/src/crumbs.ts b/packages/filebrowser/src/crumbs.ts
@@ -5,19 +5,19 @@ import { ArrayExt } from '@lumino/algorithm';
 
 import { Message } from '@lumino/messaging';
 
-import { IDragEvent } from '@lumino/dragdrop';
-
 import { ElementExt } from '@lumino/domutils';
 
+import { IDragEvent } from '@lumino/dragdrop';
+
 import { Widget } from '@lumino/widgets';
 
 import { DOMUtils, showErrorMessage } from '@jupyterlab/apputils';
 
-import { PathExt, PageConfig } from '@jupyterlab/coreutils';
+import { PageConfig, PathExt } from '@jupyterlab/coreutils';
 
 import { renameFile } from '@jupyterlab/docmanager';
 
-import { defaultIconRegistry } from '@jupyterlab/ui-components';
+import { folderIcon } from '@jupyterlab/ui-components';
 
 import { FileBrowserModel } from './model';
 
@@ -31,11 +31,6 @@ const MATERIAL_CLASS = 'jp-MaterialIcon';
  */
 const BREADCRUMB_CLASS = 'jp-BreadCrumbs';
 
-/**
- * The class name for the folder icon for the breadcrumbs home
- */
-const BREADCRUMB_HOME = 'jp-FolderIcon';
-
 /**
  * The class name for the breadcrumbs home node
  */
@@ -363,8 +358,7 @@ namespace Private {
    */
   export function createCrumbs(): ReadonlyArray<HTMLElement> {
     let home = document.createElement('span');
-    defaultIconRegistry.icon({
-      name: BREADCRUMB_HOME,
+    folderIcon.element({
       className: BREADCRUMB_HOME_CLASS,
       container: home,
       kind: 'breadCrumb'

diff --git a/packages/filebrowser/src/listing.ts b/packages/filebrowser/src/listing.ts
@@ -1812,11 +1812,20 @@ export namespace DirListing {
       const text = DOMUtils.findElement(node, ITEM_TEXT_CLASS);
       const modified = DOMUtils.findElement(node, ITEM_MODIFIED_CLASS);
 
-      let icon = fileType?.iconRenderer ? fileType.iconRenderer : (fileType?.iconClass ? JLIcon.get(fileType.iconClass) : fileIcon);
+      let icon = fileType?.iconRenderer
+        ? fileType.iconRenderer
+        : fileType?.iconClass
+        ? JLIcon.get(fileType.iconClass)
+        : fileIcon;
       let iconClass = classes(ITEM_ICON_CLASS, fileType?.iconClass);
 
       // render the icon svg node
-      icon.element({className: iconClass, container: iconContainer, center: true, kind: 'listing'});
+      icon.element({
+        className: iconClass,
+        container: iconContainer,
+        center: true,
+        kind: 'listing'
+      });
 
       let hoverText = 'Name: ' + model.name;
       // add file size to pop up if its available

diff --git a/packages/launcher/src/index.tsx b/packages/launcher/src/index.tsx
@@ -7,11 +7,7 @@ import {
   VDomRenderer
 } from '@jupyterlab/apputils';
 
-import {
-  classes,
-  DefaultIconReact,
-  defaultIconRegistry
-} from '@jupyterlab/ui-components';
+import { classes, JLIcon } from '@jupyterlab/ui-components';
 
 import {
   ArrayExt,
@@ -203,20 +199,15 @@ export class Launcher extends VDomRenderer<LauncherModel> {
         section = (
           <div className="jp-Launcher-section" key={cat}>
             <div className="jp-Launcher-sectionHeader">
-              {kernel && defaultIconRegistry.contains(iconClass) ? (
-                <DefaultIconReact
+              {kernel && (
+                <JLIcon.getReact
                   name={iconClass}
-                  className={''}
-                  center={true}
-                  kind={'launcherSection'}
-                />
-              ) : (
-                <div
                   className={classes(
-                    iconClass,
                     'jp-Launcher-sectionIcon',
                     'jp-Launcher-icon'
                   )}
+                  center={true}
+                  kind="launcherSection"
                 />
               )}
               <h2 className="jp-Launcher-sectionTitle">{cat}</h2>
@@ -415,7 +406,6 @@ function Card(
   };
 
   // Return the VDOM element.
-  const iconClass = kernel ? '' : commands.iconClass(command, args);
   return (
     <div
       className="jp-LauncherCard"
@@ -426,27 +416,24 @@ function Card(
       data-category={item.category || 'Other'}
       key={Private.keyProperty.get(item)}
     >
-      {kernel ? (
-        <div className="jp-LauncherCard-icon">
-          {item.kernelIconUrl ? (
+      <div className="jp-LauncherCard-icon">
+        {kernel ? (
+          item.kernelIconUrl ? (
             <img src={item.kernelIconUrl} className="jp-Launcher-kernelIcon" />
           ) : (
             <div className="jp-LauncherCard-noKernelIcon">
               {label[0].toUpperCase()}
             </div>
-          )}
-        </div>
-      ) : (
-        <div className="jp-LauncherCard-icon">
-          <DefaultIconReact
-            name={`${iconClass} jp-Launcher-icon`}
-            className={''}
-            fallback={true}
+          )
+        ) : (
+          <JLIcon.getReact
+            name={commands.iconClass(command, args)}
+            className="jp-Launcher-icon"
             center={true}
-            kind={'launcherCard'}
+            kind="launcherCard"
           />
-        </div>
-      )}
+        )}
+      </div>
       <div className="jp-LauncherCard-label" title={title}>
         <p>{label}</p>
       </div>