ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix search experience in notebooks (#18474) (#18485)

Browse Source 
* fix search on notebooks

* keep focus on findwidget
This commit is contained in:
Barbara Valdez
2022-02-18 15:38:38 -08:00
committed by GitHub
parent 23fbd4c1ed
commit 560e8974dd
2 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/workbench/contrib/notebook/browser/find/notebookFindWidget.ts
View File

@@ -337,15 +337,15 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
} }
private _onFindInputKeyDown(e: IKeyboardEvent): void { private _onFindInputKeyDown(e: IKeyboardEvent): void {
// focus on findWidget after navigating to result to prevent manually selecting the findInput to go to the next result
if (e.equals(KeyCode.Enter)) { if (e.equals(KeyCode.Enter)) {
this._notebookController.getAction(ACTION_IDS.FIND_NEXT).run().then(null, onUnexpectedError); this._notebookController.getAction(ACTION_IDS.FIND_NEXT).run().then(null, onUnexpectedError).finally(() => this._findInput.focus());
e.preventDefault(); e.preventDefault();
return; return;
} }
// focus on findWidget after navigating to result to prevent manually selecting findInput to go to the previous result
if (e.equals(KeyMod.Shift | KeyCode.Enter)) { if (e.equals(KeyMod.Shift | KeyCode.Enter)) {
this._notebookController.getAction(ACTION_IDS.FIND_PREVIOUS).run().then(null, onUnexpectedError); this._notebookController.getAction(ACTION_IDS.FIND_PREVIOUS).run().then(null, onUnexpectedError).finally(() => this._findInput.focus());
e.preventDefault(); e.preventDefault();
return; return;
} }

5
src/sql/workbench/contrib/notebook/browser/notebook.component.ts
View File

@@ -146,7 +146,10 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
// For Escape - the focused element is the div.notebook-preview or textarea.inputarea of the cell, so we need to make sure that it is a descendant of the current active cell // For Escape - the focused element is the div.notebook-preview or textarea.inputarea of the cell, so we need to make sure that it is a descendant of the current active cell
// on the current active editor. // on the current active editor.
const activeCellElement = this.container.nativeElement.querySelector(`.editor-group-container.active .notebook-cell.active`); const activeCellElement = this.container.nativeElement.querySelector(`.editor-group-container.active .notebook-cell.active`);
const findWidgetVisible = !!document.querySelector(`.editor-widget.find-widget.visible`);
let handled = false; let handled = false;
// check that the find widget is not opened before handling notebook cell events
if (!findWidgetVisible) {
if (DOM.isAncestor(this.container.nativeElement, document.activeElement) && this.isActive() && this.model.activeCell) { if (DOM.isAncestor(this.container.nativeElement, document.activeElement) && this.isActive() && this.model.activeCell) {
const event = new StandardKeyboardEvent(e); const event = new StandardKeyboardEvent(e);
if (!this.model.activeCell?.isEditMode) { if (!this.model.activeCell?.isEditMode) {
@@ -185,7 +188,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
if (handled) { if (handled) {
DOM.EventHelper.stop(e); DOM.EventHelper.stop(e);
} }
}
})); }));
this._register(this.themeService.onDidColorThemeChange(this.updateTheme, this)); this._register(this.themeService.onDidColorThemeChange(this.updateTheme, this));
this.updateTheme(this.themeService.getColorTheme()); this.updateTheme(this.themeService.getColorTheme());