@leafer/event 1.8.0 → 1.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/event",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "description": "@leafer/event",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,12 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/decorator": "1.8.0",
-    "@leafer/math": "1.8.0",
-    "@leafer/platform": "1.8.0"
+    "@leafer/decorator": "1.9.1",
+    "@leafer/math": "1.9.1",
+    "@leafer/data": "1.9.1",
+    "@leafer/platform": "1.9.1"
   },
   "devDependencies": {
-    "@leafer/interface": "1.8.0"
+    "@leafer/interface": "1.9.1"
   }
 }

package/src/Eventer.ts

@@ -1,5 +1,6 @@
 import { IEventListener, IEventListenerMap, IEventListenerItem, IEventListenerId, IEvent, IObject, IEventTarget, IEventOption, IEventer, IEventParamsMap, InnerId, IEventParams, IFunction } from '@leafer/interface'
 import { EventCreator } from '@leafer/platform'
+import { isArray, isObject, isString, isUndefined } from '@leafer/data'
 
 import { BoundsEvent, boundsEventMap } from './BoundsEvent'
 
@@ -27,8 +28,8 @@ export class Eventer implements IEventer {
 
         if (!listener) {
             let event: IFunction | [IFunction, IEventOption]
-            if (type instanceof Array) (type as IEventParams[]).forEach(item => this.on(item[0], item[1], item[2]))
-            else for (let key in type as IEventParamsMap) (event = (type as IEventParamsMap)[key]) instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event)
+            if (isArray(type)) (type as IEventParams[]).forEach(item => this.on(item[0], item[1], item[2]))
+            else for (let key in type as IEventParamsMap) isArray(event = (type as IEventParamsMap)[key]) ? this.on(key, event[0], event[1]) : this.on(key, event)
             return
         }
 
@@ -46,7 +47,7 @@ export class Eventer implements IEventer {
 
         let events: IEventListenerItem[]
         const map = __getListenerMap(this, capture, true)
-        const typeList = typeof type === 'string' ? type.split(' ') : type as string[]
+        const typeList = isString(type) ? type.split(' ') : type as string[]
         const item = once ? { listener, once } : { listener }
 
         typeList.forEach(type => {
@@ -66,7 +67,7 @@ export class Eventer implements IEventer {
     public off(type?: string | string[], listener?: IEventListener, options?: IEventOption): void {
         if (type) {
 
-            const typeList = typeof type === 'string' ? type.split(' ') : type
+            const typeList = isString(type) ? type.split(' ') : type
 
             if (listener) {
 
@@ -108,24 +109,24 @@ export class Eventer implements IEventer {
     }
 
     public on_(type: string | string[] | IEventParams[], listener?: IEventListener, bind?: IObject, options?: IEventOption): IEventListenerId {
-        if (!listener) (type instanceof Array) && (type as IEventParams[]).forEach(item => this.on(item[0], item[2] ? item[1] = item[1].bind(item[2]) : item[1], item[3]))
+        if (!listener) isArray(type) && (type as IEventParams[]).forEach(item => this.on(item[0], item[2] ? item[1] = item[1].bind(item[2]) : item[1], item[3]))
         else this.on(type, bind ? listener = listener.bind(bind) : listener, options)
         return { type, current: this as any, listener, options }
     }
 
     public off_(id: IEventListenerId | IEventListenerId[]): void {
         if (!id) return
-        const list = id instanceof Array ? id : [id]
+        const list = isArray(id) ? id : [id]
         list.forEach(item => {
-            if (!item.listener) (item.type instanceof Array) && (item.type as IEventParams[]).forEach(v => item.current.off(v[0], v[1], v[3]))
+            if (!item.listener) isArray(item.type) && (item.type as IEventParams[]).forEach(v => item.current.off(v[0], v[1], v[3]))
             else item.current.off(item.type as string | string[], item.listener, item.options)
         })
         list.length = 0
     }
 
     public once(type: string | string[] | IEventParams[], listener?: IEventListener, captureOrBind?: boolean | IObject, capture?: boolean): void {
-        if (!listener) return (type instanceof Array) && (type as IEventParams[]).forEach(item => this.once(item[0], item[1], item[2], item[3]))
-        if (typeof captureOrBind === 'object') listener = listener.bind(captureOrBind)
+        if (!listener) return isArray(type) && (type as IEventParams[]).forEach(item => this.once(item[0], item[1], item[2], item[3]))
+        if (isObject(captureOrBind)) listener = listener.bind(captureOrBind)
         else capture = captureOrBind
         this.on(type, listener, { once: true, capture })
     }
@@ -162,7 +163,7 @@ export class Eventer implements IEventer {
 
         const { __bubbleMap: b, __captureMap: c } = this
         const hasB = b && b[type], hasC = c && c[type]
-        return !!(capture === undefined ? (hasB || hasC) : (capture ? hasC : hasB))
+        return !!(isUndefined(capture) ? (hasB || hasC) : (capture ? hasC : hasB))
     }
 
     public destroy(): void {

package/src/LeaferEvent.ts

@@ -1,4 +1,4 @@
-import { ILeaferEvent } from '@leafer/interface'
+import { ILeaferEvent, IStringMap } from '@leafer/interface'
 
 import { Event } from './Event'
 
@@ -20,4 +20,23 @@ export class LeaferEvent extends Event implements ILeaferEvent {
 
     static END = 'leafer.end'
 
+    // 变换操作
+    static TRANSFORM = 'leafer.transform'
+    static MOVE = 'leafer.move'
+    static SCALE = 'leafer.scale'
+    static ROTATE = 'leafer.rotate'
+    static SKEW = 'leafer.skew'
+}
+
+
+const { MOVE, SCALE, ROTATE, SKEW } = LeaferEvent
+
+export const leaferTransformAttrMap: IStringMap = {
+    x: MOVE,
+    y: MOVE,
+    scaleX: SCALE,
+    scaleY: SCALE,
+    rotation: ROTATE,
+    skewX: SKEW,
+    skewY: SKEW
 }

package/src/ResizeEvent.ts

@@ -1,4 +1,5 @@
 import { ILeaf, INumberMap, IResizeEvent, IScreenSizeData } from '@leafer/interface'
+import { isObject, isUndefined } from '@leafer/data'
 
 import { Event } from './Event'
 
@@ -31,7 +32,7 @@ export class ResizeEvent extends Event implements IResizeEvent {
     readonly old: IScreenSizeData
 
     constructor(size: IScreenSizeData | string, oldSize?: IScreenSizeData) {
-        if (typeof size === 'object') {
+        if (isObject(size)) {
             super(ResizeEvent.RESIZE)
             Object.assign(this, size)
         } else {
@@ -41,7 +42,7 @@ export class ResizeEvent extends Event implements IResizeEvent {
     }
 
     static isResizing(leaf: ILeaf): boolean {
-        return this.resizingKeys && this.resizingKeys[leaf.innerId] !== undefined
+        return this.resizingKeys && !isUndefined(this.resizingKeys[leaf.innerId])
     }
 
 }

package/src/index.ts

@@ -6,7 +6,7 @@ export { ResizeEvent } from './ResizeEvent'
 export { WatchEvent } from './WatchEvent'
 export { LayoutEvent } from './LayoutEvent'
 export { RenderEvent } from './RenderEvent'
-export { LeaferEvent } from './LeaferEvent'
+export { LeaferEvent, leaferTransformAttrMap } from './LeaferEvent'
 
 export { Event } from './Event'
 export { Eventer } from './Eventer'

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IEvent, IObject, IEventTarget, IChildEvent, ILeaf, IPropertyEvent, IImageEvent, ILeaferImage, IBoundsEvent, IResizeEvent, INumberMap, IScreenSizeData, IWatchEvent, IWatchEventData, ILayoutEvent, ILayoutBlockData, IRenderEvent, IBounds, IRenderOptions, ILeaferEvent, IEventer, InnerId, IEventListenerMap, IEventParamsMap, IEventParams, IEventListener, IEventOption, IEventListenerId } from '@leafer/interface';
+import { IEvent, IObject, IEventTarget, IChildEvent, ILeaf, IPropertyEvent, IImageEvent, ILeaferImage, IBoundsEvent, IResizeEvent, INumberMap, IScreenSizeData, IWatchEvent, IWatchEventData, ILayoutEvent, ILayoutBlockData, IRenderEvent, IBounds, IRenderOptions, ILeaferEvent, IStringMap, IEventer, InnerId, IEventListenerMap, IEventParamsMap, IEventParams, IEventListener, IEventOption, IEventListenerId } from '@leafer/interface';
 
 declare class Event implements IEvent {
     readonly origin: IObject;
@@ -119,7 +119,13 @@ declare class LeaferEvent extends Event implements ILeaferEvent {
     static STOP: string;
     static RESTART: string;
     static END: string;
+    static TRANSFORM: string;
+    static MOVE: string;
+    static SCALE: string;
+    static ROTATE: string;
+    static SKEW: string;
 }
+declare const leaferTransformAttrMap: IStringMap;
 
 declare class Eventer implements IEventer {
     readonly innerId: InnerId;
@@ -140,4 +146,4 @@ declare class Eventer implements IEventer {
     destroy(): void;
 }
 
-export { BoundsEvent, ChildEvent, Event, Eventer, ImageEvent, LayoutEvent, LeaferEvent, PropertyEvent, RenderEvent, ResizeEvent, WatchEvent };
+export { BoundsEvent, ChildEvent, Event, Eventer, ImageEvent, LayoutEvent, LeaferEvent, PropertyEvent, RenderEvent, ResizeEvent, WatchEvent, leaferTransformAttrMap };