fix(Tooltip): support click-to-open with no-icon scenario (#2047)

Fixes #2046.
carbon-design-system · Mar 20, 2019 · 5360b4b · 5360b4b
1 parent 9084f78
commit 5360b4b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/components/Tooltip/Tooltip-story.js b/src/components/Tooltip/Tooltip-story.js
@@ -39,14 +39,21 @@ const props = {
     tabIndex: number('Tab index (tabIndex in <Tooltip>)', 0),
   }),
   withoutIcon: () => ({
+    clickToOpen: boolean(
+      'Click to open (clickToOpen, using `false` here is deprecated)',
+      true
+    ),
     showIcon: false,
     direction: select('Tooltip direction (direction)', directions, 'bottom'),
     triggerText: text('Trigger text (triggerText)', 'Tooltip label'),
     tabIndex: number('Tab index (tabIndex in <Tooltip>)', 0),
   }),
   customIcon: () => ({
     showIcon: true,
-    clickToOpen: boolean('Click to open (clickToOpen)', false),
+    clickToOpen: boolean(
+      'Click to open (clickToOpen, using `false` here is deprecated)',
+      true
+    ),
     direction: select('Tooltip direction (direction)', directions, 'bottom'),
     triggerText: text('Trigger text (triggerText)', 'Tooltip label'),
     tabIndex: number('Tab index (tabIndex in <Tooltip>)', 0),
@@ -64,7 +71,10 @@ const props = {
   }),
   customIconOnly: () => ({
     showIcon: true,
-    clickToOpen: boolean('Click to open (clickToOpen)', false),
+    clickToOpen: boolean(
+      'Click to open (clickToOpen, using `false` here is deprecated)',
+      true
+    ),
     direction: select('Tooltip direction (direction)', directions, 'bottom'),
     triggerText: null,
     tabIndex: number('Tab index (tabIndex in <Tooltip>)', 0),

diff --git a/src/components/Tooltip/Tooltip.js b/src/components/Tooltip/Tooltip.js
@@ -502,6 +502,8 @@ class Tooltip extends Component {
               ref={mergeRefs(ref, node => {
                 this.triggerEl = node;
               })}
+              onClick={this.handleMouse}
+              onKeyDown={this.handleKeyPress}
               onMouseOver={this.handleMouse}
               onMouseOut={this.handleMouse}
               onFocus={this.handleMouse}