fix(extension): fix event package->meta3d-event extension: "wheel eve…

…nt not work" bug solution fix InitEventDoService: use "wheel" instead of "mousewheel" event; use mouseDomEvent.deltaY;
Meta3D-Technology · Dec 19, 2023 · fb84fb6 · fb84fb6
1 parent 04525ca
commit fb84fb6
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 13 deletions.
diff --git a/packages/event/extensions/meta3d-event/dist/static/js/main.js b/packages/event/extensions/meta3d-event/dist/static/js/main.js
diff --git a/...ent/lib/es6_global/src/event_manager/service/event/handle/HandleMouseEventDoService.bs.js b/...ent/lib/es6_global/src/event_manager/service/event/handle/HandleMouseEventDoService.bs.js
@@ -40,12 +40,21 @@ function getButton(mouseDomEvent, state) {
   }
 }
 
+function _getFromDeltaY(mouseDomEvent) {
+  var data = mouseDomEvent.deltaY;
+  if (!(data == null)) {
+    return data / -100 | 0;
+  } else {
+    return 0;
+  }
+}
+
 function _getFromWheelDelta(mouseDomEvent) {
   var wheelData = mouseDomEvent.wheelDelta;
-  if (!(wheelData == null)) {
-    return wheelData / 120 | 0;
+  if (wheelData == null) {
+    return _getFromDeltaY(mouseDomEvent);
   } else {
-    return 0;
+    return wheelData / 120 | 0;
   }
 }
 
@@ -186,6 +195,7 @@ export {
   getLocation ,
   getLocationInView ,
   getButton ,
+  _getFromDeltaY ,
   _getFromWheelDelta ,
   getWheel ,
   _isPointerLocked ,

diff --git a/...meta3d-event/lib/es6_global/src/event_manager/service/init_event/InitEventDoService.bs.js b/...meta3d-event/lib/es6_global/src/event_manager/service/init_event/InitEventDoService.bs.js
@@ -207,7 +207,7 @@ function _fromPCDomEventArr(state, eventExtensionProtocolName) {
   var __x$2 = _fromPointDomEvent("mousedown", state);
   var __x$3 = _fromPointDomEvent("mouseup", state);
   var __x$4 = _fromPointDomEvent("mousemove", state);
-  var __x$5 = _fromPointDomEvent("mousewheel", state);
+  var __x$5 = _fromPointDomEvent("wheel", state);
   var __x$6 = _fromPointDomEvent("mousedown", state);
   var __x$7 = Most.tap((function ($$event) {
           _execMouseDragStartEventHandle($$event, eventExtensionProtocolName);
@@ -301,7 +301,7 @@ function fromDomEvent(state, eventExtensionProtocolName) {
             RE_EXN_ID: "Match_failure",
             _1: [
               "InitEventDoService.res",
-              443,
+              444,
               4
             ],
             Error: new Error()

diff --git a/packages/event/extensions/meta3d-event/package.json b/packages/event/extensions/meta3d-event/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meta3d-event",
-  "version": "0.21.4",
+  "version": "0.21.5",
   "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
   "displayName": "event",
   "protocol": {

diff --git a/...ensions/meta3d-event/src/event_manager/service/event/handle/HandleMouseEventDoService.res b/...ensions/meta3d-event/src/event_manager/service/event/handle/HandleMouseEventDoService.res
@@ -62,10 +62,16 @@ let getButton = (mouseDomEvent, state) => {
   }
 }
 
+let _getFromDeltaY = mouseDomEvent =>
+  switch Js.toOption(mouseDomEvent["deltaY"]) {
+  | Some(data) => data / -100
+  | None => 0
+  }
+
 let _getFromWheelDelta = mouseDomEvent =>
   switch Js.toOption(mouseDomEvent["wheelDelta"]) {
   | Some(wheelData) => wheelData / 120
-  | None => 0
+  | None => _getFromDeltaY(mouseDomEvent)
   }
 
 let getWheel = mouseDomEvent =>
@@ -137,7 +143,8 @@ let execEventHandle = ({eventData} as state, mouseEvent: mouseEvent) => {
 
   switch mouseDomEventDataArrMap->Meta3dCommonlib.MutableSparseMap.get(name->domEventNameToInt) {
   | None => state
-  | Some(arr) => arr->Meta3dCommonlib.ArraySt.reduceOneParam((. state, {handleFunc}: mouseDomEventData) =>
+  | Some(arr) =>
+    arr->Meta3dCommonlib.ArraySt.reduceOneParam((. state, {handleFunc}: mouseDomEventData) =>
       handleFunc(.
         /* convertMouseDomEventToMouseEvent(
                   eventName,
@@ -172,7 +179,7 @@ let setIsDrag = ({eventData} as state, isDrag) => {
     ...eventData,
     mouseEventData: {
       ...eventData.mouseEventData,
-      isDrag: isDrag,
+      isDrag,
     },
   },
 }

diff --git a/...event/extensions/meta3d-event/src/event_manager/service/init_event/InitEventDoService.res b/...event/extensions/meta3d-event/src/event_manager/service/init_event/InitEventDoService.res
@@ -361,7 +361,8 @@ let _fromPCDomEventArr = (state, eventExtensionProtocolName) => [
     event => _execMouseMoveEventHandle(MouseMove, event, eventExtensionProtocolName),
     _,
   ),
-  _fromPointDomEvent("mousewheel", state)->Meta3dBsMostDefault.Most.tap(
+  // _fromPointDomEvent("mousewheel", state)->Meta3dBsMostDefault.Most.tap(
+  _fromPointDomEvent("wheel", state)->Meta3dBsMostDefault.Most.tap(
     event => _execMouseEventHandle(MouseWheel, event, eventExtensionProtocolName),
     _,
   ),

diff --git a/packages/event/protocols/extension_protocols/meta3d-event-protocol/package.json b/packages/event/protocols/extension_protocols/meta3d-event-protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "meta3d-event-protocol",
-    "version": "0.21.4",
+    "version": "0.21.5",
     "publisher": "0xf63e1991A343814EdE505D7cfC368615EAe75307",
     "displayName": "event protocol",
     "repoLink": "https://github.com/Meta3D-Technology/Meta3D/tree/master/protocols/extension_protocols/meta3d-event-protocol",

diff --git a/...s/event/protocols/extension_protocols/meta3d-event-protocol/src/service/EventType.gen.tsx b/...s/event/protocols/extension_protocols/meta3d-event-protocol/src/service/EventType.gen.tsx
@@ -55,6 +55,7 @@ export type mouseDomEvent = {
   readonly webkitMovementX: (null | undefined | number); 
   readonly webkitMovementY: (null | undefined | number); 
   readonly wheelDelta: (null | undefined | number); 
+  readonly deltaY: (null | undefined | number); 
   readonly pageX: number; 
   readonly pageY: number; 
   readonly preventDefault: () => void

diff --git a/packages/event/protocols/extension_protocols/meta3d-event-protocol/src/service/EventType.res b/packages/event/protocols/extension_protocols/meta3d-event-protocol/src/service/EventType.res
@@ -53,6 +53,7 @@ type mouseDomEvent = {
   "webkitMovementX": Js.Nullable.t<int>,
   "webkitMovementY": Js.Nullable.t<int>,
   "wheelDelta": Js.Nullable.t<int>,
+  "deltaY": Js.Nullable.t<int>,
   "pageX": int,
   "pageY": int,
   "preventDefault": (. unit) => unit,