Skip to content

Disable explorer.compactFolders when accessibility mode is turned on #284888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmitrivMS wants to merge 3 commits into
base: main
Choose a base branch
from
+16 −2
Open

Disable explorer.compactFolders when accessibility mode is turned on #284888

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9c0527
Disable explorer.compactFolders when accessibility mode is turned on
dmitrivMS Dec 23, 2025
189e08e
Revert test change
dmitrivMS Dec 23, 2025
33476ac
Merge branch 'main' into dev/dmitriv/disable-compact-folders-for-a11y
dmitrivMS Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/vs/workbench/contrib/files/browser/views/explorerView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import { EditorOpenSource } from '../../../../../platform/editor/common/editor.j
import { ResourceMap } from '../../../../../base/common/map.js';
import { AbstractTreePart } from '../../../../../base/browser/ui/tree/abstractTree.js';
import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';


function hasExpandedRootChild(tree: WorkbenchCompressibleAsyncDataTree<ExplorerItem | ExplorerItem[], ExplorerItem, FuzzyScore>, treeInput: ExplorerItem[]): boolean {
Expand Down Expand Up @@ -213,7 +214,8 @@ export class ExplorerView extends ViewPane implements IExplorerView {
@IFileService private readonly fileService: IFileService,
@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
@ICommandService private readonly commandService: ICommandService,
@IOpenerService openerService: IOpenerService
@IOpenerService openerService: IOpenerService,
@IAccessibilityService private readonly accessibilityService: IAccessibilityService
) {
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);

Expand Down Expand Up @@ -448,7 +450,14 @@ export class ExplorerView extends ViewPane implements IExplorerView {

this._register(createFileIconThemableTreeContainerScope(container, this.themeService));

const isCompressionEnabled = () => this.configurationService.getValue<boolean>('explorer.compactFolders');
const isCompressionEnabled = () => {
const configValue = this.configurationService.getValue<boolean>('explorer.compactFolders');
// Disable compact folders when screen reader is optimized for better accessibility
if (this.accessibilityService.isScreenReaderOptimized()) {
return false;
}
return configValue;
};

const getFileNestingSettings = (item?: ExplorerItem) => this.configurationService.getValue<IFilesConfiguration>({ resource: item?.root.resource }).explorer.fileNesting;

Expand Down Expand Up @@ -511,6 +520,11 @@ export class ExplorerView extends ViewPane implements IExplorerView {
const onDidChangeCompressionConfiguration = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('explorer.compactFolders'));
this._register(onDidChangeCompressionConfiguration(_ => this.tree.updateOptions({ compressionEnabled: isCompressionEnabled() })));

// Update compression when screen reader mode changes
this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => {
this.tree.updateOptions({ compressionEnabled: isCompressionEnabled() });
}));

// Bind context keys
FilesExplorerFocusedContext.bindTo(this.tree.contextKeyService);
ExplorerFocusedContext.bindTo(this.tree.contextKeyService);
Expand Down
Loading