@leafer-ui/miniapp 1.4.1 → 1.5.0

package/dist/miniapp.module.js

@@ -3635,7 +3635,12 @@ const Resource = {
         return R.map[key];
     },
     remove(key) {
-        delete R.map[key];
+        const r = R.map[key];
+        if (r) {
+            if (r.destroy)
+                r.destroy();
+            delete R.map[key];
+        }
     },
     loadImage(key, format) {
         return new Promise((resolve, reject) => {
@@ -3661,6 +3666,7 @@ const Resource = {
 const R = Resource;
 
 const ImageManager = {
+    maxRecycled: 100,
     recycledList: [],
     patternTasker: new TaskProcessor(),
     get(config) {
@@ -3677,13 +3683,8 @@ const ImageManager = {
     },
     clearRecycled() {
         const list = I$1.recycledList;
-        if (list.length > 100) {
-            list.forEach(image => {
-                if (!image.use && image.url) {
-                    Resource.remove(image.url);
-                    image.destroy();
-                }
-            });
+        if (list.length > I$1.maxRecycled) {
+            list.forEach(image => (!image.use && image.url) && Resource.remove(image.url));
             list.length = 0;
         }
     },
@@ -4069,12 +4070,11 @@ function defineDataProcessor(target, key, defaultValue) {
     if (defaultValue === undefined) {
         property.get = function () { return this[computedKey]; };
     }
-    else if (typeof defaultValue === 'object') {
-        const { clone } = DataHelper;
+    else if (typeof defaultValue === 'function') {
         property.get = function () {
             let v = this[computedKey];
             if (v === undefined)
-                this[computedKey] = v = clone(defaultValue);
+                this[computedKey] = v = defaultValue(this.__leaf);
             return v;
         };
     }
@@ -5721,10 +5721,10 @@ let Leaf = class Leaf {
     static changeAttr(attrName, defaultValue, fn) {
         fn ? this.addAttr(attrName, defaultValue, fn) : defineDataProcessor(this.prototype, attrName, defaultValue);
     }
-    static addAttr(attrName, defaultValue, fn) {
+    static addAttr(attrName, defaultValue, fn, helpValue) {
         if (!fn)
             fn = boundsType;
-        fn(defaultValue)(this.prototype, attrName);
+        fn(defaultValue, helpValue)(this.prototype, attrName);
     }
     __emitLifeEvent(type) {
         if (this.hasEvent(type))
@@ -6051,7 +6051,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.4.1";
+const version = "1.5.0";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() { return false; }
@@ -7077,7 +7077,11 @@ const State = {
     setStyleName() { return Plugin.need('state'); },
     set() { return Plugin.need('state'); }
 };
-const Transition = {};
+const Transition = {
+    list: {},
+    register(attrName, fn) { Transition.list[attrName] = fn; },
+    get(attrName) { return Transition.list[attrName]; }
+};
 
 const { parse, objectToCanvasData } = PathConvert;
 const emptyPaint = {};
@@ -7501,9 +7505,6 @@ let UI = UI_1 = class UI extends Leaf {
             this.__drawPathByBox(pen);
         return pen;
     }
-    get editConfig() { return undefined; }
-    get editOuter() { return ''; }
-    get editInner() { return ''; }
     constructor(data) {
         super(data);
     }
@@ -7585,8 +7586,11 @@ let UI = UI_1 = class UI extends Leaf {
     export(_filename, _options) {
         return Plugin.need('export');
     }
+    syncExport(_filename, _options) {
+        return Plugin.need('export');
+    }
     clone(data) {
-        const json = this.toJSON();
+        const json = DataHelper.clone(this.toJSON());
         if (data)
             Object.assign(json, data);
         return UI_1.one(json);
@@ -7885,7 +7889,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     get layoutLocked() { return !this.layouter.running; }
     get FPS() { return this.renderer ? this.renderer.FPS : 60; }
     get cursorPoint() { return (this.interaction && this.interaction.hoverData) || { x: this.width / 2, y: this.height / 2 }; }
-    get clientBounds() { return this.canvas && this.canvas.getClientBounds(); }
+    get clientBounds() { return (this.canvas && this.canvas.getClientBounds(true)) || getBoundsData(); }
     constructor(userConfig, data) {
         super(data);
         this.config = {
@@ -8187,6 +8191,10 @@ let Leafer = Leafer_1 = class Leafer extends Group {
     getPagePointByClient(clientPoint, updateClient) {
         return this.getPagePoint(this.getWorldPointByClient(clientPoint, updateClient));
     }
+    getClientPointByWorld(worldPoint) {
+        const { x, y } = this.clientBounds;
+        return { x: x + worldPoint.x, y: y + worldPoint.y };
+    }
     updateClientBounds() {
         this.canvas && this.canvas.updateClientBounds();
     }
@@ -10155,8 +10163,6 @@ ui$1.__updateHitCanvas = function () {
     h.setStrokeOptions(data);
 };
 ui$1.__hit = function (inner) {
-    if (Platform.name === 'miniapp')
-        this.__drawHitPath(this.__hitCanvas);
     const data = this.__;
     if (data.__isHitPixel && this.__hitPixel(inner))
         return true;
@@ -11616,13 +11622,14 @@ function toChar(data, charX, rowData, isOverflow) {
 }
 
 function layoutText(drawData, style) {
-    const { rows, bounds } = drawData;
+    const { rows, bounds } = drawData, countRows = rows.length;
     const { __lineHeight, __baseLine, __letterSpacing, __clipText, textAlign, verticalAlign, paraSpacing, autoSizeAlign } = style;
-    let { x, y, width, height } = bounds, realHeight = __lineHeight * rows.length + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0);
+    let { x, y, width, height } = bounds, realHeight = __lineHeight * countRows + (paraSpacing ? paraSpacing * (drawData.paraNumber - 1) : 0);
     let starY = __baseLine;
     if (__clipText && realHeight > height) {
         realHeight = Math.max(height, __lineHeight);
-        drawData.overflow = rows.length;
+        if (countRows > 1)
+            drawData.overflow = countRows;
     }
     else if (height || autoSizeAlign) {
         switch (verticalAlign) {
@@ -11634,7 +11641,7 @@ function layoutText(drawData, style) {
     }
     starY += y;
     let row, rowX, rowWidth, layoutWidth = (width || autoSizeAlign) ? width : drawData.maxWidth;
-    for (let i = 0, len = rows.length; i < len; i++) {
+    for (let i = 0, len = countRows; i < len; i++) {
         row = rows[i];
         row.x = x;
         if (row.width < width || (row.width > width && !__clipText)) {
@@ -11703,7 +11710,7 @@ function clipText(drawData, style, x, width) {
                     if (i === end && charRight < right) {
                         break;
                     }
-                    else if (charRight < right && char.char !== ' ') {
+                    else if ((charRight < right && char.char !== ' ') || !i) {
                         row.data.splice(i + 1);
                         row.width -= char.width;
                         break;
@@ -11842,29 +11849,5 @@ try {
 }
 catch (_a) { }
 
-const systemInfo = wx.getSystemInfoSync();
-const platform = systemInfo.platform;
-if (platform === 'ios') {
-    LeaferImage.prototype.getPattern = function (canvas, repeat, transform, paint) {
-        const pattern = Platform.canvas.createPattern(this.view, repeat);
-        const { width, height } = canvas;
-        if (this.width !== width || this.height !== height) {
-            if (!transform)
-                transform = MatrixHelper.get();
-            MatrixHelper.scale(transform, width / this.width, height / this.height);
-        }
-        try {
-            if (transform && pattern.setTransform) {
-                pattern.setTransform(transform);
-                transform = null;
-            }
-        }
-        catch (_a) { }
-        if (paint)
-            paint.transform = transform;
-        return pattern;
-    };
-}
-
 export { AlignHelper, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, 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, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isNull, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };
 //# sourceMappingURL=miniapp.module.js.map