Merge pull request #7767 from telamonian/remove-jlicon-rendermime-int…

…erfaces

Clean up handling of Icons under unified LabIcon

.cleanignore

@@ -20,4 +20,6 @@
 @.idea/
 
 # ms IDE stuff
+@*.code-workspace
+@.history
 @.vscode

.gitignore

@@ -57,4 +57,6 @@ junit.xml
 .idea/
 
 # ms IDE stuff
+*.code-workspace
+.history
 .vscode

buildutils/src/ensure-package.ts

@@ -21,13 +21,13 @@ const HEADER_TEMPLATE = `
 `;
 
 const ICON_IMPORTS_TEMPLATE = `
-import { JLIcon } from './jlicon';
+import { LabIcon } from './labicon';
 
 // icon svg import statements
-{{iconImportStatements}}
+{{svgImportStatements}}
 
-// JLIcon instance construction
-{{jliconConstruction}}
+// LabIcon instance construction
+{{labiconConstructions}}
 `;
 
 const ICON_CSS_CLASSES_TEMPLATE = `
@@ -355,48 +355,52 @@ export async function ensureUiComponents(
   dorequire: boolean = false
 ): Promise<string[]> {
   const funcName = 'ensureUiComponents';
+  const pkgName = utils.stem(pkgPath);
   let messages: string[] = [];
 
-  const svgs = glob.sync(path.join(pkgPath, 'style/icons', '**/*.svg'));
+  const svgPaths = glob.sync(path.join(pkgPath, 'style/icons', '**/*.svg'));
 
   /* support for glob import of icon svgs */
   const iconSrcDir = path.join(pkgPath, 'src/icon');
 
   // build the per-icon import code
-  let _iconImportStatements: string[] = [];
-  let _jliconConstruction: string[] = [];
-  svgs.forEach(svg => {
-    const name = utils.stem(svg);
-    const svgpath = path
-      .relative(iconSrcDir, svg)
+  let _svgImportStatements: string[] = [];
+  let _labiconConstructions: string[] = [];
+  svgPaths.forEach(svgPath => {
+    const svgName = utils.stem(svgPath);
+    const svgImportPath = path
+      .relative(iconSrcDir, svgPath)
       .split(path.sep)
       .join('/');
 
-    const svgname = utils.camelCase(name) + 'Svg';
-    const iconname = utils.camelCase(name) + 'Icon';
+    const svgstrRef = utils.camelCase(svgName) + 'Svgstr';
+    const iconRef = utils.camelCase(svgName) + 'Icon';
+    const iconName = [pkgName, utils.stem(svgPath)].join(':');
 
     if (dorequire) {
       // load the icon svg using `require`
-      _jliconConstruction.push(
-        `export const ${iconname} = new JLIcon({ name: '${name}', svgstr: require('${svgpath}').default });`
+      _labiconConstructions.push(
+        `export const ${iconRef} = new LabIcon({ name: '${iconName}', svgstr: require('${svgImportPath}').default });`
       );
     } else {
       // load the icon svg using `import`
-      _iconImportStatements.push(`import ${svgname} from '${svgpath}';`);
+      _svgImportStatements.push(`import ${svgstrRef} from '${svgImportPath}';`);
 
-      _jliconConstruction.push(
-        `export const ${iconname} = new JLIcon({ name: '${name}', svgstr: ${svgname} });`
+      _labiconConstructions.push(
+        `export const ${iconRef} = new LabIcon({ name: '${iconName}', svgstr: ${svgstrRef} });`
       );
     }
   });
-  const iconImportStatements = _iconImportStatements.join('\n');
-  const jliconConstruction = _jliconConstruction.join('\n');
+
+  // sort the statements and then join them
+  const svgImportStatements = _svgImportStatements.sort().join('\n');
+  const labiconConstructions = _labiconConstructions.sort().join('\n');
 
   // generate the actual contents of the iconImports file
   const iconImportsPath = path.join(iconSrcDir, 'iconimports.ts');
   const iconImportsContents = utils.fromTemplate(
     HEADER_TEMPLATE + ICON_IMPORTS_TEMPLATE,
-    { funcName, iconImportStatements, jliconConstruction }
+    { funcName, svgImportStatements, labiconConstructions }
   );
   messages.push(...ensureFile(iconImportsPath, iconImportsContents, false));
 
@@ -406,23 +410,25 @@ export async function ensureUiComponents(
   // build the per-icon import code
   let _iconCSSUrls: string[] = [];
   let _iconCSSDeclarations: string[] = [];
-  svgs.forEach(svg => {
-    const name = utils.stem(svg);
-    const urlName = 'jp-icon-' + name;
-    const className = 'jp-' + utils.camelCase(name, true) + 'Icon';
+  svgPaths.forEach(svgPath => {
+    const svgName = utils.stem(svgPath);
+    const urlName = 'jp-icon-' + svgName;
+    const className = 'jp-' + utils.camelCase(svgName, true) + 'Icon';
 
     _iconCSSUrls.push(
       `--${urlName}: url('${path
-        .relative(iconCSSDir, svg)
+        .relative(iconCSSDir, svgPath)
         .split(path.sep)
         .join('/')}');`
     );
     _iconCSSDeclarations.push(
       `.${className} {background-image: var(--${urlName})}`
     );
   });
-  const iconCSSUrls = _iconCSSUrls.join('\n');
-  const iconCSSDeclarations = _iconCSSDeclarations.join('\n');
+
+  // sort the statements and then join them
+  const iconCSSUrls = _iconCSSUrls.sort().join('\n');
+  const iconCSSDeclarations = _iconCSSDeclarations.sort().join('\n');
 
   // generate the actual contents of the iconCSSClasses file
   const iconCSSClassesPath = path.join(iconCSSDir, 'deprecated.css');

dev_mode/package.json

@@ -169,7 +169,7 @@
     "@jupyterlab/vdom-extension": "~2.0.0-beta.3",
     "@jupyterlab/vega5-extension": "~2.0.0-beta.3",
     "@lumino/algorithm": "^1.2.3",
-    "@lumino/application": "^1.8.0",
+    "@lumino/application": "^1.8.2",
     "@lumino/commands": "^1.9.2",
     "@lumino/coreutils": "^1.4.2",
     "@lumino/disposable": "^1.3.4",
@@ -178,8 +178,8 @@
     "@lumino/messaging": "^1.3.3",
     "@lumino/properties": "^1.1.6",
     "@lumino/signaling": "^1.3.4",
-    "@lumino/virtualdom": "^1.4.0",
-    "@lumino/widgets": "^1.10.0",
+    "@lumino/virtualdom": "^1.5.0",
+    "@lumino/widgets": "^1.10.2",
     "react": "~16.9.0",
     "react-dom": "~16.9.0"
   },
@@ -391,6 +391,7 @@
       "@jupyterlab/test-statedb": "../tests/test-statedb",
       "@jupyterlab/test-statusbar": "../tests/test-statusbar",
       "@jupyterlab/test-terminal": "../tests/test-terminal",
+      "@jupyterlab/test-ui-components": "../tests/test-ui-components",
       "@jupyterlab/testutils": "../testutils",
       "@jupyterlab/mock-extension": "../jupyterlab/tests/mock_packages/extension"
     }

docs/environment.yml

@@ -8,5 +8,6 @@ dependencies:
 - sphinx_rtd_theme
 - recommonmark
 - pytest
+- jsx-lexer
 - pip:
   - pytest-check-links

docs/source/developer/extension_migration.rst

@@ -168,3 +168,11 @@ For example, consider how the ``@jupyterlab/debugger`` extension's
   ``await sessionContext.session?.kernel?.info`` to check when a kernel is
   ready and retrieve its details. --
   `jupyterlab/debugger#337 <https://github.com/jupyterlab/debugger/pull/337>`__
+
+Using the new icon system and ``LabIcon``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. note::
+
+  For full API documentation and examples of how to use
+  the new icon support based on ``LabIcon`` from ``@jupyterlab/ui-components``,
+  `consult the repository <https://github.com/jupyterlab/jupyterlab/tree/master/packages/ui-components#readme>`__.