@leafer-editor/worker 1.3.0 → 1.3.2

package/dist/worker.cjs

@@ -6,6 +6,7 @@ var viewport = require('@leafer-in/viewport');
 var view = require('@leafer-in/view');
 var scroll = require('@leafer-in/scroll');
 var arrow = require('@leafer-in/arrow');
+var find = require('@leafer-in/find');
 var _export = require('@leafer-in/export');
 var textEditor = require('@leafer-in/text-editor');
 var html = require('@leafer-in/html');
@@ -48,6 +49,12 @@ Object.keys(arrow).forEach(function (k) {
 		get: function () { return arrow[k]; }
 	});
 });
+Object.keys(find).forEach(function (k) {
+	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return find[k]; }
+	});
+});
 Object.keys(_export).forEach(function (k) {
 	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
 		enumerable: true,

package/dist/worker.esm.js

@@ -4,6 +4,7 @@ export * from '@leafer-in/viewport';
 export * from '@leafer-in/view';
 export * from '@leafer-in/scroll';
 export * from '@leafer-in/arrow';
+export * from '@leafer-in/find';
 export * from '@leafer-in/export';
 export * from '@leafer-in/text-editor';
 export * from '@leafer-in/html';

package/dist/worker.esm.min.js

@@ -1 +1 @@
-export*from"@leafer-ui/worker";export*from"@leafer-in/editor";export*from"@leafer-in/viewport";export*from"@leafer-in/view";export*from"@leafer-in/scroll";export*from"@leafer-in/arrow";export*from"@leafer-in/export";export*from"@leafer-in/text-editor";export*from"@leafer-in/html";
+export*from"@leafer-ui/worker";export*from"@leafer-in/editor";export*from"@leafer-in/viewport";export*from"@leafer-in/view";export*from"@leafer-in/scroll";export*from"@leafer-in/arrow";export*from"@leafer-in/find";export*from"@leafer-in/export";export*from"@leafer-in/text-editor";export*from"@leafer-in/html";

package/dist/worker.js

@@ -6010,7 +6010,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const version = "1.3.0";
+    const version = "1.3.2";
 
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() { return true; }
@@ -6542,7 +6542,7 @@ var LeaferUI = (function (exports) {
         partRender() {
             const { canvas, updateBlocks: list } = this;
             if (!list)
-                return debug$6.warn('PartRender: need update attr');
+                return;
             this.mergeBlocks();
             list.forEach(block => { if (canvas.bounds.hit(block) && !block.isEmpty())
                 this.clipRender(block); });
@@ -7398,7 +7398,7 @@ var LeaferUI = (function (exports) {
         animate(_keyframe, _options, _type, _isTemp) {
             return Plugin.need('animate');
         }
-        killAnimate(_type, _killStyle) { }
+        killAnimate(_type, _nextStyle) { }
         export(_filename, _options) {
             return Plugin.need('export');
         }
@@ -7894,8 +7894,6 @@ var LeaferUI = (function (exports) {
             this.created = true;
         }
         __onReady() {
-            if (this.ready)
-                return;
             this.ready = true;
             this.emitLeafer(LeaferEvent.BEFORE_READY);
             this.emitLeafer(LeaferEvent.READY);
@@ -7909,6 +7907,20 @@ var LeaferUI = (function (exports) {
             this.emitLeafer(LeaferEvent.VIEW_READY);
             WaitHelper.run(this.__viewReadyWait);
         }
+        __onLayoutEnd() {
+            const { grow, growWidth, growHeight } = this.config;
+            if (grow) {
+                let { width, height, pixelRatio } = this;
+                const bounds = grow === 'box' ? this.worldBoxBounds : this.__world;
+                if (growWidth !== false)
+                    width = Math.max(1, bounds.x + bounds.width);
+                if (growHeight !== false)
+                    height = Math.max(1, bounds.y + bounds.height);
+                this.__doResize({ width, height, pixelRatio });
+            }
+            if (!this.ready)
+                this.__onReady();
+        }
         __onNextRender() {
             if (this.viewReady) {
                 WaitHelper.run(this.__nextRenderWait);
@@ -8002,10 +8014,9 @@ var LeaferUI = (function (exports) {
             const runId = Run.start('FirstCreate ' + this.innerName);
             this.once(LeaferEvent.START, () => Run.end(runId));
             this.once(LayoutEvent.START, () => this.updateLazyBounds());
-            this.once(LayoutEvent.END, () => this.__onReady());
             this.once(RenderEvent.START, () => this.__onCreated());
             this.once(RenderEvent.END, () => this.__onViewReady());
-            this.__eventIds.push(this.on_(WatchEvent.DATA, this.__onWatchData, this), this.on_(RenderEvent.NEXT, this.__onNextRender, this));
+            this.__eventIds.push(this.on_(WatchEvent.DATA, this.__onWatchData, this), this.on_(LayoutEvent.END, this.__onLayoutEnd, this), this.on_(RenderEvent.NEXT, this.__onNextRender, this));
         }
         __removeListenEvents() {
             this.off_(this.__eventIds);
@@ -9928,8 +9939,8 @@ var LeaferUI = (function (exports) {
         this.__drawRenderPath(canvas); };
 
     const matrix$2 = new Matrix();
-    const ui$2 = exports.UI.prototype;
-    ui$2.__updateHitCanvas = function () {
+    const ui$3 = exports.UI.prototype;
+    ui$3.__updateHitCanvas = function () {
         const data = this.__, { hitCanvasManager } = this.leafer;
         const isHitPixelFill = (data.__pixelFill || data.__isCanvas) && data.hitFill === 'pixel';
         const isHitPixelStroke = data.__pixelStroke && data.hitStroke === 'pixel';
@@ -9956,7 +9967,7 @@ var LeaferUI = (function (exports) {
         this.__drawHitPath(h);
         h.setStrokeOptions(data);
     };
-    ui$2.__hit = function (inner) {
+    ui$3.__hit = function (inner) {
         if (Platform.name === 'miniapp')
             this.__drawHitPath(this.__hitCanvas);
         const data = this.__;
@@ -9996,24 +10007,24 @@ var LeaferUI = (function (exports) {
         return hitWidth ? this.__hitStroke(inner, hitWidth) : false;
     };
 
-    const ui$1 = exports.UI.prototype, rect = exports.Rect.prototype, box$1 = exports.Box.prototype;
+    const ui$2 = exports.UI.prototype, rect = exports.Rect.prototype, box$1 = exports.Box.prototype;
     rect.__updateHitCanvas = box$1.__updateHitCanvas = function () {
         if (this.stroke || this.cornerRadius || ((this.fill || this.__.__isCanvas) && this.hitFill === 'pixel') || this.hitStroke === 'all')
-            ui$1.__updateHitCanvas.call(this);
+            ui$2.__updateHitCanvas.call(this);
         else if (this.__hitCanvas)
             this.__hitCanvas = null;
     };
     rect.__hitFill = box$1.__hitFill = function (inner) {
-        return this.__hitCanvas ? ui$1.__hitFill.call(this, inner) : BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner);
+        return this.__hitCanvas ? ui$2.__hitFill.call(this, inner) : BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner);
     };
 
-    function getSelector(ui) {
+    function getSelector$1(ui) {
         return ui.leafer ? ui.leafer.selector : (Platform.selector || (Platform.selector = Creator.selector()));
     }
     exports.Group.prototype.pick = function (hitPoint, options) {
         this.leafer || this.updateLayout();
         options || (options = emptyData);
-        return getSelector(this).getByPoint(hitPoint, options.hitRadius || 0, Object.assign(Object.assign({}, options), { target: this }));
+        return getSelector$1(this).getByPoint(hitPoint, options.hitRadius || 0, Object.assign(Object.assign({}, options), { target: this }));
     };
 
     const canvas$1 = LeaferCanvasBase.prototype;
@@ -11252,7 +11263,7 @@ var LeaferUI = (function (exports) {
         rows.forEach(row => {
             if (row.words) {
                 indentWidth = paraIndent && row.paraStart ? paraIndent : 0;
-                addWordWidth = (width && textAlign === 'justify' && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0;
+                addWordWidth = (width && (textAlign === 'justify' || textAlign === 'both') && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0;
                 mode = (letterSpacing || row.isOverflow) ? CharMode : (addWordWidth > 0.01 ? WordMode : TextMode);
                 if (row.isOverflow && !letterSpacing)
                     row.textMode = true;
@@ -11274,7 +11285,7 @@ var LeaferUI = (function (exports) {
                         else {
                             charX = toChar(word.data, charX, row.data, row.isOverflow);
                         }
-                        if (!row.paraEnd && addWordWidth) {
+                        if (addWordWidth && (!row.paraEnd || textAlign === 'both')) {
                             charX += addWordWidth;
                             row.width += addWordWidth;
                         }
@@ -11685,7 +11696,7 @@ var LeaferUI = (function (exports) {
         }
     }
 
-    const { No, Yes, NoAndSkip, YesAndSkip } = exports.Answer;
+    const { No, Yes: Yes$1, NoAndSkip: NoAndSkip$1, YesAndSkip: YesAndSkip$1 } = exports.Answer;
     const EditSelectHelper = {
         findOne(path) {
             return path.list.find((leaf) => leaf.editable);
@@ -11694,20 +11705,20 @@ var LeaferUI = (function (exports) {
             if (leaf.__.hittable && leaf.__.visible && !leaf.__.locked && bounds.hit(leaf.__world)) {
                 if (leaf.__.editable) {
                     if (leaf.isBranch && !leaf.__.hitChildren) {
-                        return leaf.__.hitSelf ? YesAndSkip : NoAndSkip;
+                        return leaf.__.hitSelf ? YesAndSkip$1 : NoAndSkip$1;
                     }
                     else if (leaf.isFrame) {
-                        return bounds.includes(leaf.__layout.boxBounds, leaf.__world) ? YesAndSkip : No;
+                        return bounds.includes(leaf.__layout.boxBounds, leaf.__world) ? YesAndSkip$1 : No;
                     }
                     else {
                         if (bounds.hit(leaf.__layout.boxBounds, leaf.__world) && leaf.__.hitSelf)
-                            return Yes;
+                            return Yes$1;
                     }
                 }
                 return No;
             }
             else {
-                return leaf.isBranch ? NoAndSkip : No;
+                return leaf.isBranch ? NoAndSkip$1 : No;
             }
         }
     };
@@ -11871,7 +11882,7 @@ var LeaferUI = (function (exports) {
             return target.leafer !== this.editor.leafer;
         }
         allowDrag(e) {
-            if (this.running && this.editor.mergeConfig.boxSelect && !e.target.draggable) {
+            if (this.running && (this.editor.mergeConfig.boxSelect && Plugin.has('find')) && !e.target.draggable) {
                 return (!this.editor.editing && this.allow(e.target)) || (e.shiftKey && !findOne(e.path));
             }
             else {
@@ -12414,6 +12425,8 @@ var LeaferUI = (function (exports) {
             const { editor } = this;
             if (editor.single) {
                 const { element } = editor;
+                if (element.locked)
+                    return;
                 if (element.isBranch && !element.editInner) {
                     if (element.textBox) {
                         const { children } = element;
@@ -13587,7 +13600,153 @@ ${filterStyle}
 
     Plugin.add('resize');
 
-    Plugin.add('editor', 'resize');
+    const { Yes, NoAndSkip, YesAndSkip } = exports.Answer;
+    const idCondition = {}, classNameCondition = {}, tagCondition = {};
+    class Finder {
+        constructor(target) {
+            this.innerIdMap = {};
+            this.idMap = {};
+            this.methods = {
+                id: (leaf, name) => leaf.id === name ? (this.target && (this.idMap[name] = leaf), 1) : 0,
+                innerId: (leaf, innerId) => leaf.innerId === innerId ? (this.target && (this.innerIdMap[innerId] = leaf), 1) : 0,
+                className: (leaf, name) => leaf.className === name ? 1 : 0,
+                tag: (leaf, name) => leaf.__tag === name ? 1 : 0,
+                tags: (leaf, nameMap) => nameMap[leaf.__tag] ? 1 : 0
+            };
+            if (this.target = target)
+                this.__listenEvents();
+        }
+        getBy(condition, branch, one, options) {
+            switch (typeof condition) {
+                case 'number':
+                    const leaf = this.getByInnerId(condition, branch);
+                    return one ? leaf : (leaf ? [leaf] : []);
+                case 'string':
+                    switch (condition[0]) {
+                        case '#':
+                            idCondition.id = condition.substring(1), condition = idCondition;
+                            break;
+                        case '.':
+                            classNameCondition.className = condition.substring(1), condition = classNameCondition;
+                            break;
+                        default:
+                            tagCondition.tag = condition, condition = tagCondition;
+                    }
+                case 'object':
+                    if (condition.id !== undefined) {
+                        const leaf = this.getById(condition.id, branch);
+                        return one ? leaf : (leaf ? [leaf] : []);
+                    }
+                    else if (condition.tag) {
+                        const { tag } = condition, isArray = tag instanceof Array;
+                        return this.getByMethod(isArray ? this.methods.tags : this.methods.tag, branch, one, isArray ? DataHelper.toMap(tag) : tag);
+                    }
+                    else {
+                        return this.getByMethod(this.methods.className, branch, one, condition.className);
+                    }
+                case 'function':
+                    return this.getByMethod(condition, branch, one, options);
+            }
+        }
+        getByInnerId(innerId, branch) {
+            const cache = this.innerIdMap[innerId];
+            if (cache)
+                return cache;
+            this.eachFind(this.toChildren(branch), this.methods.innerId, null, innerId);
+            return this.findLeaf;
+        }
+        getById(id, branch) {
+            const cache = this.idMap[id];
+            if (cache && LeafHelper.hasParent(cache, branch || this.target))
+                return cache;
+            this.eachFind(this.toChildren(branch), this.methods.id, null, id);
+            return this.findLeaf;
+        }
+        getByClassName(className, branch) {
+            return this.getByMethod(this.methods.className, branch, false, className);
+        }
+        getByTag(tag, branch) {
+            return this.getByMethod(this.methods.tag, branch, false, tag);
+        }
+        getByMethod(method, branch, one, options) {
+            const list = one ? null : [];
+            this.eachFind(this.toChildren(branch), method, list, options);
+            return list || this.findLeaf;
+        }
+        eachFind(children, method, list, options) {
+            let child, result;
+            for (let i = 0, len = children.length; i < len; i++) {
+                child = children[i];
+                result = method(child, options);
+                if (result === Yes || result === YesAndSkip) {
+                    if (list) {
+                        list.push(child);
+                    }
+                    else {
+                        this.findLeaf = child;
+                        return;
+                    }
+                }
+                if (child.isBranch && result < NoAndSkip)
+                    this.eachFind(child.children, method, list, options);
+            }
+        }
+        toChildren(branch) {
+            this.findLeaf = null;
+            return [branch || this.target];
+        }
+        __onRemoveChild(event) {
+            const { id, innerId } = event.child;
+            if (this.idMap[id])
+                delete this.idMap[id];
+            if (this.innerIdMap[innerId])
+                delete this.innerIdMap[innerId];
+        }
+        __checkIdChange(event) {
+            if (event.attrName === 'id') {
+                const id = event.oldValue;
+                if (this.idMap[id])
+                    delete this.idMap[id];
+            }
+        }
+        __listenEvents() {
+            this.__eventIds = [
+                this.target.on_(ChildEvent.REMOVE, this.__onRemoveChild, this),
+                this.target.on_(PropertyEvent.CHANGE, this.__checkIdChange, this)
+            ];
+        }
+        __removeListenEvents() {
+            this.target.off_(this.__eventIds);
+            this.__eventIds.length = 0;
+        }
+        destroy() {
+            const { __eventIds } = this;
+            if (__eventIds && __eventIds.length) {
+                this.__removeListenEvents();
+                this.innerIdMap = {};
+                this.idMap = {};
+            }
+            this.findLeaf = null;
+        }
+    }
+
+    const ui$1 = exports.UI.prototype;
+    function getSelector(ui) {
+        return ui.leafer ? ui.leafer.selector : (Platform.selector || (Platform.selector = Creator.selector()));
+    }
+    ui$1.find = function (condition, options) {
+        return getSelector(this).getBy(condition, this, false, options);
+    };
+    ui$1.findOne = function (condition, options) {
+        return getSelector(this).getBy(condition, this, true, options);
+    };
+
+    Plugin.add('find');
+    Creator.finder = function (target) {
+        return new Finder(target);
+    };
+
+    Plugin.add('editor', 'resize', 'find');
     Creator.editor = function (options) { return new Editor(options); };
     dataType(false)(exports.Box.prototype, 'textBox');
     defineKey(exports.UI.prototype, 'editOuter', {
@@ -14615,6 +14774,7 @@ ${filterStyle}
         });
     };
 
+    Plugin.add('export');
     Object.assign(Export, ExportModule);
     exports.UI.prototype.export = function (filename, options) {
         return Export.export(this, filename, options);
@@ -14642,7 +14802,7 @@ ${filterStyle}
         style.fontWeight = text.fontWeight;
         style.textDecoration = textDecoration === 'delete' ? 'line-through' : textDecoration;
         style.textTransform = textCaseMap[text.textCase];
-        style.textAlign = text.textAlign;
+        style.textAlign = text.textAlign === 'both' ? 'justify' : text.textAlign;
         style.display = 'flex';
         style.flexDirection = 'column';
         style.justifyContent = verticalAlignMap[text.verticalAlign];
@@ -14925,6 +15085,7 @@ ${filterStyle}
     exports.Eventer = Eventer;
     exports.Export = Export;
     exports.FileHelper = FileHelper;
+    exports.Finder = Finder;
     exports.FrameData = FrameData;
     exports.GroupData = GroupData;
     exports.HTMLTextData = HTMLTextData;

package/dist/worker.min.cjs

@@ -1 +1 @@
-"use strict";var e=require("@leafer-ui/worker"),r=require("@leafer-in/editor"),t=require("@leafer-in/viewport"),o=require("@leafer-in/view"),n=require("@leafer-in/scroll"),c=require("@leafer-in/arrow"),a=require("@leafer-in/export"),p=require("@leafer-in/text-editor"),u=require("@leafer-in/html");Object.keys(e).forEach((function(r){"default"===r||Object.prototype.hasOwnProperty.call(exports,r)||Object.defineProperty(exports,r,{enumerable:!0,get:function(){return e[r]}})})),Object.keys(r).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return r[e]}})})),Object.keys(t).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return t[e]}})})),Object.keys(o).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return o[e]}})})),Object.keys(n).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return n[e]}})})),Object.keys(c).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return c[e]}})})),Object.keys(a).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return a[e]}})})),Object.keys(p).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return p[e]}})})),Object.keys(u).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return u[e]}})}));
+"use strict";var e=require("@leafer-ui/worker"),r=require("@leafer-in/editor"),t=require("@leafer-in/viewport"),o=require("@leafer-in/view"),n=require("@leafer-in/scroll"),c=require("@leafer-in/arrow"),a=require("@leafer-in/find"),p=require("@leafer-in/export"),u=require("@leafer-in/text-editor"),f=require("@leafer-in/html");Object.keys(e).forEach((function(r){"default"===r||Object.prototype.hasOwnProperty.call(exports,r)||Object.defineProperty(exports,r,{enumerable:!0,get:function(){return e[r]}})})),Object.keys(r).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return r[e]}})})),Object.keys(t).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return t[e]}})})),Object.keys(o).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return o[e]}})})),Object.keys(n).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return n[e]}})})),Object.keys(c).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return c[e]}})})),Object.keys(a).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return a[e]}})})),Object.keys(p).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return p[e]}})})),Object.keys(u).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return u[e]}})})),Object.keys(f).forEach((function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return f[e]}})}));