Bug 1587419 - Search keyword does not appear in the input text box fi…

…eld after reopening network panel search. r=Honza

Differential Revision: https://phabricator.services.mozilla.com/D48739

devtools/client/netmonitor/src/components/search/Toolbar.js

@@ -40,6 +40,7 @@ class Toolbar extends Component {
       caseSensitive: PropTypes.bool.isRequired,
       toggleCaseSensitiveSearch: PropTypes.func.isRequired,
       connector: PropTypes.object.isRequired,
+      query: PropTypes.string,
     };
   }
 
@@ -124,15 +125,17 @@ class Toolbar extends Component {
       addSearchQuery,
       clearSearchResultAndCancel,
       connector,
+      query,
     } = this.props;
     return SearchBox({
       keyShortcut: "CmdOrCtrl+Shift+F",
       placeholder: L10N.getStr("netmonitor.search.toolbar.inputPlaceholder"),
       type: "search",
       delay: FILTER_SEARCH_DELAY,
       ref: this.props.searchboxRef,
+      value: query,
       onClearButtonClick: () => clearSearchResultAndCancel(),
-      onChange: query => addSearchQuery(query),
+      onChange: newQuery => addSearchQuery(newQuery),
       onKeyDown: event => this.onKeyDown(event, connector),
     });
   }
@@ -153,6 +156,7 @@ class Toolbar extends Component {
 module.exports = connect(
   state => ({
     caseSensitive: state.search.caseSensitive,
+    query: state.search.query,
   }),
   dispatch => ({
     closeSearch: () => dispatch(Actions.closeSearch()),

devtools/client/shared/components/SearchBox.js

@@ -46,14 +46,15 @@ class SearchBox extends PureComponent {
       summary: PropTypes.string,
       summaryTooltip: PropTypes.string,
       type: PropTypes.string,
+      value: PropTypes.string,
     };
   }
 
   constructor(props) {
     super(props);
 
     this.state = {
-      value: "",
+      value: props.value || "",
       focused: false,
     };