Merge branch 'master' into accessibility/improve-tooltips-behavior

packages/components/src/tooltip/index.js

@@ -12,6 +12,7 @@ import {
 	cloneElement,
 	concatChildren,
 } from '@wordpress/element';
+import { ESCAPE } from '@wordpress/keycodes';
 
 /**
  * Internal dependencies
@@ -88,9 +89,16 @@ class Tooltip extends Component {
 			if ( event.currentTarget.disabled ) {
 				return;
 			}
-
-			// If pressed key is escape, no further actions are needed.
-			if ( event.keyCode === 27 ) { // 27 is the keyCode for escape
+
+      // If pressed key is escape, no further actions are needed.
+      if ( event.keyCode === ESCAPE ) {
+        return;
+      }
+
+			// A focus event will occur as a result of a mouse click, but it
+			// should be disambiguated between interacting with the button and
+			// using an explicit focus shift as a cue to display the tooltip.
+			if ( 'focus' === event.type && this.isInMouseDown ) {
 				return;
 			}