@codingame/monaco-vscode-keybindings-service-override 23.2.1 → 23.3.0

package/index.d.ts

@@ -11,9 +11,16 @@ declare function initUserKeybindings(configurationJson: string, options?: Partia
  * Can be called at any time after the services are initialized to update the user configuration
  */
 declare function updateUserKeybindings(keybindingsJson: string): Promise<void>;
-interface KeybindingsProps {
+export interface LockKeyCodesOverride {
+    (keyCodes: string[], next: (keyCodes: string[]) => void): void;
+}
+export interface KeybindingsProps {
     shouldUseGlobalKeybindings?: () => boolean;
+    /**
+     * Allows to override the key code lock (for instance, ['Escape'] during full screen)
+     */
+    lockKeyCodesOverride?: LockKeyCodesOverride;
 }
-export default function getServiceOverride({ shouldUseGlobalKeybindings }?: KeybindingsProps): IEditorOverrideServices;
+export default function getServiceOverride({ shouldUseGlobalKeybindings, lockKeyCodesOverride }?: KeybindingsProps): IEditorOverrideServices;
 export { defaultUserKeybindindsFile, initUserKeybindings, updateUserKeybindings };
 export type { IUserFriendlyKeybinding };

package/index.js

@@ -42,9 +42,10 @@ async function updateUserKeybindings(keybindingsJson) {
     await fileService.writeFile(userDataProfilesService.defaultProfile.keybindingsResource, VSBuffer.fromString(keybindingsJson));
 }
 let DynamicWorkbenchKeybindingService = class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService {
-    constructor(shouldUseGlobalKeybindings, contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService) {
+    constructor(shouldUseGlobalKeybindings, _lockKeyCodesOverride, contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService) {
         super(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService);
         this.shouldUseGlobalKeybindings = shouldUseGlobalKeybindings;
+        this._lockKeyCodesOverride = _lockKeyCodesOverride;
         this.keybindingProviders = [];
         this.authorizedContainers = [];
     }
@@ -89,24 +90,29 @@ let DynamicWorkbenchKeybindingService = class DynamicWorkbenchKeybindingService
             ...this.keybindingProviders.flatMap((provider) => provider.provideKeybindings())
         ];
     }
+    lockKeyCodes(keyCodes) {
+        this._lockKeyCodesOverride(keyCodes, (keyCodes) => super.lockKeyCodes(keyCodes));
+    }
 };
 DynamicWorkbenchKeybindingService = __decorate([
-    __param(1, IContextKeyService),
-    __param(2, ICommandService),
-    __param(3, ITelemetryService),
-    __param(4, INotificationService),
-    __param(5, IUserDataProfileService),
-    __param(6, IHostService),
-    __param(7, IExtensionService),
-    __param(8, IFileService),
-    __param(9, IUriIdentityService),
-    __param(10, ILogService),
-    __param(11, IKeyboardLayoutService)
+    __param(2, IContextKeyService),
+    __param(3, ICommandService),
+    __param(4, ITelemetryService),
+    __param(5, INotificationService),
+    __param(6, IUserDataProfileService),
+    __param(7, IHostService),
+    __param(8, IExtensionService),
+    __param(9, IFileService),
+    __param(10, IUriIdentityService),
+    __param(11, ILogService),
+    __param(12, IKeyboardLayoutService)
 ], DynamicWorkbenchKeybindingService);
-function getServiceOverride({ shouldUseGlobalKeybindings = () => false } = {}) {
+function getServiceOverride({ shouldUseGlobalKeybindings = () => false, lockKeyCodesOverride = (keyCodes, next) => {
+    next(keyCodes);
+} } = {}) {
     return {
         ...getServiceOverride$1(),
-        [IKeybindingService.toString()]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [shouldUseGlobalKeybindings], false),
+        [IKeybindingService.toString()]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [shouldUseGlobalKeybindings, lockKeyCodesOverride], false),
         [IKeyboardLayoutService.toString()]: new SyncDescriptor(BrowserKeyboardLayoutService, [], true),
         [ICommandService.toString()]: new SyncDescriptor(CommandService, [], true)
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "23.2.1",
+  "version": "23.3.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - keybindings service-override",
   "keywords": [],
@@ -15,13 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-2808e692-5fb9-54bf-bc21-1d3bff81e651-common": "23.2.1",
-    "@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "23.2.1",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "23.2.1",
-    "@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common": "23.2.1",
-    "@codingame/monaco-vscode-api": "23.2.1",
-    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "23.2.1",
-    "@codingame/monaco-vscode-files-service-override": "23.2.1"
+    "@codingame/monaco-vscode-2808e692-5fb9-54bf-bc21-1d3bff81e651-common": "23.3.0",
+    "@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "23.3.0",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "23.3.0",
+    "@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common": "23.3.0",
+    "@codingame/monaco-vscode-api": "23.3.0",
+    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "23.3.0",
+    "@codingame/monaco-vscode-files-service-override": "23.3.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.d.ts

@@ -26,6 +26,7 @@ export declare class WorkbenchKeybindingService extends AbstractKeybindingServic
     private readonly _contributions;
     private readonly kbsJsonSchema;
     constructor(contextKeyService: IContextKeyService, commandService: ICommandService, telemetryService: ITelemetryService, notificationService: INotificationService, userDataProfileService: IUserDataProfileService, hostService: IHostService, extensionService: IExtensionService, fileService: IFileService, uriIdentityService: IUriIdentityService, logService: ILogService, keyboardLayoutService: IKeyboardLayoutService);
+    protected lockKeyCodes(keyCodes: string[]): void;
     dispose(): void;
     private _registerKeyListeners;
     registerSchemaContribution(contribution: KeybindingsSchemaContribution): IDisposable;

package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js

@@ -207,20 +207,23 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             if (windowId !== mainWindow.vscodeWindowId) {
                 return;
             }
-            const keyboard = navigator.keyboard;
             if (BrowserFeatures.keyboard === KeyboardSupport.None) {
                 return;
             }
-            if (isFullscreen(mainWindow)) {
-                keyboard?.lock(['Escape']);
-            }
-            else {
-                keyboard?.unlock();
-            }
+            this.lockKeyCodes(isFullscreen(mainWindow) ? ['Escape'] : []);
             this._cachedResolver = null;
             this._onDidUpdateKeybindings.fire();
         }));
     }
+    lockKeyCodes(keyCodes) {
+        const keyboard = mainWindow.navigator.keyboard;
+        if (keyCodes.length > 0) {
+            keyboard?.lock(keyCodes);
+        }
+        else {
+            keyboard?.unlock();
+        }
+    }
     dispose() {
         this._contributions.forEach(c => c.listener?.dispose());
         this._contributions.length = 0;