@leafer-in/editor 1.1.0 → 1.1.1

package/dist/editor.cjs

@@ -1,220 +1,9 @@
 'use strict';
 
+var resize = require('@leafer-in/resize');
 var draw = require('@leafer-ui/draw');
 var core = require('@leafer-ui/core');
 
-const { M, L, C, Q, Z, N, D, X, G, F, O, P, U } = draw.PathCommandMap;
-const PathScaler = {
-    scale(data, scaleX, scaleY) {
-        if (!data)
-            return;
-        let command;
-        let i = 0, len = data.length;
-        while (i < len) {
-            command = data[i];
-            switch (command) {
-                case M:
-                case L:
-                    scalePoints(data, scaleX, scaleY, i, 1);
-                    i += 3;
-                    break;
-                case C:
-                    scalePoints(data, scaleX, scaleY, i, 3);
-                    i += 7;
-                    break;
-                case Q:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 5;
-                    break;
-                case Z:
-                    i += 1;
-                    break;
-                case N:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 5;
-                    break;
-                case D:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 9;
-                    break;
-                case X:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 6;
-                    break;
-                case G:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 9;
-                    break;
-                case F:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 5;
-                    break;
-                case O:
-                    data[i] = G;
-                    data.splice(i + 4, 0, data[i + 3], 0);
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 7 + 2;
-                    len += 2;
-                    break;
-                case P:
-                    data[i] = F;
-                    data.splice(i + 4, 0, data[i + 3]);
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 4 + 1;
-                    len += 1;
-                    break;
-                case U:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 6;
-                    break;
-            }
-        }
-    },
-    scalePoints(data, scaleX, scaleY, start, pointCount) {
-        for (let i = pointCount ? start + 1 : 0, end = pointCount ? i + pointCount * 2 : data.length; i < end; i += 2) {
-            data[i] *= scaleX;
-            data[i + 1] *= scaleY;
-        }
-    }
-};
-const { scalePoints } = PathScaler;
-
-const matrix$1 = draw.MatrixHelper.get();
-const { topLeft: topLeft$1, top: top$1, topRight: topRight$1, right: right$2, bottom: bottom$1, left: left$2 } = draw.Direction9;
-function scaleResize(leaf, scaleX, scaleY) {
-    if (leaf.pathInputed) {
-        scaleResizePath(leaf, scaleX, scaleY);
-    }
-    else {
-        if (scaleX !== 1)
-            leaf.width *= scaleX;
-        if (scaleY !== 1)
-            leaf.height *= scaleY;
-    }
-}
-function scaleResizeFontSize(leaf, scaleX, scaleY) {
-    const { app } = leaf;
-    const editor = app && app.editor;
-    let fontScale = scaleX;
-    if (editor.editing) {
-        const layout = leaf.__layout;
-        let { width, height } = layout.boxBounds;
-        width *= scaleY - scaleX;
-        height *= scaleX - scaleY;
-        switch (editor.resizeDirection) {
-            case top$1:
-            case bottom$1:
-                fontScale = scaleY;
-                layout.affectScaleOrRotation ? leaf.moveInner(-width / 2, 0) : leaf.x -= width / 2;
-                break;
-            case left$2:
-            case right$2:
-                layout.affectScaleOrRotation ? leaf.moveInner(0, -height / 2) : leaf.y -= height / 2;
-                break;
-            case topLeft$1:
-            case topRight$1:
-                layout.affectScaleOrRotation ? leaf.moveInner(0, -height) : leaf.y -= height;
-                break;
-        }
-    }
-    leaf.fontSize *= fontScale;
-    const data = leaf.__;
-    if (!data.__autoWidth)
-        leaf.width *= fontScale;
-    if (!data.__autoHeight)
-        leaf.height *= fontScale;
-}
-function scaleResizePath(leaf, scaleX, scaleY) {
-    PathScaler.scale(leaf.__.path, scaleX, scaleY);
-    leaf.path = leaf.__.path;
-}
-function scaleResizePoints(leaf, scaleX, scaleY) {
-    const { points } = leaf;
-    typeof points[0] === 'object' ? points.forEach(p => { p.x *= scaleX, p.y *= scaleY; }) : PathScaler.scalePoints(points, scaleX, scaleY);
-    leaf.points = points;
-}
-function scaleResizeGroup(group, scaleX, scaleY) {
-    const { children } = group;
-    for (let i = 0; i < children.length; i++) {
-        matrix$1.a = scaleX;
-        matrix$1.d = scaleY;
-        children[i].transform(matrix$1, true);
-    }
-}
-
-const leaf = draw.Leaf.prototype;
-leaf.scaleResize = function (scaleX, scaleY = scaleX, noResize) {
-    const data = this;
-    if (noResize || (data.editConfig && data.editConfig.editSize === 'scale')) {
-        data.scaleX *= scaleX;
-        data.scaleY *= scaleY;
-    }
-    else {
-        if (scaleX < 0)
-            data.scaleX *= -1, scaleX = -scaleX;
-        if (scaleY < 0)
-            data.scaleY *= -1, scaleY = -scaleY;
-        this.__scaleResize(scaleX, scaleY);
-    }
-};
-leaf.__scaleResize = function (scaleX, scaleY) {
-    scaleResize(this, scaleX, scaleY);
-};
-leaf.resizeWidth = function (width) {
-    const scale = width / this.getBounds('box', 'local').width;
-    this.scaleOf(this.__layout.boxBounds, scale, this.__.lockRatio ? scale : 1, true);
-};
-leaf.resizeHeight = function (height) {
-    const scale = height / this.getBounds('box', 'local').height;
-    this.scaleOf(this.__layout.boxBounds, this.__.lockRatio ? scale : 1, scale, true);
-};
-draw.Text.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size')) {
-        scaleResizeFontSize(this, scaleX, scaleY);
-    }
-    else {
-        scaleResize(this, scaleX, scaleY);
-    }
-};
-draw.Path.prototype.__scaleResize = function (scaleX, scaleY) {
-    scaleResizePath(this, scaleX, scaleY);
-};
-draw.Line.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.pathInputed) {
-        scaleResizePath(this, scaleX, scaleY);
-    }
-    else if (this.points) {
-        scaleResizePoints(this, scaleX, scaleY);
-    }
-    else {
-        this.width *= scaleX;
-    }
-};
-draw.Polygon.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.pathInputed) {
-        scaleResizePath(this, scaleX, scaleY);
-    }
-    else if (this.points) {
-        scaleResizePoints(this, scaleX, scaleY);
-    }
-    else {
-        scaleResize(this, scaleX, scaleY);
-    }
-};
-draw.Group.prototype.__scaleResize = function (scaleX, scaleY) {
-    scaleResizeGroup(this, scaleX, scaleY);
-};
-draw.Box.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.__.__autoSize && this.children.length) {
-        scaleResizeGroup(this, scaleX, scaleY);
-    }
-    else {
-        scaleResize(this, scaleX, scaleY);
-        if (this.__.resizeChildren)
-            scaleResizeGroup(this, scaleX, scaleY);
-    }
-};
-
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -301,9 +90,12 @@ function targetAttr(fn) {
     };
 }
 
-const matrix = draw.MatrixHelper.get();
 const { abs } = Math;
 const { copy: copy$1, scale } = draw.MatrixHelper;
+const { setListWithFn } = draw.BoundsHelper;
+const { worldBounds } = draw.LeafBoundsHelper;
+const matrix = draw.getMatrixData();
+const bounds$1 = draw.getBoundsData();
 class Stroker extends draw.UI {
     constructor() {
         super();
@@ -314,6 +106,17 @@ class Stroker extends draw.UI {
     setTarget(target, style) {
         this.set(style);
         this.target = target;
+        this.update();
+    }
+    update() {
+        const { list } = this;
+        if (list.length) {
+            setListWithFn(bounds$1, list, worldBounds);
+            this.set(bounds$1);
+        }
+        else {
+            this.width = this.height = 1;
+        }
     }
     __draw(canvas, options) {
         const { list } = this;
@@ -323,7 +126,7 @@ class Stroker extends draw.UI {
             for (let i = 0; i < list.length; i++) {
                 leaf = list[i];
                 const { worldTransform, worldRenderBounds } = leaf;
-                if (bounds && bounds.hit(worldRenderBounds, options.matrix)) {
+                if (!bounds || bounds.hit(worldRenderBounds, options.matrix)) {
                     const aScaleX = abs(worldTransform.scaleX), aScaleY = abs(worldTransform.scaleY);
                     if (aScaleX !== aScaleY) {
                         copy$1(matrix, worldTransform);
@@ -363,7 +166,6 @@ __decorate([
 function onTarget$1(stroker) {
     const value = stroker.target;
     stroker.list = value ? (value instanceof Array ? value : [value]) : [];
-    stroker.forceUpdate();
 }
 
 class SelectArea extends draw.Group {
@@ -448,8 +250,8 @@ class EditSelect extends draw.Group {
         }
     }
     update() {
-        if (this.targetStroker.target)
-            this.targetStroker.forceUpdate();
+        this.hoverStroker.update();
+        this.targetStroker.update();
     }
     onPointerMove(e) {
         const { app, editor } = this;
@@ -2118,13 +1920,13 @@ exports.EditorScaleEvent = EditorScaleEvent;
 exports.EditorSkewEvent = EditorSkewEvent;
 exports.InnerEditor = InnerEditor;
 exports.InnerEditorEvent = InnerEditorEvent;
-exports.PathScaler = PathScaler;
 exports.SelectArea = SelectArea;
 exports.Stroker = Stroker;
 exports.registerEditTool = registerEditTool;
 exports.registerInnerEditor = registerInnerEditor;
-exports.scaleResize = scaleResize;
-exports.scaleResizeFontSize = scaleResizeFontSize;
-exports.scaleResizeGroup = scaleResizeGroup;
-exports.scaleResizePath = scaleResizePath;
-exports.scaleResizePoints = scaleResizePoints;
+Object.keys(resize).forEach(function (k) {
+    if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+        enumerable: true,
+        get: function () { return resize[k]; }
+    });
+});

package/dist/editor.esm.js

@@ -1,218 +1,7 @@
-import { PathCommandMap, MatrixHelper, Direction9, Leaf, Text, Path, Line, Polygon, Group, Box, Event, defineKey, UI, Paint, Rect, Answer, Bounds, LeafList, PointHelper, AroundHelper, MathHelper, Matrix, Debug, PropertyEvent, LeafHelper, DataHelper, RenderEvent, getPointData, Creator, dataType } from '@leafer-ui/draw';
+export * from '@leafer-in/resize';
+import { Event, defineKey, getMatrixData, getBoundsData, UI, Paint, MatrixHelper, BoundsHelper, LeafBoundsHelper, Group, Rect, Answer, Bounds, LeafList, PointHelper, AroundHelper, MathHelper, Direction9, Box, Text, Matrix, Debug, PropertyEvent, LeafHelper, DataHelper, RenderEvent, getPointData, Creator, dataType } from '@leafer-ui/draw';
 import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, RotateEvent, KeyEvent } from '@leafer-ui/core';
 
-const { M, L, C, Q, Z, N, D, X, G, F, O, P, U } = PathCommandMap;
-const PathScaler = {
-    scale(data, scaleX, scaleY) {
-        if (!data)
-            return;
-        let command;
-        let i = 0, len = data.length;
-        while (i < len) {
-            command = data[i];
-            switch (command) {
-                case M:
-                case L:
-                    scalePoints(data, scaleX, scaleY, i, 1);
-                    i += 3;
-                    break;
-                case C:
-                    scalePoints(data, scaleX, scaleY, i, 3);
-                    i += 7;
-                    break;
-                case Q:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 5;
-                    break;
-                case Z:
-                    i += 1;
-                    break;
-                case N:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 5;
-                    break;
-                case D:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 9;
-                    break;
-                case X:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 6;
-                    break;
-                case G:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 9;
-                    break;
-                case F:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 5;
-                    break;
-                case O:
-                    data[i] = G;
-                    data.splice(i + 4, 0, data[i + 3], 0);
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 7 + 2;
-                    len += 2;
-                    break;
-                case P:
-                    data[i] = F;
-                    data.splice(i + 4, 0, data[i + 3]);
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 4 + 1;
-                    len += 1;
-                    break;
-                case U:
-                    scalePoints(data, scaleX, scaleY, i, 2);
-                    i += 6;
-                    break;
-            }
-        }
-    },
-    scalePoints(data, scaleX, scaleY, start, pointCount) {
-        for (let i = pointCount ? start + 1 : 0, end = pointCount ? i + pointCount * 2 : data.length; i < end; i += 2) {
-            data[i] *= scaleX;
-            data[i + 1] *= scaleY;
-        }
-    }
-};
-const { scalePoints } = PathScaler;
-
-const matrix$1 = MatrixHelper.get();
-const { topLeft: topLeft$1, top: top$1, topRight: topRight$1, right: right$2, bottom: bottom$1, left: left$2 } = Direction9;
-function scaleResize(leaf, scaleX, scaleY) {
-    if (leaf.pathInputed) {
-        scaleResizePath(leaf, scaleX, scaleY);
-    }
-    else {
-        if (scaleX !== 1)
-            leaf.width *= scaleX;
-        if (scaleY !== 1)
-            leaf.height *= scaleY;
-    }
-}
-function scaleResizeFontSize(leaf, scaleX, scaleY) {
-    const { app } = leaf;
-    const editor = app && app.editor;
-    let fontScale = scaleX;
-    if (editor.editing) {
-        const layout = leaf.__layout;
-        let { width, height } = layout.boxBounds;
-        width *= scaleY - scaleX;
-        height *= scaleX - scaleY;
-        switch (editor.resizeDirection) {
-            case top$1:
-            case bottom$1:
-                fontScale = scaleY;
-                layout.affectScaleOrRotation ? leaf.moveInner(-width / 2, 0) : leaf.x -= width / 2;
-                break;
-            case left$2:
-            case right$2:
-                layout.affectScaleOrRotation ? leaf.moveInner(0, -height / 2) : leaf.y -= height / 2;
-                break;
-            case topLeft$1:
-            case topRight$1:
-                layout.affectScaleOrRotation ? leaf.moveInner(0, -height) : leaf.y -= height;
-                break;
-        }
-    }
-    leaf.fontSize *= fontScale;
-    const data = leaf.__;
-    if (!data.__autoWidth)
-        leaf.width *= fontScale;
-    if (!data.__autoHeight)
-        leaf.height *= fontScale;
-}
-function scaleResizePath(leaf, scaleX, scaleY) {
-    PathScaler.scale(leaf.__.path, scaleX, scaleY);
-    leaf.path = leaf.__.path;
-}
-function scaleResizePoints(leaf, scaleX, scaleY) {
-    const { points } = leaf;
-    typeof points[0] === 'object' ? points.forEach(p => { p.x *= scaleX, p.y *= scaleY; }) : PathScaler.scalePoints(points, scaleX, scaleY);
-    leaf.points = points;
-}
-function scaleResizeGroup(group, scaleX, scaleY) {
-    const { children } = group;
-    for (let i = 0; i < children.length; i++) {
-        matrix$1.a = scaleX;
-        matrix$1.d = scaleY;
-        children[i].transform(matrix$1, true);
-    }
-}
-
-const leaf = Leaf.prototype;
-leaf.scaleResize = function (scaleX, scaleY = scaleX, noResize) {
-    const data = this;
-    if (noResize || (data.editConfig && data.editConfig.editSize === 'scale')) {
-        data.scaleX *= scaleX;
-        data.scaleY *= scaleY;
-    }
-    else {
-        if (scaleX < 0)
-            data.scaleX *= -1, scaleX = -scaleX;
-        if (scaleY < 0)
-            data.scaleY *= -1, scaleY = -scaleY;
-        this.__scaleResize(scaleX, scaleY);
-    }
-};
-leaf.__scaleResize = function (scaleX, scaleY) {
-    scaleResize(this, scaleX, scaleY);
-};
-leaf.resizeWidth = function (width) {
-    const scale = width / this.getBounds('box', 'local').width;
-    this.scaleOf(this.__layout.boxBounds, scale, this.__.lockRatio ? scale : 1, true);
-};
-leaf.resizeHeight = function (height) {
-    const scale = height / this.getBounds('box', 'local').height;
-    this.scaleOf(this.__layout.boxBounds, this.__.lockRatio ? scale : 1, scale, true);
-};
-Text.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.__.resizeFontSize || (this.editConfig && this.editConfig.editSize === 'font-size')) {
-        scaleResizeFontSize(this, scaleX, scaleY);
-    }
-    else {
-        scaleResize(this, scaleX, scaleY);
-    }
-};
-Path.prototype.__scaleResize = function (scaleX, scaleY) {
-    scaleResizePath(this, scaleX, scaleY);
-};
-Line.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.pathInputed) {
-        scaleResizePath(this, scaleX, scaleY);
-    }
-    else if (this.points) {
-        scaleResizePoints(this, scaleX, scaleY);
-    }
-    else {
-        this.width *= scaleX;
-    }
-};
-Polygon.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.pathInputed) {
-        scaleResizePath(this, scaleX, scaleY);
-    }
-    else if (this.points) {
-        scaleResizePoints(this, scaleX, scaleY);
-    }
-    else {
-        scaleResize(this, scaleX, scaleY);
-    }
-};
-Group.prototype.__scaleResize = function (scaleX, scaleY) {
-    scaleResizeGroup(this, scaleX, scaleY);
-};
-Box.prototype.__scaleResize = function (scaleX, scaleY) {
-    if (this.__.__autoSize && this.children.length) {
-        scaleResizeGroup(this, scaleX, scaleY);
-    }
-    else {
-        scaleResize(this, scaleX, scaleY);
-        if (this.__.resizeChildren)
-            scaleResizeGroup(this, scaleX, scaleY);
-    }
-};
-
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -299,9 +88,12 @@ function targetAttr(fn) {
     };
 }
 
-const matrix = MatrixHelper.get();
 const { abs } = Math;
 const { copy: copy$1, scale } = MatrixHelper;
+const { setListWithFn } = BoundsHelper;
+const { worldBounds } = LeafBoundsHelper;
+const matrix = getMatrixData();
+const bounds$1 = getBoundsData();
 class Stroker extends UI {
     constructor() {
         super();
@@ -312,6 +104,17 @@ class Stroker extends UI {
     setTarget(target, style) {
         this.set(style);
         this.target = target;
+        this.update();
+    }
+    update() {
+        const { list } = this;
+        if (list.length) {
+            setListWithFn(bounds$1, list, worldBounds);
+            this.set(bounds$1);
+        }
+        else {
+            this.width = this.height = 1;
+        }
     }
     __draw(canvas, options) {
         const { list } = this;
@@ -321,7 +124,7 @@ class Stroker extends UI {
             for (let i = 0; i < list.length; i++) {
                 leaf = list[i];
                 const { worldTransform, worldRenderBounds } = leaf;
-                if (bounds && bounds.hit(worldRenderBounds, options.matrix)) {
+                if (!bounds || bounds.hit(worldRenderBounds, options.matrix)) {
                     const aScaleX = abs(worldTransform.scaleX), aScaleY = abs(worldTransform.scaleY);
                     if (aScaleX !== aScaleY) {
                         copy$1(matrix, worldTransform);
@@ -361,7 +164,6 @@ __decorate([
 function onTarget$1(stroker) {
     const value = stroker.target;
     stroker.list = value ? (value instanceof Array ? value : [value]) : [];
-    stroker.forceUpdate();
 }
 
 class SelectArea extends Group {
@@ -446,8 +248,8 @@ class EditSelect extends Group {
         }
     }
     update() {
-        if (this.targetStroker.target)
-            this.targetStroker.forceUpdate();
+        this.hoverStroker.update();
+        this.targetStroker.update();
     }
     onPointerMove(e) {
         const { app, editor } = this;
@@ -2100,4 +1902,4 @@ UI.setEditInner = function (editorName) {
     });
 };
 
-export { EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, InnerEditor, InnerEditorEvent, LineEditTool, PathScaler, SelectArea, Stroker, registerEditTool, registerInnerEditor, scaleResize, scaleResizeFontSize, scaleResizeGroup, scaleResizePath, scaleResizePoints };
+export { EditBox, EditDataHelper, EditPoint, EditSelect, EditSelectHelper, EditTool, EditToolCreator, Editor, EditorEvent, EditorGroupEvent, EditorHelper, EditorMoveEvent, EditorRotateEvent, EditorScaleEvent, EditorSkewEvent, InnerEditor, InnerEditorEvent, LineEditTool, SelectArea, Stroker, registerEditTool, registerInnerEditor };