Skip to content

Commit 6d6bd0a

Browse files
committed
fix issue
1 parent 7bf0f83 commit 6d6bd0a

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
2626
import { getNotificationFromContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
2727
import { IListService, WorkbenchList } from 'vs/platform/list/browser/listService';
2828
import { NotificationFocusedContext } from 'vs/workbench/common/contextkeys';
29-
import { IAccessibleViewService, AccessibleViewService, IAccessibleContentProvider, IAccessibleViewOptions, AccessibleViewType } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
29+
import { IAccessibleViewService, AccessibleViewService, IAccessibleContentProvider, IAccessibleViewOptions, AccessibleViewType, accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
3030

3131
registerAccessibilityConfiguration();
3232
registerSingleton(IAccessibleViewService, AccessibleViewService, InstantiationType.Delayed);
@@ -231,12 +231,12 @@ class AccessibleViewNavigatorContribution extends Disposable {
231231
const accessibleViewService = accessor.get(IAccessibleViewService);
232232
accessibleViewService.next();
233233
return true;
234-
}));
234+
}, accessibleViewIsShown));
235235
this._register(AccessibleViewPreviousAction.addImplementation(95, 'previous', accessor => {
236236
const accessibleViewService = accessor.get(IAccessibleViewService);
237237
accessibleViewService.previous();
238238
return true;
239-
}));
239+
}, accessibleViewIsShown));
240240
}
241241
}
242242

src/vs/workbench/contrib/accessibility/browser/accessibilityContribution.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { Command, MultiCommand } from 'vs/editor/browser/editorExtensions';
1010
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
1111
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
1212
import { MenuId } from 'vs/platform/actions/common/actions';
13-
import { accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
1413

1514
export const enum AccessibilityVerbositySettingId {
1615
Terminal = 'accessibility.verbosity.terminal',
@@ -111,7 +110,7 @@ export const AccessibleViewAction = registerCommand(new MultiCommand({
111110

112111
export const AccessibleViewNextAction = registerCommand(new MultiCommand({
113112
id: 'editor.action.accessibleViewNext',
114-
precondition: accessibleViewIsShown,
113+
precondition: undefined,
115114
kbOpts: {
116115
primary: KeyMod.Alt | KeyCode.BracketRight,
117116
weight: KeybindingWeight.WorkbenchContrib
@@ -126,7 +125,7 @@ export const AccessibleViewNextAction = registerCommand(new MultiCommand({
126125

127126
export const AccessibleViewPreviousAction = registerCommand(new MultiCommand({
128127
id: 'editor.action.accessibleViewPrevious',
129-
precondition: accessibleViewIsShown,
128+
precondition: undefined,
130129
kbOpts: {
131130
primary: KeyMod.Alt | KeyCode.BracketLeft,
132131
weight: KeybindingWeight.WorkbenchContrib

src/vs/workbench/contrib/accessibility/browser/accessibleView.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ class AccessibleView extends Disposable {
135135
this._contextViewService.showContextView(delegate);
136136
if (provider.options.type === AccessibleViewType.HelpMenu) {
137137
this._accessiblityHelpIsShown.set(true);
138+
} else {
139+
this._accessibleViewIsShown.set(true);
138140
}
141+
this._currentProvider = provider;
139142
}
140143

141144
previous(): void {
@@ -200,7 +203,7 @@ class AccessibleView extends Disposable {
200203
this._configurationService.updateValue(settingKey, false);
201204
}
202205
provider.onKeyDown?.(e);
203-
e.stopPropagation();
206+
// e.stopPropagation();
204207
}));
205208
disposableStore.add(this._editorWidget.onKeyDown((e) => {
206209
if (e.keyCode === KeyCode.Escape) {

0 commit comments

Comments
 (0)