fix(event): fix init event job->chrome bug for getMovementDeltaWhenPo…

…interLocked publish npm
Wonder-Technology · May 24, 2019 · 4f3e45b · 4f3e45b
1 parent 58f6e1c
commit 4f3e45b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wonder.js",
-  "version": "1.1.0-alpha.6",
+  "version": "1.1.0-alpha.7",
   "authors": "Wonder",
   "description": "3d webgl engine",
   "homepage": "https://github.com/Wonder-Technology/Wonder.js",

diff --git a/src/api/api/APIAPI.re b/src/api/api/APIAPI.re
diff --git a/src/job/utils/InitEventJobUtils.re b/src/job/utils/InitEventJobUtils.re
@@ -401,6 +401,11 @@ let _fromPCDomEventArr = state => [|
   |> WonderBsMost.Most.tap(event => _execMouseDragStartEventHandle(event))
   |> WonderBsMost.Most.flatMap(event =>
        _fromPointDomEvent("mousemove", state)
+       /*!
+         fix chrome bug for getMovementDeltaWhenPointerLocked:
+         the first movementDelta->x >100!
+                */
+       |> WonderBsMost.Most.skip(1)
        |> WonderBsMost.Most.until(
             _fromPointDomEvent("mouseup", state)
             |> WonderBsMost.Most.tap(event =>

diff --git a/src/service/state/main/event/handle/HandleMouseEventMainService.re b/src/service/state/main/event/handle/HandleMouseEventMainService.re
@@ -108,8 +108,7 @@ let getMovementDelta = (mouseDomEvent, {eventRecord} as state) =>
     );
 
 let convertMouseDomEventToMouseEvent =
-    (eventName, mouseDomEvent, state)
-    : mouseEvent => {
+    (eventName, mouseDomEvent, state): mouseEvent => {
   name: eventName,
   location: getLocation(mouseDomEvent, state),
   locationInView: getLocationInView(mouseDomEvent, state),

diff --git a/test/unit/ecs/component/cameraController/ArcballCameraController_test.re b/test/unit/ecs/component/cameraController/ArcballCameraController_test.re
@@ -89,10 +89,9 @@ let _ =
           EventTool.getPointEventBindedDom(state),
           MouseEventTool.buildMouseEvent(),
         );
-        EventTool.triggerDomEvent(
-          "mousemove",
-          EventTool.getPointEventBindedDom(state),
+        EventTool.triggerFirstMouseDragOverEvent(
           MouseEventTool.buildMouseEvent(~movementX=1, ~movementY=2, ()),
+          state,
         );
         let state = EventTool.restore(state);
 

diff --git a/test/unit/ecs/component/cameraController/EventArcballCameraController_test.re b/test/unit/ecs/component/cameraController/EventArcballCameraController_test.re
@@ -267,14 +267,13 @@ let _ =
                   EventTool.getPointEventBindedDom(state),
                   MouseEventTool.buildMouseEvent(),
                 );
-                EventTool.triggerDomEvent(
-                  "mousemove",
-                  EventTool.getPointEventBindedDom(state),
+                EventTool.triggerFirstMouseDragOverEvent(
                   MouseEventTool.buildMouseEvent(
                     ~movementX=1,
                     ~movementY=2,
                     (),
                   ),
+                  state,
                 );
                 let state = EventTool.restore(state);
 

diff --git a/test/unit/job/no_worker/InitEventJob_test.re b/test/unit/job/no_worker/InitEventJob_test.re
@@ -607,10 +607,9 @@ let _ =
               EventTool.getPointEventBindedDom(state),
               MouseEventTool.buildMouseEvent(),
             );
-            EventTool.triggerDomEvent(
-              "mousemove",
-              EventTool.getPointEventBindedDom(state),
+            EventTool.triggerFirstMouseDragOverEvent(
               MouseEventTool.buildMouseEvent(),
+              state,
             );
             EventTool.triggerDomEvent(
               "mousemove",
@@ -744,10 +743,9 @@ let _ =
                 EventTool.getPointEventBindedDom(state),
                 MouseEventTool.buildMouseEvent(),
               );
-              EventTool.triggerDomEvent(
-                "mousemove",
-                EventTool.getPointEventBindedDom(state),
+              EventTool.triggerFirstMouseDragOverEvent(
                 MouseEventTool.buildMouseEvent(~pageX=10, ~pageY=20, ()),
+                state,
               );
               EventTool.triggerDomEvent(
                 "mousemove",
@@ -772,10 +770,9 @@ let _ =
                 EventTool.getPointEventBindedDom(state),
                 MouseEventTool.buildMouseEvent(),
               );
-              EventTool.triggerDomEvent(
-                "mousemove",
-                EventTool.getPointEventBindedDom(state),
+              EventTool.triggerFirstMouseDragOverEvent(
                 MouseEventTool.buildMouseEvent(~pageX=50, ~pageY=80, ()),
+                state,
               );
               let state = EventTool.restore(state);
 
@@ -824,10 +821,9 @@ let _ =
                 EventTool.getPointEventBindedDom(state),
                 MouseEventTool.buildMouseEvent(~pageX=50, ~pageY=80, ()),
               );
-              EventTool.triggerDomEvent(
-                "mousemove",
-                EventTool.getPointEventBindedDom(state),
+              EventTool.triggerFirstMouseDragOverEvent(
                 MouseEventTool.buildMouseEvent(~pageX=55, ~pageY=110, ()),
+                state,
               );
               EventTool.triggerDomEvent(
                 "mousemove",
@@ -863,10 +859,9 @@ let _ =
                 EventTool.getPointEventBindedDom(state),
                 MouseEventTool.buildMouseEvent(~which=eventButton, ()),
               );
-              EventTool.triggerDomEvent(
-                "mousemove",
-                EventTool.getPointEventBindedDom(state),
+              EventTool.triggerFirstMouseDragOverEvent(
                 MouseEventTool.buildMouseEvent(~which=eventButton, ()),
+                state,
               );
               let state = EventTool.restore(state);
 
@@ -2182,10 +2177,9 @@ let _ =
               EventTool.getPointEventBindedDom(state),
               MouseEventTool.buildMouseEvent(),
             );
-            EventTool.triggerDomEvent(
-              "mousemove",
-              EventTool.getPointEventBindedDom(state),
+            EventTool.triggerFirstMouseDragOverEvent(
               MouseEventTool.buildMouseEvent(),
+              state,
             );
             EventTool.triggerDomEvent(
               "mousemove",
@@ -2220,10 +2214,9 @@ let _ =
               EventTool.getPointEventBindedDom(state),
               MouseEventTool.buildMouseEvent(),
             );
-            EventTool.triggerDomEvent(
-              "mousemove",
-              EventTool.getPointEventBindedDom(state),
+            EventTool.triggerFirstMouseDragOverEvent(
               MouseEventTool.buildMouseEvent(),
+              state,
             );
             EventTool.triggerDomEvent(
               "mouseup",

diff --git a/test/unit/job/no_worker/tool/EventTool.re b/test/unit/job/no_worker/tool/EventTool.re
@@ -179,4 +179,9 @@ let restore = state => {
   _clearEventQueueMap(.);
 
   ManageEventMainService.unsubscribeDomEventStream(state);
+};
+
+let triggerFirstMouseDragOverEvent = (mouseEvent, state) => {
+  triggerDomEvent("mousemove", getPointEventBindedDom(state), mouseEvent);
+  triggerDomEvent("mousemove", getPointEventBindedDom(state), mouseEvent);
 };