@codingame/monaco-vscode-view-common-service-override 26.2.1 → 26.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "26.2.1",
+  "version": "26.2.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.2.1",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "26.2.1"
+    "@codingame/monaco-vscode-api": "26.2.2",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "26.2.2"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.js

@@ -31,6 +31,7 @@ import { nativeHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { joinStrings } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 
 var LanguageStatus_1;
 registerCss(languageStatus);
@@ -247,12 +248,12 @@ let LanguageStatus = class LanguageStatus {
             if (!userHasInteractedWithStatus) {
                 const hoverTarget = targetWindow.document.querySelector(".monaco-workbench .context-view");
                 if (isHTMLElement(hoverTarget)) {
-                    const observer = ( new MutationObserver(() => {
+                    const observer = new mainWindow.MutationObserver(() => {
                         if (targetWindow.document.contains(this._combinedEntryTooltip)) {
                             this._interactionCounter.increment();
                             observer.disconnect();
                         }
-                    }));
+                    });
                     observer.observe(hoverTarget, {
                         childList: true,
                         subtree: true

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js

@@ -1,13 +1,13 @@
 
-import { h, reset, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { h, DisposableResizeObserver, reset, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { MergeEditorLineRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { observableSignal } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignal';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 class EditorGutter extends Disposable {
     constructor(_editor, _domNode, itemProvider) {
@@ -38,13 +38,12 @@ class EditorGutter extends Disposable {
                 width: "100%"
             }
         }).root);
-        const o = ( new ResizeObserver(() => {
+        const o = this._register(( new DisposableResizeObserver(() => {
             transaction(tx => {
                 this.domNodeSizeChanged.trigger(tx);
             });
-        }));
+        })));
         o.observe(this._domNode);
-        this._register(toDisposable(() => o.disconnect()));
         this._register(autorun(reader => {
             scrollDecoration.className = this.isScrollTopZero.read(reader) ? "" : "scroll-decoration";
         }));

package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Dimension, getWindow, EventType, addDisposableListener, findParentWithClass } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { DisposableResizeObserver, Dimension, getWindow, EventType, addDisposableListener, findParentWithClass } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -105,14 +105,11 @@ let WebviewViewPane = class WebviewViewPane extends ViewPane {
         this._container = container;
         this._rootContainer = undefined;
         if (!this._resizeObserver) {
-            this._resizeObserver = ( new ResizeObserver(() => {
+            this._resizeObserver = this._register(( new DisposableResizeObserver(() => {
                 setTimeout(() => {
                     this.layoutWebview();
                 }, 0);
-            }));
-            this._register(toDisposable(() => {
-                this._resizeObserver?.disconnect();
-            }));
+            })));
             this._resizeObserver.observe(container);
         }
     }