change all refs to iconRenderer => icon across codebase

- exception: refs to title.iconRenderer, where title is a Lumino Title obj, were left as-is

packages/apputils/src/toolbar.tsx

@@ -367,7 +367,7 @@ export namespace Toolbar {
     sessionContext: ISessionContext
   ): Widget {
     return new ToolbarButton({
-      iconRenderer: stopIcon,
+      icon: stopIcon,
       onClick: () => {
         void sessionContext.session?.kernel?.interrupt();
       },
@@ -383,7 +383,7 @@ export namespace Toolbar {
     dialogs?: ISessionContext.IDialogs
   ): Widget {
     return new ToolbarButton({
-      iconRenderer: refreshIcon,
+      icon: refreshIcon,
       onClick: () => {
         void (dialogs ?? sessionContextDialogs).restart(sessionContext);
       },
@@ -450,7 +450,7 @@ export namespace ToolbarButtonComponent {
     label?: string;
     iconClass?: string;
     iconLabel?: string;
-    iconRenderer?: JLIcon;
+    icon?: JLIcon;
     tooltip?: string;
     onClick?: () => void;
     enabled?: boolean;
@@ -483,9 +483,9 @@ export function ToolbarButtonComponent(props: ToolbarButtonComponent.IProps) {
   };
 
   const Icon = () => {
-    if (props.iconRenderer) {
+    if (props.icon) {
       return (
-        <props.iconRenderer.react
+        <props.icon.react
           className={classes(props.iconClass, 'jp-ToolbarButtonComponent-icon')}
           tag="span"
           justify="center"

packages/extensionmanager/src/widget.tsx

@@ -352,7 +352,7 @@ export class CollapsibleSection extends React.Component<
       <>
         <header>
           <ToolbarButtonComponent
-            iconRenderer={this.state.isOpen ? caretDownIcon : caretRightIcon}
+            icon={this.state.isOpen ? caretDownIcon : caretRightIcon}
             iconClass={iconStyle({ height: 'auto', width: '20px' })}
             onClick={() => {
               this.handleCollapse();
@@ -542,7 +542,7 @@ export class ExtensionView extends VDomRenderer<ListModel> {
           headerElements={
             <ToolbarButtonComponent
               key="refresh-button"
-              iconRenderer={refreshIcon}
+              icon={refreshIcon}
               onClick={() => {
                 model.refreshInstalled();
               }}

packages/filebrowser-extension/src/index.ts

@@ -235,7 +235,7 @@ async function activateFactory(
 
     // Add a launcher toolbar item.
     let launcher = new ToolbarButton({
-      iconRenderer: addIcon,
+      icon: addIcon,
       onClick: () => {
         return Private.createLauncher(commands, widget);
       },

packages/filebrowser/src/browser.ts

@@ -69,7 +69,7 @@ export class FileBrowser extends Widget {
     this._directoryPending = false;
 
     const newFolder = new ToolbarButton({
-      iconRenderer: newFolderIcon,
+      icon: newFolderIcon,
       onClick: () => {
         this.createNewDirectory();
       },
@@ -77,7 +77,7 @@ export class FileBrowser extends Widget {
     });
     const uploader = new Uploader({ model });
     const refresher = new ToolbarButton({
-      iconRenderer: refreshIcon,
+      icon: refreshIcon,
       onClick: () => {
         void model.refresh();
       },

packages/filebrowser/src/upload.ts

@@ -15,7 +15,7 @@ export class Uploader extends ToolbarButton {
    */
   constructor(options: Uploader.IOptions) {
     super({
-      iconRenderer: fileUploadIcon,
+      icon: fileUploadIcon,
       onClick: () => {
         this._input.click();
       },

packages/htmlviewer/src/index.tsx

@@ -89,7 +89,7 @@ export class HTMLViewer extends DocumentWidget<IFrame>
     this.toolbar.addItem(
       'refresh',
       new ToolbarButton({
-        iconRenderer: refreshIcon,
+        icon: refreshIcon,
         onClick: () => {
           this.content.url = this.content.url;
         },

packages/notebook/src/default-toolbar.tsx

@@ -68,7 +68,7 @@ export namespace ToolbarItems {
         <UseSignal signal={panel.context.fileChanged}>
           {() => (
             <ToolbarButtonComponent
-              iconRenderer={saveIcon}
+              icon={saveIcon}
               onClick={onClick}
               tooltip="Save the notebook contents and create checkpoint"
               enabled={
@@ -91,7 +91,7 @@ export namespace ToolbarItems {
    */
   export function createInsertButton(panel: NotebookPanel): Widget {
     return new ToolbarButton({
-      iconRenderer: addIcon,
+      icon: addIcon,
       onClick: () => {
         NotebookActions.insertBelow(panel.content);
       },
@@ -104,7 +104,7 @@ export namespace ToolbarItems {
    */
   export function createCutButton(panel: NotebookPanel): Widget {
     return new ToolbarButton({
-      iconRenderer: cutIcon,
+      icon: cutIcon,
       onClick: () => {
         NotebookActions.cut(panel.content);
       },
@@ -117,7 +117,7 @@ export namespace ToolbarItems {
    */
   export function createCopyButton(panel: NotebookPanel): Widget {
     return new ToolbarButton({
-      iconRenderer: copyIcon,
+      icon: copyIcon,
       onClick: () => {
         NotebookActions.copy(panel.content);
       },
@@ -130,7 +130,7 @@ export namespace ToolbarItems {
    */
   export function createPasteButton(panel: NotebookPanel): Widget {
     return new ToolbarButton({
-      iconRenderer: pasteIcon,
+      icon: pasteIcon,
       onClick: () => {
         NotebookActions.paste(panel.content);
       },
@@ -143,7 +143,7 @@ export namespace ToolbarItems {
    */
   export function createRunButton(panel: NotebookPanel): Widget {
     return new ToolbarButton({
-      iconRenderer: runIcon,
+      icon: runIcon,
       onClick: () => {
         void NotebookActions.runAndAdvance(panel.content, panel.sessionContext);
       },

packages/running-extension/src/index.ts

@@ -108,7 +108,7 @@ function addKernelRunningSessionManager(
     shutdown() {
       return manager.shutdown(this._model.id);
     }
-    iconRenderer() {
+    icon() {
       let { name, path, type } = this._model;
       if ((name || PathExt.basename(path)).indexOf('.ipynb') !== -1) {
         return notebookIcon;

packages/running/src/index.tsx

@@ -116,7 +116,7 @@ export class RunningSessionManagers implements IRunningSessionManagers {
 
 function Item(props: { runningItem: IRunningSessions.IRunningItem }) {
   const { runningItem } = props;
-  const icon = runningItem.iconRenderer();
+  const icon = runningItem.icon();
 
   return (
     <li className={ITEM_CLASS}>
@@ -183,7 +183,7 @@ function Section(props: { manager: IRunningSessions.IManager }) {
         <header className={SECTION_HEADER_CLASS}>
           <h2>{props.manager.name} Sessions</h2>
           <ToolbarButtonComponent
-            iconRenderer={closeIcon}
+            icon={closeIcon}
             onClick={onShutdown}
             tooltip={`Shut Down All ${props.manager.name} Sessions…`}
           />
@@ -205,7 +205,7 @@ function RunningSessionsComponent(props: {
       <div className={HEADER_CLASS}>
         <ToolbarButtonComponent
           tooltip="Refresh List"
-          iconRenderer={refreshIcon}
+          icon={refreshIcon}
           onClick={() =>
             props.managers.items().forEach(manager => manager.refreshRunning())
           }
@@ -269,7 +269,7 @@ export namespace IRunningSessions {
     // called when the shutdown button is pressed on a particular item
     shutdown: () => void;
     // JLIcon to use as the icon
-    iconRenderer: () => JLIcon;
+    icon: () => JLIcon;
     // called to determine the label for each item
     label: () => string;
     // called to determine the `title` attribute for each item, which is revealed on hover

packages/terminal-extension/src/index.ts

@@ -288,7 +288,7 @@ function addRunningSessionManager(
     open() {
       void app.commands.execute('terminal:open', { name: this._model.name });
     }
-    iconRenderer() {
+    icon() {
       return terminalIcon;
     }
     label() {

packages/ui-components/src/components/htmlselect.tsx

@@ -38,7 +38,7 @@ export interface IHTMLSelectProps
 
   iconProps?: JLIcon.IProps;
 
-  iconRenderer?: JLIcon;
+  icon?: JLIcon;
 
   options?: Array<string | number | IOptionProps>;
 }
@@ -51,7 +51,7 @@ export class HTMLSelect extends React.Component<IHTMLSelectProps> {
       disabled,
       elementRef,
       iconProps,
-      iconRenderer = caretDownEmptyIcon,
+      icon = caretDownEmptyIcon,
       options = [],
       ...htmlProps
     } = this.props;
@@ -87,7 +87,7 @@ export class HTMLSelect extends React.Component<IHTMLSelectProps> {
           {optionChildren}
           {htmlProps.children}
         </select>
-        <iconRenderer.react
+        <icon.react
           {...{
             tag: 'span',
             kind: 'select',