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

package/package.json

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

package/src/LeafBounds.ts

@@ -4,7 +4,7 @@ import { PathBounds } from '@leafer/path'
 import { BranchHelper, LeafHelper } from '@leafer/helper'
 
 
-const { updateMatrix, updateAllMatrix, hasParentAutoLayout } = LeafHelper
+const { updateMatrix, updateAllMatrix } = LeafHelper
 const { updateBounds } = BranchHelper
 const { toOuterOf, copyAndSpread, copy } = BoundsHelper
 const { toBounds } = PathBounds
@@ -32,7 +32,6 @@ export const LeafBounds: ILeafBoundsModule = {
             this.__updateRenderPath()
 
             this.__updateBoxBounds()
-            layout.boxChanged = false
             layout.resized = true
         }
 
@@ -48,15 +47,16 @@ export const LeafBounds: ILeafBoundsModule = {
         }
 
 
+        layout.boxChanged = false // must after updateLocalBoxBounds()
+
+
         if (layout.strokeChanged) {
 
             layout.strokeSpread = this.__updateStrokeSpread()
 
             if (layout.strokeSpread) {
 
-                if (layout.strokeBounds === layout.boxBounds) {
-                    layout.spreadStroke()
-                }
+                if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke()
 
                 this.__updateStrokeBounds()
                 this.__updateLocalStrokeBounds()
@@ -66,7 +66,7 @@ export const LeafBounds: ILeafBoundsModule = {
             }
 
             layout.strokeChanged = false
-            if (layout.renderSpread) layout.renderChanged = true
+            if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true
 
             if (this.parent) this.parent.__layout.strokeChange()
             layout.resized = true
@@ -79,9 +79,7 @@ export const LeafBounds: ILeafBoundsModule = {
 
             if (layout.renderSpread) {
 
-                if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) {
-                    layout.spreadRender()
-                }
+                if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender()
 
                 this.__updateRenderBounds()
                 this.__updateLocalRenderBounds()
@@ -100,7 +98,7 @@ export const LeafBounds: ILeafBoundsModule = {
     },
 
     __updateLocalBoxBounds(): void {
-        if (this.__hasAutoLayout) this.__updateAutoLayout()
+        if (this.__hasAutoLayout) this.__updateAutoLayout() //  origin / around / flow
         toOuterOf(this.__layout.boxBounds, this.__local, this.__local)
     },
 
@@ -130,16 +128,24 @@ export const LeafBounds: ILeafBoundsModule = {
     __updateAutoLayout(): void {
         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 (this.leafer && this.leafer.ready) this.leafer.layouter.addExtra(this) // add part 
+
+            if (this.__.flow) {
+
+                if (this.__layout.boxChanged) this.__updateFlowLayout()
+
+                updateAllMatrix(this)
+                updateBounds(this, this)
+
+                if (this.__.__autoSide) this.__updateBoxBounds()
 
-            if (hasParentAutoLayout(this)) {
-                updateMatrix(this)
             } else {
+
                 updateAllMatrix(this)
                 updateBounds(this, this)
+
             }
+
         } else {
             updateMatrix(this)
         }
@@ -152,12 +158,13 @@ export const LeafBounds: ILeafBoundsModule = {
     },
 
     __updateStrokeBounds(): void {
-        copyAndSpread(this.__layout.strokeBounds, this.__layout.boxBounds, this.__layout.strokeSpread)
+        const layout = this.__layout
+        copyAndSpread(layout.strokeBounds, layout.boxBounds, layout.strokeBoxSpread)
     },
 
     __updateRenderBounds(): void {
-        const { renderSpread, strokeBounds, renderBounds } = this.__layout
-        renderSpread > 0 ? copyAndSpread(renderBounds, strokeBounds, renderSpread) : copy(renderBounds, strokeBounds) // Box use -1
-    },
+        const layout = this.__layout
+        layout.renderSpread > 0 ? copyAndSpread(layout.renderBounds, layout.boxBounds, layout.renderSpread) : copy(layout.renderBounds, layout.strokeBounds) // Box use -1
+    }
 
 }