@leafer-ui/miniapp 1.0.0-rc.26 → 1.0.0-rc.28

package/dist/miniapp.module.js

@@ -11,8 +11,15 @@ const Platform = {
         hitCanvasSize: 100,
         maxCacheSize: 2560 * 1600,
         maxPatternSize: 4096 * 2160,
-        suffix: '',
-        crossOrigin: 'anonymous'
+        crossOrigin: 'anonymous',
+        getRealURL(url) {
+            const { prefix, suffix } = Platform.image;
+            if (suffix && !url.startsWith('data:') && !url.startsWith('blob:'))
+                url += (url.includes("?") ? "&" : "?") + suffix;
+            if (prefix && url[0] === '/')
+                url = prefix + url;
+            return url;
+        }
     }
 };
 
@@ -5126,6 +5133,7 @@ let Leaf = class Leaf {
     get __worldFlipped() { return this.__world.scaleX < 0 || this.__world.scaleY < 0; }
     get __onlyHitMask() { return this.__hasMask && !this.__.hitChildren; }
     get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
+    get __inLazyBounds() { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world); }
     get pathInputed() { return this.__.__pathInputed; }
     constructor(data) {
         this.innerId = create(LEAF);
@@ -5189,6 +5197,9 @@ let Leaf = class Leaf {
     }
     set(_data) { }
     get(_name) { return undefined; }
+    setAttr(name, value) { this[name] = value; }
+    getAttr(name) { return this[name]; }
+    getComputedAttr(name) { return this.__[name]; }
     toJSON() {
         return this.__.__getInputData();
     }
@@ -5207,6 +5218,9 @@ let Leaf = class Leaf {
     findOne(_condition, _options) { return undefined; }
     findId(_id) { return undefined; }
     focus(_value) { }
+    updateLayout() {
+        this.__layout.update();
+    }
     forceUpdate(attrName) {
         if (attrName === undefined)
             attrName = 'width';
@@ -5216,8 +5230,8 @@ let Leaf = class Leaf {
         this.__[attrName] = value === undefined ? null : undefined;
         this[attrName] = value;
     }
-    updateLayout() {
-        this.__layout.update();
+    forceRender(_bounds) {
+        this.forceUpdate('surface');
     }
     __updateWorldMatrix() { }
     __updateLocalMatrix() { }
@@ -5749,7 +5763,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.0-rc.26";
+const version = "1.0.0-rc.27";
 const inviteCode = {};
 
 class LeaferCanvas extends LeaferCanvasBase {
@@ -5887,12 +5901,12 @@ function useCanvas(_canvasType, app) {
                     });
                 });
             },
-            loadImage(url) {
+            loadImage(src) {
                 return new Promise((resolve, reject) => {
                     const img = Platform.canvas.view.createImage();
                     img.onload = () => { resolve(img); };
                     img.onerror = (error) => { reject(error); };
-                    img.src = url;
+                    img.src = Platform.image.getRealURL(src);
                 });
             },
             noRepeat: 'repeat-x'
@@ -7212,6 +7226,8 @@ const UIRender = {
             this.__drawRenderPath(canvas);
             if (fill && !ignoreFill)
                 this.__.__pixelFill ? Paint.fills(fill, this, canvas) : Paint.fill('#000000', this, canvas);
+            if (this.__.__isCanvas)
+                this.__drawAfterFill(canvas, options);
             if (stroke && !ignoreStroke)
                 this.__.__pixelStroke ? Paint.strokes(stroke, this, canvas) : Paint.stroke('#000000', this, canvas);
         }
@@ -7325,7 +7341,7 @@ let UI = UI_1 = class UI extends Leaf {
     __onUpdateSize() {
         if (this.__.__input) {
             const data = this.__;
-            (data.lazy && this.leafer && this.leafer.created && !this.leafer.lazyBounds.hit(this.__world)) ? data.__needComputePaint = true : data.__computePaint();
+            (data.lazy && !this.__inLazyBounds && !Export.running) ? data.__needComputePaint = true : data.__computePaint();
         }
     }
     __updateRenderPath() {
@@ -7634,6 +7650,9 @@ __decorate([
 __decorate([
     dataType()
 ], UI.prototype, "disabledStyle", void 0);
+__decorate([
+    dataType({})
+], UI.prototype, "data", void 0);
 __decorate([
     rewrite(Leaf.prototype.reset)
 ], UI.prototype, "reset", null);
@@ -7880,6 +7899,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
                 if (!this.parent)
                     this.canvas.hittable = newValue;
             }
+            else if (attrName === 'zIndex') {
+                this.canvas.zIndex = newValue;
+                setTimeout(() => this.parent && this.parent.__updateSortChildren());
+            }
         }
         return super.__setAttr(attrName, newValue);
     }
@@ -8476,7 +8499,7 @@ let Canvas = class Canvas extends Rect {
         super(data);
         this.canvas = Creator.canvas(this.__);
         this.context = this.canvas.context;
-        this.__.__drawAfterFill = true;
+        this.__.__isCanvas = this.__.__drawAfterFill = true;
     }
     draw(ui, offset, scale, rotation) {
         ui.__layout.update();
@@ -8498,7 +8521,7 @@ let Canvas = class Canvas extends Rect {
     __drawAfterFill(canvas, _options) {
         const origin = this.canvas.view;
         const { width, height } = this;
-        if (this.__.cornerRadius) {
+        if (this.__.cornerRadius || this.pathInputed) {
             canvas.save();
             canvas.clip();
             canvas.drawImage(this.canvas.view, 0, 0, origin.width, origin.height, 0, 0, width, height);
@@ -8544,9 +8567,6 @@ __decorate([
 __decorate([
     resizeType()
 ], Canvas.prototype, "contextSettings", void 0);
-__decorate([
-    hitType('all')
-], Canvas.prototype, "hitFill", void 0);
 Canvas = __decorate([
     registerUI()
 ], Canvas);
@@ -8843,15 +8863,17 @@ let App = class App extends Leafer {
         this.add(leafer);
         return leafer;
     }
-    add(leafer) {
+    add(leafer, index) {
         if (!leafer.view) {
             if (this.realCanvas && !this.canvas.bounds) {
-                setTimeout(() => this.add(leafer), 10);
+                setTimeout(() => this.add(leafer, index), 10);
                 return;
             }
             leafer.init(this.__getChildConfig(leafer.userConfig), this);
         }
-        super.add(leafer);
+        super.add(leafer, index);
+        if (index !== undefined)
+            leafer.canvas.childIndex = index;
         this.__listenChildEvents(leafer);
     }
     __onPropertyChange() {
@@ -9013,20 +9035,32 @@ let DragEvent = class DragEvent extends PointerEvent {
             move.x = 0;
         return move;
     }
-    static getMoveInDragBounds(box, dragBounds, move, change) {
-        const x = box.x + move.x, y = box.y + move.y;
-        const right = x + box.width, bottom = y + box.height;
+    static getMoveInDragBounds(childBox, dragBounds, move, change) {
+        const x = childBox.x + move.x, y = childBox.y + move.y;
+        const right = x + childBox.width, bottom = y + childBox.height;
         const boundsRight = dragBounds.x + dragBounds.width, boundsBottom = dragBounds.y + dragBounds.height;
         if (!change)
             move = Object.assign({}, move);
-        if (x < dragBounds.x)
-            move.x += dragBounds.x - x;
-        else if (right > boundsRight)
-            move.x += boundsRight - right;
-        if (y < dragBounds.y)
-            move.y += dragBounds.y - y;
-        else if (bottom > boundsBottom)
-            move.y += boundsBottom - bottom;
+        if (BoundsHelper.includes(childBox, dragBounds)) {
+            if (x > dragBounds.x)
+                move.x += dragBounds.x - x;
+            else if (right < boundsRight)
+                move.x += boundsRight - right;
+            if (y > dragBounds.y)
+                move.y += dragBounds.y - y;
+            else if (bottom < boundsBottom)
+                move.y += boundsBottom - bottom;
+        }
+        else {
+            if (x < dragBounds.x)
+                move.x += dragBounds.x - x;
+            else if (right > boundsRight)
+                move.x += boundsRight - right;
+            if (y < dragBounds.y)
+                move.y += dragBounds.y - y;
+            else if (bottom > boundsBottom)
+                move.y += boundsBottom - bottom;
+        }
         return move;
     }
     getPageMove(total) {
@@ -9186,13 +9220,15 @@ const LeaferTypeCreator = {
 };
 const { list, register } = LeaferTypeCreator;
 register('draw', () => { });
+register('custom', () => { });
 register('design', addInteractionWindow);
 register('document', document);
 
-Leafer.prototype.initType = function (type) {
+const leafer = Leafer.prototype;
+leafer.initType = function (type) {
     LeaferTypeCreator.run(type, this);
 };
-Leafer.prototype.getValidMove = function (moveX, moveY) {
+leafer.getValidMove = function (moveX, moveY) {
     const { scroll, disabled } = this.app.config.move;
     if (scroll) {
         if (Math.abs(moveX) > Math.abs(moveY))
@@ -9222,7 +9258,7 @@ Leafer.prototype.getValidMove = function (moveX, moveY) {
     }
     return { x: disabled ? 0 : moveX, y: disabled ? 0 : moveY };
 };
-Leafer.prototype.getValidScale = function (changeScale) {
+leafer.getValidScale = function (changeScale) {
     const { scaleX } = this.zoomLayer.__, { min, max, disabled } = this.app.config.zoom, absScale = Math.abs(scaleX * changeScale);
     if (absScale < min)
         changeScale = min / scaleX;
@@ -9678,7 +9714,7 @@ const config = {
         swipeDistance: 20,
         preventDefaultMenu: true
     },
-    cursor: {},
+    cursor: true,
     keyEvent: true
 };
 
@@ -9991,7 +10027,7 @@ class InteractionBase {
         this.hoverData = data;
     }
     updateCursor(data) {
-        if (this.config.cursor.stop || !this.config.pointer.hover)
+        if (!this.config.cursor || !this.config.pointer.hover)
             return;
         if (!data) {
             this.updateHoverData();
@@ -10146,27 +10182,6 @@ class HitCanvasManager extends CanvasManager {
     }
 }
 
-const canvas$1 = LeaferCanvasBase.prototype;
-canvas$1.hitFill = function (point, fillRule) {
-    return fillRule ? this.context.isPointInPath(point.x, point.y, fillRule) : this.context.isPointInPath(point.x, point.y);
-};
-canvas$1.hitStroke = function (point, strokeWidth) {
-    this.strokeWidth = strokeWidth;
-    return this.context.isPointInStroke(point.x, point.y);
-};
-canvas$1.hitPixel = function (radiusPoint, offset, scale = 1) {
-    let { x, y, radiusX, radiusY } = radiusPoint;
-    if (offset)
-        x -= offset.x, y -= offset.y;
-    tempBounds$1.set(x - radiusX, y - radiusY, radiusX * 2, radiusY * 2).scale(scale).ceil();
-    const { data } = this.context.getImageData(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width, tempBounds$1.height);
-    for (let i = 0, len = data.length; i < len; i += 4) {
-        if (data[i + 3] > 0)
-            return true;
-    }
-    return data[3] > 0;
-};
-
 const { toInnerRadiusPointOf, copy: copy$2, setRadius } = PointHelper;
 const inner = {};
 const leaf = Leaf.prototype;
@@ -10203,7 +10218,7 @@ const matrix = new Matrix();
 const ui$2 = UI.prototype;
 ui$2.__updateHitCanvas = function () {
     const data = this.__, { hitCanvasManager } = this.leafer;
-    const isHitPixelFill = data.__pixelFill && data.hitFill === 'pixel';
+    const isHitPixelFill = (data.__pixelFill || data.__isCanvas) && data.hitFill === 'pixel';
     const isHitPixelStroke = data.__pixelStroke && data.hitStroke === 'pixel';
     const isHitPixel = isHitPixelFill || isHitPixelStroke;
     if (!this.__hitCanvas)
@@ -10235,11 +10250,11 @@ ui$2.__hit = function (inner) {
     if (data.__isHitPixel && this.__hitPixel(inner))
         return true;
     const { hitFill } = data;
-    const needHitFillPath = (data.fill && hitFill && hitFill !== 'none') || hitFill === 'all';
+    const needHitFillPath = ((data.fill || data.__isCanvas) && (hitFill === 'path' || (hitFill === 'pixel' && !(data.__pixelFill || data.__isCanvas)))) || hitFill === 'all';
     if (needHitFillPath && this.__hitFill(inner))
         return true;
     const { hitStroke, __strokeWidth } = data;
-    const needHitStrokePath = (data.stroke && hitFill && hitStroke !== 'none') || hitStroke === 'all';
+    const needHitStrokePath = (data.stroke && (hitStroke === 'path' || (hitStroke === 'pixel' && !data.__pixelStroke))) || hitStroke === 'all';
     if (!needHitFillPath && !needHitStrokePath)
         return false;
     const radiusWidth = inner.radiusX * 2;
@@ -10271,7 +10286,7 @@ ui$2.__hit = function (inner) {
 const ui$1 = new UI();
 const rect = Rect.prototype;
 rect.__updateHitCanvas = function () {
-    if (this.stroke || this.cornerRadius || (this.fill && this.hitFill === 'pixel') || this.hitStroke === 'all')
+    if (this.stroke || this.cornerRadius || ((this.fill || this.__.__isCanvas) && this.hitFill === 'pixel') || this.hitStroke === 'all')
         ui$1.__updateHitCanvas.call(this);
     else if (this.__hitCanvas)
         this.__hitCanvas = null;
@@ -10294,6 +10309,27 @@ group.pick = function (hitPoint, options) {
     return this.leafer ? this.leafer.selector.getByPoint(hitPoint, options.hitRadius || 0, Object.assign(Object.assign({}, options), { target: this })) : null;
 };
 
+const canvas$1 = LeaferCanvasBase.prototype;
+canvas$1.hitFill = function (point, fillRule) {
+    return fillRule ? this.context.isPointInPath(point.x, point.y, fillRule) : this.context.isPointInPath(point.x, point.y);
+};
+canvas$1.hitStroke = function (point, strokeWidth) {
+    this.strokeWidth = strokeWidth;
+    return this.context.isPointInStroke(point.x, point.y);
+};
+canvas$1.hitPixel = function (radiusPoint, offset, scale = 1) {
+    let { x, y, radiusX, radiusY } = radiusPoint;
+    if (offset)
+        x -= offset.x, y -= offset.y;
+    tempBounds$1.set(x - radiusX, y - radiusY, radiusX * 2, radiusY * 2).scale(scale).ceil();
+    const { data } = this.context.getImageData(tempBounds$1.x, tempBounds$1.y, tempBounds$1.width || 1, tempBounds$1.height || 1);
+    for (let i = 0, len = data.length; i < len; i += 4) {
+        if (data[i + 3] > 0)
+            return true;
+    }
+    return data[3] > 0;
+};
+
 const PointerEventHelper = {
     convertTouch(e, local) {
         const touch = PointerEventHelper.getTouch(e);
@@ -10998,7 +11034,7 @@ function checkImage(ui, canvas, paint, allowPaint) {
                     width *= data.scaleX;
                     height *= data.scaleY;
                 }
-                allowPaint = width * height > Platform.image.maxCacheSize;
+                allowPaint = (width * height > Platform.image.maxCacheSize) || Export.running;
             }
             else {
                 allowPaint = false;
@@ -11510,7 +11546,8 @@ function createRows(drawData, content, style) {
                     if (breakAll) {
                         if (wordWidth)
                             addWord();
-                        addRow();
+                        if (rowWidth)
+                            addRow();
                     }
                     else {
                         if (!afterBreak)
@@ -11518,10 +11555,12 @@ function createRows(drawData, content, style) {
                         if (langBreak || afterBreak || charType === Break || charType === Before || charType === Single || (wordWidth + charWidth > realWidth)) {
                             if (wordWidth)
                                 addWord();
-                            addRow();
+                            if (rowWidth)
+                                addRow();
                         }
                         else {
-                            addRow();
+                            if (rowWidth)
+                                addRow();
                         }
                     }
                 }
@@ -11907,6 +11946,7 @@ const ExportModule = {
             }
             const { leafer } = leaf;
             if (leafer) {
+                checkLazy(leaf);
                 leafer.waitViewCompleted(() => __awaiter(this, void 0, void 0, function* () {
                     options = FileHelper.getExportOptions(options);
                     let renderBounds, trimBounds, scaleX = 1, scaleY = 1;
@@ -11914,6 +11954,8 @@ const ExportModule = {
                     const { slice, trim, onCanvas } = options;
                     let scale = options.scale || 1;
                     let pixelRatio = options.pixelRatio || 1;
+                    const smooth = options.smooth === undefined ? leafer.config.smooth : options.smooth;
+                    const contextSettings = options.contextSettings || leafer.config.contextSettings;
                     if (leaf.isApp) {
                         scale *= pixelRatio;
                         pixelRatio = leaf.app.pixelRatio;
@@ -11952,7 +11994,7 @@ const ExportModule = {
                         renderBounds = leaf.getBounds('render', relative);
                     }
                     const { x, y, width, height } = new Bounds(renderBounds).scale(scale);
-                    let canvas = Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio });
+                    let canvas = Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio, smooth, contextSettings });
                     const renderOptions = { matrix: matrix.scale(1 / scale).invert().translate(-x, -y).withScale(1 / scaleX * scale, 1 / scaleY * scale) };
                     if (slice) {
                         leaf = leafer;
@@ -11998,6 +12040,12 @@ function addTask(task) {
         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');
@@ -12085,4 +12133,4 @@ LeaferCanvas.prototype.updateViewSize = function () {
     }
 };
 
-export { AlignHelper, AnimateEvent, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Export, FileHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, LeaferTypeCreator, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MultiTouchHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Platform, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, arrowType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, inviteCode, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, stateType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, AnimateEvent, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Export, FileHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, LeaferTypeCreator, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MultiTouchHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Platform, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, addInteractionWindow, affectRenderBoundsType, affectStrokeBoundsType, arrowType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, inviteCode, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, stateType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };