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

Notebook scrolling to search result instead of selected cell (#20580)

Browse Source 
* do not scroll to current result if there's other cell active

Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>
This commit is contained in:
Barbara Valdez
2022-11-04 11:05:26 -07:00
committed by GitHub
parent f8b7c32030
commit efe56eba8c
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/workbench/contrib/notebook/browser/cellViews/interfaces.ts
View File

@@ -73,16 +73,18 @@ export abstract class CellView extends AngularDisposable implements OnDestroy, I
let elements = this.getHtmlElements(); let elements = this.getHtmlElements();
if (elements?.length >= range.startLineNumber) { if (elements?.length >= range.startLineNumber) {
let elementContainingText = elements[range.startLineNumber - 1]; let elementContainingText = elements[range.startLineNumber - 1];
let isCellActive = range.cell.active;
let markCurrent = new Mark(elementContainingText); // to highlight the current item of them all. let markCurrent = new Mark(elementContainingText); // to highlight the current item of them all.
markCurrent.markRanges([{ markCurrent.markRanges([{
start: range.startColumn - 1, //subtracting 1 since markdown html is 0 indexed. start: range.startColumn - 1, //subtracting 1 since markdown html is 0 indexed.
length: range.endColumn - range.startColumn length: range.endColumn - range.startColumn
}], { }], {
className: findRangeSpecificClass, className: findRangeSpecificClass,
each: function (node, range) { each: function (node, range) {
// node is the marked DOM element if (isCellActive) {
node.scrollIntoView({ block: 'center' }); // node is the marked DOM element
node.scrollIntoView({ block: 'center' });
}
} }
}); });
} }

4
src/sql/workbench/contrib/notebook/browser/cellViews/output.component.ts
View File

@@ -216,7 +216,7 @@ export class OutputComponent extends CellView implements OnInit, AfterViewInit {
className: findRangeSpecificClass, className: findRangeSpecificClass,
each: function (node, range) { each: function (node, range) {
// node is the marked DOM element // node is the marked DOM element
node.scrollIntoView({ behavior: 'smooth', block: 'center' }); node.scrollIntoView({ block: 'center' });
} }
}); });
} else if (elements?.length >= range.startLineNumber) { } else if (elements?.length >= range.startLineNumber) {
@@ -228,7 +228,7 @@ export class OutputComponent extends CellView implements OnInit, AfterViewInit {
className: findRangeSpecificClass, className: findRangeSpecificClass,
each: function (node) { each: function (node) {
// node is the marked DOM element // node is the marked DOM element
node.scrollIntoView({ behavior: 'smooth', block: 'center' }); node.scrollIntoView({ block: 'center' });
} }
}); });
} }

3
src/sql/workbench/contrib/notebook/browser/notebookEditor.ts
View File

@@ -350,9 +350,6 @@ export class NotebookEditor extends EditorPane implements IFindNotebookControlle
this._findDecorations.getCount(), this._findDecorations.getCount(),
this._currentMatch this._currentMatch
); );
if (this._finder.getDomNode().style.visibility === 'visible' && this._previousMatch !== this._currentMatch) {
this._setCurrentFindMatch(this._currentMatch);
}
} }
} }