leafer-ui 1.9.2 → 1.9.4

package/dist/web.js

@@ -49,7 +49,7 @@ var LeaferUI = function(exports) {
         return value === undefined;
     }
     function isNull(value) {
-        return value === undefined || value === null;
+        return value == null;
     }
     function isString(value) {
         return typeof value === "string";
@@ -285,6 +285,9 @@ var LeaferUI = function(exports) {
             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) {
@@ -1129,10 +1132,8 @@ var LeaferUI = function(exports) {
             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);
@@ -3869,7 +3870,7 @@ var LeaferUI = function(exports) {
         return {
             get() {
                 const v = this[privateKey];
-                return isUndefined(v) ? defaultValue : v;
+                return v == null ? defaultValue : v;
             },
             set(value) {
                 this[privateKey] = value;
@@ -4122,21 +4123,21 @@ var LeaferUI = function(exports) {
             };
         } 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;
@@ -4146,7 +4147,7 @@ var LeaferUI = function(exports) {
         } 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;
@@ -4878,7 +4879,7 @@ var LeaferUI = function(exports) {
         }
         boxChange() {
             this.boxChanged = true;
-            this.localBoxChanged || this.localBoxChange();
+            this.localBoxChanged ? this.boundsChanged || (this.boundsChanged = true) : this.localBoxChange();
             this.hitCanvasChanged = true;
         }
         localBoxChange() {
@@ -4912,7 +4913,7 @@ var LeaferUI = function(exports) {
         }
         matrixChange() {
             this.matrixChanged = true;
-            this.localBoxChanged || this.localBoxChange();
+            this.localBoxChanged ? this.boundsChanged || (this.boundsChanged = true) : this.localBoxChange();
         }
         surfaceChange() {
             this.surfaceChanged = true;
@@ -5886,10 +5887,10 @@ var LeaferUI = function(exports) {
                 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) {
@@ -6343,7 +6344,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "1.9.2";
+    const version = "1.9.4";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -8555,26 +8556,24 @@ var LeaferUI = function(exports) {
         }
         __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();