@leafer-ui/event 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/event",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "@leafer-ui/event",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,9 +22,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.7.0"
+    "@leafer/core": "1.9.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.7.0"
+    "@leafer/interface": "1.9.0"
   }
 }

package/src/DragEvent.ts

@@ -37,14 +37,18 @@ export class DragEvent extends PointerEvent implements IDragEvent {
         this.data = data
     }
 
-    static getValidMove(leaf: ILeaf, start: IPointData, total: IPointData): IPointData {
-        const { draggable, dragBounds } = leaf, move = leaf.getLocalPoint(total, null, true)
+    static getValidMove(leaf: ILeaf, start: IPointData, total: IPointData, checkLimit = true): IPointData {
+        const move = leaf.getLocalPoint(total, null, true)
         PointHelper.move(move, start.x - leaf.x, start.y - leaf.y)
+        if (checkLimit) this.limitMove(leaf, move) // 检查拖拽限制
+        return move
+    }
 
+    static limitMove(leaf: ILeaf, move: IPointData): void {
+        const { draggable, dragBounds } = leaf
         if (dragBounds) this.getMoveInDragBounds(leaf.__localBoxBounds, dragBounds === 'parent' ? leaf.parent.boxBounds : dragBounds, move, true)
         if (draggable === 'x') move.y = 0
         if (draggable === 'y') move.x = 0
-        return move
     }
 
     static getMoveInDragBounds(childBox: IBoundsData, dragBounds: IBoundsData, move: IPointData, change?: boolean): IPointData {

package/src/KeyEvent.ts

@@ -1,4 +1,4 @@
-import { IKeyEvent } from '@leafer/interface'
+import { IKeyCodes, IKeyEvent } from '@leafer/interface'
 import { registerUIEvent } from '@leafer/core'
 
 import { UIEvent } from './UIEvent'
@@ -7,11 +7,14 @@ import { UIEvent } from './UIEvent'
 @registerUIEvent()
 export class KeyEvent extends UIEvent implements IKeyEvent {
 
+    static BEFORE_DOWN = 'key.before_down'
+    static BEFORE_UP = 'key.before_up'
+
     static DOWN = 'key.down'
     static HOLD = 'key.hold'
     static UP = 'key.up'
 
-    public readonly code: string
+    public readonly code: IKeyCodes
     public readonly key: string
 
 }

package/src/Keyboard.ts

@@ -1,4 +1,4 @@
-import { IBooleanMap } from '@leafer/interface'
+import { IBooleanMap, IShortcutKeyCodes, IShortcutKeys, IShortcutKeysCheck, IUIEvent } from '@leafer/interface'
 
 
 const downKeyMap: IBooleanMap = {}
@@ -9,10 +9,15 @@ export const Keyboard = {
         return Keyboard.isHold('Space')
     },
 
-    isHold(code: string): boolean {
+    isHold(code: IShortcutKeyCodes): boolean {
         return downKeyMap[code]
     },
 
+    // 是否按住快捷键，可扩展语义化快捷键组合 ctrl + F || shift + F
+    isHoldKeys(shortcutKeys: IShortcutKeysCheck | IShortcutKeys, e?: IUIEvent): boolean {
+        return e ? (shortcutKeys as IShortcutKeysCheck)(e) : undefined
+    },
+
     setDownCode(code: string): void {
         if (!downKeyMap[code]) downKeyMap[code] = true
     },

package/src/UIEvent.ts

@@ -1,4 +1,4 @@
-import { ILeaf, ILeafList, IPointData, IUIEvent } from '@leafer/interface'
+import { ILeaf, ILeafList, IPointData, IUIEvent, IShortcutKeys, IShortcutKeysCheck } from '@leafer/interface'
 import { Event, EventCreator } from '@leafer/core'
 
 import { Keyboard } from './Keyboard'
@@ -33,6 +33,11 @@ export class UIEvent extends Event implements IUIEvent {
         Object.assign(this, params)
     }
 
+
+    public isHoldKeys(shortcutKeys?: IShortcutKeysCheck | IShortcutKeys): boolean {
+        return Keyboard.isHoldKeys(shortcutKeys, this)
+    }
+
     public getBoxPoint(relative?: ILeaf): IPointData {
         return (relative || this.current).getBoxPoint(this)
     }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IUIEvent, ILeafList, ILeaf, IPointData, IPointerEvent, PointerType, IDragEvent, IObject, IBoundsData, IDropEvent, IMoveEvent, IRotateEvent, ISwipeEvent, IZoomEvent, IKeyEvent } from '@leafer/interface';
+import { IUIEvent, ILeafList, ILeaf, IShortcutKeysCheck, IShortcutKeys, IPointData, IPointerEvent, PointerType, IDragEvent, IObject, IBoundsData, IDropEvent, IMoveEvent, IRotateEvent, ISwipeEvent, IZoomEvent, IKeyEvent, IKeyCodes, IShortcutKeyCodes } from '@leafer/interface';
 import { Event } from '@leafer/core';
 
 declare class UIEvent extends Event implements IUIEvent {
@@ -19,6 +19,7 @@ declare class UIEvent extends Event implements IUIEvent {
     readonly current: ILeaf;
     readonly bubbles: boolean;
     constructor(params: IUIEvent);
+    isHoldKeys(shortcutKeys?: IShortcutKeysCheck | IShortcutKeys): boolean;
     getBoxPoint(relative?: ILeaf): IPointData;
     getInnerPoint(relative?: ILeaf): IPointData;
     getLocalPoint(relative?: ILeaf): IPointData;
@@ -78,7 +79,8 @@ declare class DragEvent extends PointerEvent implements IDragEvent {
     static data: IObject;
     static setList(data: ILeaf | ILeaf[] | ILeafList): void;
     static setData(data: IObject): void;
-    static getValidMove(leaf: ILeaf, start: IPointData, total: IPointData): IPointData;
+    static getValidMove(leaf: ILeaf, start: IPointData, total: IPointData, checkLimit?: boolean): IPointData;
+    static limitMove(leaf: ILeaf, move: IPointData): void;
     static getMoveInDragBounds(childBox: IBoundsData, dragBounds: IBoundsData, move: IPointData, change?: boolean): IPointData;
     getPageMove(total?: boolean): IPointData;
     getInnerMove(relative?: ILeaf, total?: boolean): IPointData;
@@ -134,16 +136,19 @@ declare class ZoomEvent extends PointerEvent implements IZoomEvent {
 }
 
 declare class KeyEvent extends UIEvent implements IKeyEvent {
+    static BEFORE_DOWN: string;
+    static BEFORE_UP: string;
     static DOWN: string;
     static HOLD: string;
     static UP: string;
-    readonly code: string;
+    readonly code: IKeyCodes;
     readonly key: string;
 }
 
 declare const Keyboard: {
     isHoldSpaceKey(): boolean;
-    isHold(code: string): boolean;
+    isHold(code: IShortcutKeyCodes): boolean;
+    isHoldKeys(shortcutKeys: IShortcutKeysCheck | IShortcutKeys, e?: IUIEvent): boolean;
     setDownCode(code: string): void;
     setUpCode(code: string): void;
 };