fix: introduces FinalIcon

carbon-design-system · Apr 19, 2019 · 6ca00da · 6ca00da
1 parent e556fdd
commit 6ca00da
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/components/Tooltip/Tooltip.js b/src/components/Tooltip/Tooltip.js
@@ -481,16 +481,20 @@ class Tooltip extends Component {
 
     const iconProperties = { name: iconName, role: null, description: null };
 
-    const finalIcon = IconCustomElement ? (
-      <IconCustomElement {...iconProperties} />
-    ) : (
-      <Icon
-        icon={!icon && !iconName ? iconInfoGlyph : icon}
-        iconRef={mergeRefs(ref, node => {
-          this.triggerEl = node;
-        })}
-        {...iconProperties}
-      />
+    const FinalIcon = properties => (
+      <div className={`${prefix}--tooltip__trigger`} {...properties}>
+        {IconCustomElement ? (
+          <IconCustomElement {...iconProperties} />
+        ) : (
+          <Icon
+            icon={!icon && !iconName ? iconInfoGlyph : icon}
+            iconRef={mergeRefs(ref, node => {
+              this.triggerEl = node;
+            })}
+            {...iconProperties}
+          />
+        )}
+      </div>
     );
 
     return (
@@ -499,9 +503,7 @@ class Tooltip extends Component {
           {showIcon ? (
             <div id={triggerId} className={triggerClasses}>
               {triggerText}
-              <div className={`${prefix}--tooltip__trigger`} {...properties}>
-                {finalIcon}
-              </div>
+              <FinalIcon {...properties} />
             </div>
           ) : (
             <div id={triggerId} className={triggerClasses} {...properties}>