leafer-draw 1.11.2 → 1.12.0

package/dist/web.module.js

@@ -4056,16 +4056,27 @@ const ImageManager = {
     recycle(image) {
         image.use--;
         setTimeout(() => {
-            if (!image.use) I.recycledList.push(image);
+            if (!image.use) {
+                if (Platform.image.isLarge(image)) {
+                    if (image.url) Resource.remove(image.url);
+                } else {
+                    image.clearLevels();
+                    I.recycledList.push(image);
+                }
+            }
         });
     },
-    clearRecycled() {
+    recyclePaint(paint) {
+        I.recycle(paint.image);
+    },
+    clearRecycled(force) {
         const list = I.recycledList;
-        if (list.length > I.maxRecycled) {
-            list.forEach(image => !image.use && image.url && Resource.remove(image.url));
+        if (list.length > I.maxRecycled || force) {
+            list.forEach(image => (!image.use || force) && image.url && Resource.remove(image.url));
             list.length = 0;
         }
     },
+    clearLevels() {},
     hasAlphaPixel(config) {
         return FileHelper.alphaPixelTypes.some(item => I.isFormat(item, config));
     },
@@ -4080,7 +4091,7 @@ const ImageManager = {
         return false;
     },
     destroy() {
-        I.recycledList = [];
+        this.clearRecycled(true);
     }
 };
 
@@ -4183,11 +4194,15 @@ class LeaferImage {
         Platform.image.setPatternTransform(pattern, transform, paint);
         return pattern;
     }
+    clearLevels(_checkUse) {}
     destroy() {
+        this.clearLevels();
+        const {view: view} = this;
+        if (view && view.close) view.close();
         this.config = {
             url: ""
         };
-        this.cache = null;
+        this.cache = this.view = null;
         this.waitComplete.length = 0;
     }
 }
@@ -5966,6 +5981,7 @@ const LeafBounds = {
 const LeafRender = {
     __render(canvas, options) {
         if (options.shape) return this.__renderShape(canvas, options);
+        if (options.cellList && !options.cellList.has(this)) return;
         if (this.__worldOpacity) {
             const data = this.__;
             if (data.bright && !options.topRendering) return options.topList.add(this);
@@ -6864,7 +6880,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.11.2";
+const version = "1.12.0";
 
 const debug$4 = Debug.get("LeaferCanvas");
 
@@ -7187,7 +7203,7 @@ class Watcher {
         return this.hasAdd || this.hasRemove || this.hasVisible;
     }
     get updatedList() {
-        if (this.hasRemove) {
+        if (this.hasRemove && this.config.usePartLayout) {
             const updatedList = new LeafList;
             this.__updatedList.list.forEach(item => {
                 if (item.leafer) updatedList.add(item);
@@ -7222,16 +7238,18 @@ class Watcher {
         if (this.running) this.target.emit(RenderEvent.REQUEST);
     }
     __onAttrChange(event) {
-        this.__updatedList.add(event.target);
+        if (this.config.usePartLayout) this.__updatedList.add(event.target);
         this.update();
     }
     __onChildEvent(event) {
-        if (event.type === ChildEvent.ADD) {
-            this.hasAdd = true;
-            this.__pushChild(event.child);
-        } else {
-            this.hasRemove = true;
-            this.__updatedList.add(event.parent);
+        if (this.config.usePartLayout) {
+            if (event.type === ChildEvent.ADD) {
+                this.hasAdd = true;
+                this.__pushChild(event.child);
+            } else {
+                this.hasRemove = true;
+                this.__updatedList.add(event.parent);
+            }
         }
         this.update();
     }
@@ -7348,7 +7366,9 @@ const debug$3 = Debug.get("Layouter");
 class Layouter {
     constructor(target, userConfig) {
         this.totalTimes = 0;
-        this.config = {};
+        this.config = {
+            usePartLayout: true
+        };
         this.__levelList = new LeafLevelList;
         this.target = target;
         if (userConfig) this.config = DataHelper.default(userConfig, this.config);
@@ -7393,7 +7413,7 @@ class Layouter {
         this.totalTimes++;
         this.layouting = true;
         this.target.emit(WatchEvent.REQUEST);
-        if (this.totalTimes > 1) {
+        if (this.totalTimes > 1 && this.config.usePartLayout) {
             this.partLayout();
         } else {
             this.fullLayout();
@@ -7510,7 +7530,7 @@ class Renderer {
     }
     update(change = true) {
         if (!this.changed) this.changed = change;
-        this.__requestRender();
+        if (!this.requestTime) this.__requestRender();
     }
     requestLayout() {
         this.target.emit(LayoutEvent.REQUEST);
@@ -7617,7 +7637,7 @@ class Renderer {
         Run.end(t);
     }
     __render(bounds, realBounds) {
-        const {canvas: canvas} = this, includes = bounds.includes(this.target.__world), options = includes ? {
+        const {canvas: canvas, target: target} = this, includes = bounds.includes(target.__world), options = includes ? {
             includes: includes
         } : {
             bounds: bounds,
@@ -7625,12 +7645,16 @@ class Renderer {
         };
         if (this.needFill) canvas.fillWorld(bounds, this.config.fill);
         if (Debug.showRepaint) Debug.drawRepaint(canvas, bounds);
-        Platform.render(this.target, canvas, options);
+        if (this.config.useCellRender) options.cellList = this.getCellList();
+        Platform.render(target, canvas, options);
         this.renderBounds = realBounds = realBounds || bounds;
         this.renderOptions = options;
         this.totalBounds.isEmpty() ? this.totalBounds = realBounds : this.totalBounds.add(realBounds);
         canvas.updateRender(realBounds);
     }
+    getCellList() {
+        return undefined;
+    }
     addBlock(block) {
         if (!this.updateBlocks) this.updateBlocks = [];
         this.updateBlocks.push(block);
@@ -8091,6 +8115,11 @@ class TextData extends UIData {
         }
         this._boxStyle = value;
     }
+    __getInputData(names, options) {
+        const data = super.__getInputData(names, options);
+        if (data.textEditing) delete data.textEditing;
+        return data;
+    }
 }
 
 class ImageData extends RectData {
@@ -9937,6 +9966,7 @@ function getLeafPaint(attrName, paint, ui) {
     const {boxBounds: boxBounds} = ui.__layout;
     switch (paint.type) {
       case "image":
+        if (!paint.url) return undefined;
         leafPaint = PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url]);
         break;
 
@@ -10341,7 +10371,7 @@ function checkImage(paint, drawImage, ui, canvas, renderOptions) {
             if (data.repeat) {
                 drawImage = false;
             } else if (!(originPaint.changeful || Platform.name === "miniapp" && ResizeEvent.isResizing(ui) || exporting)) {
-                drawImage = Platform.image.isLarge(image, scaleX, scaleY);
+                drawImage = Platform.image.isLarge(image, scaleX, scaleY) || image.width * scaleX > 8096 || image.height * scaleY > 8096;
             }
         }
         if (drawImage) {
@@ -10400,7 +10430,7 @@ function recycleImage(attrName, data) {
             if (url) {
                 if (!recycleMap) recycleMap = {};
                 recycleMap[url] = true;
-                ImageManager.recycle(image);
+                ImageManager.recyclePaint(paint);
                 if (image.loading) {
                     if (!input) {
                         input = data.__input && data.__input[attrName] || [];