@leafer/display-module 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display-module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "@leafer/display-module",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,12 +22,12 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/helper": "1.0.0",
-    "@leafer/event": "1.0.0",
-    "@leafer/math": "1.0.0",
-    "@leafer/debug": "1.0.0"
+    "@leafer/helper": "1.0.1",
+    "@leafer/event": "1.0.1",
+    "@leafer/math": "1.0.1",
+    "@leafer/debug": "1.0.1"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0"
+    "@leafer/interface": "1.0.1"
   }
 }

package/src/LeafEventer.ts

@@ -1,14 +1,16 @@
-import { IEventListener, IEventListenerOptions, IEventListenerMap, IEventListenerItem, IEventListenerId, IEvent, IObject, IEventTarget, ILeafEventerModule } from '@leafer/interface'
+import { IEventListener, IEventListenerMap, IEventListenerItem, IEventListenerId, IEvent, IObject, IEventTarget, ILeafEventerModule, IEventOption } from '@leafer/interface'
 import { EventCreator } from '@leafer/platform'
 
 const empty = {}
 
 export const LeafEventer: ILeafEventerModule = {
 
-    on(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void {
+    on(type: string | string[], listener: IEventListener, options?: IEventOption): void {
         let capture: boolean, once: boolean
         if (options) {
-            if (typeof options === 'boolean') {
+            if (options === 'once') {
+                once = true
+            } else if (typeof options === 'boolean') {
                 capture = options
             } else {
                 capture = options.capture
@@ -33,7 +35,7 @@ export const LeafEventer: ILeafEventerModule = {
         })
     },
 
-    off(type?: string | string[], listener?: IEventListener, options?: IEventListenerOptions | boolean): void {
+    off(type?: string | string[], listener?: IEventListener, options?: IEventOption): void {
         if (type) {
 
             const typeList = typeof type === 'string' ? type.split(' ') : type
@@ -41,7 +43,7 @@ export const LeafEventer: ILeafEventerModule = {
             if (listener) {
 
                 let capture: boolean
-                if (options) capture = typeof options === 'boolean' ? options : options.capture
+                if (options) capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture)
 
                 let events: IEventListenerItem[], index: number
                 const map = __getListenerMap(this, capture)
@@ -76,7 +78,7 @@ export const LeafEventer: ILeafEventerModule = {
 
     },
 
-    on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId {
+    on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventOption): IEventListenerId {
         if (bind) listener = listener.bind(bind)
         this.on(type, listener, options)
         return { type, current: this, listener, options }

package/src/LeafMatrix.ts

@@ -22,7 +22,7 @@ export const LeafMatrix: ILeafMatrixModule = {
             if (layout.affectScaleOrRotation) {
 
                 if (layout.scaleChanged || layout.rotationChanged) {
-                    setLayout(local, data as ILayoutData, null, layout.affectRotation)
+                    setLayout(local, data as ILayoutData, null, null, layout.affectRotation)
                     layout.scaleChanged = layout.rotationChanged = false
                 }
 
@@ -33,7 +33,7 @@ export const LeafMatrix: ILeafMatrixModule = {
 
             if (data.around || data.origin) {
                 toPoint(data.around || data.origin, layout.boxBounds, tempPoint)
-                translateInner(local, -tempPoint.x, -tempPoint.y, data.origin as unknown as boolean)
+                translateInner(local, -tempPoint.x, -tempPoint.y, !data.around)
             }
 
         }