fix(event): fix "unbind arcballCameraController event" bug: unbind sh…

…ould unbind cameraController's all binded functions
Wonder-Technology · May 9, 2019 · 24f861f · 24f861f
1 parent 05422f1
commit 24f861f
Show file tree

Hide file tree

Showing 12 changed files with 315 additions and 195 deletions.
diff --git a/src/service/record/main/camera_controller/arcball/RecordArcballCameraControllerService.re b/src/service/record/main/camera_controller/arcball/RecordArcballCameraControllerService.re
@@ -2,15 +2,15 @@ open StateDataMainType;
 
 let create = () => {
   index: 0,
-  pointDragStartEventHandleFuncMap:
+  pointDragStartEventHandleFuncListMap:
     WonderCommonlib.MutableSparseMapService.createEmpty(),
-  pointDragDropEventHandleFuncMap:
+  pointDragDropEventHandleFuncListMap:
     WonderCommonlib.MutableSparseMapService.createEmpty(),
-  pointDragOverEventHandleFuncMap:
+  pointDragOverEventHandleFuncListMap:
     WonderCommonlib.MutableSparseMapService.createEmpty(),
-  pointScaleEventHandleFuncMap:
+  pointScaleEventHandleFuncListMap:
     WonderCommonlib.MutableSparseMapService.createEmpty(),
-  keydownEventHandleFuncMap:
+  keydownEventHandleFuncListMap:
     WonderCommonlib.MutableSparseMapService.createEmpty(),
   dirtyArray: WonderCommonlib.ArrayService.createEmpty(),
   distanceMap: WonderCommonlib.MutableSparseMapService.createEmpty(),
@@ -31,11 +31,11 @@ let deepCopyForRestore =
     (
       {
         index,
-        pointDragStartEventHandleFuncMap,
-        pointDragDropEventHandleFuncMap,
-        pointDragOverEventHandleFuncMap,
-        pointScaleEventHandleFuncMap,
-        keydownEventHandleFuncMap,
+        pointDragStartEventHandleFuncListMap,
+        pointDragDropEventHandleFuncListMap,
+        pointDragOverEventHandleFuncListMap,
+        pointScaleEventHandleFuncListMap,
+        keydownEventHandleFuncListMap,
         dirtyArray,
         distanceMap,
         minDistanceMap,
@@ -52,17 +52,21 @@ let deepCopyForRestore =
       },
     ) => {
   index,
-  pointDragStartEventHandleFuncMap:
-    pointDragStartEventHandleFuncMap |> WonderCommonlib.MutableSparseMapService.copy,
-  pointDragDropEventHandleFuncMap:
-    pointDragDropEventHandleFuncMap |> WonderCommonlib.MutableSparseMapService.copy,
-  pointDragOverEventHandleFuncMap:
-    pointDragOverEventHandleFuncMap |> WonderCommonlib.MutableSparseMapService.copy,
-  pointScaleEventHandleFuncMap:
-    pointScaleEventHandleFuncMap
+  pointDragStartEventHandleFuncListMap:
+    pointDragStartEventHandleFuncListMap
+    |> WonderCommonlib.MutableSparseMapService.copy,
+  pointDragDropEventHandleFuncListMap:
+    pointDragDropEventHandleFuncListMap
+    |> WonderCommonlib.MutableSparseMapService.copy,
+  pointDragOverEventHandleFuncListMap:
+    pointDragOverEventHandleFuncListMap
+    |> WonderCommonlib.MutableSparseMapService.copy,
+  pointScaleEventHandleFuncListMap:
+    pointScaleEventHandleFuncListMap
+    |> WonderCommonlib.MutableSparseMapService.copy,
+  keydownEventHandleFuncListMap:
+    keydownEventHandleFuncListMap
     |> WonderCommonlib.MutableSparseMapService.copy,
-  keydownEventHandleFuncMap:
-    keydownEventHandleFuncMap |> WonderCommonlib.MutableSparseMapService.copy,
   dirtyArray: dirtyArray |> Js.Array.copy,
   distanceMap: distanceMap |> WonderCommonlib.MutableSparseMapService.copy,
   minDistanceMap:

diff --git a/...service/state/main/camera_controller/arcball/DisposeArcballCameraControllerMainService.re b/...service/state/main/camera_controller/arcball/DisposeArcballCameraControllerMainService.re
@@ -10,9 +10,6 @@ let _disposeData = (cameraController, state) => {
     |> EventArcballCameraControllerMainService.unbindEvent(cameraController);
 
   let {
-    pointDragOverEventHandleFuncMap,
-    pointScaleEventHandleFuncMap,
-    keydownEventHandleFuncMap,
     dirtyArray,
     distanceMap,
     minDistanceMap,