fix(TooltipSimple): handle case when the tooltip icon not displaying (c…

…arbon-design-system#793) * fix(TooltipSimple): handle case when the tooltip icon not displaying, resolves carbon-design-system#786 * fix(TooltipSimple): handle case when the tooltip icon not displaying, resolves carbon-design-system#786
joshblack · Apr 10, 2018 · c55e5a3 · c55e5a3
1 parent 6da6698
commit c55e5a3
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/src/components/TooltipSimple/TooltipSimple.js b/src/components/TooltipSimple/TooltipSimple.js
@@ -17,18 +17,31 @@ const TooltipSimple = ({
 
   const tooltipWrapperClasses = classNames(`bx--tooltip--simple`, className);
   return (
-    <div className={tooltipWrapperClasses}>
-      {children}
-      <div
-        className={tooltipClasses}
-        data-tooltip-text={text}
-        tabIndex="0"
-        role="button"
-        {...other}>
-        {showIcon && (
-          <Icon role="img" name={iconName} description={iconDescription} />
-        )}
-      </div>
+    <div>
+      {showIcon ? (
+        <div className={tooltipWrapperClasses}>
+          {children}
+          <div
+            className={tooltipClasses}
+            data-tooltip-text={text}
+            tabIndex="0"
+            role="button"
+            {...other}>
+            <Icon role="img" name={iconName} description={iconDescription} />
+          </div>
+        </div>
+      ) : (
+        <div className={tooltipWrapperClasses}>
+          <div
+            className={tooltipClasses}
+            data-tooltip-text={text}
+            tabIndex="0"
+            role="button"
+            {...other}>
+            {children}
+          </div>
+        </div>
+      )}
     </div>
   );
 };