Gesture.addTarget returns an IDisposable

isidorn · isidorn · commit c2997da2ac72 · 2019-09-30T14:42:58.000+02:00
fixes microsoft#81630
diff --git a/src/vs/base/browser/touch.ts b/src/vs/base/browser/touch.ts
@@ -86,15 +86,21 @@ export class Gesture extends Disposable {
 		this._register(DomUtils.addDisposableListener(document, 'touchmove', (e: TouchEvent) => this.onTouchMove(e)));
 	}
 
-	public static addTarget(element: HTMLElement): void {
+	public static addTarget(element: HTMLElement): IDisposable {
 		if (!Gesture.isTouchDevice()) {
-			return;
+			return Disposable.None;
 		}
 		if (!Gesture.INSTANCE) {
 			Gesture.INSTANCE = new Gesture();
 		}
 
 		Gesture.INSTANCE.targets.push(element);
+
+		return {
+			dispose: () => {
+				Gesture.INSTANCE.targets = Gesture.INSTANCE.targets.filter(t => t !== element);
+			}
+		};
 	}
 
 	@memoize
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -103,7 +103,7 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
 
 	render(container: HTMLElement): void {
 		this.element = container;
-		Gesture.addTarget(container);
+		this._register(Gesture.addTarget(container));
 
 		const enableDragging = this.options && this.options.draggable;
 		if (enableDragging) {
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
@@ -63,7 +63,7 @@ export class Button extends Disposable {
 
 		container.appendChild(this._element);
 
-		Gesture.addTarget(this._element);
+		this._register(Gesture.addTarget(this._element));
 
 		[DOM.EventType.CLICK, EventType.Tap].forEach(eventType => {
 			this._register(DOM.addDisposableListener(this._element, eventType, e => {
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -83,7 +83,7 @@ export class BaseDropdown extends ActionRunner {
 			this._register(cleanupFn);
 		}
 
-		Gesture.addTarget(this._label);
+		this._register(Gesture.addTarget(this._label));
 	}
 
 	get element(): HTMLElement {
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
@@ -236,7 +236,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 		this.rowsContainer = document.createElement('div');
 		this.rowsContainer.className = 'monaco-list-rows';
-		Gesture.addTarget(this.rowsContainer);
+		this.disposables.add(Gesture.addTarget(this.rowsContainer));
 
 		this.scrollableElement = this.disposables.add(new ScrollableElement(this.rowsContainer, {
 			alwaysConsumeMouseWheel: true,
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
@@ -542,7 +542,7 @@ export class MouseController<T> implements IDisposable {
 			list.onContextMenu(this.onContextMenu, this, this.disposables);
 			list.onMouseDblClick(this.onDoubleClick, this, this.disposables);
 			list.onTouchStart(this.onMouseDown, this, this.disposables);
-			Gesture.addTarget(list.getHTMLElement());
+			this.disposables.add(Gesture.addTarget(list.getHTMLElement()));
 		}
 
 		list.onMouseClick(this.onPointer, this, this.disposables);
diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts
@@ -238,7 +238,7 @@ export class MenuBar extends Disposable {
 				}
 			}));
 
-			Gesture.addTarget(buttonElement);
+			this._register(Gesture.addTarget(buttonElement));
 			this._register(DOM.addDisposableListener(buttonElement, EventType.Tap, (e: GestureEvent) => {
 				// Ignore this touch if the menu is touched
 				if (this.isOpen && this.focusedMenu && this.focusedMenu.holder && DOM.isAncestor(e.initialTarget as HTMLElement, this.focusedMenu.holder)) {
@@ -322,7 +322,7 @@ export class MenuBar extends Disposable {
 			}
 		}));
 
-		Gesture.addTarget(buttonElement);
+		this._register(Gesture.addTarget(buttonElement));
 		this._register(DOM.addDisposableListener(buttonElement, EventType.Tap, (e: GestureEvent) => {
 			// Ignore this touch if the menu is touched
 			if (this.isOpen && this.focusedMenu && this.focusedMenu.holder && DOM.isAncestor(e.initialTarget as HTMLElement, this.focusedMenu.holder)) {
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
@@ -139,7 +139,7 @@ export class Sash extends Disposable {
 		this._register(domEvent(this.el, 'mousedown')(this.onMouseDown, this));
 		this._register(domEvent(this.el, 'dblclick')(this.onMouseDoubleClick, this));
 
-		Gesture.addTarget(this.el);
+		this._register(Gesture.addTarget(this.el));
 		this._register(domEvent(this.el, EventType.Start)(this.onTouchStart, this));
 
 		if (isIPad) {
diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts
@@ -437,6 +437,7 @@ export class TreeView extends HeightMap {
 	private shouldInvalidateDropReaction: boolean;
 	private currentDropTargets: ViewItem[] | null = null;
 	private currentDropDisposable: Lifecycle.IDisposable = Lifecycle.Disposable.None;
+	private gestureDisposable: Lifecycle.IDisposable = Lifecycle.Disposable.None;
 	private dragAndDropScrollInterval: number | null = null;
 	private dragAndDropScrollTimeout: number | null = null;
 	private dragAndDropMouseY: number | null = null;
@@ -523,7 +524,7 @@ export class TreeView extends HeightMap {
 			this.wrapper.style.msTouchAction = 'none';
 			this.wrapper.style.msContentZooming = 'none';
 		} else {
-			Touch.Gesture.addTarget(this.wrapper);
+			this.gestureDisposable = Touch.Gesture.addTarget(this.wrapper);
 		}
 
 		this.rowsContainer = document.createElement('div');
@@ -1675,6 +1676,7 @@ export class TreeView extends HeightMap {
 		if (this.context.cache) {
 			this.context.cache.dispose();
 		}
+		this.gestureDisposable.dispose();
 
 		super.dispose();
 	}
diff --git a/src/vs/editor/browser/controller/pointerHandler.ts b/src/vs/editor/browser/controller/pointerHandler.ts
@@ -190,7 +190,7 @@ class TouchHandler extends MouseHandler {
 	constructor(context: ViewContext, viewController: ViewController, viewHelper: IPointerHandlerHelper) {
 		super(context, viewController, viewHelper);
 
-		Gesture.addTarget(this.viewHelper.linesContentDomNode);
+		this._register(Gesture.addTarget(this.viewHelper.linesContentDomNode));
 
 		this._register(dom.addDisposableListener(this.viewHelper.linesContentDomNode, EventType.Tap, (e) => this.onTap(e)));
 		this._register(dom.addDisposableListener(this.viewHelper.linesContentDomNode, EventType.Change, (e) => this.onChange(e)));
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -34,7 +34,7 @@ export class NoTabsTitleControl extends TitleControl {
 		this.registerContainerListeners();
 
 		// Gesture Support
-		Gesture.addTarget(this.titleContainer);
+		this._register(Gesture.addTarget(this.titleContainer));
 
 		const labelContainer = document.createElement('div');
 		addClass(labelContainer, 'label-container');
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -425,7 +425,7 @@ export class TabsTitleControl extends TitleControl {
 		addClass(tabContainer, 'tab');
 
 		// Gesture Support
-		Gesture.addTarget(tabContainer);
+		this._register(Gesture.addTarget(tabContainer));
 
 		// Tab Border Top
 		const tabBorderTopContainer = document.createElement('div');

Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,21 @@ export class Gesture extends Disposable {`
`86`	`86`	`this._register(DomUtils.addDisposableListener(document, 'touchmove', (e: TouchEvent) => this.onTouchMove(e)));`
`87`	`87`	`}`
`88`	`88`
`89`		`- public static addTarget(element: HTMLElement): void {`
	`89`	`+ public static addTarget(element: HTMLElement): IDisposable {`
`90`	`90`	`if (!Gesture.isTouchDevice()) {`
`91`		`- return;`
	`91`	`+ return Disposable.None;`
`92`	`92`	`}`
`93`	`93`	`if (!Gesture.INSTANCE) {`
`94`	`94`	`Gesture.INSTANCE = new Gesture();`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`Gesture.INSTANCE.targets.push(element);`
	`98`	`+`
	`99`	`+ return {`
	`100`	`+ dispose: () => {`
	`101`	`+ Gesture.INSTANCE.targets = Gesture.INSTANCE.targets.filter(t => t !== element);`
	`102`	`+ }`
	`103`	`+ };`
`98`	`104`	`}`
`99`	`105`
`100`	`106`	`@memoize`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ export class BaseDropdown extends ActionRunner {`
`83`	`83`	`this._register(cleanupFn);`
`84`	`84`	`}`
`85`	`85`
`86`		`- Gesture.addTarget(this._label);`
	`86`	`+ this._register(Gesture.addTarget(this._label));`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`get element(): HTMLElement {`
Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ export class MouseController<T> implements IDisposable {`
`542`	`542`	`list.onContextMenu(this.onContextMenu, this, this.disposables);`
`543`	`543`	`list.onMouseDblClick(this.onDoubleClick, this, this.disposables);`
`544`	`544`	`list.onTouchStart(this.onMouseDown, this, this.disposables);`
`545`		`- Gesture.addTarget(list.getHTMLElement());`
	`545`	`+ this.disposables.add(Gesture.addTarget(list.getHTMLElement()));`
`546`	`546`	`}`
`547`	`547`
`548`	`548`	`list.onMouseClick(this.onPointer, this, this.disposables);`