@codingame/monaco-vscode-workbench-service-override 2.2.0-next.4 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "2.2.0-next.4",
+  "version": "2.2.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,19 +18,19 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.4",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-view-banner-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.4",
-    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.4"
+    "@codingame/monaco-vscode-keybindings-service-override": "2.2.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "2.2.0",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "2.2.0",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "2.2.0",
+    "@codingame/monaco-vscode-view-banner-service-override": "2.2.0",
+    "@codingame/monaco-vscode-files-service-override": "2.2.0",
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.0",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.0",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.0",
+    "@codingame/monaco-vscode-host-service-override": "2.2.0",
+    "@codingame/monaco-vscode-base-service-override": "2.2.0"
   }
 }

package/tools/views.d.ts

@@ -29,6 +29,7 @@ type Label = string | {
 };
 declare abstract class SimpleEditorPane extends EditorPane {
     protected container: HTMLElement;
+    protected wrapper: HTMLElement;
     private scrollbar;
     private inputDisposable;
     constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);

package/tools/views.js

@@ -26,7 +26,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
-import { assertAllDefined, assertIsDefined } from 'vscode/vscode/vs/base/common/types';
+import { assertIsDefined, assertAllDefined } from 'vscode/vscode/vs/base/common/types';
 export { ConfirmResult } from '../override/vs/platform/dialogs/common/dialogs.js';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -40,8 +40,19 @@ let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
     }
     createEditor(parent) {
         this.container = this.initialize();
-        this.scrollbar = this._register(new DomScrollableElement(this.container, { horizontal: 1 , vertical: 1  }));
+        this.wrapper = document.createElement('div');
+        this.wrapper.append(this.container);
+        this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
         parent.appendChild(this.scrollbar.getDomNode());
+        const observer = new ResizeObserver(() => {
+            assertIsDefined(this.scrollbar).scanDomNode();
+        });
+        observer.observe(this.container);
+        this._register({
+            dispose() {
+                observer.disconnect();
+            }
+        });
     }
     async setInput(input, editorOptions, context, token) {
         await super.setInput(input, editorOptions, context, token);
@@ -49,10 +60,11 @@ let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
             return;
         }
         this.inputDisposable.value = await this.renderInput?.(input, editorOptions, context, token);
+        assertIsDefined(this.scrollbar).scanDomNode();
     }
     layout(dimension) {
-        const [container, scrollbar] = assertAllDefined(this.container, this.scrollbar);
-        size(container, dimension.width, dimension.height);
+        const [wrapper, scrollbar] = assertAllDefined(this.wrapper, this.scrollbar);
+        size(wrapper, dimension.width, dimension.height);
         scrollbar.scanDomNode();
     }
     focus() {

package/vscode/src/vs/workbench/browser/layout.js

@@ -1099,7 +1099,7 @@ class Layout extends Disposable {
     }
     layout() {
         if (!this.disposed) {
-            this._mainContainerDimension = getClientArea(this.parent);
+            this._mainContainerDimension = getClientArea(this.state.runtime.mainWindowFullscreen ? mainWindow.document.body : this.parent);
             this.logService.trace(`Layout#layout, height: ${this._mainContainerDimension.height}, width: ${this._mainContainerDimension.width}`);
             position(this.mainContainer, 0, 0, 0, 0, 'relative');
             size(this.mainContainer, this._mainContainerDimension.width, this._mainContainerDimension.height);