Merge pull request #6241 from aschlaep/fix-documentsearch-refocus

Fix re-focus on ctrl+f when search overlay is already open
jupyterlab · Apr 26, 2019 · 10ac1a7 · 10ac1a7
2 parents f40af6c + 09684ee
commit 10ac1a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/documentsearch/src/searchinstance.ts b/packages/documentsearch/src/searchinstance.ts
@@ -67,9 +67,11 @@ export class SearchInstance implements IDisposable {
    */
   focusInput(): void {
     this._displayState.forceFocus = true;
+    this._displayState.searchInputFocused = true;
 
     // Trigger a rerender without resetting the forceFocus.
     this._displayUpdateSignal.emit(this._displayState);
+    this._displayState.forceFocus = false;
   }
 
   /**

diff --git a/packages/documentsearch/src/searchoverlay.tsx b/packages/documentsearch/src/searchoverlay.tsx
@@ -73,7 +73,7 @@ class SearchEntry extends React.Component<ISearchEntryProps> {
   }
 
   componentDidUpdate() {
-    if (this.props.forceFocus && this.props.inputFocused) {
+    if (this.props.forceFocus) {
       this.focusInput();
     }
   }