refactor: mouseWheelEvent is deprecated, use WheelEvent

antvis · Dec 10, 2019 · 78eeb88 · 78eeb88
1 parent 88b0952
commit 78eeb88
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/packages/x6/src/common/dom-event.ts b/packages/x6/src/common/dom-event.ts
@@ -7,7 +7,7 @@ export namespace DomEvent {
   function addToList(
     elem: HTMLElement | SVGElement | Document | Window,
     name: string,
-    handler: Handler
+    handler: Handler,
   ) {
     const node = elem as any
     if (node[LIST_KEY] == null) {
@@ -20,15 +20,15 @@ export namespace DomEvent {
     ? (
         elem: HTMLElement | SVGElement | Document | Window,
         name: string,
-        handler: Handler
+        handler: Handler,
       ) => {
         elem.addEventListener(name, handler, false)
         addToList(elem, name, handler)
       }
     : (
         elem: HTMLElement | SVGElement | Document | Window,
         name: string,
-        handler: Handler
+        handler: Handler,
       ) => {
         const node = elem as any
         node.attachEvent(`on${name}`, handler)
@@ -38,7 +38,7 @@ export namespace DomEvent {
   function removeFromList(
     elem: HTMLElement | SVGElement | Document | Window,
     name: string,
-    handler: Handler
+    handler: Handler,
   ) {
     const list = (elem as any)[LIST_KEY]
     if (list != null) {
@@ -60,15 +60,15 @@ export namespace DomEvent {
     ? (
         elem: HTMLElement | SVGElement | Document | Window,
         name: string,
-        handler: Handler
+        handler: Handler,
       ) => {
         elem.removeEventListener(name, handler, false)
         removeFromList(elem, name, handler)
       }
     : (
         elem: HTMLElement | SVGElement | Document | Window,
         name: string,
-        handler: Handler
+        handler: Handler,
       ) => {
         const node = elem as any
         node.detachEvent(`on${name}`, handler)
@@ -89,29 +89,29 @@ export namespace DomEvent {
     elem: HTMLElement | SVGElement | Document | Window,
     startListener?: Handler | null,
     moveListener?: Handler | null,
-    endListener?: Handler | null
+    endListener?: Handler | null,
   ) {
     if (startListener != null) {
       addListener(
         elem,
         detector.SUPPORT_POINTER ? 'pointerdown' : 'mousedown',
-        startListener
+        startListener,
       )
     }
 
     if (moveListener != null) {
       addListener(
         elem,
         detector.SUPPORT_POINTER ? 'pointermove' : 'mousemove',
-        moveListener
+        moveListener,
       )
     }
 
     if (endListener != null) {
       addListener(
         elem,
         detector.SUPPORT_POINTER ? 'pointerup' : 'mouseup',
-        endListener
+        endListener,
       )
     }
 
@@ -134,29 +134,29 @@ export namespace DomEvent {
     elem: HTMLElement | SVGElement | Document | Window,
     startListener: Handler | null,
     moveListener: Handler | null,
-    endListener: Handler | null
+    endListener: Handler | null,
   ) {
     if (startListener != null) {
       removeListener(
         elem,
         detector.SUPPORT_POINTER ? 'pointerdown' : 'mousedown',
-        startListener
+        startListener,
       )
     }
 
     if (moveListener != null) {
       removeListener(
         elem,
         detector.SUPPORT_POINTER ? 'pointermove' : 'mousemove',
-        moveListener
+        moveListener,
       )
     }
 
     if (endListener != null) {
       removeListener(
         elem,
         detector.SUPPORT_POINTER ? 'pointerup' : 'mouseup',
-        endListener
+        endListener,
       )
     }
 
@@ -190,17 +190,17 @@ export namespace DomEvent {
   }
 
   export function addMouseWheelListener(
-    func: (e: MouseWheelEvent, direction: boolean) => any,
-    target?: HTMLElement
+    func: (e: WheelEvent, direction: boolean) => any,
+    target?: HTMLElement,
   ) {
     if (func != null) {
-      const wheelHandler = function(e: MouseWheelEvent) {
+      const wheelHandler = function(e: WheelEvent) {
         // IE does not give an event object but the
         // global event object is the mousewheel event
         // at this point in time.
         if (e == null) {
           // tslint:disable-next-line
-          e = window.event as MouseWheelEvent
+          e = window.event as WheelEvent
         }
 
         let delta = 0
@@ -400,7 +400,7 @@ export namespace DomEvent {
   export function consume(
     e: Event,
     preventDefault: boolean = true,
-    stopPropagation: boolean = true
+    stopPropagation: boolean = true,
   ) {
     if (preventDefault) {
       if (e.preventDefault) {