@leafer/core 2.0.0 → 2.0.2

package/lib/core.cjs

@@ -1720,7 +1720,7 @@ const Platform = {
         resize(view, width, height, xGap, yGap, clip, smooth, opacity, _filters, interlace) {
             const realWidth = max(floor(width + (xGap || 0)), 1), realHeight = max(floor(height + (yGap || 0)), 1);
             let interlaceX, interlaceY, interlaceOffset;
-            if (interlace && (interlaceOffset = UnitConvertHelper.number(interlace.offset, (interlaceX = interlace.type === "x") ? width : height))) interlaceX || (interlaceY = true);
+            if (interlace && (interlaceOffset = UnitConvertHelper.number(interlace.offset, interlace.type === "x" ? width : height))) interlace.type === "x" ? interlaceX = true : interlaceY = true;
             const canvas = Platform.origin.createCanvas(interlaceY ? realWidth * 2 : realWidth, interlaceX ? realHeight * 2 : realHeight);
             const ctx = canvas.getContext("2d");
             if (opacity) ctx.globalAlpha = opacity;
@@ -1890,7 +1890,10 @@ const UICreator = {
         list$1[tag] = UI;
     },
     get(tag, data, x, y, width, height) {
-        if (!list$1[tag]) debug$9.error("not register " + tag);
+        if (!list$1[tag]) {
+            debug$9.warn("not register " + tag);
+            return undefined;
+        }
         const ui = new list$1[tag](data);
         if (!isUndefined(x)) {
             ui.x = x;
@@ -3310,10 +3313,10 @@ const PathCommandDataHelper = {
             data.push(O$2, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0);
         }
     },
-    arcTo(data, x1, y1, x2, y2, radius, lastX, lastY) {
+    arcTo(data, x1, y1, x2, y2, radius, lastX, lastY, fullRadius) {
         if (!isUndefined(lastX)) {
-            const d = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2);
-            radius = min(radius, min(d / 2, d / 2 * abs(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
+            const r = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2) / (fullRadius ? 1 : 2);
+            radius = min(radius, min(r, r * abs(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
         }
         data.push(U$2, x1, y1, x2, y2, radius);
     },
@@ -3657,7 +3660,7 @@ const PathCorner = {
         let command, lastCommand, commandLen;
         let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
         if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
-        const len = data.length;
+        const len = data.length, three = len === 9;
         const smooth = [];
         while (i < len) {
             command = data[i];
@@ -3669,7 +3672,7 @@ const PathCorner = {
                 if (data[i] === L$1) {
                     secondX = data[i + 1];
                     secondY = data[i + 2];
-                    smooth.push(M, getCenterX(startX, secondX), getCenterY(startY, secondY));
+                    three ? smooth.push(M, startX, startY) : smooth.push(M, getCenterX(startX, secondX), getCenterY(startY, secondY));
                 } else {
                     smooth.push(M, startX, startY);
                 }
@@ -3681,11 +3684,11 @@ const PathCorner = {
                 i += 3;
                 switch (data[i]) {
                   case L$1:
-                    arcTo(smooth, x, y, data[i + 1], data[i + 2], cornerRadius, lastX, lastY);
+                    arcTo(smooth, x, y, data[i + 1], data[i + 2], cornerRadius, lastX, lastY, three);
                     break;
 
                   case Z:
-                    arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY);
+                    arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY, three);
                     break;
 
                   default:
@@ -3697,7 +3700,7 @@ const PathCorner = {
 
               case Z:
                 if (lastCommand !== Z) {
-                    arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY);
+                    arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY, three);
                     smooth.push(Z);
                 }
                 i += 1;
@@ -3747,10 +3750,10 @@ function canvasPatch(drawer) {
 const FileHelper = {
     alphaPixelTypes: [ "png", "webp", "svg" ],
     upperCaseTypeMap: {},
-    mineType(type) {
-        if (!type || type.startsWith("image")) return type;
+    mimeType(type, base = "image") {
+        if (!type || type.startsWith(base)) return type;
         if (type === "jpg") type = "jpeg";
-        return "image/" + type;
+        return base + "/" + type;
     },
     fileType(filename) {
         const l = filename.split(".");
@@ -3783,6 +3786,8 @@ const FileHelper = {
 
 const F = FileHelper;
 
+F.mineType = F.mimeType;
+
 F.alphaPixelTypes.forEach(type => F.upperCaseTypeMap[type] = type.toUpperCase());
 
 const debug$4 = Debug.get("TaskProcessor");
@@ -4027,6 +4032,9 @@ const debug$3 = Debug.get("Resource");
 
 const Resource = {
     tasker: new TaskProcessor,
+    queue: new TaskProcessor({
+        parallel: 1
+    }),
     map: {},
     get isComplete() {
         return R.tasker.isComplete;
@@ -4063,6 +4071,12 @@ const Resource = {
         R.set(key, value);
         return value;
     },
+    loadFilm(_key, _format) {
+        return undefined;
+    },
+    loadVideo(_key, _format) {
+        return undefined;
+    },
     destroy() {
         R.map = {};
     }
@@ -4073,12 +4087,10 @@ const R = Resource;
 const ImageManager = {
     maxRecycled: 10,
     recycledList: [],
-    patternTasker: new TaskProcessor({
-        parallel: 1
-    }),
-    get(config) {
+    patternTasker: Resource.queue,
+    get(config, type) {
         let image = Resource.get(config.url);
-        if (!image) Resource.set(config.url, image = Creator.image(config));
+        if (!image) Resource.set(config.url, image = type === "film" ? Creator.film(config) : Creator.image(config));
         image.use++;
         return image;
     },
@@ -4113,7 +4125,7 @@ const ImageManager = {
         if (config.format) return config.format === format;
         const {url: url} = config;
         if (url.startsWith("data:")) {
-            if (url.startsWith("data:" + FileHelper.mineType(format))) return true;
+            if (url.startsWith("data:" + FileHelper.mimeType(format))) return true;
         } else {
             if (url.includes("." + format) || url.includes("." + FileHelper.upperCaseTypeMap[format])) return true; else if (format === "png" && !url.includes(".")) return true;
         }
@@ -4129,6 +4141,9 @@ const I = ImageManager;
 const {IMAGE: IMAGE, create: create$1} = IncrementId;
 
 class LeaferImage {
+    get tag() {
+        return "Image";
+    }
     get url() {
         return this.config.url;
     }
@@ -4157,7 +4172,7 @@ class LeaferImage {
         if (!this.loading) {
             this.loading = true;
             Resource.tasker.add(() => __awaiter(this, void 0, void 0, function*() {
-                return yield Platform.origin.loadImage(this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
+                return yield Platform.origin["load" + this.tag](this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
                     if (thumbSize) this.setThumbView(img);
                     this.setView(img);
                 }).catch(e => {
@@ -4231,6 +4246,9 @@ class LeaferImage {
         Platform.image.setPatternTransform(pattern, transform, paint);
         return pattern;
     }
+    render(canvas, x, y, width, height, _leaf, _paint, _imageScaleX, _imageScaleY) {
+        canvas.drawImage(this.view, x, y, width, height);
+    }
     getLoadUrl(_thumbSize) {
         return this.url;
     }
@@ -4257,6 +4275,18 @@ class LeaferImage {
     }
 }
 
+class LeaferFilm extends LeaferImage {
+    get tag() {
+        return "Film";
+    }
+}
+
+class LeaferVideo extends LeaferImage {
+    get tag() {
+        return "Video";
+    }
+}
+
 function defineKey(target, key, descriptor, noConfigurable) {
     if (!noConfigurable) descriptor.configurable = descriptor.enumerable = true;
     Object.defineProperty(target, key, descriptor);
@@ -6145,9 +6175,11 @@ const BranchRender = {
         if (this.__hasMask) {
             this.__renderMask(canvas, options);
         } else {
+            let child;
             const {children: children} = this;
             for (let i = 0, len = children.length; i < len; i++) {
-                excludeRenderBounds(children[i], options) || children[i].__render(canvas, options);
+                child = children[i];
+                excludeRenderBounds(child, options) || (child.__.complex ? child.__renderComplex(canvas, options) : child.__render(canvas, options));
             }
         }
     },
@@ -6628,6 +6660,7 @@ exports.Leaf = class Leaf {
     __drawHitPath(_canvas) {}
     __updateHitCanvas() {}
     __render(_canvas, _options) {}
+    __renderComplex(_canvas, _options) {}
     __drawFast(_canvas, _options) {}
     __draw(_canvas, _options, _originCanvas) {}
     __clip(_canvas, _options) {}
@@ -6747,6 +6780,7 @@ exports.Branch = class Branch extends exports.Leaf {
                 this.add(item, index);
                 noIndex || index++;
             }); else child = UICreator.get(child.tag, child);
+            if (!child) return;
         }
         if (child.parent) child.parent.remove(child);
         child.parent = this;
@@ -6972,7 +7006,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.0.0";
+const version = "2.0.2";
 
 exports.AlignHelper = AlignHelper;
 
@@ -7048,8 +7082,12 @@ exports.LeaferCanvasBase = LeaferCanvasBase;
 
 exports.LeaferEvent = LeaferEvent;
 
+exports.LeaferFilm = LeaferFilm;
+
 exports.LeaferImage = LeaferImage;
 
+exports.LeaferVideo = LeaferVideo;
+
 exports.MathHelper = MathHelper;
 
 exports.Matrix = Matrix;

package/lib/core.esm.js

@@ -1718,7 +1718,7 @@ const Platform = {
         resize(view, width, height, xGap, yGap, clip, smooth, opacity, _filters, interlace) {
             const realWidth = max(floor(width + (xGap || 0)), 1), realHeight = max(floor(height + (yGap || 0)), 1);
             let interlaceX, interlaceY, interlaceOffset;
-            if (interlace && (interlaceOffset = UnitConvertHelper.number(interlace.offset, (interlaceX = interlace.type === "x") ? width : height))) interlaceX || (interlaceY = true);
+            if (interlace && (interlaceOffset = UnitConvertHelper.number(interlace.offset, interlace.type === "x" ? width : height))) interlace.type === "x" ? interlaceX = true : interlaceY = true;
             const canvas = Platform.origin.createCanvas(interlaceY ? realWidth * 2 : realWidth, interlaceX ? realHeight * 2 : realHeight);
             const ctx = canvas.getContext("2d");
             if (opacity) ctx.globalAlpha = opacity;
@@ -1888,7 +1888,10 @@ const UICreator = {
         list$1[tag] = UI;
     },
     get(tag, data, x, y, width, height) {
-        if (!list$1[tag]) debug$9.error("not register " + tag);
+        if (!list$1[tag]) {
+            debug$9.warn("not register " + tag);
+            return undefined;
+        }
         const ui = new list$1[tag](data);
         if (!isUndefined(x)) {
             ui.x = x;
@@ -3308,10 +3311,10 @@ const PathCommandDataHelper = {
             data.push(O$2, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0);
         }
     },
-    arcTo(data, x1, y1, x2, y2, radius, lastX, lastY) {
+    arcTo(data, x1, y1, x2, y2, radius, lastX, lastY, fullRadius) {
         if (!isUndefined(lastX)) {
-            const d = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2);
-            radius = min(radius, min(d / 2, d / 2 * abs(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
+            const r = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2) / (fullRadius ? 1 : 2);
+            radius = min(radius, min(r, r * abs(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
         }
         data.push(U$2, x1, y1, x2, y2, radius);
     },
@@ -3655,7 +3658,7 @@ const PathCorner = {
         let command, lastCommand, commandLen;
         let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
         if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
-        const len = data.length;
+        const len = data.length, three = len === 9;
         const smooth = [];
         while (i < len) {
             command = data[i];
@@ -3667,7 +3670,7 @@ const PathCorner = {
                 if (data[i] === L$1) {
                     secondX = data[i + 1];
                     secondY = data[i + 2];
-                    smooth.push(M, getCenterX(startX, secondX), getCenterY(startY, secondY));
+                    three ? smooth.push(M, startX, startY) : smooth.push(M, getCenterX(startX, secondX), getCenterY(startY, secondY));
                 } else {
                     smooth.push(M, startX, startY);
                 }
@@ -3679,11 +3682,11 @@ const PathCorner = {
                 i += 3;
                 switch (data[i]) {
                   case L$1:
-                    arcTo(smooth, x, y, data[i + 1], data[i + 2], cornerRadius, lastX, lastY);
+                    arcTo(smooth, x, y, data[i + 1], data[i + 2], cornerRadius, lastX, lastY, three);
                     break;
 
                   case Z:
-                    arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY);
+                    arcTo(smooth, x, y, startX, startY, cornerRadius, lastX, lastY, three);
                     break;
 
                   default:
@@ -3695,7 +3698,7 @@ const PathCorner = {
 
               case Z:
                 if (lastCommand !== Z) {
-                    arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY);
+                    arcTo(smooth, startX, startY, secondX, secondY, cornerRadius, lastX, lastY, three);
                     smooth.push(Z);
                 }
                 i += 1;
@@ -3745,10 +3748,10 @@ function canvasPatch(drawer) {
 const FileHelper = {
     alphaPixelTypes: [ "png", "webp", "svg" ],
     upperCaseTypeMap: {},
-    mineType(type) {
-        if (!type || type.startsWith("image")) return type;
+    mimeType(type, base = "image") {
+        if (!type || type.startsWith(base)) return type;
         if (type === "jpg") type = "jpeg";
-        return "image/" + type;
+        return base + "/" + type;
     },
     fileType(filename) {
         const l = filename.split(".");
@@ -3781,6 +3784,8 @@ const FileHelper = {
 
 const F = FileHelper;
 
+F.mineType = F.mimeType;
+
 F.alphaPixelTypes.forEach(type => F.upperCaseTypeMap[type] = type.toUpperCase());
 
 const debug$4 = Debug.get("TaskProcessor");
@@ -4025,6 +4030,9 @@ const debug$3 = Debug.get("Resource");
 
 const Resource = {
     tasker: new TaskProcessor,
+    queue: new TaskProcessor({
+        parallel: 1
+    }),
     map: {},
     get isComplete() {
         return R.tasker.isComplete;
@@ -4061,6 +4069,12 @@ const Resource = {
         R.set(key, value);
         return value;
     },
+    loadFilm(_key, _format) {
+        return undefined;
+    },
+    loadVideo(_key, _format) {
+        return undefined;
+    },
     destroy() {
         R.map = {};
     }
@@ -4071,12 +4085,10 @@ const R = Resource;
 const ImageManager = {
     maxRecycled: 10,
     recycledList: [],
-    patternTasker: new TaskProcessor({
-        parallel: 1
-    }),
-    get(config) {
+    patternTasker: Resource.queue,
+    get(config, type) {
         let image = Resource.get(config.url);
-        if (!image) Resource.set(config.url, image = Creator.image(config));
+        if (!image) Resource.set(config.url, image = type === "film" ? Creator.film(config) : Creator.image(config));
         image.use++;
         return image;
     },
@@ -4111,7 +4123,7 @@ const ImageManager = {
         if (config.format) return config.format === format;
         const {url: url} = config;
         if (url.startsWith("data:")) {
-            if (url.startsWith("data:" + FileHelper.mineType(format))) return true;
+            if (url.startsWith("data:" + FileHelper.mimeType(format))) return true;
         } else {
             if (url.includes("." + format) || url.includes("." + FileHelper.upperCaseTypeMap[format])) return true; else if (format === "png" && !url.includes(".")) return true;
         }
@@ -4127,6 +4139,9 @@ const I = ImageManager;
 const {IMAGE: IMAGE, create: create$1} = IncrementId;
 
 class LeaferImage {
+    get tag() {
+        return "Image";
+    }
     get url() {
         return this.config.url;
     }
@@ -4155,7 +4170,7 @@ class LeaferImage {
         if (!this.loading) {
             this.loading = true;
             Resource.tasker.add(() => __awaiter(this, void 0, void 0, function*() {
-                return yield Platform.origin.loadImage(this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
+                return yield Platform.origin["load" + this.tag](this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
                     if (thumbSize) this.setThumbView(img);
                     this.setView(img);
                 }).catch(e => {
@@ -4229,6 +4244,9 @@ class LeaferImage {
         Platform.image.setPatternTransform(pattern, transform, paint);
         return pattern;
     }
+    render(canvas, x, y, width, height, _leaf, _paint, _imageScaleX, _imageScaleY) {
+        canvas.drawImage(this.view, x, y, width, height);
+    }
     getLoadUrl(_thumbSize) {
         return this.url;
     }
@@ -4255,6 +4273,18 @@ class LeaferImage {
     }
 }
 
+class LeaferFilm extends LeaferImage {
+    get tag() {
+        return "Film";
+    }
+}
+
+class LeaferVideo extends LeaferImage {
+    get tag() {
+        return "Video";
+    }
+}
+
 function defineKey(target, key, descriptor, noConfigurable) {
     if (!noConfigurable) descriptor.configurable = descriptor.enumerable = true;
     Object.defineProperty(target, key, descriptor);
@@ -6143,9 +6173,11 @@ const BranchRender = {
         if (this.__hasMask) {
             this.__renderMask(canvas, options);
         } else {
+            let child;
             const {children: children} = this;
             for (let i = 0, len = children.length; i < len; i++) {
-                excludeRenderBounds(children[i], options) || children[i].__render(canvas, options);
+                child = children[i];
+                excludeRenderBounds(child, options) || (child.__.complex ? child.__renderComplex(canvas, options) : child.__render(canvas, options));
             }
         }
     },
@@ -6626,6 +6658,7 @@ let Leaf = class Leaf {
     __drawHitPath(_canvas) {}
     __updateHitCanvas() {}
     __render(_canvas, _options) {}
+    __renderComplex(_canvas, _options) {}
     __drawFast(_canvas, _options) {}
     __draw(_canvas, _options, _originCanvas) {}
     __clip(_canvas, _options) {}
@@ -6745,6 +6778,7 @@ let Branch = class Branch extends Leaf {
                 this.add(item, index);
                 noIndex || index++;
             }); else child = UICreator.get(child.tag, child);
+            if (!child) return;
         }
         if (child.parent) child.parent.remove(child);
         child.parent = this;
@@ -6970,6 +7004,6 @@ class LeafLevelList {
     }
 }
 
-const version = "2.0.0";
+const version = "2.0.2";
 
-export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, FourNumberHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferImage, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, UnitConvertHelper, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, tryToNumber, useModule, version, visibleType };
+export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, FourNumberHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, UnitConvertHelper, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, tryToNumber, useModule, version, visibleType };