@leafer/event 1.9.0 → 1.9.2

package/package.json

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

package/src/Eventer.ts

@@ -118,8 +118,10 @@ export class Eventer implements IEventer {
         if (!id) return
         const list = isArray(id) ? id : [id]
         list.forEach(item => {
-            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)
+            if (item) {
+                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
     }

package/src/PropertyEvent.ts

@@ -1,13 +1,17 @@
-import { IPropertyEvent, IEventTarget } from '@leafer/interface'
+import { IPropertyEvent, IEventTarget, IStringMap } from '@leafer/interface'
 
 import { Event } from './Event'
 
 
+const SCROLL = 'property.scroll'
+
 export class PropertyEvent extends Event implements IPropertyEvent {
 
     static CHANGE = 'property.change'
     static LEAFER_CHANGE = 'property.leafer_change'
 
+    static SCROLL = SCROLL
+
     readonly attrName: string
     readonly oldValue: unknown
     readonly newValue: unknown
@@ -19,4 +23,10 @@ export class PropertyEvent extends Event implements IPropertyEvent {
         this.newValue = newValue
     }
 
+}
+
+// 额外派发的属性事件
+export const extraPropertyEventMap: IStringMap = {
+    scrollX: SCROLL,
+    scrollY: SCROLL
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 export { ChildEvent } from './ChildEvent'
-export { PropertyEvent } from './PropertyEvent'
+export { PropertyEvent, extraPropertyEventMap } from './PropertyEvent'
 export { ImageEvent } from './ImageEvent'
 export { BoundsEvent } from './BoundsEvent'
 export { ResizeEvent } from './ResizeEvent'

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, IStringMap, IEventer, InnerId, IEventListenerMap, IEventParamsMap, IEventParams, IEventListener, IEventOption, IEventListenerId } from '@leafer/interface';
+import { IEvent, IObject, IEventTarget, IChildEvent, ILeaf, IPropertyEvent, IStringMap, 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';
 
 declare class Event implements IEvent {
     readonly origin: IObject;
@@ -31,11 +31,13 @@ declare class ChildEvent extends Event implements IChildEvent {
 declare class PropertyEvent extends Event implements IPropertyEvent {
     static CHANGE: string;
     static LEAFER_CHANGE: string;
+    static SCROLL: string;
     readonly attrName: string;
     readonly oldValue: unknown;
     readonly newValue: unknown;
     constructor(type: string, target: IEventTarget, attrName: string, oldValue: unknown, newValue: unknown);
 }
+declare const extraPropertyEventMap: IStringMap;
 
 declare class ImageEvent extends Event implements IImageEvent {
     static LOAD: string;
@@ -146,4 +148,4 @@ declare class Eventer implements IEventer {
     destroy(): void;
 }
 
-export { BoundsEvent, ChildEvent, Event, Eventer, ImageEvent, LayoutEvent, LeaferEvent, PropertyEvent, RenderEvent, ResizeEvent, WatchEvent, leaferTransformAttrMap };
+export { BoundsEvent, ChildEvent, Event, Eventer, ImageEvent, LayoutEvent, LeaferEvent, PropertyEvent, RenderEvent, ResizeEvent, WatchEvent, extraPropertyEventMap, leaferTransformAttrMap };