@leafer/layouter 1.0.0-alpha.10 → 1.0.0-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/layouter",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.23",
   "description": "@leafer/canvas",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,14 +19,14 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/event": "1.0.0-alpha.10",
-    "@leafer/math": "1.0.0-alpha.10",
-    "@leafer/list": "1.0.0-alpha.10",
-    "@leafer/data": "1.0.0-alpha.10",
-    "@leafer/helper": "1.0.0-alpha.10",
-    "@leafer/debug": "1.0.0-alpha.10"
+    "@leafer/event": "1.0.0-alpha.23",
+    "@leafer/math": "1.0.0-alpha.23",
+    "@leafer/list": "1.0.0-alpha.23",
+    "@leafer/data": "1.0.0-alpha.23",
+    "@leafer/helper": "1.0.0-alpha.23",
+    "@leafer/debug": "1.0.0-alpha.23"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-alpha.10"
+    "@leafer/interface": "1.0.0-alpha.23"
   }
 }

package/src/LayoutBlockData.ts

@@ -26,7 +26,7 @@ export class LayoutBlockData implements ILayoutBlockData {
 
     public setAfter(): void {
         setByListWithHandle(this.afterBounds, this.updatedList.list, worldBounds)
-        this.__computeChange()
+        this.updatedBounds.setByList([this.beforeBounds, this.afterBounds])
     }
 
     public merge(data: ILayoutBlockData): void {
@@ -36,15 +36,6 @@ export class LayoutBlockData implements ILayoutBlockData {
         this.updatedBounds.add(data.updatedBounds)
     }
 
-    protected __computeChange(): void {
-        const { updatedBounds: changedBounds } = this
-        changedBounds.setByList([this.beforeBounds, this.afterBounds])
-        if (!changedBounds.isEmpty()) {
-            changedBounds.spread(2)
-            changedBounds.ceil()
-        }
-    }
-
     public destroy(): void {
         this.updatedList = null
     }

package/src/Layouter.ts

@@ -54,13 +54,11 @@ export class Layouter implements ILayouter {
     public layout(): void {
         if (!this.running) return
         const { target } = this
-        const { LAYOUT, END } = LayoutEvent
         this.times = 0
         this.changed = false
         target.emit(LayoutEvent.START)
         this.layoutOnce()
-        target.emitEvent(new LayoutEvent(LAYOUT, this.layoutedBlocks))
-        target.emitEvent(new LayoutEvent(END, this.layoutedBlocks))
+        target.emitEvent(new LayoutEvent(LayoutEvent.END, this.layoutedBlocks))
         this.layoutedBlocks = null
     }
 
@@ -82,20 +80,21 @@ export class Layouter implements ILayouter {
 
         const t = Run.start('PartLayout')
         const { target, __updateList: updateList } = this
-        const { BEFORE_ONCE, ONCE, AFTER_ONCE } = LayoutEvent
+        const { BEFORE, LAYOUT, AFTER } = LayoutEvent
 
         const blocks = this.getBlocks(updateList)
         blocks.forEach(item => { item.setBefore() })
-        target.emitEvent(new LayoutEvent(BEFORE_ONCE, blocks))
+        target.emitEvent(new LayoutEvent(BEFORE, blocks))
 
         updateList.sort()
         updateMatrix(updateList, this.__levelList)
         updateBounds(this.__levelList)
         updateChange(updateList)
 
-        blocks.forEach(item => { item.setAfter() })
-        target.emitEvent(new LayoutEvent(ONCE, blocks))
-        target.emitEvent(new LayoutEvent(AFTER_ONCE, blocks))
+        blocks.forEach(item => item.setAfter())
+
+        target.emitEvent(new LayoutEvent(LAYOUT, blocks))
+        target.emitEvent(new LayoutEvent(AFTER, blocks))
 
         this.setBlocks(blocks)
 
@@ -110,16 +109,16 @@ export class Layouter implements ILayouter {
         const t = Run.start('FullLayout')
 
         const { target } = this
-        const { BEFORE_ONCE, ONCE, AFTER_ONCE } = LayoutEvent
+        const { BEFORE, LAYOUT, AFTER } = LayoutEvent
 
         const blocks = this.getBlocks(new LeafList(target))
-        target.emitEvent(new LayoutEvent(BEFORE_ONCE, blocks))
+        target.emitEvent(new LayoutEvent(BEFORE, blocks))
 
         Layouter.fullLayout(target)
 
         blocks.forEach(item => { item.setAfter() })
-        target.emitEvent(new LayoutEvent(ONCE, blocks))
-        target.emitEvent(new LayoutEvent(AFTER_ONCE, blocks))
+        target.emitEvent(new LayoutEvent(LAYOUT, blocks))
+        target.emitEvent(new LayoutEvent(AFTER, blocks))
 
         this.setBlocks(blocks)
 
@@ -156,7 +155,7 @@ export class Layouter implements ILayouter {
     }
 
     protected __checkAgain(): void {
-        if (this.changed && this.times <= this.config.partLayout.maxTimes) this.target.emit(LayoutEvent.AGAIN) // 防止更新布局过程中产生了属性修改
+        //if (this.changed && this.times <= this.config.partLayout.maxTimes) this.target.emit(LayoutEvent.AGAIN) // 防止更新布局过程中产生了属性修改
     }
 
     protected __onReceiveWatchData(event: WatchEvent): void {
@@ -179,6 +178,7 @@ export class Layouter implements ILayouter {
 
     public destroy(): void {
         if (this.target) {
+            this.stop()
             this.__removeListenEvents()
             this.target = null
         }

package/src/LayouterHelper.ts

@@ -11,7 +11,7 @@ export function updateMatrix(updateList: ILeafList, levelList: ILeafLevelList):
     let layout: ILeafLayout
     updateList.list.forEach(leaf => {  // 更新矩阵, 所有子元素，和父元素都需要更新bounds
         layout = leaf.__layout
-        if (levelList.without(leaf)) { // 防止重复， 子元素可能已经被父元素更新过
+        if (levelList.without(leaf) && !layout.useZoomProxy) { // 防止重复， 子元素可能已经被父元素更新过
 
             if (layout.matrixChanged) {