@leafer-draw/miniapp 1.2.2 → 1.3.1

package/dist/miniapp.cjs

@@ -415,7 +415,7 @@ class LayoutBlockData {
 }
 
 const { updateAllMatrix, updateAllChange } = core.LeafHelper;
-const debug$2 = core.Debug.get('Layouter');
+const debug$1 = core.Debug.get('Layouter');
 class Layouter {
     constructor(target, userConfig) {
         this.totalTimes = 0;
@@ -450,7 +450,7 @@ class Layouter {
             target.emitEvent(new core.LayoutEvent(core.LayoutEvent.END, this.layoutedBlocks, this.times));
         }
         catch (e) {
-            debug$2.error(e);
+            debug$1.error(e);
         }
         this.layoutedBlocks = null;
     }
@@ -464,9 +464,9 @@ class Layouter {
     }
     layoutOnce() {
         if (this.layouting)
-            return debug$2.warn('layouting');
+            return debug$1.warn('layouting');
         if (this.times > 3)
-            return debug$2.warn('layout max times');
+            return debug$1.warn('layout max times');
         this.times++;
         this.totalTimes++;
         this.layouting = true;
@@ -570,7 +570,7 @@ class Layouter {
     }
 }
 
-const debug$1 = core.Debug.get('Renderer');
+const debug = core.Debug.get('Renderer');
 class Renderer {
     get needFill() { return !!(!this.canvas.allowBackgroundColor && this.config.fill); }
     constructor(target, canvas, userConfig) {
@@ -608,7 +608,7 @@ class Renderer {
         const { target } = this;
         this.times = 0;
         this.totalBounds = new core.Bounds();
-        debug$1.log(target.innerName, '--->');
+        debug.log(target.innerName, '--->');
         try {
             if (!target.isApp)
                 target.app.emit(core.RenderEvent.CHILD_START, target);
@@ -619,9 +619,9 @@ class Renderer {
         }
         catch (e) {
             this.rendering = false;
-            debug$1.error(e);
+            debug.error(e);
         }
-        debug$1.log('-------------|');
+        debug.log('-------------|');
     }
     renderAgain() {
         if (this.rendering) {
@@ -633,9 +633,9 @@ class Renderer {
     }
     renderOnce(callback) {
         if (this.rendering)
-            return debug$1.warn('rendering');
+            return debug.warn('rendering');
         if (this.times > 3)
-            return debug$1.warn('render max times');
+            return debug.warn('render max times');
         this.times++;
         this.totalTimes++;
         this.rendering = true;
@@ -672,7 +672,7 @@ class Renderer {
     partRender() {
         const { canvas, updateBlocks: list } = this;
         if (!list)
-            return debug$1.warn('PartRender: need update attr');
+            return debug.warn('PartRender: need update attr');
         this.mergeBlocks();
         list.forEach(block => { if (canvas.bounds.hit(block) && !block.isEmpty())
             this.clipRender(block); });
@@ -775,7 +775,7 @@ class Renderer {
                         empty = (!leaf.__world.width || !leaf.__world.height);
                         if (empty) {
                             if (!leaf.isLeafer)
-                                debug$1.tip(leaf.innerName, ': empty');
+                                debug.tip(leaf.innerName, ': empty');
                             empty = (!leaf.isBranch || leaf.isBranchLeaf);
                         }
                         return empty;
@@ -2327,197 +2327,12 @@ const ColorConvertModule = {
     string
 };
 
-const { setPoint, addPoint, toBounds } = core.TwoPointBoundsHelper;
-function getTrimBounds(canvas) {
-    const { width, height } = canvas.view;
-    const { data } = canvas.context.getImageData(0, 0, width, height);
-    let x, y, pointBounds, index = 0;
-    for (let i = 0; i < data.length; i += 4) {
-        if (data[i + 3] !== 0) {
-            x = index % width;
-            y = (index - x) / width;
-            pointBounds ? addPoint(pointBounds, x, y) : setPoint(pointBounds = {}, x, y);
-        }
-        index++;
-    }
-    const bounds = new core.Bounds();
-    toBounds(pointBounds, bounds);
-    return bounds.scale(1 / canvas.pixelRatio).ceil();
-}
-
-const ExportModule = {
-    export(leaf, filename, options) {
-        this.running = true;
-        const fileType = core.FileHelper.fileType(filename);
-        const isDownload = filename.includes('.');
-        options = core.FileHelper.getExportOptions(options);
-        return addTask((success) => new Promise((resolve) => {
-            const over = (result) => {
-                success(result);
-                resolve();
-                this.running = false;
-            };
-            const { toURL } = core.Platform;
-            const { download } = core.Platform.origin;
-            if (fileType === 'json') {
-                isDownload && download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename);
-                return over({ data: isDownload ? true : leaf.toJSON(options.json) });
-            }
-            if (fileType === 'svg') {
-                isDownload && download(toURL(leaf.toSVG(), 'svg'), filename);
-                return over({ data: isDownload ? true : leaf.toSVG() });
-            }
-            const { leafer } = leaf;
-            if (leafer) {
-                checkLazy(leaf);
-                leafer.waitViewCompleted(() => __awaiter(this, void 0, void 0, function* () {
-                    let renderBounds, trimBounds, scaleX = 1, scaleY = 1;
-                    const { worldTransform, isLeafer, isFrame } = leaf;
-                    const { slice, trim, onCanvas } = options;
-                    const smooth = options.smooth === undefined ? leafer.config.smooth : options.smooth;
-                    const contextSettings = options.contextSettings || leafer.config.contextSettings;
-                    const screenshot = options.screenshot || leaf.isApp;
-                    const fill = (isLeafer && screenshot) ? (options.fill === undefined ? leaf.fill : options.fill) : options.fill;
-                    const needFill = core.FileHelper.isOpaqueImage(filename) || fill, matrix = new core.Matrix();
-                    if (screenshot) {
-                        renderBounds = screenshot === true ? (isLeafer ? leafer.canvas.bounds : leaf.worldRenderBounds) : screenshot;
-                    }
-                    else {
-                        let relative = options.relative || (isLeafer ? 'inner' : 'local');
-                        scaleX = worldTransform.scaleX;
-                        scaleY = worldTransform.scaleY;
-                        switch (relative) {
-                            case 'inner':
-                                matrix.set(worldTransform);
-                                break;
-                            case 'local':
-                                matrix.set(worldTransform).divide(leaf.localTransform);
-                                scaleX /= leaf.scaleX;
-                                scaleY /= leaf.scaleY;
-                                break;
-                            case 'world':
-                                scaleX = 1;
-                                scaleY = 1;
-                                break;
-                            case 'page':
-                                relative = leaf.leafer;
-                            default:
-                                matrix.set(worldTransform).divide(leaf.getTransform(relative));
-                                const l = relative.worldTransform;
-                                scaleX /= scaleX / l.scaleX;
-                                scaleY /= scaleY / l.scaleY;
-                        }
-                        renderBounds = leaf.getBounds('render', relative);
-                    }
-                    const scaleData = { scaleX: 1, scaleY: 1 };
-                    core.MathHelper.getScaleData(options.scale, options.size, renderBounds, scaleData);
-                    let pixelRatio = options.pixelRatio || 1;
-                    if (leaf.isApp) {
-                        scaleData.scaleX *= pixelRatio;
-                        scaleData.scaleY *= pixelRatio;
-                        pixelRatio = leaf.app.pixelRatio;
-                    }
-                    const { x, y, width, height } = new core.Bounds(renderBounds).scale(scaleData.scaleX, scaleData.scaleY);
-                    const renderOptions = { matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY) };
-                    let canvas = core.Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio, smooth, contextSettings });
-                    let sliceLeaf;
-                    if (slice) {
-                        sliceLeaf = leaf;
-                        sliceLeaf.__worldOpacity = 0;
-                        leaf = leafer;
-                        renderOptions.bounds = canvas.bounds;
-                    }
-                    canvas.save();
-                    if (isFrame && fill !== undefined) {
-                        const oldFill = leaf.get('fill');
-                        leaf.fill = '';
-                        leaf.__render(canvas, renderOptions);
-                        leaf.fill = oldFill;
-                    }
-                    else {
-                        leaf.__render(canvas, renderOptions);
-                    }
-                    canvas.restore();
-                    if (sliceLeaf)
-                        sliceLeaf.__updateWorldOpacity();
-                    if (trim) {
-                        trimBounds = getTrimBounds(canvas);
-                        const old = canvas, { width, height } = trimBounds;
-                        const config = { x: 0, y: 0, width, height, pixelRatio };
-                        canvas = core.Creator.canvas(config);
-                        canvas.copyWorld(old, trimBounds, config);
-                    }
-                    if (needFill)
-                        canvas.fillWorld(canvas.bounds, fill || '#FFFFFF', 'destination-over');
-                    if (onCanvas)
-                        onCanvas(canvas);
-                    const data = filename === 'canvas' ? canvas : yield canvas.export(filename, options);
-                    over({ data, width: canvas.pixelWidth, height: canvas.pixelHeight, renderBounds, trimBounds });
-                }));
-            }
-            else {
-                over({ data: false });
-            }
-        }));
-    }
-};
-let tasker;
-function addTask(task) {
-    if (!tasker)
-        tasker = new core.TaskProcessor();
-    return new Promise((resolve) => {
-        tasker.add(() => __awaiter(this, void 0, void 0, function* () { return yield task(resolve); }), { parallel: false });
-    });
-}
-function checkLazy(leaf) {
-    if (leaf.__.__needComputePaint)
-        leaf.__.__computePaint();
-    if (leaf.isBranch)
-        leaf.children.forEach(child => checkLazy(child));
-}
-
-const canvas = core.LeaferCanvasBase.prototype;
-const debug = core.Debug.get('@leafer-ui/export');
-canvas.export = function (filename, options) {
-    const { quality, blob } = core.FileHelper.getExportOptions(options);
-    if (filename.includes('.'))
-        return this.saveAs(filename, quality);
-    else if (blob)
-        return this.toBlob(filename, quality);
-    else
-        return this.toDataURL(filename, quality);
-};
-canvas.toBlob = function (type, quality) {
-    return new Promise((resolve) => {
-        core.Platform.origin.canvasToBolb(this.view, type, quality).then((blob) => {
-            resolve(blob);
-        }).catch((e) => {
-            debug.error(e);
-            resolve(null);
-        });
-    });
-};
-canvas.toDataURL = function (type, quality) {
-    return core.Platform.origin.canvasToDataURL(this.view, type, quality);
-};
-canvas.saveAs = function (filename, quality) {
-    return new Promise((resolve) => {
-        core.Platform.origin.canvasSaveAs(this.view, filename, quality).then(() => {
-            resolve(true);
-        }).catch((e) => {
-            debug.error(e);
-            resolve(false);
-        });
-    });
-};
-
 Object.assign(draw.TextConvert, TextConvertModule);
 Object.assign(draw.ColorConvert, ColorConvertModule);
 Object.assign(draw.Paint, PaintModule);
 Object.assign(draw.PaintImage, PaintImageModule);
 Object.assign(draw.PaintGradient, PaintGradientModule);
 Object.assign(draw.Effect, EffectModule);
-Object.assign(draw.Export, ExportModule);
 
 try {
     if (wx)

package/dist/miniapp.esm.js

@@ -1,4 +1,4 @@
-import { LeaferCanvasBase, Platform, canvasPatch, DataHelper, canvasSizeAttrs, ResizeEvent, Creator, LeaferImage, defineKey, FileHelper, LeafList, RenderEvent, ChildEvent, WatchEvent, PropertyEvent, LeafHelper, BranchHelper, Bounds, LeafBoundsHelper, Debug, LeafLevelList, LayoutEvent, Run, ImageManager, BoundsHelper, MatrixHelper, MathHelper, AlignHelper, ImageEvent, AroundHelper, PointHelper, Direction4, TwoPointBoundsHelper, TaskProcessor, Matrix } from '@leafer/core';
+import { LeaferCanvasBase, Platform, canvasPatch, DataHelper, canvasSizeAttrs, ResizeEvent, Creator, LeaferImage, defineKey, FileHelper, LeafList, RenderEvent, ChildEvent, WatchEvent, PropertyEvent, LeafHelper, BranchHelper, Bounds, LeafBoundsHelper, Debug, LeafLevelList, LayoutEvent, Run, ImageManager, BoundsHelper, MatrixHelper, MathHelper, AlignHelper, ImageEvent, AroundHelper, PointHelper, Direction4 } from '@leafer/core';
 export * from '@leafer/core';
 export { LeaferImage } from '@leafer/core';
 import { PaintImage, ColorConvert, PaintGradient, Export, Group, TextConvert, Paint, Effect } from '@leafer-ui/draw';
@@ -416,7 +416,7 @@ class LayoutBlockData {
 }
 
 const { updateAllMatrix, updateAllChange } = LeafHelper;
-const debug$2 = Debug.get('Layouter');
+const debug$1 = Debug.get('Layouter');
 class Layouter {
     constructor(target, userConfig) {
         this.totalTimes = 0;
@@ -451,7 +451,7 @@ class Layouter {
             target.emitEvent(new LayoutEvent(LayoutEvent.END, this.layoutedBlocks, this.times));
         }
         catch (e) {
-            debug$2.error(e);
+            debug$1.error(e);
         }
         this.layoutedBlocks = null;
     }
@@ -465,9 +465,9 @@ class Layouter {
     }
     layoutOnce() {
         if (this.layouting)
-            return debug$2.warn('layouting');
+            return debug$1.warn('layouting');
         if (this.times > 3)
-            return debug$2.warn('layout max times');
+            return debug$1.warn('layout max times');
         this.times++;
         this.totalTimes++;
         this.layouting = true;
@@ -571,7 +571,7 @@ class Layouter {
     }
 }
 
-const debug$1 = Debug.get('Renderer');
+const debug = Debug.get('Renderer');
 class Renderer {
     get needFill() { return !!(!this.canvas.allowBackgroundColor && this.config.fill); }
     constructor(target, canvas, userConfig) {
@@ -609,7 +609,7 @@ class Renderer {
         const { target } = this;
         this.times = 0;
         this.totalBounds = new Bounds();
-        debug$1.log(target.innerName, '--->');
+        debug.log(target.innerName, '--->');
         try {
             if (!target.isApp)
                 target.app.emit(RenderEvent.CHILD_START, target);
@@ -620,9 +620,9 @@ class Renderer {
         }
         catch (e) {
             this.rendering = false;
-            debug$1.error(e);
+            debug.error(e);
         }
-        debug$1.log('-------------|');
+        debug.log('-------------|');
     }
     renderAgain() {
         if (this.rendering) {
@@ -634,9 +634,9 @@ class Renderer {
     }
     renderOnce(callback) {
         if (this.rendering)
-            return debug$1.warn('rendering');
+            return debug.warn('rendering');
         if (this.times > 3)
-            return debug$1.warn('render max times');
+            return debug.warn('render max times');
         this.times++;
         this.totalTimes++;
         this.rendering = true;
@@ -673,7 +673,7 @@ class Renderer {
     partRender() {
         const { canvas, updateBlocks: list } = this;
         if (!list)
-            return debug$1.warn('PartRender: need update attr');
+            return debug.warn('PartRender: need update attr');
         this.mergeBlocks();
         list.forEach(block => { if (canvas.bounds.hit(block) && !block.isEmpty())
             this.clipRender(block); });
@@ -776,7 +776,7 @@ class Renderer {
                         empty = (!leaf.__world.width || !leaf.__world.height);
                         if (empty) {
                             if (!leaf.isLeafer)
-                                debug$1.tip(leaf.innerName, ': empty');
+                                debug.tip(leaf.innerName, ': empty');
                             empty = (!leaf.isBranch || leaf.isBranchLeaf);
                         }
                         return empty;
@@ -2328,197 +2328,12 @@ const ColorConvertModule = {
     string
 };
 
-const { setPoint, addPoint, toBounds } = TwoPointBoundsHelper;
-function getTrimBounds(canvas) {
-    const { width, height } = canvas.view;
-    const { data } = canvas.context.getImageData(0, 0, width, height);
-    let x, y, pointBounds, index = 0;
-    for (let i = 0; i < data.length; i += 4) {
-        if (data[i + 3] !== 0) {
-            x = index % width;
-            y = (index - x) / width;
-            pointBounds ? addPoint(pointBounds, x, y) : setPoint(pointBounds = {}, x, y);
-        }
-        index++;
-    }
-    const bounds = new Bounds();
-    toBounds(pointBounds, bounds);
-    return bounds.scale(1 / canvas.pixelRatio).ceil();
-}
-
-const ExportModule = {
-    export(leaf, filename, options) {
-        this.running = true;
-        const fileType = FileHelper.fileType(filename);
-        const isDownload = filename.includes('.');
-        options = FileHelper.getExportOptions(options);
-        return addTask((success) => new Promise((resolve) => {
-            const over = (result) => {
-                success(result);
-                resolve();
-                this.running = false;
-            };
-            const { toURL } = Platform;
-            const { download } = Platform.origin;
-            if (fileType === 'json') {
-                isDownload && download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename);
-                return over({ data: isDownload ? true : leaf.toJSON(options.json) });
-            }
-            if (fileType === 'svg') {
-                isDownload && download(toURL(leaf.toSVG(), 'svg'), filename);
-                return over({ data: isDownload ? true : leaf.toSVG() });
-            }
-            const { leafer } = leaf;
-            if (leafer) {
-                checkLazy(leaf);
-                leafer.waitViewCompleted(() => __awaiter(this, void 0, void 0, function* () {
-                    let renderBounds, trimBounds, scaleX = 1, scaleY = 1;
-                    const { worldTransform, isLeafer, isFrame } = leaf;
-                    const { slice, trim, onCanvas } = options;
-                    const smooth = options.smooth === undefined ? leafer.config.smooth : options.smooth;
-                    const contextSettings = options.contextSettings || leafer.config.contextSettings;
-                    const screenshot = options.screenshot || leaf.isApp;
-                    const fill = (isLeafer && screenshot) ? (options.fill === undefined ? leaf.fill : options.fill) : options.fill;
-                    const needFill = FileHelper.isOpaqueImage(filename) || fill, matrix = new Matrix();
-                    if (screenshot) {
-                        renderBounds = screenshot === true ? (isLeafer ? leafer.canvas.bounds : leaf.worldRenderBounds) : screenshot;
-                    }
-                    else {
-                        let relative = options.relative || (isLeafer ? 'inner' : 'local');
-                        scaleX = worldTransform.scaleX;
-                        scaleY = worldTransform.scaleY;
-                        switch (relative) {
-                            case 'inner':
-                                matrix.set(worldTransform);
-                                break;
-                            case 'local':
-                                matrix.set(worldTransform).divide(leaf.localTransform);
-                                scaleX /= leaf.scaleX;
-                                scaleY /= leaf.scaleY;
-                                break;
-                            case 'world':
-                                scaleX = 1;
-                                scaleY = 1;
-                                break;
-                            case 'page':
-                                relative = leaf.leafer;
-                            default:
-                                matrix.set(worldTransform).divide(leaf.getTransform(relative));
-                                const l = relative.worldTransform;
-                                scaleX /= scaleX / l.scaleX;
-                                scaleY /= scaleY / l.scaleY;
-                        }
-                        renderBounds = leaf.getBounds('render', relative);
-                    }
-                    const scaleData = { scaleX: 1, scaleY: 1 };
-                    MathHelper.getScaleData(options.scale, options.size, renderBounds, scaleData);
-                    let pixelRatio = options.pixelRatio || 1;
-                    if (leaf.isApp) {
-                        scaleData.scaleX *= pixelRatio;
-                        scaleData.scaleY *= pixelRatio;
-                        pixelRatio = leaf.app.pixelRatio;
-                    }
-                    const { x, y, width, height } = new Bounds(renderBounds).scale(scaleData.scaleX, scaleData.scaleY);
-                    const renderOptions = { matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY) };
-                    let canvas = Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio, smooth, contextSettings });
-                    let sliceLeaf;
-                    if (slice) {
-                        sliceLeaf = leaf;
-                        sliceLeaf.__worldOpacity = 0;
-                        leaf = leafer;
-                        renderOptions.bounds = canvas.bounds;
-                    }
-                    canvas.save();
-                    if (isFrame && fill !== undefined) {
-                        const oldFill = leaf.get('fill');
-                        leaf.fill = '';
-                        leaf.__render(canvas, renderOptions);
-                        leaf.fill = oldFill;
-                    }
-                    else {
-                        leaf.__render(canvas, renderOptions);
-                    }
-                    canvas.restore();
-                    if (sliceLeaf)
-                        sliceLeaf.__updateWorldOpacity();
-                    if (trim) {
-                        trimBounds = getTrimBounds(canvas);
-                        const old = canvas, { width, height } = trimBounds;
-                        const config = { x: 0, y: 0, width, height, pixelRatio };
-                        canvas = Creator.canvas(config);
-                        canvas.copyWorld(old, trimBounds, config);
-                    }
-                    if (needFill)
-                        canvas.fillWorld(canvas.bounds, fill || '#FFFFFF', 'destination-over');
-                    if (onCanvas)
-                        onCanvas(canvas);
-                    const data = filename === 'canvas' ? canvas : yield canvas.export(filename, options);
-                    over({ data, width: canvas.pixelWidth, height: canvas.pixelHeight, renderBounds, trimBounds });
-                }));
-            }
-            else {
-                over({ data: false });
-            }
-        }));
-    }
-};
-let tasker;
-function addTask(task) {
-    if (!tasker)
-        tasker = new TaskProcessor();
-    return new Promise((resolve) => {
-        tasker.add(() => __awaiter(this, void 0, void 0, function* () { return yield task(resolve); }), { parallel: false });
-    });
-}
-function checkLazy(leaf) {
-    if (leaf.__.__needComputePaint)
-        leaf.__.__computePaint();
-    if (leaf.isBranch)
-        leaf.children.forEach(child => checkLazy(child));
-}
-
-const canvas = LeaferCanvasBase.prototype;
-const debug = Debug.get('@leafer-ui/export');
-canvas.export = function (filename, options) {
-    const { quality, blob } = FileHelper.getExportOptions(options);
-    if (filename.includes('.'))
-        return this.saveAs(filename, quality);
-    else if (blob)
-        return this.toBlob(filename, quality);
-    else
-        return this.toDataURL(filename, quality);
-};
-canvas.toBlob = function (type, quality) {
-    return new Promise((resolve) => {
-        Platform.origin.canvasToBolb(this.view, type, quality).then((blob) => {
-            resolve(blob);
-        }).catch((e) => {
-            debug.error(e);
-            resolve(null);
-        });
-    });
-};
-canvas.toDataURL = function (type, quality) {
-    return Platform.origin.canvasToDataURL(this.view, type, quality);
-};
-canvas.saveAs = function (filename, quality) {
-    return new Promise((resolve) => {
-        Platform.origin.canvasSaveAs(this.view, filename, quality).then(() => {
-            resolve(true);
-        }).catch((e) => {
-            debug.error(e);
-            resolve(false);
-        });
-    });
-};
-
 Object.assign(TextConvert, TextConvertModule);
 Object.assign(ColorConvert, ColorConvertModule);
 Object.assign(Paint, PaintModule);
 Object.assign(PaintImage, PaintImageModule);
 Object.assign(PaintGradient, PaintGradientModule);
 Object.assign(Effect, EffectModule);
-Object.assign(Export, ExportModule);
 
 try {
     if (wx)