simplified typing of createIcon return type

jupyterlab · Oct 7, 2019 · d45419a · d45419a
1 parent aab6d7d
commit d45419a
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/packages/ui-components/src/icon/jlicon.tsx b/packages/ui-components/src/icon/jlicon.tsx
@@ -33,7 +33,7 @@ export function createIcon(
     }
   }
 
-  const _JLIcon = React.forwardRef(
+  const JLIcon: JLIcon.IComponent = React.forwardRef(
     (props: JLIcon.IProps, ref: React.RefObject<HTMLDivElement>) => {
       const { className, title, tag = 'div', ...propsStyle } = props;
       const Tag = tag;
@@ -59,11 +59,6 @@ export function createIcon(
     }
   );
 
-  // widen type to include .element
-  let JLIcon: typeof _JLIcon & {
-    element: (props: JLIcon.IProps) => HTMLElement;
-  } = _JLIcon as any;
-
   JLIcon.element = ({
     className,
     title,
@@ -116,9 +111,12 @@ export namespace JLIcon {
   }
 
   /**
-   * The state for a JLIcon component
+   * The type of the react component-like object that gets
+   * returned by createIcon
    */
-  export interface IState {}
+  export interface IComponent extends ReturnType<typeof React.forwardRef> {
+    element?: (props: IProps) => HTMLElement;
+  }
 }
 
 namespace Private {
@@ -134,9 +132,3 @@ namespace Private {
     }
   }
 }
-
-// import notTrustedSvg from '../../style/icons/statusbar/not-trusted.svg';
-// import trustedSvg from '../../style/icons/statusbar/trusted.svg';
-//
-// export const NotTrustedIcon = createIcon('notTrusted', notTrustedSvg);
-// export const TrustedIcon = createIcon('trusted', trustedSvg);