leafer-game 2.2.0 → 2.2.2

package/dist/web.js

@@ -4261,10 +4261,13 @@ var LeaferUI = function(exports) {
     function surfaceType(defaultValue) {
         return decorateLeafAttr(defaultValue, key => attr({
             set(value) {
-                this.__setAttr(key, value) && (this.__layout.surfaceChanged || this.__layout.surfaceChange());
+                this.__setAttr(key, value) && doSurfaceType(this);
             }
         }));
     }
+    function doSurfaceType(leaf) {
+        leaf.__layout.surfaceChanged || leaf.__layout.surfaceChange();
+    }
     function dimType(defaultValue) {
         return decorateLeafAttr(defaultValue, key => attr({
             set(value) {
@@ -4324,12 +4327,12 @@ var LeaferUI = function(exports) {
             }
         }));
     }
-    function maskType(defaultValue) {
+    function maskType(defaultValue, updateSelf) {
         return decorateLeafAttr(defaultValue, key => attr({
             set(value) {
                 if (this.__setAttr(key, value)) {
                     this.__layout.boxChanged || this.__layout.boxChange();
-                    this.waitParent(() => {
+                    updateSelf ? this.__updateMask() : this.waitParent(() => {
                         this.parent.__updateMask(value);
                     });
                 }
@@ -5860,7 +5863,8 @@ var LeaferUI = function(exports) {
             if (this.__worldOpacity && hasSize(nowWorld)) {
                 const data = this.__;
                 if (data.__useDim) {
-                    if (data.dim) options.dimOpacity = data.dim === true ? .2 : data.dim; else if (data.bright && !options.topRendering) return options.topList.add(this); else if (data.dimskip) options.dimOpacity && (options.dimOpacity = 0);
+                    if (data.bright && !options.topRendering) return options.topList.add(this);
+                    if (data.dim) options.dimOpacity = data.dim === true ? .2 : data.dim; else if (data.dimskip) options.dimOpacity && (options.dimOpacity = 0);
                 }
                 if (data.__single && !this.isBranchLeaf) {
                     if (data.eraser === "path") return this.__renderEraser(canvas, options);
@@ -5884,6 +5888,7 @@ var LeaferUI = function(exports) {
                     child = children[i];
                     excludeRenderBounds$1(child, options) || (child.__hasComplex ? LeafHelper.renderComplex(child, canvas, options) : child.__render(canvas, options));
                 }
+                if (this.__hasMask === 0) this.__rerenderMask(canvas, options);
             }
         },
         __clip(canvas, options) {
@@ -6092,11 +6097,19 @@ var LeaferUI = function(exports) {
         updateLayout() {
             this.__layout.update();
         }
-        forceUpdate(attrName) {
-            if (isUndefined(attrName)) attrName = "width"; else if (attrName === "surface") attrName = "blendMode";
-            const value = this.__.__getInput(attrName);
-            this.__[attrName] = isUndefined(value) ? null : undefined;
-            this[attrName] = value;
+        forceUpdate(typeOrAttrName) {
+            let quick;
+            if (!typeOrAttrName || typeOrAttrName === "bounds") doBoundsType(this), quick = true; else if (typeOrAttrName === "surface") doSurfaceType(this), 
+            quick = true; else if (typeOrAttrName === "stroke") doStrokeType(this), quick = true;
+            if (quick) {
+                const {leafer: leafer} = this;
+                return leafer && leafer.watcher && leafer.watcher.__onAttrChange({
+                    target: this
+                });
+            }
+            const value = this.__.__getInput(typeOrAttrName);
+            this.__[typeOrAttrName] = isUndefined(value) ? null : undefined;
+            this[typeOrAttrName] = value;
         }
         forceRender(_bounds, _sync) {
             this.forceUpdate("surface");
@@ -6115,7 +6128,8 @@ var LeaferUI = function(exports) {
             canvas.restore();
         }
         __updateMask(_value) {
-            this.__hasMask = this.children.some(item => item.__.mask && item.__.visible && item.__.opacity);
+            const hasMask = this.children.some(item => item.__.mask && item.__.visible && item.__.opacity);
+            this.__hasMask = this.__.maskskip ? hasMask && 0 : hasMask;
         }
         __getNowWorld(options) {
             if (options.matrix) {
@@ -6574,7 +6588,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.2.0";
+    const version = "2.2.1";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -7455,7 +7469,7 @@ var LeaferUI = function(exports) {
                 for (let i = 0, len = list.length; i < len; i++) {
                     find = list[i];
                     if (ignoreHittable || LeafHelper.worldHittable(find)) {
-                        this.hitChild(find, point);
+                        this.hitChild(find, find.hitThrough ? this.point : point);
                         if (findList.length) {
                             if (find.isBranchLeaf && list.some(item => item !== find && LeafHelper.hasParent(item, find))) {
                                 findList.reset();
@@ -7468,7 +7482,7 @@ var LeaferUI = function(exports) {
             }
             if (bottomList) {
                 for (let i = 0, len = bottomList.length; i < len; i++) {
-                    this.hitChild(bottomList[i].target, this.point, bottomList[i].proxy);
+                    this.hitChild(bottomList[i].target, this.point, undefined, bottomList[i].proxy);
                     if (findList.length) return findList.list[0];
                 }
             }
@@ -7526,42 +7540,38 @@ var LeaferUI = function(exports) {
         hitBranch(branch) {
             this.eachFind(branch.children, branch.__onlyHitMask);
         }
-        eachFind(children, hitMask) {
+        eachFind(children, onlyHitMask) {
             let child, hit, data;
             const {point: point} = this, len = children.length;
             for (let i = len - 1; i > -1; i--) {
                 child = children[i], data = child.__;
-                if (!data.visible || hitMask && !data.mask) continue;
+                if (!data.visible || onlyHitMask && !data.mask) continue;
                 hit = hitRadiusPoint$1(child.__world, data.hitRadius ? copyRadiusPoint$1(tempPoint$2, point, data.hitRadius) : point);
                 if (child.isBranch) {
                     if (hit || child.__ignoreHitWorld) {
                         if (child.isBranchLeaf && data.__clipAfterFill && !child.__hitWorld(point, true)) continue;
                         if (child.topChildren) this.eachFind(child.topChildren, false);
                         this.eachFind(child.children, child.__onlyHitMask);
-                        if (child.isBranchLeaf) this.hitChild(child, point);
+                        if (child.isBranchLeaf) this.hitChild(child, point, onlyHitMask);
                     }
                 } else {
-                    if (hit) this.hitChild(child, point);
+                    if (hit) this.hitChild(child, point, onlyHitMask);
                 }
             }
         }
-        hitChild(child, point, proxy) {
+        hitChild(child, point, onlyHitMask, proxy) {
             if (this.exclude && this.exclude.has(child)) return;
-            if (child.__hitWorld(point)) {
-                const {parent: parent} = child;
-                if (parent && parent.__hasMask && !child.__.mask) {
-                    let findMasks = [], item;
-                    const {children: children} = parent;
-                    for (let i = 0, len = children.length; i < len; i++) {
-                        item = children[i];
-                        if (item.__.mask) findMasks.push(item);
-                        if (item === child) {
-                            if (findMasks && !findMasks.every(value => value.__hitWorld(point))) return;
-                            break;
-                        }
-                    }
+            if (child.__hitWorld(point, onlyHitMask && child.mask === "path" ? true : undefined)) {
+                const {parent: parent, mask: mask} = child;
+                if (parent && parent.__hasMask && mask && !(mask === "clipping" || mask === "clipping-path")) {
+                    if (!parent.children.some(item => !item.mask && item.__hitWorld(point))) return;
+                }
+                const leaf = proxy || child, {hitThrough: hitThrough} = child, {findList: findList} = this;
+                if (hitThrough) {
+                    const index = findList.list.findIndex(item => item[hitThrough] === child[hitThrough]);
+                    if (index > 0) return findList.addAt(leaf, index);
                 }
-                this.findList.add(proxy || child);
+                findList.add(leaf);
             }
         }
         clear() {
@@ -8328,6 +8338,7 @@ var LeaferUI = function(exports) {
     __decorate([ dataType("auto") ], exports.UI.prototype, "dragBoundsType", void 0);
     __decorate([ dataType(false) ], exports.UI.prototype, "editable", void 0);
     __decorate([ hitType(true) ], exports.UI.prototype, "hittable", void 0);
+    __decorate([ hitType() ], exports.UI.prototype, "hitThrough", void 0);
     __decorate([ hitType("path") ], exports.UI.prototype, "hitFill", void 0);
     __decorate([ strokeType("path") ], exports.UI.prototype, "hitStroke", void 0);
     __decorate([ hitType(false) ], exports.UI.prototype, "hitBox", void 0);
@@ -9917,6 +9928,7 @@ var LeaferUI = function(exports) {
         }
         dragEnd(data) {
             if (!this.dragging && !this.moving) return;
+            setTimeout(() => this.interaction.pointerMove(data));
             if (this.checkDragEndAnimate(data)) return;
             this.dragEndReal(data);
         }
@@ -11443,7 +11455,7 @@ var LeaferUI = function(exports) {
             data.__naturalWidth = image.width / data.pixelRatio;
             data.__naturalHeight = image.height / data.pixelRatio;
             if (data.__autoSide) {
-                ui.forceUpdate("width");
+                ui.forceUpdate();
                 LeafHelper.updateBounds(ui);
                 ui.__layout.boundsChanged = true;
                 if (ui.__proxyData) {
@@ -12705,7 +12717,7 @@ var LeaferUI = function(exports) {
                 const data = this.__;
                 const width = nowFrame.width / data.pixelRatio;
                 const height = nowFrame.height / data.pixelRatio;
-                if (data.width !== width || data.height !== height) this.forceUpdate("width");
+                if (data.width !== width || data.height !== height) this.forceUpdate();
                 data.__naturalWidth = width;
                 data.__naturalHeight = height;
             }
@@ -14723,6 +14735,7 @@ var LeaferUI = function(exports) {
     exports.dimType = dimType;
     exports.doBoundsType = doBoundsType;
     exports.doStrokeType = doStrokeType;
+    exports.doSurfaceType = doSurfaceType;
     exports.effectType = effectType;
     exports.emptyData = emptyData;
     exports.eraserType = eraserType;