From 051f207decbe8b825c79d05967a3eb6d5f74cbcf Mon Sep 17 00:00:00 2001
From: Oleksandr Fediashov <olfedias@microsoft.com>
Date: Wed, 5 Feb 2020 11:07:25 +0100
Subject: [PATCH] RFC: remove icons from theme

---
 packages/react/src/components/Icon/Icon.tsx | 29 +++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/react/src/components/Icon/Icon.tsx b/packages/react/src/components/Icon/Icon.tsx
index 8e86f8fca3..2ba5356a61 100644
--- a/packages/react/src/components/Icon/Icon.tsx
+++ b/packages/react/src/components/Icon/Icon.tsx
@@ -16,6 +16,12 @@ import { WithAsProp, withSafeTypeForAs } from '../../types'
 
 export type IconXSpacing = 'none' | 'before' | 'after' | 'both'
 
+export type IconDefinition = {
+  className?: string
+  type: 'font' | 'svg'
+  icon?: () => React.ReactSVGElement
+}
+
 export interface IconProps extends UIComponentProps, ColorComponentProps {
   /** Accessibility behavior if overridden by the user. */
   accessibility?: Accessibility
@@ -29,7 +35,10 @@ export interface IconProps extends UIComponentProps, ColorComponentProps {
   /** An icon can show it is currently unable to be interacted with. */
   disabled?: boolean
 
+  definition?: IconDefinition
+
   /** Name of the icon. */
+  // TODO: REMOVE ME
   name: string
 
   /** An icon can provide an outline variant. */
@@ -76,15 +85,25 @@ class Icon extends UIComponent<WithAsProp<IconProps>, any> {
   }
 
   renderComponent({ ElementType, classes, unhandledProps, accessibility, theme, rtl, styles }) {
-    const { name } = this.props
-    const { icons = {} } = theme || {}
+    const { definition, name } = this.props
+
+    let isSvgIcon: boolean
+    let iconComponent: React.ElementType
+
+    if (definition) {
+      iconComponent = definition.icon
+      isSvgIcon = definition.type === 'svg'
+    } else {
+      const { icons = {} } = theme || {}
+      const maybeIcon = icons[name]
 
-    const maybeIcon = icons[name]
-    const isSvgIcon = maybeIcon && maybeIcon.isSvg
+      iconComponent = maybeIcon.icon
+      isSvgIcon = maybeIcon && maybeIcon.isSvg
+    }
 
     return (
       <ElementType className={classes.root} {...accessibility.attributes.root} {...unhandledProps}>
-        {isSvgIcon && callable(maybeIcon.icon)({ classes, rtl, props: this.props })}
+        {isSvgIcon && callable(iconComponent)({ classes, rtl, props: this.props })}
       </ElementType>
     )
   }