refactor(isOverflow)

Author: leaferjs

packages/display-module/data/src/TextData.ts

@@ -35,8 +35,7 @@ export class TextData extends UIData implements ITextData {
     }
 
     setBoxStyle(value: IUI) {
-        const t = this.__leaf as IText
-        let box = t.__box
+        let t = this.__leaf as IText, box = t.__box
 
         if (value) {
 
@@ -45,24 +44,16 @@ export class TextData extends UIData implements ITextData {
             else box = t.__box = UICreator.get('Rect', 0 as any) as IUI // 传递 0 可以优化内存占用
 
             const layout = t.__layout, boxLayout = box.__layout
-            if (!boxStyle) {
-                box.parent = t as any
-                box.__world = t.__world
-                boxLayout.boxBounds = layout.boxBounds
-            }
+            if (!boxStyle) box.parent = t as any, box.__world = t.__world, boxLayout.boxBounds = layout.boxBounds
 
             box.set(value)
             if (boxLayout.strokeChanged) layout.strokeChange()
             if (boxLayout.renderChanged) layout.renderChange()
             box.__updateChange()
 
-        } else {
-
-            if (box) {
-                t.__box = box.parent = null
-                box.destroy()
-            }
-
+        } else if (box) {
+            t.__box = box.parent = null
+            box.destroy()
         }
 
         this._boxStyle = value

packages/display/src/Box.ts

@@ -102,11 +102,11 @@ export class Box extends Group implements IBox {
             copy(childrenRenderBounds, renderBounds)
             this.__updateRectRenderBounds()
 
-            isOverflow = !includes(renderBounds, childrenRenderBounds)
+            isOverflow = !includes(renderBounds, childrenRenderBounds) || undefined
             if (isOverflow && this.__.overflow !== 'hide') add(renderBounds, childrenRenderBounds)
         } else this.__updateRectRenderBounds()
 
-        !this.isOverflow !== !isOverflow && (this.isOverflow = isOverflow) // 节省赋值
+        this.isOverflow !== isOverflow && (this.isOverflow = isOverflow) // 节省赋值
     }
 
     @rewrite(rect.__updateRenderBounds)

packages/display/src/Text.ts

@@ -153,13 +153,11 @@ export class Text extends UI implements IText {
 
         if (italic) b.width += fontSize * 0.16 // 倾斜会导致文本的bounds增大
 
-        const isOverflow = !includes(b, contentBounds)
-        if (isOverflow) {
-            setList(data.__textBoxBounds = {} as IBoundsData, [b, contentBounds])
-            layout.renderChanged = true
-        } else data.__textBoxBounds = b
+        const isOverflow = !includes(b, contentBounds) || undefined
+        if (isOverflow) setList(data.__textBoxBounds = {} as IBoundsData, [b, contentBounds]), layout.renderChanged = true
+        else data.__textBoxBounds = b
 
-        !this.isOverflow !== !isOverflow && (this.isOverflow = isOverflow) // 节省赋值
+        this.isOverflow !== isOverflow && (this.isOverflow = isOverflow) // 节省赋值
     }
 
     public __onUpdateSize(): void {
@@ -181,16 +179,13 @@ export class Text extends UI implements IText {
 
     public __draw(canvas: ILeaferCanvas, options: IRenderOptions, originCanvas?: ILeaferCanvas): void {
         const box = this.__box
-        if (box) {
-            box.__nowWorld = this.__nowWorld
-            box.__draw(canvas, options, originCanvas)
-        }
+        if (box) box.__nowWorld = this.__nowWorld, box.__draw(canvas, options, originCanvas)
         if (this.textEditing && !Export.running) return
         super.__draw(canvas, options, originCanvas)
     }
 
     public destroy(): void {
-        this.boxStyle = null
+        if (this.boxStyle) this.boxStyle = null
         super.destroy()
     }