aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js
diff options
context:
space:
mode:
authorJeremy Davis <jeremy.davis@sonarsource.com>2019-02-08 15:59:03 +0100
committerSonarTech <sonartech@sonarsource.com>2019-02-12 20:20:54 +0100
commitce5749103936828955d9de52108a0e4b5cd76f12 (patch)
tree7fe11662bd055cdae2482421ba21a4aeda498323 /server/sonar-web/src/main/js
parentee6d1e906736f988dc399d3ea7e9562014027084 (diff)
downloadsonarqube-ce5749103936828955d9de52108a0e4b5cd76f12.tar.gz
sonarqube-ce5749103936828955d9de52108a0e4b5cd76f12.zip
SONAR-11717 Fix searchbox focus
Diffstat (limited to 'server/sonar-web/src/main/js')
-rw-r--r--server/sonar-web/src/main/js/apps/groups/components/__tests__/__snapshots__/EditMembers-test.tsx.snap2
-rw-r--r--server/sonar-web/src/main/js/components/controls/SearchBox.css1
-rw-r--r--server/sonar-web/src/main/js/components/controls/SearchBox.tsx9
-rw-r--r--server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap1
4 files changed, 9 insertions, 4 deletions
diff --git a/server/sonar-web/src/main/js/apps/groups/components/__tests__/__snapshots__/EditMembers-test.tsx.snap b/server/sonar-web/src/main/js/apps/groups/components/__tests__/__snapshots__/EditMembers-test.tsx.snap
index 57ca00c2b1e..6a1c6b7e4c7 100644
--- a/server/sonar-web/src/main/js/apps/groups/components/__tests__/__snapshots__/EditMembers-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/groups/components/__tests__/__snapshots__/EditMembers-test.tsx.snap
@@ -247,6 +247,7 @@ exports[`should edit members 2`] = `
</ul>
<div
class="search-box"
+ title=""
>
<input
aria-label="search_verb"
@@ -493,6 +494,7 @@ exports[`should edit members 2`] = `
>
<div
className="search-box"
+ title=""
>
<input
aria-label="search_verb"
diff --git a/server/sonar-web/src/main/js/components/controls/SearchBox.css b/server/sonar-web/src/main/js/components/controls/SearchBox.css
index 75ef9f94f4d..ea129a95b57 100644
--- a/server/sonar-web/src/main/js/components/controls/SearchBox.css
+++ b/server/sonar-web/src/main/js/components/controls/SearchBox.css
@@ -66,6 +66,7 @@
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
+ pointer-events: none;
}
.search-box-input:focus ~ .search-box-magnifier {
diff --git a/server/sonar-web/src/main/js/components/controls/SearchBox.tsx b/server/sonar-web/src/main/js/components/controls/SearchBox.tsx
index e1bae427cc8..2d2b5669917 100644
--- a/server/sonar-web/src/main/js/components/controls/SearchBox.tsx
+++ b/server/sonar-web/src/main/js/components/controls/SearchBox.tsx
@@ -131,7 +131,10 @@ export default class SearchBox extends React.PureComponent<Props, State> {
const tooShort = minLength !== undefined && value.length > 0 && value.length < minLength;
return (
- <div className={classNames('search-box', this.props.className)} id={this.props.id}>
+ <div
+ className={classNames('search-box', this.props.className)}
+ id={this.props.id}
+ title={tooShort ? translateWithParameters('select2.tooShort', minLength!) : ''}>
<input
aria-label={translate('search_verb')}
autoComplete="off"
@@ -162,9 +165,7 @@ export default class SearchBox extends React.PureComponent<Props, State> {
)}
{tooShort && (
- <span
- className="search-box-note"
- title={translateWithParameters('select2.tooShort', minLength!)}>
+ <span className="search-box-note">
{translateWithParameters('select2.tooShort', minLength!)}
</span>
)}
diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap b/server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap
index aeddfd7253c..e7183478c77 100644
--- a/server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap
@@ -3,6 +3,7 @@
exports[`renders 1`] = `
<div
className="search-box"
+ title=""
>
<input
aria-label="search_verb"