From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Mon, 17 Dec 2018 11:09:32 +0000 (+0100)
Subject: SONAR-11568 Fix tooltip when hovering over a search result with mouse
X-Git-Tag: 7.6~214
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35d4defcf214eec9f04f00860538199f82f997c1;p=sonarqube.git

SONAR-11568 Fix tooltip when hovering over a search result with mouse
---

diff --git a/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx b/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx
index c75fd6719b3..67eb15dbb84 100644
--- a/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx
+++ b/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx
@@ -122,28 +122,28 @@ export default class SearchResult extends React.PureComponent<Props, State> {
           placement="left"
           visible={this.state.tooltipVisible}>
           <Link
-            className="navbar-search-item-link"
             data-key={component.key}
             onClick={this.props.onClose}
-            onMouseEnter={this.handleMouseEnter}
             to={getProjectUrl(component.key)}>
-            <span className="navbar-search-item-icons little-spacer-right">
-              {component.isFavorite && <FavoriteIcon favorite={true} size={12} />}
-              {!component.isFavorite && component.isRecentlyBrowsed && <ClockIcon size={12} />}
-              <QualifierIcon className="little-spacer-right" qualifier={component.qualifier} />
+            <span className="navbar-search-item-link" onMouseEnter={this.handleMouseEnter}>
+              <span className="navbar-search-item-icons little-spacer-right">
+                {component.isFavorite && <FavoriteIcon favorite={true} size={12} />}
+                {!component.isFavorite && component.isRecentlyBrowsed && <ClockIcon size={12} />}
+                <QualifierIcon className="little-spacer-right" qualifier={component.qualifier} />
+              </span>
+
+              {component.match ? (
+                <span
+                  className="navbar-search-item-match"
+                  dangerouslySetInnerHTML={{ __html: component.match }}
+                />
+              ) : (
+                <span className="navbar-search-item-match">{component.name}</span>
+              )}
+
+              {this.renderOrganization(component)}
+              {this.renderProject(component)}
             </span>
-
-            {component.match ? (
-              <span
-                className="navbar-search-item-match"
-                dangerouslySetInnerHTML={{ __html: component.match }}
-              />
-            ) : (
-              <span className="navbar-search-item-match">{component.name}</span>
-            )}
-
-            {this.renderOrganization(component)}
-            {this.renderProject(component)}
           </Link>
         </Tooltip>
       </li>
diff --git a/server/sonar-web/src/main/js/app/components/search/__tests__/__snapshots__/SearchResult-test.tsx.snap b/server/sonar-web/src/main/js/app/components/search/__tests__/__snapshots__/SearchResult-test.tsx.snap
index 0a9d6781bf0..21d0975f905 100644
--- a/server/sonar-web/src/main/js/app/components/search/__tests__/__snapshots__/SearchResult-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/search/__tests__/__snapshots__/SearchResult-test.tsx.snap
@@ -11,10 +11,8 @@ exports[`renders favorite 1`] = `
     visible={false}
   >
     <Link
-      className="navbar-search-item-link"
       data-key="foo"
       onClick={[MockFunction]}
-      onMouseEnter={[Function]}
       onlyActiveOnIndex={false}
       style={Object {}}
       to={
@@ -28,21 +26,26 @@ exports[`renders favorite 1`] = `
       }
     >
       <span
-        className="navbar-search-item-icons little-spacer-right"
+        className="navbar-search-item-link"
+        onMouseEnter={[Function]}
       >
-        <FavoriteIcon
-          favorite={true}
-          size={12}
-        />
-        <QualifierIcon
-          className="little-spacer-right"
-          qualifier="TRK"
-        />
-      </span>
-      <span
-        className="navbar-search-item-match"
-      >
-        foo
+        <span
+          className="navbar-search-item-icons little-spacer-right"
+        >
+          <FavoriteIcon
+            favorite={true}
+            size={12}
+          />
+          <QualifierIcon
+            className="little-spacer-right"
+            qualifier="TRK"
+          />
+        </span>
+        <span
+          className="navbar-search-item-match"
+        >
+          foo
+        </span>
       </span>
     </Link>
   </Tooltip>
@@ -60,10 +63,8 @@ exports[`renders match 1`] = `
     visible={false}
   >
     <Link
-      className="navbar-search-item-link"
       data-key="foo"
       onClick={[MockFunction]}
-      onMouseEnter={[Function]}
       onlyActiveOnIndex={false}
       style={Object {}}
       to={
@@ -77,21 +78,26 @@ exports[`renders match 1`] = `
       }
     >
       <span
-        className="navbar-search-item-icons little-spacer-right"
+        className="navbar-search-item-link"
+        onMouseEnter={[Function]}
       >
-        <QualifierIcon
-          className="little-spacer-right"
-          qualifier="TRK"
+        <span
+          className="navbar-search-item-icons little-spacer-right"
+        >
+          <QualifierIcon
+            className="little-spacer-right"
+            qualifier="TRK"
+          />
+        </span>
+        <span
+          className="navbar-search-item-match"
+          dangerouslySetInnerHTML={
+            Object {
+              "__html": "f<mark>o</mark>o",
+            }
+          }
         />
       </span>
-      <span
-        className="navbar-search-item-match"
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "f<mark>o</mark>o",
-          }
-        }
-      />
     </Link>
   </Tooltip>
 </li>
@@ -108,10 +114,8 @@ exports[`renders organizations 1`] = `
     visible={false}
   >
     <Link
-      className="navbar-search-item-link"
       data-key="foo"
       onClick={[MockFunction]}
-      onMouseEnter={[Function]}
       onlyActiveOnIndex={false}
       style={Object {}}
       to={
@@ -125,26 +129,31 @@ exports[`renders organizations 1`] = `
       }
     >
       <span
-        className="navbar-search-item-icons little-spacer-right"
-      >
-        <ClockIcon
-          size={12}
-        />
-        <QualifierIcon
-          className="little-spacer-right"
-          qualifier="TRK"
-        />
-      </span>
-      <span
-        className="navbar-search-item-match"
+        className="navbar-search-item-link"
+        onMouseEnter={[Function]}
       >
-        foo
+        <span
+          className="navbar-search-item-icons little-spacer-right"
+        >
+          <ClockIcon
+            size={12}
+          />
+          <QualifierIcon
+            className="little-spacer-right"
+            qualifier="TRK"
+          />
+        </span>
+        <span
+          className="navbar-search-item-match"
+        >
+          foo
+        </span>
+        <div
+          className="navbar-search-item-right text-muted-2"
+        >
+          bar
+        </div>
       </span>
-      <div
-        className="navbar-search-item-right text-muted-2"
-      >
-        bar
-      </div>
     </Link>
   </Tooltip>
 </li>
@@ -161,10 +170,8 @@ exports[`renders organizations 2`] = `
     visible={false}
   >
     <Link
-      className="navbar-search-item-link"
       data-key="foo"
       onClick={[MockFunction]}
-      onMouseEnter={[Function]}
       onlyActiveOnIndex={false}
       style={Object {}}
       to={
@@ -178,20 +185,25 @@ exports[`renders organizations 2`] = `
       }
     >
       <span
-        className="navbar-search-item-icons little-spacer-right"
-      >
-        <ClockIcon
-          size={12}
-        />
-        <QualifierIcon
-          className="little-spacer-right"
-          qualifier="TRK"
-        />
-      </span>
-      <span
-        className="navbar-search-item-match"
+        className="navbar-search-item-link"
+        onMouseEnter={[Function]}
       >
-        foo
+        <span
+          className="navbar-search-item-icons little-spacer-right"
+        >
+          <ClockIcon
+            size={12}
+          />
+          <QualifierIcon
+            className="little-spacer-right"
+            qualifier="TRK"
+          />
+        </span>
+        <span
+          className="navbar-search-item-match"
+        >
+          foo
+        </span>
       </span>
     </Link>
   </Tooltip>
@@ -209,10 +221,8 @@ exports[`renders projects 1`] = `
     visible={false}
   >
     <Link
-      className="navbar-search-item-link"
       data-key="qwe"
       onClick={[MockFunction]}
-      onMouseEnter={[Function]}
       onlyActiveOnIndex={false}
       style={Object {}}
       to={
@@ -226,26 +236,31 @@ exports[`renders projects 1`] = `
       }
     >
       <span
-        className="navbar-search-item-icons little-spacer-right"
+        className="navbar-search-item-link"
+        onMouseEnter={[Function]}
       >
-        <ClockIcon
-          size={12}
-        />
-        <QualifierIcon
-          className="little-spacer-right"
-          qualifier="BRC"
-        />
-      </span>
-      <span
-        className="navbar-search-item-match"
-      >
-        qwe
+        <span
+          className="navbar-search-item-icons little-spacer-right"
+        >
+          <ClockIcon
+            size={12}
+          />
+          <QualifierIcon
+            className="little-spacer-right"
+            qualifier="BRC"
+          />
+        </span>
+        <span
+          className="navbar-search-item-match"
+        >
+          qwe
+        </span>
+        <div
+          className="navbar-search-item-right text-muted-2"
+        >
+          foo
+        </div>
       </span>
-      <div
-        className="navbar-search-item-right text-muted-2"
-      >
-        foo
-      </div>
     </Link>
   </Tooltip>
 </li>
@@ -262,10 +277,8 @@ exports[`renders recently browsed 1`] = `
     visible={false}
   >
     <Link
-      className="navbar-search-item-link"
       data-key="foo"
       onClick={[MockFunction]}
-      onMouseEnter={[Function]}
       onlyActiveOnIndex={false}
       style={Object {}}
       to={
@@ -279,20 +292,25 @@ exports[`renders recently browsed 1`] = `
       }
     >
       <span
-        className="navbar-search-item-icons little-spacer-right"
+        className="navbar-search-item-link"
+        onMouseEnter={[Function]}
       >
-        <ClockIcon
-          size={12}
-        />
-        <QualifierIcon
-          className="little-spacer-right"
-          qualifier="TRK"
-        />
-      </span>
-      <span
-        className="navbar-search-item-match"
-      >
-        foo
+        <span
+          className="navbar-search-item-icons little-spacer-right"
+        >
+          <ClockIcon
+            size={12}
+          />
+          <QualifierIcon
+            className="little-spacer-right"
+            qualifier="TRK"
+          />
+        </span>
+        <span
+          className="navbar-search-item-match"
+        >
+          foo
+        </span>
       </span>
     </Link>
   </Tooltip>
@@ -310,10 +328,8 @@ exports[`renders selected 1`] = `
     visible={false}
   >
     <Link
-      className="navbar-search-item-link"
       data-key="foo"
       onClick={[MockFunction]}
-      onMouseEnter={[Function]}
       onlyActiveOnIndex={false}
       style={Object {}}
       to={
@@ -327,17 +343,22 @@ exports[`renders selected 1`] = `
       }
     >
       <span
-        className="navbar-search-item-icons little-spacer-right"
-      >
-        <QualifierIcon
-          className="little-spacer-right"
-          qualifier="TRK"
-        />
-      </span>
-      <span
-        className="navbar-search-item-match"
+        className="navbar-search-item-link"
+        onMouseEnter={[Function]}
       >
-        foo
+        <span
+          className="navbar-search-item-icons little-spacer-right"
+        >
+          <QualifierIcon
+            className="little-spacer-right"
+            qualifier="TRK"
+          />
+        </span>
+        <span
+          className="navbar-search-item-match"
+        >
+          foo
+        </span>
       </span>
     </Link>
   </Tooltip>
@@ -356,10 +377,8 @@ exports[`renders selected 2`] = `
     visible={false}
   >
     <Link
-      className="navbar-search-item-link"
       data-key="foo"
       onClick={[MockFunction]}
-      onMouseEnter={[Function]}
       onlyActiveOnIndex={false}
       style={Object {}}
       to={
@@ -373,17 +392,22 @@ exports[`renders selected 2`] = `
       }
     >
       <span
-        className="navbar-search-item-icons little-spacer-right"
-      >
-        <QualifierIcon
-          className="little-spacer-right"
-          qualifier="TRK"
-        />
-      </span>
-      <span
-        className="navbar-search-item-match"
+        className="navbar-search-item-link"
+        onMouseEnter={[Function]}
       >
-        foo
+        <span
+          className="navbar-search-item-icons little-spacer-right"
+        >
+          <QualifierIcon
+            className="little-spacer-right"
+            qualifier="TRK"
+          />
+        </span>
+        <span
+          className="navbar-search-item-match"
+        >
+          foo
+        </span>
       </span>
     </Link>
   </Tooltip>