From 427b60c619d940a6a94c58cac9a2b691ea275e51 Mon Sep 17 00:00:00 2001 From: chenshenhai Date: Mon, 16 Aug 2021 12:47:08 +0800 Subject: [PATCH] Revert "feat: add leave event for @idraw/board" This reverts commit 5b2b245be98c23f3bce827a83ba5bf1ec6b5d5bf. --- packages/board/examples/features/lib/event.js | 4 ---- packages/board/examples/test/event.html | 13 ------------- packages/board/src/lib/event.ts | 1 - packages/board/src/lib/watcher.ts | 10 ---------- scripts/browser/event.js | 14 +------------- 5 files changed, 1 insertion(+), 41 deletions(-) diff --git a/packages/board/examples/features/lib/event.js b/packages/board/examples/features/lib/event.js index 335d079..9c83cf1 100644 --- a/packages/board/examples/features/lib/event.js +++ b/packages/board/examples/features/lib/event.js @@ -37,8 +37,4 @@ export function initEvent(board) { board.on('hover', (p) => { // console.log('hover', p); }) - - board.on('leave', (p) => { - console.log('leave ===', p); - }); } \ No newline at end of file diff --git a/packages/board/examples/test/event.html b/packages/board/examples/test/event.html index 2b9e5d7..9153202 100644 --- a/packages/board/examples/test/event.html +++ b/packages/board/examples/test/event.html @@ -143,10 +143,6 @@ const handleWheelY = (moveY) => { renderText(`wheelY: moveY=${moveY}`); } - const handleLeave = (e) => { - console.log('leave ==', e); - renderText(`leave: x=${e.x}, y=${e.y}`); - } board.on('hover', handleHover); board.on('point', handlePoint); @@ -155,7 +151,6 @@ board.on('moveEnd', handleMoveEnd); board.on('wheelX', handleWheelX); board.on('wheelY', handleWheelY); - board.on('leave', handleLeave); drawBoard(board) board.draw(); @@ -181,12 +176,6 @@ clientX: clientX, clientY: clientY, }); - - // leave - event.mouseLeave({ - x: 301, - y: 221, - }); } setTimeout(() => { @@ -199,11 +188,9 @@ board.off('moveEnd', handleMoveEnd); board.off('wheelX', handleWheelX); board.off('wheelY', handleWheelY); - board.off('leave', handleLeave); triggerEvent(100, 80) }, 100); }, 100); - })() diff --git a/packages/board/src/lib/event.ts b/packages/board/src/lib/event.ts index 066e370..38646e3 100644 --- a/packages/board/src/lib/event.ts +++ b/packages/board/src/lib/event.ts @@ -1,7 +1,6 @@ import { TypePoint } from '@idraw/types'; export interface TypeBoardEventArgMap { - 'leave': TypePoint; 'hover': TypePoint; 'point': TypePoint; 'move': TypePoint; diff --git a/packages/board/src/lib/watcher.ts b/packages/board/src/lib/watcher.ts index e44610c..74e3042 100644 --- a/packages/board/src/lib/watcher.ts +++ b/packages/board/src/lib/watcher.ts @@ -33,7 +33,6 @@ export class Watcher { canvas.addEventListener('mousemove', this._listenMove.bind(this), true); canvas.addEventListener('mouseup', this._listenMoveEnd.bind(this), true); canvas.addEventListener('mouseleave', this._listenMoveEnd.bind(this), true); - canvas.addEventListener('mouseleave', this._listenMoveLeave.bind(this), true); canvas.addEventListener('wheel', this._listenWheel.bind(this), true); canvas.addEventListener('touchstart', this._listenMoveStart.bind(this), true); @@ -88,15 +87,6 @@ export class Watcher { this._isMoving = false; } - _listenMoveLeave(e: MouseEvent|TouchEvent): void { - e.preventDefault(); - if (this._event.has('leave')) { - const p = this._getPosition(e); - this._event.trigger('leave', p); - } - this._isMoving = false; - } - _listenWheel(e: WheelEvent) { e.preventDefault(); if (this._event.has('wheelX') && (e.deltaX > 0 || e.deltaX < 0)) { diff --git a/scripts/browser/event.js b/scripts/browser/event.js index b247dcc..6b72e9f 100644 --- a/scripts/browser/event.js +++ b/scripts/browser/event.js @@ -23,18 +23,6 @@ function mouseMove(opts){ elem.dispatchEvent(event); } -function mouseLeave(opts){ - const { x,y } = opts; - const event = new MouseEvent('mouseleave', { - screenX: x, - screenY: y, - clientX: x, - clientY: y, - }); - const elem = document.elementFromPoint(x,y); - elem.dispatchEvent(event); -} - // function mouseOver(opts){ // const { x,y } = opts; @@ -89,7 +77,7 @@ export default { mouseDown, mouseUp, mouseMove, - mouseLeave, + // mouseOver, wheelX, wheelY, } \ No newline at end of file