updateOptions should only update overrideStyles when set (#171797)

* updateOptions: only update overrideStyles when defined * revert changes from 6d6d9bd
microsoft · Jan 20, 2023 · 124960d · 124960d
1 parent 9b63d86
commit 124960d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
@@ -331,7 +331,9 @@ export class WorkbenchList<T> extends List<T> {
 	override updateOptions(options: IWorkbenchListOptionsUpdate): void {
 		super.updateOptions(options);
 
-		this.updateStyles(options.overrideStyles);
+		if (options.overrideStyles !== undefined) {
+			this.updateStyles(options.overrideStyles);
+		}
 
 		if (options.multipleSelectionSupport !== undefined) {
 			this.listSupportsMultiSelect.set(!!options.multipleSelectionSupport);
@@ -441,7 +443,7 @@ export class WorkbenchPagedList<T> extends PagedList<T> {
 	override updateOptions(options: IWorkbenchListOptionsUpdate): void {
 		super.updateOptions(options);
 
-		if (options.overrideStyles) {
+		if (options.overrideStyles !== undefined) {
 			this.updateStyles(options.overrideStyles);
 		}
 
@@ -584,7 +586,9 @@ export class WorkbenchTable<TRow> extends Table<TRow> {
 	override updateOptions(options: IWorkbenchTableOptionsUpdate): void {
 		super.updateOptions(options);
 
-		this.updateStyles(options.overrideStyles);
+		if (options.overrideStyles !== undefined) {
+			this.updateStyles(options.overrideStyles);
+		}
 
 		if (options.multipleSelectionSupport !== undefined) {
 			this.listSupportsMultiSelect.set(!!options.multipleSelectionSupport);
@@ -935,7 +939,7 @@ export class WorkbenchDataTree<TInput, T, TFilterData = void> extends DataTree<T
 	override updateOptions(options: IWorkbenchDataTreeOptionsUpdate = {}): void {
 		super.updateOptions(options);
 
-		if (options.overrideStyles) {
+		if (options.overrideStyles !== undefined) {
 			this.internals.updateStyleOverrides(options.overrideStyles);
 		}
 

diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -185,24 +185,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	private _shadowElement?: HTMLElement;
 	private _shadowElementViewInfo: { height: number; width: number; top: number; left: number } | null = null;
 
-	private _listStyleOverride = {
-		listBackground: notebookEditorBackground,
-		listActiveSelectionBackground: notebookEditorBackground,
-		listActiveSelectionForeground: foreground,
-		listFocusAndSelectionBackground: notebookEditorBackground,
-		listFocusAndSelectionForeground: foreground,
-		listFocusBackground: notebookEditorBackground,
-		listFocusForeground: foreground,
-		listHoverForeground: foreground,
-		listHoverBackground: notebookEditorBackground,
-		listHoverOutline: focusBorder,
-		listFocusOutline: focusBorder,
-		listInactiveSelectionBackground: notebookEditorBackground,
-		listInactiveSelectionForeground: foreground,
-		listInactiveFocusBackground: notebookEditorBackground,
-		listInactiveFocusOutline: notebookEditorBackground,
-	};
-
 	private readonly _editorFocus: IContextKey<boolean>;
 	private readonly _outputFocus: IContextKey<boolean>;
 	private readonly _editorEditable: IContextKey<boolean>;
@@ -865,7 +847,23 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 				transformOptimization: false, //(isMacintosh && isNative) || getTitleBarStyle(this.configurationService, this.environmentService) === 'native',
 				initialSize: this._dimension,
 				styleController: (_suffix: string) => { return this._list; },
-				overrideStyles: this._listStyleOverride,
+				overrideStyles: {
+					listBackground: notebookEditorBackground,
+					listActiveSelectionBackground: notebookEditorBackground,
+					listActiveSelectionForeground: foreground,
+					listFocusAndSelectionBackground: notebookEditorBackground,
+					listFocusAndSelectionForeground: foreground,
+					listFocusBackground: notebookEditorBackground,
+					listFocusForeground: foreground,
+					listHoverForeground: foreground,
+					listHoverBackground: notebookEditorBackground,
+					listHoverOutline: focusBorder,
+					listFocusOutline: focusBorder,
+					listInactiveSelectionBackground: notebookEditorBackground,
+					listInactiveSelectionForeground: foreground,
+					listInactiveFocusBackground: notebookEditorBackground,
+					listInactiveFocusOutline: notebookEditorBackground,
+				},
 				accessibilityProvider: {
 					getAriaLabel: (element: CellViewModel) => {
 						if (!this.viewModel) {
@@ -1735,12 +1733,12 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		const newCellListHeight = Math.max(newBodyHeight - topInserToolbarHeight, 0);
 		if (this._list.getRenderHeight() < newCellListHeight) {
 			// the new dimension is larger than the list viewport, update its additional height first, otherwise the list view will move down a bit (as the `scrollBottom` will move down)
-			this._list.updateOptions({ additionalScrollHeight: this._allowScrollBeyondLastLine() ? Math.max(0, (newCellListHeight - 50)) : topInserToolbarHeight, overrideStyles: this._listStyleOverride });
+			this._list.updateOptions({ additionalScrollHeight: this._allowScrollBeyondLastLine() ? Math.max(0, (newCellListHeight - 50)) : topInserToolbarHeight });
 			this._list.layout(newCellListHeight, dimension.width);
 		} else {
 			// the new dimension is smaller than the list viewport, if we update the additional height, the `scrollBottom` will move up, which moves the whole list view upwards a bit. So we run a layout first.
 			this._list.layout(newCellListHeight, dimension.width);
-			this._list.updateOptions({ additionalScrollHeight: this._allowScrollBeyondLastLine() ? Math.max(0, (newCellListHeight - 50)) : topInserToolbarHeight, overrideStyles: this._listStyleOverride });
+			this._list.updateOptions({ additionalScrollHeight: this._allowScrollBeyondLastLine() ? Math.max(0, (newCellListHeight - 50)) : topInserToolbarHeight });
 		}
 
 		this._overlayContainer.style.visibility = 'visible';