Delay handling of mouse events until view has finished painting
This commit is contained in:
parent
ac614ab1e7
commit
32cbb35eac
|
@ -35,6 +35,56 @@ function createMouseMoveEventMerger(mouseTargetFactory:MouseTarget.MouseTargetFa
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class EventGateKeeper<T> {
|
||||||
|
|
||||||
|
public handler: (value:T)=>void;
|
||||||
|
|
||||||
|
private _destination: (value:T)=>void;
|
||||||
|
private _condition: ()=>boolean;
|
||||||
|
|
||||||
|
private _retryTimer: number;
|
||||||
|
private _retryValue: T;
|
||||||
|
|
||||||
|
constructor(destination:(value:T)=>void, condition:()=>boolean) {
|
||||||
|
this._destination = destination;
|
||||||
|
this._condition = condition;
|
||||||
|
this._retryTimer = -1;
|
||||||
|
this.handler = (value:T) => this._handle(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public dispose(): void {
|
||||||
|
if (this._retryTimer !== -1) {
|
||||||
|
clearTimeout(this._retryTimer);
|
||||||
|
this._retryTimer = -1;
|
||||||
|
this._retryValue = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private _handle(value:T): void {
|
||||||
|
if (this._condition()) {
|
||||||
|
|
||||||
|
if (this._retryTimer !== -1) {
|
||||||
|
clearTimeout(this._retryTimer);
|
||||||
|
this._retryTimer = -1;
|
||||||
|
this._retryValue = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
this._destination(value);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
this._retryValue = value;
|
||||||
|
if (this._retryTimer === -1) {
|
||||||
|
this._retryTimer = setTimeout(() => {
|
||||||
|
this._retryTimer = -1;
|
||||||
|
let tmp = this._retryValue;
|
||||||
|
this._retryValue = null;
|
||||||
|
this._handle(tmp);
|
||||||
|
}, 10);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposable {
|
export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposable {
|
||||||
|
|
||||||
static CLEAR_MOUSE_DOWN_COUNT_TIME = 400; // ms
|
static CLEAR_MOUSE_DOWN_COUNT_TIME = 400; // ms
|
||||||
|
@ -64,6 +114,9 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa
|
||||||
|
|
||||||
private lastMouseLeaveTime:number;
|
private lastMouseLeaveTime:number;
|
||||||
|
|
||||||
|
private _mouseMoveEventHandler: EventGateKeeper<Mouse.StandardMouseEvent>;
|
||||||
|
private _mouseDownThenMoveEventHandler: EventGateKeeper<Mouse.StandardMouseEvent>;
|
||||||
|
|
||||||
constructor(context:EditorBrowser.IViewContext, viewController:EditorBrowser.IViewController, viewHelper:EditorBrowser.IPointerHandlerHelper) {
|
constructor(context:EditorBrowser.IViewContext, viewController:EditorBrowser.IViewController, viewHelper:EditorBrowser.IPointerHandlerHelper) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
|
@ -95,10 +148,15 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa
|
||||||
this.listenersToRemove.push(DomUtils.addListener(this.viewHelper.viewDomNode, 'contextmenu',
|
this.listenersToRemove.push(DomUtils.addListener(this.viewHelper.viewDomNode, 'contextmenu',
|
||||||
(e: MouseEvent) => this._onContextMenu(e)));
|
(e: MouseEvent) => this._onContextMenu(e)));
|
||||||
|
|
||||||
|
this._mouseMoveEventHandler = new EventGateKeeper<Mouse.StandardMouseEvent>((e) => this._onMouseMove(e), () => !this.viewHelper.isDirty());
|
||||||
|
this.toDispose.push(this._mouseMoveEventHandler);
|
||||||
this.listenersToRemove.push(DomUtils.addThrottledListener(this.viewHelper.viewDomNode, 'mousemove',
|
this.listenersToRemove.push(DomUtils.addThrottledListener(this.viewHelper.viewDomNode, 'mousemove',
|
||||||
(e: Mouse.StandardMouseEvent) => this._onMouseMove(e),
|
this._mouseMoveEventHandler.handler,
|
||||||
createMouseMoveEventMerger(this.mouseTargetFactory), MouseHandler.MOUSE_MOVE_MINIMUM_TIME));
|
createMouseMoveEventMerger(this.mouseTargetFactory), MouseHandler.MOUSE_MOVE_MINIMUM_TIME));
|
||||||
|
|
||||||
|
this._mouseDownThenMoveEventHandler = new EventGateKeeper<Mouse.StandardMouseEvent>((e) => this._onMouseDownThenMove(e), () => !this.viewHelper.isDirty());
|
||||||
|
this.toDispose.push(this._mouseDownThenMoveEventHandler);
|
||||||
|
|
||||||
this.listenersToRemove.push(DomUtils.addListener(this.viewHelper.viewDomNode, 'mouseup',
|
this.listenersToRemove.push(DomUtils.addListener(this.viewHelper.viewDomNode, 'mouseup',
|
||||||
(e: MouseEvent) => this._onMouseUp(e)));
|
(e: MouseEvent) => this._onMouseUp(e)));
|
||||||
|
|
||||||
|
@ -267,15 +325,17 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa
|
||||||
|
|
||||||
this.mouseMoveMonitor.startMonitoring(
|
this.mouseMoveMonitor.startMonitoring(
|
||||||
createMouseMoveEventMerger(null),
|
createMouseMoveEventMerger(null),
|
||||||
(e:Mouse.StandardMouseEvent) => {
|
this._mouseDownThenMoveEventHandler.handler,
|
||||||
this._updateMouse(this.monitoringStartTargetType, e, true);
|
|
||||||
},
|
|
||||||
() => {
|
() => {
|
||||||
this._unhook();
|
this._unhook();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private _onMouseDownThenMove(e:Mouse.StandardMouseEvent): void {
|
||||||
|
this._updateMouse(this.monitoringStartTargetType, e, true);
|
||||||
|
}
|
||||||
|
|
||||||
private _unhook(): void {
|
private _unhook(): void {
|
||||||
if (this.onScrollTimeout !== -1) {
|
if (this.onScrollTimeout !== -1) {
|
||||||
window.clearTimeout(this.onScrollTimeout);
|
window.clearTimeout(this.onScrollTimeout);
|
||||||
|
|
|
@ -52,6 +52,7 @@ export interface IPointerHandlerHelper {
|
||||||
linesContentDomNode:HTMLElement;
|
linesContentDomNode:HTMLElement;
|
||||||
|
|
||||||
focusTextArea(): void;
|
focusTextArea(): void;
|
||||||
|
isDirty(): boolean;
|
||||||
|
|
||||||
getScrollTop(): number;
|
getScrollTop(): number;
|
||||||
setScrollTop(scrollTop:number): void;
|
setScrollTop(scrollTop:number): void;
|
||||||
|
|
|
@ -292,6 +292,10 @@ export class View extends ViewEventHandler implements EditorBrowser.IView, Lifec
|
||||||
this.focus();
|
this.focus();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
isDirty: (): boolean => {
|
||||||
|
return (this.accumulatedModelEvents.length > 0);
|
||||||
|
},
|
||||||
|
|
||||||
getScrollTop: () => {
|
getScrollTop: () => {
|
||||||
if (this._isDisposed) {
|
if (this._isDisposed) {
|
||||||
throw new Error('ViewImpl.pointerHandler.getScrollTop: View is disposed');
|
throw new Error('ViewImpl.pointerHandler.getScrollTop: View is disposed');
|
||||||
|
|
Loading…
Reference in a new issue