Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-30 18:46:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #188428. Top Insert Toolbar height workaround is no longer needed. (#188726)

Browse Source
This commit is contained in:
Peng Lyu
2023-07-24 16:46:01 -07:00
committed by GitHub
parent 87afa166d0
commit 261fcf2d57
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+2 -7
View File
@@ -135,8 +135,6 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
private _isInLayout: boolean = false;
private readonly _viewContext: ViewContext;
private _webviewElement: FastDomNode<HTMLElement> | null = null;
get webviewElement() {
@@ -161,7 +159,6 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
) {
super(listUser, container, delegate, renderers, options, contextKeyService, listService, configurationService, instantiationService);
NOTEBOOK_CELL_LIST_FOCUSED.bindTo(this.contextKeyService).set(true);
this._viewContext = viewContext;
this._previousFocusedElements = this.getFocusedElements();
this._localDisposableStore.add(this.onDidChangeFocus((e) => {
this._previousFocusedElements.forEach(element => {
@@ -826,9 +823,8 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
const scrollHeight = this.view.scrollHeight;
const scrollTop = this.getViewScrollTop();
const wrapperBottom = this.getViewScrollBottom();
const topInsertToolbarHeight = this._viewContext.notebookOptions.computeTopInsertToolbarHeight(this.viewModel?.viewType);
this.view.setScrollTop(scrollHeight - (wrapperBottom - scrollTop) - topInsertToolbarHeight);
this.view.setScrollTop(scrollHeight - (wrapperBottom - scrollTop));
}
//#region Reveal Cell synchronously
@@ -1226,8 +1222,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
}
getViewScrollBottom() {
const topInsertToolbarHeight = this._viewContext.notebookOptions.computeTopInsertToolbarHeight(this.viewModel?.viewType);
return this.getViewScrollTop() + this.view.renderHeight - topInsertToolbarHeight;
return this.getViewScrollTop() + this.view.renderHeight;
}
setCellEditorSelection(cell: ICellViewModel, range: Range) {
src/vs/workbench/contrib/notebook/test/browser/notebookCellList.test.ts
+7 -15
View File
@@ -5,25 +5,17 @@
import * as assert from 'assert';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
import { createNotebookCellList, setupInstantiationService, withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
suite('NotebookCellList', () => {
let disposables: DisposableStore;
let instantiationService: TestInstantiationService;
let notebookDefaultOptions: NotebookOptions;
let topInsertToolbarHeight: number;
suiteSetup(() => {
disposables = new DisposableStore();
instantiationService = setupInstantiationService(disposables);
notebookDefaultOptions = new NotebookOptions(instantiationService.get(IConfigurationService), instantiationService.get(INotebookExecutionStateService), false);
topInsertToolbarHeight = notebookDefaultOptions.computeTopInsertToolbarHeight();
});
suiteTeardown(() => disposables.dispose());
@@ -51,7 +43,7 @@ suite('NotebookCellList', () => {
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(210 + topInsertToolbarHeight, 100);
cellList.layout(210, 100);
// scroll a bit, scrollTop to bottom: 5, 215
cellList.scrollTop = 5;
@@ -98,7 +90,7 @@ suite('NotebookCellList', () => {
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(210 + topInsertToolbarHeight, 100);
cellList.layout(210, 100);
// init scrollTop and scrollBottom
assert.deepStrictEqual(cellList.scrollTop, 0);
@@ -144,7 +136,7 @@ suite('NotebookCellList', () => {
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(210 + topInsertToolbarHeight, 100);
cellList.layout(210, 100);
// init scrollTop and scrollBottom
assert.deepStrictEqual(cellList.scrollTop, 0);
@@ -179,7 +171,7 @@ suite('NotebookCellList', () => {
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(210 + topInsertToolbarHeight, 100);
cellList.layout(210, 100);
// init scrollTop and scrollBottom
assert.deepStrictEqual(cellList.scrollTop, 0);
@@ -221,7 +213,7 @@ suite('NotebookCellList', () => {
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(210 + topInsertToolbarHeight, 100);
cellList.layout(210, 100);
// init scrollTop and scrollBottom
assert.deepStrictEqual(cellList.scrollTop, 0);
@@ -274,7 +266,7 @@ suite('NotebookCellList', () => {
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(210 + topInsertToolbarHeight, 100);
cellList.layout(210, 100);
// init scrollTop and scrollBottom
assert.deepStrictEqual(cellList.scrollTop, 0);
@@ -310,7 +302,7 @@ suite('NotebookCellList', () => {
cellList.attachViewModel(viewModel);
// render height 210, it can render 3 full cells and 1 partial cell
cellList.layout(210 + topInsertToolbarHeight, 100);
cellList.layout(210, 100);
// init scrollTop and scrollBottom
assert.deepStrictEqual(cellList.scrollTop, 0);