@leafer/miniapp 1.9.2 → 1.9.3

package/dist/miniapp.module.js

@@ -1191,10 +1191,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);
@@ -6741,7 +6739,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.9.2";
+const version = "1.9.3";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -9096,7 +9094,10 @@ let Box = class Box extends Group {
             const data = this.__, layout = this.__layout, {renderBounds: renderBounds, boxBounds: boxBounds} = layout;
             const childrenRenderBounds = layout.childrenRenderBounds || (layout.childrenRenderBounds = getBoundsData());
             super.__updateRenderBounds(childrenRenderBounds);
-            scroll(childrenRenderBounds, data);
+            if (data.overflow.includes("scroll")) {
+                add(childrenRenderBounds, boxBounds);
+                scroll(childrenRenderBounds, data);
+            }
             this.__updateRectRenderBounds();
             isOverflow = !includes$1(boxBounds, childrenRenderBounds);
             if (isOverflow && data.overflow === "show") add(renderBounds, childrenRenderBounds);
@@ -14776,11 +14777,22 @@ let Editor = class Editor extends Group {
     updateEditTool() {
         this.unloadEditTool();
         if (this.editing) {
-            const name = this.element.editOuter || "EditTool";
-            const tool = this.editTool = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this);
-            this.editBox.load();
-            tool.load();
-            this.update();
+            const target = this.element;
+            let name = target.editOuter || "EditTool";
+            const {beforeEditOuter: beforeEditOuter} = this.mergeConfig;
+            if (beforeEditOuter) {
+                const check = beforeEditOuter({
+                    target: target,
+                    name: name
+                });
+                if (isString(check)) name = check; else if (check === false) return;
+            }
+            if (EditToolCreator.list[name]) {
+                const tool = this.editTool = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this);
+                this.editBox.load();
+                tool.load();
+                this.update();
+            }
         }
     }
     unloadEditTool() {
@@ -14873,13 +14885,21 @@ let Editor = class Editor extends Group {
         if (isString(nameOrSelect)) name = nameOrSelect; else if (!select) select = nameOrSelect;
         if (target && select) this.target = target;
         if (this.single) {
-            const editTarget = target || this.element;
-            name || (name = editTarget.editInner);
-            if (name && EditToolCreator.list[name]) {
+            if (!target) target = this.element;
+            if (!name) name = target.editInner;
+            const {beforeEditInner: beforeEditInner} = this.mergeConfig;
+            if (beforeEditInner) {
+                const check = beforeEditInner({
+                    target: target,
+                    name: name
+                });
+                if (isString(check)) name = check; else if (check === false) return;
+            }
+            if (EditToolCreator.list[name]) {
                 this.editTool.unload();
                 this.innerEditing = true;
                 this.innerEditor = this.editToolList[name] = this.editToolList[name] || EditToolCreator.get(name, this);
-                this.innerEditor.editTarget = editTarget;
+                this.innerEditor.editTarget = target;
                 this.emitInnerEvent(InnerEditorEvent.BEFORE_OPEN);
                 this.innerEditor.load();
                 this.emitInnerEvent(InnerEditorEvent.OPEN);