@leafer-ui/core 1.5.2 → 1.6.0

package/lib/core.cjs

@@ -62,26 +62,25 @@ exports.App = class App extends draw.Leafer {
         this.leafer = this;
         this.watcher.disable();
         this.layouter.disable();
-        this.__eventIds.push(this.on_(core.PropertyEvent.CHANGE, this.__onPropertyChange, this));
     }
     start() {
         super.start();
-        this.children.forEach(leafer => leafer.start());
+        this.forEach(leafer => leafer.start());
     }
     stop() {
-        this.children.forEach(leafer => leafer.stop());
+        this.forEach(leafer => leafer.stop());
         super.stop();
     }
     unlockLayout() {
         super.unlockLayout();
-        this.children.forEach(leafer => leafer.unlockLayout());
+        this.forEach(leafer => leafer.unlockLayout());
     }
     lockLayout() {
         super.lockLayout();
-        this.children.forEach(leafer => leafer.lockLayout());
+        this.forEach(leafer => leafer.lockLayout());
     }
     forceRender(bounds, sync) {
-        this.children.forEach(leafer => leafer.forceRender(bounds, sync));
+        this.forEach(leafer => leafer.forceRender(bounds, sync));
     }
     addLeafer(merge) {
         const leafer = new draw.Leafer(merge);
@@ -101,9 +100,8 @@ exports.App = class App extends draw.Leafer {
             leafer.canvas.childIndex = index;
         this.__listenChildEvents(leafer);
     }
-    __onPropertyChange() {
-        if (core.Debug.showHitView)
-            this.children.forEach(leafer => leafer.forceUpdate('surface'));
+    forEach(fn) {
+        this.children.forEach(fn);
     }
     __onCreated() {
         this.created = this.children.every(child => child.created);
@@ -126,18 +124,18 @@ exports.App = class App extends draw.Leafer {
             const m = options.matrix;
             if (m)
                 canvas.setTransform(m.a, m.b, m.c, m.d, m.e, m.f);
-            this.children.forEach(leafer => canvas.copyWorld(leafer.canvas));
+            this.forEach(leafer => canvas.copyWorld(leafer.canvas));
         }
     }
     __onResize(event) {
-        this.children.forEach(leafer => leafer.resize(event));
+        this.forEach(leafer => leafer.resize(event));
         super.__onResize(event);
     }
     updateLayout() {
-        this.children.forEach(leafer => leafer.updateLayout());
+        this.forEach(leafer => leafer.updateLayout());
     }
     __getChildConfig(userConfig) {
-        let config = Object.assign({}, this.config);
+        const config = Object.assign({}, this.config);
         config.hittable = config.realCanvas = undefined;
         if (userConfig)
             core.DataHelper.assign(config, userConfig);
@@ -696,6 +694,7 @@ const config = {
         delta: { x: 80 / 4, y: 8.0 },
     },
     pointer: {
+        snap: true,
         hitRadius: 5,
         tapTime: 120,
         longPressTime: 800,
@@ -790,7 +789,7 @@ class InteractionBase {
         if (this.downData) {
             const canDrag = core.PointHelper.getDistance(this.downData, data) > this.p.dragDistance;
             if (canDrag) {
-                if (this.waitTap)
+                if (this.waitTap || this.longPressTimer)
                     this.pointerWaitCancel();
                 this.waitRightTap = false;
             }
@@ -1051,7 +1050,10 @@ class InteractionBase {
     }
     getLocal(clientPoint, updateClient) {
         const clientBounds = this.canvas.getClientBounds(updateClient);
-        return { x: clientPoint.clientX - clientBounds.x, y: clientPoint.clientY - clientBounds.y };
+        const point = { x: clientPoint.clientX - clientBounds.x, y: clientPoint.clientY - clientBounds.y };
+        if (this.p.snap)
+            core.PointHelper.round(point);
+        return point;
     }
     emitTap(data) {
         this.emit(exports.PointerEvent.TAP, data);
@@ -1183,25 +1185,26 @@ const { toInnerRadiusPointOf, copy, setRadius } = core.PointHelper;
 const inner = {};
 const leaf = core.Leaf.prototype;
 leaf.__hitWorld = function (point) {
-    if (!this.__.hitSelf)
+    const data = this.__;
+    if (!data.hitSelf)
         return false;
-    if (this.__.hitRadius) {
+    const world = this.__world, layout = this.__layout;
+    const isSmall = world.width < 10 && world.height < 10;
+    if (data.hitRadius) {
         copy(inner, point), point = inner;
-        setRadius(point, this.__.hitRadius);
+        setRadius(point, data.hitRadius);
     }
-    toInnerRadiusPointOf(point, this.__world, inner);
-    const { width, height } = this.__world;
-    const isSmall = width < 10 && height < 10;
-    if (this.__.hitBox || isSmall) {
-        if (core.BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner))
+    toInnerRadiusPointOf(point, world, inner);
+    if (data.hitBox || isSmall) {
+        if (core.BoundsHelper.hitRadiusPoint(layout.boxBounds, inner))
             return true;
         if (isSmall)
             return false;
     }
-    if (this.__layout.hitCanvasChanged || !this.__hitCanvas) {
+    if (layout.hitCanvasChanged || !this.__hitCanvas) {
         this.__updateHitCanvas();
-        if (!this.__layout.boundsChanged)
-            this.__layout.hitCanvasChanged = false;
+        if (!layout.boundsChanged)
+            layout.hitCanvasChanged = false;
     }
     return this.__hit(inner);
 };
@@ -1214,7 +1217,9 @@ leaf.__drawHitPath = function (canvas) { if (canvas)
 const matrix = new core.Matrix();
 const ui$1 = draw.UI.prototype;
 ui$1.__updateHitCanvas = function () {
-    const data = this.__, { hitCanvasManager } = this.leafer;
+    if (this.__box)
+        this.__box.__updateHitCanvas();
+    const data = this.__, { hitCanvasManager } = this.leafer || this.parent.leafer;
     const isHitPixelFill = (data.__pixelFill || data.__isCanvas) && data.hitFill === 'pixel';
     const isHitPixelStroke = data.__pixelStroke && data.hitStroke === 'pixel';
     const isHitPixel = isHitPixelFill || isHitPixelStroke;
@@ -1228,9 +1233,9 @@ ui$1.__updateHitCanvas = function () {
         const { x, y, width, height } = core.tempBounds.set(renderBounds).scale(scale);
         h.resize({ width, height, pixelRatio: 1 });
         h.clear();
-        draw.ImageManager.patternLocked = true;
+        core.ImageManager.patternLocked = true;
         this.__renderShape(h, { matrix: matrix.setWith(this.__world).scaleWith(1 / scale).invertWith().translate(-x, -y) }, !isHitPixelFill, !isHitPixelStroke);
-        draw.ImageManager.patternLocked = false;
+        core.ImageManager.patternLocked = false;
         h.resetTransform();
         data.__isHitPixel = true;
     }
@@ -1241,6 +1246,8 @@ ui$1.__updateHitCanvas = function () {
     h.setStrokeOptions(data);
 };
 ui$1.__hit = function (inner) {
+    if (this.__box && this.__box.__hit(inner))
+        return true;
     const data = this.__;
     if (data.__isHitPixel && this.__hitPixel(inner))
         return true;
@@ -1289,6 +1296,15 @@ rect.__hitFill = box.__hitFill = function (inner) {
     return this.__hitCanvas ? ui.__hitFill.call(this, inner) : core.BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner);
 };
 
+draw.Text.prototype.__drawHitPath = function (canvas) {
+    const { __lineHeight, fontSize, __baseLine, __letterSpacing, __textDrawData: data } = this.__;
+    canvas.beginPath();
+    if (__letterSpacing < 0)
+        this.__drawPathByBox(canvas);
+    else
+        data.rows.forEach(row => canvas.rect(row.x, row.y - __baseLine, row.width, __lineHeight < fontSize ? fontSize : __lineHeight));
+};
+
 function getSelector(ui) {
     return ui.leafer ? ui.leafer.selector : (draw.Platform.selector || (draw.Platform.selector = draw.Creator.selector()));
 }