feat(dataZoom): Add 'no-function-keys' option to RoamController and InsideZoomModel

src/component/dataZoom/InsideZoomModel.ts

@@ -19,6 +19,7 @@
 
 import DataZoomModel, {DataZoomOption} from './DataZoomModel';
 import { inheritDefaultOption } from '../../util/component';
+import { RoamKeysSetting } from '../helper/RoamController';
 
 export interface InsideDataZoomOption extends DataZoomOption {
 
@@ -32,11 +33,11 @@ export interface InsideDataZoomOption extends DataZoomOption {
      */
     zoomLock?: boolean
 
-    zoomOnMouseWheel?: boolean | 'shift' | 'ctrl' | 'alt'
+    zoomOnMouseWheel?: RoamKeysSetting
 
-    moveOnMouseMove?: boolean | 'shift' | 'ctrl' | 'alt'
+    moveOnMouseMove?: RoamKeysSetting
 
-    moveOnMouseWheel?: boolean | 'shift' | 'ctrl' | 'alt'
+    moveOnMouseWheel?: RoamKeysSetting
 
     preventDefaultMouseMove?: boolean
 

src/component/helper/RoamController.ts

@@ -28,11 +28,12 @@ import Group from 'zrender/src/graphic/Group';
 // Can be null/undefined or true/false
 // or 'pan/move' or 'zoom'/'scale'
 export type RoamType = RoamOptionMixin['roam'];
+export type RoamKeysSetting = boolean | 'ctrl' | 'shift' | 'alt' | 'no-function-keys';
 
 interface RoamOption {
-    zoomOnMouseWheel?: boolean | 'ctrl' | 'shift' | 'alt'
-    moveOnMouseMove?: boolean | 'ctrl' | 'shift' | 'alt'
-    moveOnMouseWheel?: boolean | 'ctrl' | 'shift' | 'alt'
+    zoomOnMouseWheel?: RoamKeysSetting
+    moveOnMouseMove?: RoamKeysSetting
+    moveOnMouseWheel?: RoamKeysSetting
     /**
      * If fixed the page when pan
      */
@@ -327,16 +328,21 @@ function trigger<T extends RoamEventType>(
 //     moveOnMouseMove
 //     moveOnMouseWheel
 // }
-// The value can be: true / false / 'shift' / 'ctrl' / 'alt'.
+// The value can be: true / false / 'shift' / 'ctrl' / 'alt', 'no-function-keys'.
 function isAvailableBehavior(
     behaviorToCheck: RoamBehavior,
     e: ZRElementEvent,
     settings: Pick<RoamOption, RoamBehavior>
 ) {
+    if (!behaviorToCheck) return true;
     const setting = settings[behaviorToCheck];
-    return !behaviorToCheck || (
-        setting && (!isString(setting) || e.event[setting + 'Key' as 'shiftKey' | 'ctrlKey' | 'altKey'])
-    );
+    if (isString(setting)) {
+        const event = e.event;
+        return setting == 'no-function-keys' ?
+            !event.shiftKey && !event.ctrlKey && !event.altKey :
+            event[setting + 'Key' as 'shiftKey' | 'ctrlKey' | 'altKey'];
+    }
+    return setting;
 }
 
 export default RoamController;