From b328fcb7e3741bb0968e6e4b5e438f21066fc629 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Sep 2019 10:58:11 +0200
Subject: [PATCH] show shorter placeholder for filter feed when not focused

---
 src/components/structures/LeftPanel.js |  3 ++-
 src/components/structures/SearchBox.js | 12 +++++++++++-
 src/i18n/strings/en_EN.json            |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index fcae8bf4e6..4e8217f5fa 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -264,7 +264,8 @@ const LeftPanel = React.createClass({
 
         const searchBox = (<SearchBox
             enableRoomSearchFocus={true}
-            placeholder={ _t('Filter room names') }
+            blurredPlaceholder={ _t('Filter') }
+            placeholder={ _t('Filter rooms…') }
             onSearch={ this.onSearch }
             onCleared={ this.onSearchCleared }
             onFocus={this._onSearchFocus}
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index e2421e68f4..34efb5b50f 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -21,6 +21,7 @@ import { KeyCode } from '../../Keyboard';
 import dis from '../../dispatcher';
 import { throttle } from 'lodash';
 import AccessibleButton from '../../components/views/elements/AccessibleButton';
+import classNames from 'classnames';
 
 module.exports = React.createClass({
     displayName: 'SearchBox',
@@ -46,6 +47,7 @@ module.exports = React.createClass({
     getInitialState: function() {
         return {
             searchTerm: "",
+            blurred: true,
         };
     },
 
@@ -93,6 +95,7 @@ module.exports = React.createClass({
     },
 
     _onFocus: function(ev) {
+        this.setState({blurred: false});
         ev.target.select();
         if (this.props.onFocus) {
             this.props.onFocus(ev);
@@ -100,6 +103,7 @@ module.exports = React.createClass({
     },
 
     _onBlur: function(ev) {
+        this.setState({blurred: true});
         if (this.props.onBlur) {
             this.props.onBlur(ev);
         }
@@ -127,6 +131,12 @@ module.exports = React.createClass({
                     onClick={ () => {this._clearSearch("button"); } }>
             </AccessibleButton>) : undefined;
 
+        // show a shorter placeholder when blurred, if requested
+        // this is used for the room filter field that has
+        // the explore button next to it when blurred
+        const placeholder = this.state.blurred ?
+            (this.props.blurredPlaceholder || this.props.placeholder) :
+            this.props.placeholder;
         const className = this.props.className || "";
         return (
             <div className="mx_SearchBox mx_textinput">
@@ -139,8 +149,8 @@ module.exports = React.createClass({
                     onFocus={ this._onFocus }
                     onChange={ this.onChange }
                     onKeyDown={ this._onKeyDown }
-                    placeholder={ this.props.placeholder }
                     onBlur={this._onBlur}
+                    placeholder={ placeholder }
                 />
                 { clearButton }
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8dba563b9d..ca19fb8fe1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1473,8 +1473,9 @@
     "Community %(groupId)s not found": "Community %(groupId)s not found",
     "This homeserver does not support communities": "This homeserver does not support communities",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
-    "Filter room names": "Filter room names",
     "Explore": "Explore",
+    "Filter": "Filter",
+    "Filter rooms…": "Filter rooms…",
     "Failed to reject invitation": "Failed to reject invitation",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",