@leafer/layouter 1.6.1 → 1.6.3

package/package.json

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

package/src/Layouter.ts

@@ -52,7 +52,7 @@ export class Layouter implements ILayouter {
     }
 
     public layout(): void {
-        if (!this.running) return
+        if (this.layouting || !this.running) return
         const { target } = this
         this.times = 0
 
@@ -153,11 +153,8 @@ export class Layouter implements ILayouter {
     static fullLayout(target: ILeaf): void {
         updateAllMatrix(target, true)
 
-        if (target.isBranch) {
-            BranchHelper.updateBounds(target)
-        } else {
-            LeafHelper.updateBounds(target)
-        }
+        if (target.isBranch) BranchHelper.updateBounds(target)
+        else LeafHelper.updateBounds(target)
 
         updateAllChange(target)
     }
@@ -187,11 +184,12 @@ export class Layouter implements ILayouter {
     }
 
     protected __listenEvents(): void {
-        const { target } = this
         this.__eventIds = [
-            target.on_(LayoutEvent.REQUEST, this.layout, this),
-            target.on_(LayoutEvent.AGAIN, this.layoutAgain, this),
-            target.on_(WatchEvent.DATA, this.__onReceiveWatchData, this)
+            this.target.on_([
+                [LayoutEvent.REQUEST, this.layout, this],
+                [LayoutEvent.AGAIN, this.layoutAgain, this],
+                [WatchEvent.DATA, this.__onReceiveWatchData, this]
+            ])
         ]
     }
 

package/src/LayouterHelper.ts

@@ -2,7 +2,7 @@ import { ILeafLayout, ILeafLevelList, ILeafList, ILeaf } from '@leafer/interface
 import { BranchHelper, LeafHelper } from '@leafer/core'
 
 
-const { updateAllMatrix, updateBounds: updateOneBounds, updateAllWorldOpacity } = LeafHelper
+const { updateAllMatrix, updateBounds: updateOneBounds, updateChange: updateOneChange } = LeafHelper
 const { pushAllChildBranch, pushAllParent } = BranchHelper
 
 
@@ -56,11 +56,5 @@ export function updateBounds(boundsList: ILeafLevelList): void {
 
 
 export function updateChange(updateList: ILeafList): void {
-    let layout: ILeafLayout
-    updateList.list.forEach(leaf => {
-        layout = leaf.__layout
-        if (layout.opacityChanged) updateAllWorldOpacity(leaf)
-        if (layout.stateStyleChanged) setTimeout(() => layout.stateStyleChanged && leaf.updateState())
-        leaf.__updateChange()
-    })
+    updateList.list.forEach(updateOneChange)
 }