@leafer/core 1.0.8 → 1.0.10

package/lib/core.cjs

@@ -1413,14 +1413,13 @@ const UICreator = {
     list: {},
     register(UI) {
         const { __tag: tag } = UI.prototype;
-        if (list$1[tag]) {
+        if (list$1[tag])
             debug$7.repeat(tag);
-        }
-        else {
-            list$1[tag] = UI;
-        }
+        list$1[tag] = UI;
     },
     get(tag, data, x, y, width, height) {
+        if (!list$1[tag])
+            debug$7.error('not register ' + tag);
         const ui = new list$1[tag](data);
         if (x !== undefined) {
             ui.x = x;
@@ -1444,7 +1443,7 @@ const EventCreator = {
         Object.keys(Event).forEach(key => {
             name = Event[key];
             if (typeof name === 'string')
-                nameList[name] ? debug$6.repeat(name) : nameList[name] = Event;
+                nameList[name] && debug$6.repeat(name), nameList[name] = Event;
         });
     },
     changeName(oldName, newName) {
@@ -1646,7 +1645,7 @@ class LeafData {
         const t = this;
         if (t.blendMode === 'pass-through') {
             const leaf = this.__leaf;
-            if ((t.opacity < 1 && leaf.isBranch) || leaf.__hasEraser || t.eraser) {
+            if ((t.opacity < 1 && (leaf.isBranch || t.__hasMultiPaint)) || leaf.__hasEraser || t.eraser) {
                 t.__single = true;
             }
             else if (t.__single) {
@@ -2044,8 +2043,9 @@ class LeaferCanvasBase extends Canvas {
             takeCanvas = this.getSameCanvas();
             takeCanvas.copyWorld(this);
         }
-        DataHelper.copyAttrs(this.size, size, canvasSizeAttrs);
-        this.size.pixelRatio || (this.size.pixelRatio = 1);
+        const s = this.size;
+        DataHelper.copyAttrs(s, size, canvasSizeAttrs);
+        canvasSizeAttrs.forEach(key => s[key] || (s[key] = 1));
         this.bounds = new Bounds(0, 0, this.width, this.height);
         if (this.context && !this.unreal) {
             this.updateViewSize();
@@ -2159,6 +2159,17 @@ class LeaferCanvasBase extends Canvas {
         if (!onlyResetTransform)
             this.useWorldTransform();
     }
+    useGrayscaleAlpha(bounds) {
+        this.setTempBounds(bounds, true, true);
+        let alpha, pixel;
+        const { context } = this, imageData = context.getImageData(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height), { data } = imageData;
+        for (let i = 0, len = data.length; i < len; i += 4) {
+            pixel = data[i] * 0.299 + data[i + 1] * 0.587 + data[i + 2] * 0.114;
+            if (alpha = data[i + 3])
+                data[i + 3] = alpha === 255 ? pixel : alpha * (pixel / 255);
+        }
+        context.putImageData(imageData, tempBounds.x, tempBounds.y);
+    }
     useMask(maskCanvas, fromBounds, toBounds) {
         this.copyWorld(maskCanvas, fromBounds, toBounds, 'destination-in');
     }
@@ -2169,7 +2180,7 @@ class LeaferCanvasBase extends Canvas {
         if (blendMode)
             this.blendMode = blendMode;
         this.fillStyle = color;
-        tempBounds.set(bounds).scale(this.pixelRatio);
+        this.setTempBounds(bounds);
         this.fillRect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height);
         if (blendMode)
             this.blendMode = 'source-over';
@@ -2178,22 +2189,18 @@ class LeaferCanvasBase extends Canvas {
         if (blendMode)
             this.blendMode = blendMode;
         this.strokeStyle = color;
-        tempBounds.set(bounds).scale(this.pixelRatio);
+        this.setTempBounds(bounds);
         this.strokeRect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height);
         if (blendMode)
             this.blendMode = 'source-over';
     }
     clearWorld(bounds, ceilPixel) {
-        tempBounds.set(bounds).scale(this.pixelRatio);
-        if (ceilPixel)
-            tempBounds.ceil();
+        this.setTempBounds(bounds, ceilPixel);
         this.clearRect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height);
     }
     clipWorld(bounds, ceilPixel) {
         this.beginPath();
-        tempBounds.set(bounds).scale(this.pixelRatio);
-        if (ceilPixel)
-            tempBounds.ceil();
+        this.setTempBounds(bounds, ceilPixel);
         this.rect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height);
         this.clip();
     }
@@ -2201,6 +2208,14 @@ class LeaferCanvasBase extends Canvas {
         const { pixelRatio } = this;
         this.clearRect(0, 0, this.width * pixelRatio + 2, this.height * pixelRatio + 2);
     }
+    setTempBounds(bounds, ceil, intersect) {
+        tempBounds.set(bounds);
+        if (intersect)
+            tempBounds.intersect(this.bounds);
+        tempBounds.scale(this.pixelRatio);
+        if (ceil)
+            tempBounds.ceil();
+    }
     isSameSize(size) {
         return this.width === size.width && this.height === size.height && this.pixelRatio === size.pixelRatio;
     }
@@ -5214,13 +5229,14 @@ const BranchRender = {
         this.__.__checkSingle();
     },
     __render(canvas, options) {
+        this.__nowWorld = this.__getNowWorld(options);
         if (this.__worldOpacity) {
             if (this.__.__single) {
                 if (this.__.eraser === 'path')
                     return this.__renderEraser(canvas, options);
                 const tempCanvas = canvas.getSameCanvas(false, true);
                 this.__renderBranch(tempCanvas, options);
-                const nowWorld = this.__getNowWorld(options);
+                const nowWorld = this.__nowWorld;
                 canvas.opacity = this.__.opacity;
                 canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, this.__.__blendMode, true);
                 tempCanvas.recycle(nowWorld);
@@ -5961,7 +5977,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.8";
+const version = "1.0.10";
 
 exports.AlignHelper = AlignHelper;
 exports.AroundHelper = AroundHelper;

package/lib/core.esm.js

@@ -1411,14 +1411,13 @@ const UICreator = {
     list: {},
     register(UI) {
         const { __tag: tag } = UI.prototype;
-        if (list$1[tag]) {
+        if (list$1[tag])
             debug$7.repeat(tag);
-        }
-        else {
-            list$1[tag] = UI;
-        }
+        list$1[tag] = UI;
     },
     get(tag, data, x, y, width, height) {
+        if (!list$1[tag])
+            debug$7.error('not register ' + tag);
         const ui = new list$1[tag](data);
         if (x !== undefined) {
             ui.x = x;
@@ -1442,7 +1441,7 @@ const EventCreator = {
         Object.keys(Event).forEach(key => {
             name = Event[key];
             if (typeof name === 'string')
-                nameList[name] ? debug$6.repeat(name) : nameList[name] = Event;
+                nameList[name] && debug$6.repeat(name), nameList[name] = Event;
         });
     },
     changeName(oldName, newName) {
@@ -1644,7 +1643,7 @@ class LeafData {
         const t = this;
         if (t.blendMode === 'pass-through') {
             const leaf = this.__leaf;
-            if ((t.opacity < 1 && leaf.isBranch) || leaf.__hasEraser || t.eraser) {
+            if ((t.opacity < 1 && (leaf.isBranch || t.__hasMultiPaint)) || leaf.__hasEraser || t.eraser) {
                 t.__single = true;
             }
             else if (t.__single) {
@@ -2042,8 +2041,9 @@ class LeaferCanvasBase extends Canvas {
             takeCanvas = this.getSameCanvas();
             takeCanvas.copyWorld(this);
         }
-        DataHelper.copyAttrs(this.size, size, canvasSizeAttrs);
-        this.size.pixelRatio || (this.size.pixelRatio = 1);
+        const s = this.size;
+        DataHelper.copyAttrs(s, size, canvasSizeAttrs);
+        canvasSizeAttrs.forEach(key => s[key] || (s[key] = 1));
         this.bounds = new Bounds(0, 0, this.width, this.height);
         if (this.context && !this.unreal) {
             this.updateViewSize();
@@ -2157,6 +2157,17 @@ class LeaferCanvasBase extends Canvas {
         if (!onlyResetTransform)
             this.useWorldTransform();
     }
+    useGrayscaleAlpha(bounds) {
+        this.setTempBounds(bounds, true, true);
+        let alpha, pixel;
+        const { context } = this, imageData = context.getImageData(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height), { data } = imageData;
+        for (let i = 0, len = data.length; i < len; i += 4) {
+            pixel = data[i] * 0.299 + data[i + 1] * 0.587 + data[i + 2] * 0.114;
+            if (alpha = data[i + 3])
+                data[i + 3] = alpha === 255 ? pixel : alpha * (pixel / 255);
+        }
+        context.putImageData(imageData, tempBounds.x, tempBounds.y);
+    }
     useMask(maskCanvas, fromBounds, toBounds) {
         this.copyWorld(maskCanvas, fromBounds, toBounds, 'destination-in');
     }
@@ -2167,7 +2178,7 @@ class LeaferCanvasBase extends Canvas {
         if (blendMode)
             this.blendMode = blendMode;
         this.fillStyle = color;
-        tempBounds.set(bounds).scale(this.pixelRatio);
+        this.setTempBounds(bounds);
         this.fillRect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height);
         if (blendMode)
             this.blendMode = 'source-over';
@@ -2176,22 +2187,18 @@ class LeaferCanvasBase extends Canvas {
         if (blendMode)
             this.blendMode = blendMode;
         this.strokeStyle = color;
-        tempBounds.set(bounds).scale(this.pixelRatio);
+        this.setTempBounds(bounds);
         this.strokeRect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height);
         if (blendMode)
             this.blendMode = 'source-over';
     }
     clearWorld(bounds, ceilPixel) {
-        tempBounds.set(bounds).scale(this.pixelRatio);
-        if (ceilPixel)
-            tempBounds.ceil();
+        this.setTempBounds(bounds, ceilPixel);
         this.clearRect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height);
     }
     clipWorld(bounds, ceilPixel) {
         this.beginPath();
-        tempBounds.set(bounds).scale(this.pixelRatio);
-        if (ceilPixel)
-            tempBounds.ceil();
+        this.setTempBounds(bounds, ceilPixel);
         this.rect(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height);
         this.clip();
     }
@@ -2199,6 +2206,14 @@ class LeaferCanvasBase extends Canvas {
         const { pixelRatio } = this;
         this.clearRect(0, 0, this.width * pixelRatio + 2, this.height * pixelRatio + 2);
     }
+    setTempBounds(bounds, ceil, intersect) {
+        tempBounds.set(bounds);
+        if (intersect)
+            tempBounds.intersect(this.bounds);
+        tempBounds.scale(this.pixelRatio);
+        if (ceil)
+            tempBounds.ceil();
+    }
     isSameSize(size) {
         return this.width === size.width && this.height === size.height && this.pixelRatio === size.pixelRatio;
     }
@@ -5212,13 +5227,14 @@ const BranchRender = {
         this.__.__checkSingle();
     },
     __render(canvas, options) {
+        this.__nowWorld = this.__getNowWorld(options);
         if (this.__worldOpacity) {
             if (this.__.__single) {
                 if (this.__.eraser === 'path')
                     return this.__renderEraser(canvas, options);
                 const tempCanvas = canvas.getSameCanvas(false, true);
                 this.__renderBranch(tempCanvas, options);
-                const nowWorld = this.__getNowWorld(options);
+                const nowWorld = this.__nowWorld;
                 canvas.opacity = this.__.opacity;
                 canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, this.__.__blendMode, true);
                 tempCanvas.recycle(nowWorld);
@@ -5959,6 +5975,6 @@ class LeafLevelList {
     }
 }
 
-const version = "1.0.8";
+const version = "1.0.10";
 
 export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, 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, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isNull, layoutProcessor, maskType, naturalBoundsType, needPlugin, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, useModule, version, visibleType };