@leafer/display-module 1.0.0-rc.22 → 1.0.0-rc.23

package/package.json

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

package/src/BranchRender.ts

@@ -22,6 +22,8 @@ export const BranchRender: IBranchRenderModule = {
 
             if (this.__.__single) {
 
+                if (this.__.eraser === 'path') return this.__renderEraser(canvas, options)
+
                 const tempCanvas = canvas.getSameCanvas(false, true)
 
                 this.__renderBranch(tempCanvas, options)

package/src/LeafBounds.ts

@@ -131,6 +131,9 @@ export const LeafBounds: ILeafBoundsModule = {
         this.__layout.matrixChanged = true
         if (this.isBranch) {
             if (this.leafer) this.leafer.layouter.addExtra(this) // add part render
+            if (this.__.flow) this.__updateFlowLayout()
+            // console.log('update flow')
+
             if (hasParentAutoLayout(this)) {
                 updateMatrix(this)
             } else {

package/src/LeafEventer.ts

@@ -33,24 +33,47 @@ export const LeafEventer: ILeafEventerModule = {
         })
     },
 
-    off(type: string | string[], listener: IEventListener, options?: IEventListenerOptions | boolean): void {
-        let capture: boolean
-        if (options) capture = typeof options === 'boolean' ? options : options.capture
+    off(type?: string | string[], listener?: IEventListener, options?: IEventListenerOptions | boolean): void {
+        if (type) {
 
-        let events: IEventListenerItem[], index: number
-        const map = __getListenerMap(this, capture)
-        const typeList = typeof type === 'string' ? type.split(' ') : type
+            const typeList = typeof type === 'string' ? type.split(' ') : type
+
+            if (listener) {
+
+                let capture: boolean
+                if (options) capture = typeof options === 'boolean' ? options : options.capture
+
+                let events: IEventListenerItem[], index: number
+                const map = __getListenerMap(this, capture)
+
+                typeList.forEach(type => {
+                    if (type) {
+                        events = map[type]
+                        if (events) {
+                            index = events.findIndex(item => item.listener === listener)
+                            if (index > -1) events.splice(index, 1)
+                            if (!events.length) delete map[type]
+                        }
+                    }
+                })
+
+            } else {
+
+                // off type
+                const { __bubbleMap: b, __captureMap: c } = this
+                typeList.forEach(type => {
+                    if (b) delete b[type]
+                    if (c) delete c[type]
+                })
 
-        typeList.forEach(type => {
-            if (type) {
-                events = map[type]
-                if (events) {
-                    index = events.findIndex(item => item.listener === listener)
-                    if (index > -1) events.splice(index, 1)
-                    if (!events.length) delete map[type]
-                }
             }
-        })
+
+        } else {
+
+            this.__bubbleMap = this.__captureMap = undefined  // off all
+
+        }
+
     },
 
     on_(type: string | string[], listener: IEventListener, bind?: IObject, options?: IEventListenerOptions | boolean): IEventListenerId {

package/src/LeafMatrix.ts

@@ -1,4 +1,4 @@
-import { ILeafMatrixModule, ILayoutData } from '@leafer/interface'
+import { ILeafMatrixModule, ILayoutData, IScrollPointData } from '@leafer/interface'
 import { AroundHelper, MatrixHelper } from '@leafer/math'
 
 
@@ -9,7 +9,7 @@ export const LeafMatrix: ILeafMatrixModule = {
 
     __updateWorldMatrix(): void {
 
-        multiplyParent(this.__local || this.__layout, this.parent ? this.parent.__world : defaultWorld, this.__world, !!this.__layout.affectScaleOrRotation, this.__ as ILayoutData)
+        multiplyParent(this.__local || this.__layout, this.parent ? this.parent.__world : defaultWorld, this.__world, !!this.__layout.affectScaleOrRotation, this.__ as ILayoutData, this.parent && this.parent.__ as IScrollPointData)
 
     },
 
@@ -28,12 +28,12 @@ export const LeafMatrix: ILeafMatrixModule = {
 
             }
 
-            local.e = data.x
-            local.f = data.y
+            local.e = data.x + data.offsetX
+            local.f = data.y + data.offsetY
 
-            if (data.around) {
-                toPoint(data.around, layout.boxBounds, tempPoint)
-                translateInner(local, -tempPoint.x, -tempPoint.y)
+            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)
             }
 
         }

package/src/LeafRender.ts

@@ -11,6 +11,8 @@ export const LeafRender: ILeafRenderModule = {
 
             if (this.__.__single) {
 
+                if (this.__.eraser === 'path') return this.__renderEraser(canvas, options)
+
                 const tempCanvas = canvas.getSameCanvas(true, true)
                 this.__draw(tempCanvas, options)