leafer-draw 1.3.3 → 1.4.1

package/dist/web.esm.js

@@ -1,4 +1,4 @@
-import { Debug, LeaferCanvasBase, Platform, DataHelper, canvasSizeAttrs, ResizeEvent, canvasPatch, Creator, LeaferImage, defineKey, FileHelper, LeafList, RenderEvent, ChildEvent, WatchEvent, PropertyEvent, LeafHelper, BranchHelper, Bounds, LeafBoundsHelper, LeafLevelList, LayoutEvent, Run, ImageManager, BoundsHelper, MatrixHelper, MathHelper, AlignHelper, ImageEvent, AroundHelper, PointHelper, Direction4 } from '@leafer/core';
+import { Debug, LeaferCanvasBase, Platform, DataHelper, canvasSizeAttrs, ResizeEvent, canvasPatch, FileHelper, Creator, LeaferImage, defineKey, LeafList, RenderEvent, ChildEvent, WatchEvent, PropertyEvent, LeafHelper, BranchHelper, LeafBoundsHelper, Bounds, LeafLevelList, LayoutEvent, Run, ImageManager, BoundsHelper, MatrixHelper, MathHelper, AlignHelper, ImageEvent, AroundHelper, PointHelper, Direction4 } from '@leafer/core';
 export * from '@leafer/core';
 export { LeaferImage } from '@leafer/core';
 import { PaintImage, ColorConvert, PaintGradient, Export, Group, TextConvert, Paint, Effect } from '@leafer-ui/draw';
@@ -122,7 +122,7 @@ class LeaferCanvas extends LeaferCanvasBase {
             }
         }
         else {
-            window.addEventListener('resize', () => {
+            window.addEventListener('resize', this.windowListener = () => {
                 const pixelRatio = Platform.devicePixelRatio;
                 if (this.pixelRatio !== pixelRatio) {
                     const { width, height } = this;
@@ -151,11 +151,9 @@ class LeaferCanvas extends LeaferCanvasBase {
     }
     stopAutoLayout() {
         this.autoLayout = false;
-        this.resizeListener = null;
-        if (this.resizeObserver) {
+        if (this.resizeObserver)
             this.resizeObserver.disconnect();
-            this.resizeObserver = null;
-        }
+        this.resizeListener = this.resizeObserver = null;
     }
     emitResize(size) {
         const oldSize = {};
@@ -176,6 +174,10 @@ class LeaferCanvas extends LeaferCanvasBase {
     destroy() {
         if (this.view) {
             this.stopAutoLayout();
+            if (this.windowListener) {
+                window.removeEventListener('resize', this.windowListener);
+                this.windowListener = null;
+            }
             if (!this.unreal) {
                 const view = this.view;
                 if (view.parentElement)
@@ -202,7 +204,10 @@ function useCanvas(_canvasType, _power) {
             canvas.height = height;
             return canvas;
         },
-        canvasToDataURL: (canvas, type, quality) => canvas.toDataURL(mineType(type), quality),
+        canvasToDataURL: (canvas, type, quality) => {
+            const imageType = mineType(type), url = canvas.toDataURL(imageType, quality);
+            return imageType === 'image/bmp' ? url.replace('image/png;', 'image/bmp;') : url;
+        },
         canvasToBolb: (canvas, type, quality) => new Promise((resolve) => canvas.toBlob(resolve, mineType(type), quality)),
         canvasSaveAs: (canvas, filename, quality) => {
             const url = canvas.toDataURL(mineType(fileType(filename)), quality);
@@ -247,14 +252,14 @@ function useCanvas(_canvasType, _power) {
 Platform.name = 'web';
 Platform.isMobile = 'ontouchstart' in window;
 Platform.requestRender = function (render) { window.requestAnimationFrame(render); };
-defineKey(Platform, 'devicePixelRatio', { get() { return Math.max(1, devicePixelRatio); } });
+defineKey(Platform, 'devicePixelRatio', { get() { return devicePixelRatio; } });
 const { userAgent } = navigator;
 if (userAgent.indexOf("Firefox") > -1) {
     Platform.conicGradientRotate90 = true;
     Platform.intWheelDeltaY = true;
     Platform.syncDomFont = true;
 }
-else if (userAgent.indexOf("Safari") > -1 && userAgent.indexOf("Chrome") === -1) {
+else if (userAgent.indexOf("AppleWebKit") > -1) {
     Platform.fullImageShadow = true;
 }
 if (userAgent.indexOf('Windows') > -1) {
@@ -523,7 +528,7 @@ class Layouter {
     }
     partLayout() {
         var _a;
-        if (!((_a = this.__updatedList) === null || _a === undefined ? undefined : _a.length))
+        if (!((_a = this.__updatedList) === null || _a === void 0 ? void 0 : _a.length))
             return;
         const t = Run.start('PartLayout');
         const { target, __updatedList: updateList } = this;
@@ -1213,7 +1218,7 @@ function getPatternData(paint, box, image) {
         box = tempBox.set(box).shrink(paint.padding);
     if (paint.mode === 'strench')
         paint.mode = 'stretch';
-    const { opacity, mode, align, offset, scale, size, rotation, repeat } = paint;
+    const { opacity, mode, align, offset, scale, size, rotation, repeat, filters } = paint;
     const sameBox = box.width === width && box.height === height;
     const data = { mode };
     const swapSize = align !== 'center' && (rotation || 0) % 180 === 90;
@@ -1276,6 +1281,8 @@ function getPatternData(paint, box, image) {
     data.height = height;
     if (opacity)
         data.opacity = opacity;
+    if (filters)
+        data.filters = filters;
     if (repeat)
         data.repeat = typeof repeat === 'string' ? (repeat === 'x' ? 'repeat-x' : 'repeat-y') : 'repeat';
     return data;
@@ -1378,7 +1385,7 @@ function createPattern(ui, paint, pixelRatio) {
         scaleX = abs$1(scaleX);
         scaleY = abs$1(scaleY);
         const { image, data } = paint;
-        let imageScale, imageMatrix, { width, height, scaleX: sx, scaleY: sy, opacity, transform, repeat } = data;
+        let imageScale, imageMatrix, { width, height, scaleX: sx, scaleY: sy, transform, repeat } = data;
         if (sx) {
             imageMatrix = get$1();
             copy$1(imageMatrix, transform);
@@ -1421,7 +1428,7 @@ function createPattern(ui, paint, pixelRatio) {
             }
             scale(imageMatrix, 1 / scaleX, 1 / scaleY);
         }
-        const canvas = image.getCanvas(ceil(width) || 1, ceil(height) || 1, opacity);
+        const canvas = image.getCanvas(ceil(width) || 1, ceil(height) || 1, data.opacity, data.filters);
         const pattern = image.getPattern(canvas, repeat || (Platform.origin.noRepeat || 'no-repeat'), imageMatrix, paint);
         paint.style = pattern;
         paint.patternId = id;
@@ -1497,7 +1504,7 @@ function checkImage(ui, canvas, paint, allowPaint) {
                 canvas.opacity *= data.opacity;
             if (data.transform)
                 canvas.transform(data.transform);
-            canvas.drawImage(paint.image.view, 0, 0, data.width, data.height);
+            canvas.drawImage(paint.image.getFull(data.filters), 0, 0, data.width, data.height);
             canvas.restore();
             return true;
         }
@@ -1507,7 +1514,7 @@ function checkImage(ui, canvas, paint, allowPaint) {
             }
             else {
                 if (!paint.patternTask) {
-                    paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, undefined, undefined, function* () {
+                    paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function* () {
                         paint.patternTask = null;
                         if (canvas.bounds.hit(ui.__nowWorld))
                             createPattern(ui, paint, pixelRatio);
@@ -2097,11 +2104,11 @@ const TextMode = 2;
 function layoutChar(drawData, style, width, _height) {
     const { rows } = drawData;
     const { textAlign, paraIndent, letterSpacing } = style;
-    let charX, addWordWidth, indentWidth, mode, wordChar;
+    let charX, addWordWidth, indentWidth, mode, wordChar, wordsLength;
     rows.forEach(row => {
         if (row.words) {
-            indentWidth = paraIndent && row.paraStart ? paraIndent : 0;
-            addWordWidth = (width && (textAlign === 'justify' || textAlign === 'both') && row.words.length > 1) ? (width - row.width - indentWidth) / (row.words.length - 1) : 0;
+            indentWidth = paraIndent && row.paraStart ? paraIndent : 0, wordsLength = row.words.length;
+            addWordWidth = (width && (textAlign === 'justify' || textAlign === 'both') && wordsLength > 1) ? (width - row.width - indentWidth) / (wordsLength - 1) : 0;
             mode = (letterSpacing || row.isOverflow) ? CharMode : (addWordWidth > 0.01 ? WordMode : TextMode);
             if (row.isOverflow && !letterSpacing)
                 row.textMode = true;
@@ -2113,7 +2120,7 @@ function layoutChar(drawData, style, width, _height) {
                 row.x += indentWidth;
                 charX = row.x;
                 row.data = [];
-                row.words.forEach(word => {
+                row.words.forEach((word, index) => {
                     if (mode === WordMode) {
                         wordChar = { char: '', x: charX };
                         charX = toWordChar(word.data, charX, wordChar);
@@ -2123,7 +2130,7 @@ function layoutChar(drawData, style, width, _height) {
                     else {
                         charX = toChar(word.data, charX, row.data, row.isOverflow);
                     }
-                    if (addWordWidth && (!row.paraEnd || textAlign === 'both')) {
+                    if (addWordWidth && (!row.paraEnd || textAlign === 'both') && (index !== wordsLength - 1)) {
                         charX += addWordWidth;
                         row.width += addWordWidth;
                     }
@@ -2375,3 +2382,4 @@ Object.assign(Effect, EffectModule);
 useCanvas();
 
 export { Layouter, LeaferCanvas, Renderer, Watcher, useCanvas };
+//# sourceMappingURL=web.esm.js.map