@leafer-draw/miniapp 1.9.2 → 1.9.4

package/dist/miniapp.module.js

@@ -54,7 +54,7 @@ function isUndefined(value) {
 }
 
 function isNull(value) {
-    return value === undefined || value === null;
+    return value == null;
 }
 
 function isString(value) {
@@ -304,6 +304,9 @@ const MathHelper = {
         num = round$3(num * a) / a;
         return num === -0 ? 0 : num;
     },
+    sign(num) {
+        return num < 0 ? -1 : 1;
+    },
     getScaleData(scale, size, originSize, scaleData) {
         if (!scaleData) scaleData = {};
         if (size) {
@@ -1191,10 +1194,8 @@ const BoundsHelper = {
         t.y += y;
     },
     scroll(t, data) {
-        if (data.scrollY || data.scrollX) {
-            t.x += data.scrollX;
-            t.y += data.scrollY;
-        }
+        t.x += data.scrollX;
+        t.y += data.scrollY;
     },
     getByMove(t, x, y) {
         t = Object.assign({}, t);
@@ -4104,7 +4105,7 @@ function createDescriptor(key, defaultValue) {
     return {
         get() {
             const v = this[privateKey];
-            return isUndefined(v) ? defaultValue : v;
+            return v == null ? defaultValue : v;
         },
         set(value) {
             this[privateKey] = value;
@@ -4390,21 +4391,21 @@ function defineDataProcessor(target, key, defaultValue) {
         };
     } else if (typeof defaultValue === "function") {
         property.get = function() {
-            let v = this[computedKey];
-            return v === undefined ? defaultValue(this.__leaf) : v;
+            const v = this[computedKey];
+            return v == null ? defaultValue(this.__leaf) : v;
         };
     } else if (isObject(defaultValue)) {
         const isEmpty = isEmptyData(defaultValue);
         property.get = function() {
-            let v = this[computedKey];
-            return v === undefined ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v;
+            const v = this[computedKey];
+            return v == null ? this[computedKey] = isEmpty ? {} : DataHelper.clone(defaultValue) : v;
         };
     }
     const isBox = target.isBranchLeaf;
     if (key === "width") {
         property.get = function() {
             const v = this[computedKey];
-            if (v === undefined) {
+            if (v == null) {
                 const t = this, naturalWidth = t.__naturalWidth, leaf = t.__leaf;
                 if (!defaultValue || leaf.pathInputed) return leaf.boxBounds.width;
                 if (naturalWidth) return t._height && t.__useNaturalRatio ? t._height * naturalWidth / t.__naturalHeight : naturalWidth;
@@ -4414,7 +4415,7 @@ function defineDataProcessor(target, key, defaultValue) {
     } else if (key === "height") {
         property.get = function() {
             const v = this[computedKey];
-            if (v === undefined) {
+            if (v == null) {
                 const t = this, naturalHeight = t.__naturalHeight, leaf = t.__leaf;
                 if (!defaultValue || leaf.pathInputed) return leaf.boxBounds.height;
                 if (naturalHeight) return t._width && t.__useNaturalRatio ? t._width * naturalHeight / t.__naturalWidth : naturalHeight;
@@ -5174,7 +5175,7 @@ class LeafLayout {
     }
     boxChange() {
         this.boxChanged = true;
-        this.localBoxChanged || this.localBoxChange();
+        this.localBoxChanged ? this.boundsChanged || (this.boundsChanged = true) : this.localBoxChange();
         this.hitCanvasChanged = true;
     }
     localBoxChange() {
@@ -5208,7 +5209,7 @@ class LeafLayout {
     }
     matrixChange() {
         this.matrixChanged = true;
-        this.localBoxChanged || this.localBoxChange();
+        this.localBoxChanged ? this.boundsChanged || (this.boundsChanged = true) : this.localBoxChange();
     }
     surfaceChange() {
         this.surfaceChanged = true;
@@ -6274,10 +6275,10 @@ let Leaf = class Leaf {
             relative.innerToWorld(world, to, distance);
             world = to ? to : world;
         }
-        toInnerPoint(this.worldTransform, world, to, distance);
+        toInnerPoint(this.scrollWorldTransform, world, to, distance);
     }
     innerToWorld(inner, to, distance, relative) {
-        toOuterPoint(this.worldTransform, inner, to, distance);
+        toOuterPoint(this.scrollWorldTransform, inner, to, distance);
         if (relative) relative.worldToInner(to ? to : inner, null, distance);
     }
     getBoxPoint(world, relative, distance, change) {
@@ -6741,7 +6742,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.9.2";
+const version = "1.9.4";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -8908,26 +8909,24 @@ let Box = class Box extends Group {
     }
     __updateStrokeBounds() {}
     __updateRenderBounds() {
-        let isOverflow;
+        let isOverflow, isScrollMode;
         if (this.children.length) {
-            const data = this.__, layout = this.__layout, {renderBounds: renderBounds, boxBounds: boxBounds} = layout;
+            const data = this.__, layout = this.__layout, {renderBounds: renderBounds, boxBounds: boxBounds} = layout, {overflow: overflow} = data;
             const childrenRenderBounds = layout.childrenRenderBounds || (layout.childrenRenderBounds = getBoundsData());
             super.__updateRenderBounds(childrenRenderBounds);
-            scroll(childrenRenderBounds, data);
+            if (isScrollMode = overflow.includes("scroll")) {
+                add(childrenRenderBounds, boxBounds);
+                scroll(childrenRenderBounds, data);
+            }
             this.__updateRectRenderBounds();
             isOverflow = !includes$1(boxBounds, childrenRenderBounds);
-            if (isOverflow && data.overflow === "show") add(renderBounds, childrenRenderBounds);
+            if (isOverflow && overflow === "show") add(renderBounds, childrenRenderBounds);
         } else this.__updateRectRenderBounds();
         DataHelper.stintSet(this, "isOverflow", isOverflow);
-        this.__checkScroll();
+        this.__checkScroll(isScrollMode);
     }
     __updateRectRenderBounds() {}
-    __updateWorldBounds() {
-        if (this.hasScroller) this.__updateScroll();
-        super.__updateWorldBounds();
-    }
-    __checkScroll() {}
-    __updateScroll() {}
+    __checkScroll(_isScrollMode) {}
     __updateRectChange() {}
     __updateChange() {
         super.__updateChange();