@codingame/monaco-vscode-workbench-service-override 2.2.1 → 2.2.2

package/package.json

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

package/tools/views.d.ts

@@ -4,6 +4,7 @@ import { BrandedService, ServicesAccessor } from 'vscode/vscode/vs/platform/inst
 import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Dimension } from 'vscode/vscode/vs/base/browser/dom';
 import { Event } from 'vscode/vscode/vs/base/common/event';
+import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
@@ -30,7 +31,7 @@ type Label = string | {
 declare abstract class SimpleEditorPane extends EditorPane {
     protected container: HTMLElement;
     protected wrapper: HTMLElement;
-    private scrollbar;
+    protected scrollbar: DomScrollableElement | undefined;
     private inputDisposable;
     constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
     protected createEditor(parent: HTMLElement): void;
@@ -73,7 +74,7 @@ interface CustomViewOption {
     readonly id: string;
     name: string;
     order?: number;
-    renderBody(container: HTMLElement): IDisposable;
+    renderBody(container: HTMLElement, scrollbar: DomScrollableElement): IDisposable;
     location: ViewContainerLocation;
     icon?: string;
     canMoveView?: boolean;

package/tools/views.js

@@ -182,13 +182,13 @@ function registerCustomView(options) {
             ctorDescriptor: new SyncDescriptor(class extends ViewPane {
                 renderBody(container) {
                     super.renderBody(container);
+                    this.wrapper = document.createElement('div');
+                    this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
                     this.container = $('.view-pane-content');
                     this.container.style.display = 'flex';
                     this.container.style.alignItems = 'stretch';
-                    this._register(options.renderBody(this.container));
-                    this.wrapper = document.createElement('div');
+                    this._register(options.renderBody(this.container, this.scrollbar));
                     this.wrapper.append(this.container);
-                    this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
                     container.appendChild(this.scrollbar.getDomNode());
                     const observer = new ResizeObserver(() => {
                         assertIsDefined(this.scrollbar).scanDomNode();