@leafer/layouter 1.0.0-rc.6 → 1.0.0-rc.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/layouter",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.8",
   "description": "@leafer/canvas",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,9 +22,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.6"
+    "@leafer/core": "1.0.0-rc.8"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.6"
+    "@leafer/interface": "1.0.0-rc.8"
   }
 }

package/src/LayoutBlockData.ts

@@ -1,9 +1,9 @@
 import { IBounds, ILayoutBlockData, ILeafList, ILeaf } from '@leafer/interface'
-import { Bounds, BoundsHelper, LeafBoundsHelper, LeafList } from '@leafer/core'
+import { Bounds, LeafBoundsHelper, LeafList } from '@leafer/core'
 
 
 const { worldBounds } = LeafBoundsHelper
-const { setByListWithHandle } = BoundsHelper
+const bigBounds = { x: 0, y: 0, width: 100000, height: 100000 }
 
 export class LayoutBlockData implements ILayoutBlockData {
 
@@ -19,16 +19,22 @@ export class LayoutBlockData implements ILayoutBlockData {
     }
 
     public setBefore(): void {
-        setByListWithHandle(this.beforeBounds, this.updatedList.list, worldBounds)
+        this.beforeBounds.setListWithFn(this.updatedList.list, worldBounds)
     }
 
     public setAfter(): void {
-        setByListWithHandle(this.afterBounds, this.updatedList.list, worldBounds)
-        this.updatedBounds.setByList([this.beforeBounds, this.afterBounds])
+        const { list } = this.updatedList
+        if (list.some(leaf => leaf.noBounds)) {
+            this.afterBounds.set(bigBounds)
+        } else {
+            this.afterBounds.setListWithFn(list, worldBounds)
+        }
+
+        this.updatedBounds.setList([this.beforeBounds, this.afterBounds])
     }
 
     public merge(data: ILayoutBlockData): void {
-        this.updatedList.pushList(data.updatedList.list)
+        this.updatedList.addList(data.updatedList.list)
         this.beforeBounds.add(data.beforeBounds)
         this.afterBounds.add(data.afterBounds)
         this.updatedBounds.add(data.updatedBounds)

package/src/Layouter.ts

@@ -1,12 +1,11 @@
 import { ILayouter, ILeaf, ILayoutBlockData, IEventListenerId, ILayouterConfig, ILeafList } from '@leafer/interface'
 import { LayoutEvent, WatchEvent, LeafLevelList, LeafList, BranchHelper, LeafHelper, DataHelper, Run, Debug } from '@leafer/core'
 
-import { updateBounds, updateMatrix, updateChange } from './LayouterHelper'
+import { updateMatrix, updateBounds, updateChange } from './LayouterHelper'
 import { LayoutBlockData } from './LayoutBlockData'
 
 
-const { updateAllWorldMatrix, updateAllChange } = LeafHelper
-const { pushAllBranchStack, updateWorldBoundsByBranchStack } = BranchHelper
+const { updateAllMatrix, updateAllChange } = LeafHelper
 
 const debug = Debug.get('Layouter')
 
@@ -14,6 +13,7 @@ export class Layouter implements ILayouter {
 
     public target: ILeaf
     public layoutedBlocks: ILayoutBlockData[]
+    public extraBlock: ILayoutBlockData // around / autoLayout
 
     public totalTimes: number = 0
     public times: number
@@ -76,7 +76,6 @@ export class Layouter implements ILayouter {
     }
 
     public layoutOnce(): void {
-
         if (this.layouting) return debug.warn('layouting')
         if (this.times > 3) return debug.warn('layout max times')
 
@@ -99,7 +98,6 @@ export class Layouter implements ILayouter {
             this.waitAgain = false
             this.layoutOnce()
         }
-
     }
 
     public partLayout(): void {
@@ -110,14 +108,16 @@ export class Layouter implements ILayouter {
         const { BEFORE, LAYOUT, AFTER } = LayoutEvent
 
         const blocks = this.getBlocks(updateList)
-        blocks.forEach(item => { item.setBefore() })
+        blocks.forEach(item => item.setBefore())
         target.emitEvent(new LayoutEvent(BEFORE, blocks, this.times))
 
+        this.extraBlock = null
         updateList.sort()
         updateMatrix(updateList, this.__levelList)
         updateBounds(this.__levelList)
         updateChange(updateList)
 
+        if (this.extraBlock) blocks.push(this.extraBlock)
         blocks.forEach(item => item.setAfter())
 
         target.emitEvent(new LayoutEvent(LAYOUT, blocks, this.times))
@@ -128,7 +128,6 @@ export class Layouter implements ILayouter {
         this.__levelList.reset()
         this.__updatedList = null
         Run.end(t)
-
     }
 
     public fullLayout(): void {
@@ -149,23 +148,25 @@ export class Layouter implements ILayouter {
         this.addBlocks(blocks)
 
         Run.end(t)
-
     }
 
     static fullLayout(target: ILeaf): void {
-        updateAllWorldMatrix(target)
+        updateAllMatrix(target, true)
 
         if (target.isBranch) {
-            const branchStack: ILeaf[] = [target]
-            pushAllBranchStack(target, branchStack)
-            updateWorldBoundsByBranchStack(branchStack)
+            BranchHelper.updateBounds(target)
         } else {
-            target.__updateWorldBounds()
+            LeafHelper.updateBounds(target)
         }
 
         updateAllChange(target)
     }
 
+    public addExtra(leaf: ILeaf): void {
+        const block = this.extraBlock || (this.extraBlock = new LayoutBlockData([]))
+        block.updatedList.add(leaf)
+        block.beforeBounds.add(leaf.__world)
+    }
 
     public createBlock(data: ILeafList | ILeaf[]): ILayoutBlockData {
         return new LayoutBlockData(data)
@@ -200,8 +201,7 @@ export class Layouter implements ILayouter {
         if (this.target) {
             this.stop()
             this.__removeListenEvents()
-            this.target = null
-            this.config = null
+            this.target = this.config = null
         }
     }
 

package/src/LayouterHelper.ts

@@ -1,8 +1,8 @@
-import { ILeaf, ILeafLayout, ILeafLevelList, ILeafList } from '@leafer/interface'
+import { ILeafLayout, ILeafLevelList, ILeafList, ILeaf } from '@leafer/interface'
 import { BranchHelper, LeafHelper } from '@leafer/core'
 
 
-const { updateAllWorldMatrix, updateAllWorldOpacity } = LeafHelper
+const { updateAllMatrix, updateBounds: updateOneBounds, updateAllWorldOpacity } = LeafHelper
 const { pushAllChildBranch, pushAllParent } = BranchHelper
 
 
@@ -15,15 +15,15 @@ export function updateMatrix(updateList: ILeafList, levelList: ILeafLevelList):
 
             if (layout.matrixChanged) {
 
-                updateAllWorldMatrix(leaf)
+                updateAllMatrix(leaf, true)
 
-                levelList.push(leaf)
+                levelList.add(leaf)
                 if (leaf.isBranch) pushAllChildBranch(leaf, levelList)
                 pushAllParent(leaf, levelList)
 
             } else if (layout.boundsChanged) {
 
-                levelList.push(leaf)
+                levelList.add(leaf)
                 if (leaf.isBranch) leaf.__tempNumber = 0  // 标识需要更新子Leaf元素的WorldBounds分支, 0表示不需要更新
                 pushAllParent(leaf, levelList)
             }
@@ -32,30 +32,26 @@ export function updateMatrix(updateList: ILeafList, levelList: ILeafLevelList):
 
 }
 
-
 export function updateBounds(boundsList: ILeafLevelList): void {
-
-    let itemList: ILeaf[], branch: ILeaf
+    let list: ILeaf[], branch: ILeaf, children: ILeaf[]
     boundsList.sort(true)
     boundsList.levels.forEach(level => {
-        itemList = boundsList.levelMap[level]
-        for (let i = 0, len = itemList.length; i < len; i++) {
-            branch = itemList[i]
+        list = boundsList.levelMap[level]
+        for (let i = 0, len = list.length; i < len; i++) {
+            branch = list[i]
 
             // 标识了需要更新子元素
             if (branch.isBranch && branch.__tempNumber) {
-                for (let j = 0, jLen = branch.children.length; j < jLen; j++) {
-                    if (!branch.children[j].isBranch) {
-                        branch.children[j].__updateWorldBounds()
+                children = branch.children
+                for (let j = 0, jLen = children.length; j < jLen; j++) {
+                    if (!children[j].isBranch) {
+                        updateOneBounds(children[j])
                     }
                 }
             }
-
-            branch.__updateWorldBounds()
-
+            updateOneBounds(branch)
         }
     })
-
 }
 
 

package/types/index.d.ts

@@ -4,6 +4,7 @@ import { LeafLevelList, WatchEvent } from '@leafer/core';
 declare class Layouter implements ILayouter {
     target: ILeaf;
     layoutedBlocks: ILayoutBlockData[];
+    extraBlock: ILayoutBlockData;
     totalTimes: number;
     times: number;
     disabled: boolean;
@@ -24,6 +25,7 @@ declare class Layouter implements ILayouter {
     partLayout(): void;
     fullLayout(): void;
     static fullLayout(target: ILeaf): void;
+    addExtra(leaf: ILeaf): void;
     createBlock(data: ILeafList | ILeaf[]): ILayoutBlockData;
     getBlocks(list: ILeafList): ILayoutBlockData[];
     addBlocks(current: ILayoutBlockData[]): void;