@leafer-ui/display 1.9.2 → 1.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "@leafer-ui/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,14 +22,14 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.9.2",
-    "@leafer-ui/data": "1.9.2",
-    "@leafer-ui/display-module": "1.9.2",
-    "@leafer-ui/decorator": "1.9.2",
-    "@leafer-ui/external": "1.9.2"
+    "@leafer/core": "1.9.4",
+    "@leafer-ui/data": "1.9.4",
+    "@leafer-ui/display-module": "1.9.4",
+    "@leafer-ui/decorator": "1.9.4",
+    "@leafer-ui/external": "1.9.4"
   },
   "devDependencies": {
-    "@leafer/interface": "1.9.2",
-    "@leafer-ui/interface": "1.9.2"
+    "@leafer/interface": "1.9.4",
+    "@leafer-ui/interface": "1.9.4"
   }
 }

package/src/Box.ts

@@ -40,7 +40,7 @@ export class Box extends Group implements IBox {
 
     public isOverflow?: boolean
 
-    // scroller rewrite
+    // scroller will rewrite
     public scrollConfig?: IScrollConfig
 
     public scroller?: IScroller
@@ -99,39 +99,36 @@ export class Box extends Group implements IBox {
     public __updateStrokeBounds(): void { }
 
     public __updateRenderBounds(): void {
-        let isOverflow: boolean
+        let isOverflow: boolean, isScrollMode: boolean
 
         if (this.children.length) {
-            const data = this.__, layout = this.__layout, { renderBounds, boxBounds } = layout
+            const data = this.__, layout = this.__layout, { renderBounds, boxBounds } = layout, { overflow } = data
 
             const childrenRenderBounds = layout.childrenRenderBounds || (layout.childrenRenderBounds = getBoundsData())
             super.__updateRenderBounds(childrenRenderBounds)
-            scroll(childrenRenderBounds, data as IScrollPointData)  // 增加滚动逻辑
+
+            if (isScrollMode = overflow.includes('scroll')) {  // 检查滚动逻辑
+                add(childrenRenderBounds, boxBounds)
+                scroll(childrenRenderBounds, data as IScrollPointData)
+            }
 
             this.__updateRectRenderBounds()
 
             isOverflow = !includes(boxBounds, childrenRenderBounds)
-            if (isOverflow && data.overflow === 'show') add(renderBounds, childrenRenderBounds)
+            if (isOverflow && overflow === 'show') add(renderBounds, childrenRenderBounds)
         } else this.__updateRectRenderBounds()
 
         DataHelper.stintSet(this, 'isOverflow', isOverflow)
 
-        this.__checkScroll()
+        this.__checkScroll(isScrollMode)
     }
 
     @rewrite(rect.__updateRenderBounds)
     public __updateRectRenderBounds(): void { }
 
-    public __updateWorldBounds(): void {
-        if (this.hasScroller) this.__updateScroll()
-        super.__updateWorldBounds()
-    }
-
 
     //  scroller will rewrite
-    public __checkScroll(): void { }
-
-    public __updateScroll(): void { }
+    public __checkScroll(_isScrollMode: boolean): void { }
 
 
     @rewrite(rect.__updateChange)

package/types/index.d.ts

@@ -298,9 +298,7 @@ declare class Box extends Group implements IBox {
     __updateStrokeBounds(): void;
     __updateRenderBounds(): void;
     __updateRectRenderBounds(): void;
-    __updateWorldBounds(): void;
-    __checkScroll(): void;
-    __updateScroll(): void;
+    __checkScroll(_isScrollMode: boolean): void;
     __updateRectChange(): void;
     __updateChange(): void;
     __renderRect(_canvas: ILeaferCanvas, _options: IRenderOptions): void;