leafer-ui 1.3.3 → 1.4.0

package/dist/web.module.js

@@ -3821,10 +3821,10 @@ function autoLayoutType(defaultValue) {
     return decorateLeafAttr(defaultValue, (key) => attr({
         set(value) {
             if (this.__setAttr(key, value)) {
-                this.__layout.matrixChanged || this.__layout.matrixChange();
                 this.__hasAutoLayout = !!(this.origin || this.around || this.flow);
                 if (!this.__local)
                     this.__layout.createLocal();
+                doBoundsType(this);
             }
         }
     }));
@@ -4207,55 +4207,62 @@ const LeafHelper = {
         y += t.y;
         transition ? t.animate({ x, y }, transition) : (t.x = x, t.y = y);
     },
-    zoomOfWorld(t, origin, scaleX, scaleY, resize) {
-        L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize);
+    zoomOfWorld(t, origin, scaleX, scaleY, resize, transition) {
+        L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition);
     },
-    zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize) {
-        copy$7(matrix$1, t.__localMatrix);
+    zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition) {
+        const o = t.__localMatrix;
+        if (typeof scaleY !== 'number') {
+            if (scaleY)
+                transition = scaleY;
+            scaleY = scaleX;
+        }
+        copy$7(matrix$1, o);
         scaleOfOuter$2(matrix$1, origin, scaleX, scaleY);
         if (t.origin || t.around) {
-            L.setTransform(t, matrix$1, resize);
+            L.setTransform(t, matrix$1, resize, transition);
         }
         else {
-            moveByMatrix(t, matrix$1);
-            t.scaleResize(scaleX, scaleY, resize !== true);
+            const x = t.x + matrix$1.e - o.e, y = t.y + matrix$1.f - o.f;
+            if (transition && !resize)
+                t.animate({ x, y, scaleX: t.scaleX * scaleX, scaleY: t.scaleY * scaleY }, transition);
+            else
+                t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true);
         }
     },
-    rotateOfWorld(t, origin, angle) {
-        L.rotateOfLocal(t, getTempLocal(t, origin), angle);
+    rotateOfWorld(t, origin, angle, transition) {
+        L.rotateOfLocal(t, getTempLocal(t, origin), angle, transition);
     },
-    rotateOfLocal(t, origin, angle) {
-        copy$7(matrix$1, t.__localMatrix);
+    rotateOfLocal(t, origin, angle, transition) {
+        const o = t.__localMatrix;
+        copy$7(matrix$1, o);
         rotateOfOuter$2(matrix$1, origin, angle);
-        if (t.origin || t.around) {
-            L.setTransform(t, matrix$1);
-        }
-        else {
-            moveByMatrix(t, matrix$1);
-            t.rotation = MathHelper.formatRotation(t.rotation + angle);
-        }
+        if (t.origin || t.around)
+            L.setTransform(t, matrix$1, false, transition);
+        else
+            t.set({ x: t.x + matrix$1.e - o.e, y: t.y + matrix$1.f - o.f, rotation: MathHelper.formatRotation(t.rotation + angle) }, transition);
     },
-    skewOfWorld(t, origin, skewX, skewY, resize) {
-        L.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize);
+    skewOfWorld(t, origin, skewX, skewY, resize, transition) {
+        L.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize, transition);
     },
-    skewOfLocal(t, origin, skewX, skewY = 0, resize) {
+    skewOfLocal(t, origin, skewX, skewY = 0, resize, transition) {
         copy$7(matrix$1, t.__localMatrix);
         skewOfOuter(matrix$1, origin, skewX, skewY);
-        L.setTransform(t, matrix$1, resize);
+        L.setTransform(t, matrix$1, resize, transition);
     },
-    transformWorld(t, transform, resize) {
+    transformWorld(t, transform, resize, transition) {
         copy$7(matrix$1, t.worldTransform);
         multiplyParent$2(matrix$1, transform);
         if (t.parent)
             divideParent(matrix$1, t.parent.worldTransform);
-        L.setTransform(t, matrix$1, resize);
+        L.setTransform(t, matrix$1, resize, transition);
     },
-    transform(t, transform, resize) {
+    transform(t, transform, resize, transition) {
         copy$7(matrix$1, t.localTransform);
         multiplyParent$2(matrix$1, transform);
-        L.setTransform(t, matrix$1, resize);
+        L.setTransform(t, matrix$1, resize, transition);
     },
-    setTransform(t, transform, resize) {
+    setTransform(t, transform, resize, transition) {
         const data = t.__, originPoint = data.origin && L.getInnerOrigin(t, data.origin);
         const layout = getLayout(transform, originPoint, data.around && L.getInnerOrigin(t, data.around));
         if (resize) {
@@ -4270,7 +4277,7 @@ const LeafHelper = {
             t.scaleResize(scaleX, scaleY, false);
         }
         else
-            t.set(layout);
+            t.set(layout, transition);
     },
     getFlipTransform(t, axis) {
         const m = getMatrixData();
@@ -4307,11 +4314,6 @@ const LeafHelper = {
 };
 const L = LeafHelper;
 const { updateAllMatrix: updateAllMatrix$3, updateMatrix: updateMatrix$2, updateAllWorldOpacity: updateAllWorldOpacity$1, updateAllChange: updateAllChange$1 } = L;
-function moveByMatrix(t, matrix) {
-    const { e, f } = t.__localMatrix;
-    t.x += matrix.e - e;
-    t.y += matrix.f - f;
-}
 function getTempLocal(t, world) {
     t.__layout.update();
     return t.parent ? PointHelper.tempToInnerOf(world, t.parent.__world) : world;
@@ -5585,11 +5587,11 @@ let Leaf = class Leaf {
         const layer = this.leafer ? this.leafer.zoomLayer : this;
         return layer.getWorldPoint(page, relative, distance, change);
     }
-    setTransform(matrix, resize) {
-        setTransform(this, matrix, resize);
+    setTransform(matrix, resize, transition) {
+        setTransform(this, matrix, resize, transition);
     }
-    transform(matrix, resize) {
-        transform(this, matrix, resize);
+    transform(matrix, resize, transition) {
+        transform(this, matrix, resize, transition);
     }
     move(x, y, transition) {
         moveLocal(this, x, y, transition);
@@ -5597,32 +5599,32 @@ let Leaf = class Leaf {
     moveInner(x, y, transition) {
         moveWorld(this, x, y, true, transition);
     }
-    scaleOf(origin, scaleX, scaleY, resize) {
-        zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize);
+    scaleOf(origin, scaleX, scaleY, resize, transition) {
+        zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition);
     }
-    rotateOf(origin, rotation) {
-        rotateOfLocal(this, getLocalOrigin(this, origin), rotation);
+    rotateOf(origin, rotation, transition) {
+        rotateOfLocal(this, getLocalOrigin(this, origin), rotation, transition);
     }
-    skewOf(origin, skewX, skewY, resize) {
-        skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize);
+    skewOf(origin, skewX, skewY, resize, transition) {
+        skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize, transition);
     }
-    transformWorld(worldTransform, resize) {
-        transformWorld(this, worldTransform, resize);
+    transformWorld(worldTransform, resize, transition) {
+        transformWorld(this, worldTransform, resize, transition);
     }
     moveWorld(x, y, transition) {
         moveWorld(this, x, y, false, transition);
     }
-    scaleOfWorld(worldOrigin, scaleX, scaleY, resize) {
-        zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize);
+    scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition) {
+        zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition);
     }
     rotateOfWorld(worldOrigin, rotation) {
         rotateOfWorld(this, worldOrigin, rotation);
     }
-    skewOfWorld(worldOrigin, skewX, skewY, resize) {
-        skewOfWorld(this, worldOrigin, skewX, skewY, resize);
+    skewOfWorld(worldOrigin, skewX, skewY, resize, transition) {
+        skewOfWorld(this, worldOrigin, skewX, skewY, resize, transition);
     }
-    flip(axis) {
-        transform(this, getFlipTransform(this, axis));
+    flip(axis, transition) {
+        transform(this, getFlipTransform(this, axis), false, transition);
     }
     scaleResize(scaleX, scaleY = scaleX, _noResize) {
         this.scaleX *= scaleX;
@@ -6010,7 +6012,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.3.3";
+const version = "1.4.0";
 
 const debug$5 = Debug.get('LeaferCanvas');
 class LeaferCanvas extends LeaferCanvasBase {
@@ -6130,7 +6132,7 @@ class LeaferCanvas extends LeaferCanvasBase {
             }
         }
         else {
-            window.addEventListener('resize', () => {
+            window.addEventListener('resize', this.windowListener = () => {
                 const pixelRatio = Platform.devicePixelRatio;
                 if (this.pixelRatio !== pixelRatio) {
                     const { width, height } = this;
@@ -6159,11 +6161,9 @@ class LeaferCanvas extends LeaferCanvasBase {
     }
     stopAutoLayout() {
         this.autoLayout = false;
-        this.resizeListener = null;
-        if (this.resizeObserver) {
+        if (this.resizeObserver)
             this.resizeObserver.disconnect();
-            this.resizeObserver = null;
-        }
+        this.resizeListener = this.resizeObserver = null;
     }
     emitResize(size) {
         const oldSize = {};
@@ -6184,6 +6184,10 @@ class LeaferCanvas extends LeaferCanvasBase {
     destroy() {
         if (this.view) {
             this.stopAutoLayout();
+            if (this.windowListener) {
+                window.removeEventListener('resize', this.windowListener);
+                this.windowListener = null;
+            }
             if (!this.unreal) {
                 const view = this.view;
                 if (view.parentElement)
@@ -6210,7 +6214,10 @@ function useCanvas(_canvasType, _power) {
             canvas.height = height;
             return canvas;
         },
-        canvasToDataURL: (canvas, type, quality) => canvas.toDataURL(mineType(type), quality),
+        canvasToDataURL: (canvas, type, quality) => {
+            const imageType = mineType(type), url = canvas.toDataURL(imageType, quality);
+            return imageType === 'image/bmp' ? url.replace('image/png;', 'image/bmp;') : url;
+        },
         canvasToBolb: (canvas, type, quality) => new Promise((resolve) => canvas.toBlob(resolve, mineType(type), quality)),
         canvasSaveAs: (canvas, filename, quality) => {
             const url = canvas.toDataURL(mineType(fileType(filename)), quality);
@@ -6255,7 +6262,7 @@ function useCanvas(_canvasType, _power) {
 Platform.name = 'web';
 Platform.isMobile = 'ontouchstart' in window;
 Platform.requestRender = function (render) { window.requestAnimationFrame(render); };
-defineKey(Platform, 'devicePixelRatio', { get() { return Math.max(1, devicePixelRatio); } });
+defineKey(Platform, 'devicePixelRatio', { get() { return devicePixelRatio; } });
 const { userAgent } = navigator;
 if (userAgent.indexOf("Firefox") > -1) {
     Platform.conicGradientRotate90 = true;
@@ -9691,10 +9698,9 @@ class InteractionBase {
         }
     }
     pointerMoveReal(data) {
-        const { dragHover, dragDistance } = this.p;
         this.emit(PointerEvent$1.BEFORE_MOVE, data, this.defaultPath);
         if (this.downData) {
-            const canDrag = PointHelper.getDistance(this.downData, data) > dragDistance;
+            const canDrag = PointHelper.getDistance(this.downData, data) > this.p.dragDistance;
             if (canDrag) {
                 if (this.waitTap)
                     this.pointerWaitCancel();
@@ -9706,9 +9712,8 @@ class InteractionBase {
             this.updateHoverData(data);
             this.checkPath(data);
             this.emit(PointerEvent$1.MOVE, data);
-            if (!(this.dragging && !dragHover))
-                this.pointerHover(data);
-            if (this.dragger.dragging) {
+            this.pointerHover(data);
+            if (this.dragging) {
                 this.dragger.dragOverOrOut(data);
                 this.dragger.dragEnterOrLeave(data);
             }
@@ -9789,7 +9794,8 @@ class InteractionBase {
             this.updateCursor();
     }
     pointerHover(data) {
-        if (this.canHover) {
+        if (this.canHover && !(this.dragging && !this.p.dragHover)) {
+            data.path || (data.path = new LeafList());
             this.pointerOverOrOut(data);
             this.pointerEnterOrLeave(data);
         }
@@ -10268,6 +10274,7 @@ class Interaction extends InteractionBase {
             'pointerdown': this.onPointerDown,
             'mousedown': this.onMouseDown,
             'touchstart': this.onTouchStart,
+            'pointerleave': this.onPointerLeave,
             'contextmenu': this.onContextMenu,
             'wheel': this.onWheel,
             'gesturestart': this.onGesturestart,
@@ -10350,11 +10357,15 @@ class Interaction extends InteractionBase {
         this.usePointer || (this.usePointer = true);
         this.pointerDown(PointerEventHelper.convert(e, this.getLocal(e)));
     }
-    onPointerMove(e) {
+    onPointerMove(e, isLeave) {
         if (this.config.pointer.touch || this.useMultiTouch || this.preventWindowPointer(e))
             return;
         this.usePointer || (this.usePointer = true);
-        this.pointerMove(PointerEventHelper.convert(e, this.getLocal(e, true)));
+        const data = PointerEventHelper.convert(e, this.getLocal(e, true));
+        isLeave ? this.pointerHover(data) : this.pointerMove(data);
+    }
+    onPointerLeave(e) {
+        this.onPointerMove(e, true);
     }
     onPointerUp(e) {
         if (this.downData)
@@ -11740,11 +11751,11 @@ const TextMode = 2;
 function layoutChar(drawData, style, width, _height) {
     const { rows } = drawData;
     const { textAlign, paraIndent, letterSpacing } = style;
-    let charX, addWordWidth, indentWidth, mode, wordChar;
+    let charX, addWordWidth, indentWidth, mode, wordChar, wordsLength;
     rows.forEach(row => {
         if (row.words) {
-            indentWidth = paraIndent && row.paraStart ? paraIndent : 0;
-            addWordWidth = (width && (textAlign === 'justify' || textAlign === 'both') && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0;
+            indentWidth = paraIndent && row.paraStart ? paraIndent : 0, wordsLength = row.words.length;
+            addWordWidth = (width && (textAlign === 'justify' || textAlign === 'both') && wordsLength > 1) ? (width - row.width - indentWidth) / (wordsLength - 1) : 0;
             mode = (letterSpacing || row.isOverflow) ? CharMode : (addWordWidth > 0.01 ? WordMode : TextMode);
             if (row.isOverflow && !letterSpacing)
                 row.textMode = true;
@@ -11756,7 +11767,7 @@ function layoutChar(drawData, style, width, _height) {
                 row.x += indentWidth;
                 charX = row.x;
                 row.data = [];
-                row.words.forEach(word => {
+                row.words.forEach((word, index) => {
                     if (mode === WordMode) {
                         wordChar = { char: '', x: charX };
                         charX = toWordChar(word.data, charX, wordChar);
@@ -11766,7 +11777,7 @@ function layoutChar(drawData, style, width, _height) {
                     else {
                         charX = toChar(word.data, charX, row.data, row.isOverflow);
                     }
-                    if (addWordWidth && (!row.paraEnd || textAlign === 'both')) {
+                    if (addWordWidth && (!row.paraEnd || textAlign === 'both') && (index !== wordsLength - 1)) {
                         charX += addWordWidth;
                         row.width += addWordWidth;
                     }
@@ -12023,3 +12034,4 @@ Object.assign(Creator, {
 useCanvas();
 
 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$1 as DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image$1 as 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$1 as PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, 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=web.module.js.map