leafer-draw 1.3.2 → 1.4.0

package/dist/web.cjs

@@ -121,7 +121,7 @@ class LeaferCanvas extends core.LeaferCanvasBase {
             }
         }
         else {
-            window.addEventListener('resize', () => {
+            window.addEventListener('resize', this.windowListener = () => {
                 const pixelRatio = core.Platform.devicePixelRatio;
                 if (this.pixelRatio !== pixelRatio) {
                     const { width, height } = this;
@@ -150,11 +150,9 @@ class LeaferCanvas extends core.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 = {};
@@ -175,6 +173,10 @@ class LeaferCanvas extends core.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)
@@ -201,7 +203,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);
@@ -246,7 +251,7 @@ function useCanvas(_canvasType, _power) {
 core.Platform.name = 'web';
 core.Platform.isMobile = 'ontouchstart' in window;
 core.Platform.requestRender = function (render) { window.requestAnimationFrame(render); };
-core.defineKey(core.Platform, 'devicePixelRatio', { get() { return Math.max(1, devicePixelRatio); } });
+core.defineKey(core.Platform, 'devicePixelRatio', { get() { return devicePixelRatio; } });
 const { userAgent } = navigator;
 if (userAgent.indexOf("Firefox") > -1) {
     core.Platform.conicGradientRotate90 = true;
@@ -522,7 +527,7 @@ class Layouter {
     }
     partLayout() {
         var _a;
-        if (!((_a = this.__updatedList) === null || _a === void 0 ? void 0 : _a.length))
+        if (!((_a = this.__updatedList) === null || _a === undefined ? undefined : _a.length))
             return;
         const t = core.Run.start('PartLayout');
         const { target, __updatedList: updateList } = this;
@@ -1445,7 +1450,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -1506,7 +1511,7 @@ function checkImage(ui, canvas, paint, allowPaint) {
             }
             else {
                 if (!paint.patternTask) {
-                    paint.patternTask = core.ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function* () {
+                    paint.patternTask = core.ImageManager.patternTasker.add(() => __awaiter(this, undefined, undefined, function* () {
                         paint.patternTask = null;
                         if (canvas.bounds.hit(ui.__nowWorld))
                             createPattern(ui, paint, pixelRatio);
@@ -1662,7 +1667,7 @@ function shadow(ui, current, shape) {
     const end = shadow.length - 1;
     toOffsetOutBounds$1(bounds, offsetOutBounds$1);
     shadow.forEach((item, index) => {
-        other.setWorldShadow((offsetOutBounds$1.offsetX + item.x * scaleX), (offsetOutBounds$1.offsetY + item.y * scaleY), item.blur * scaleX, item.color);
+        other.setWorldShadow((offsetOutBounds$1.offsetX + item.x * scaleX), (offsetOutBounds$1.offsetY + item.y * scaleY), item.blur * scaleX, draw.ColorConvert.string(item.color));
         spreadScale = item.spread ? 1 + item.spread * 2 / (__layout.boxBounds.width + (__layout.strokeBoxSpread || 0) * 2) : 0;
         drawWorldShadow(other, offsetOutBounds$1, spreadScale, shape);
         copyBounds = bounds;
@@ -1738,7 +1743,7 @@ function innerShadow(ui, current, shape) {
             other.copyWorld(shape.canvas, shapeBounds, bounds, 'source-out');
             copyBounds = bounds;
         }
-        other.fillWorld(copyBounds, item.color, 'source-in');
+        other.fillWorld(copyBounds, draw.ColorConvert.string(item.color), 'source-in');
         if (ui.__worldFlipped) {
             current.copyWorldByReset(other, copyBounds, nowWorld, item.blendMode);
         }
@@ -2096,11 +2101,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;
@@ -2112,7 +2117,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);
@@ -2122,7 +2127,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;
                     }
@@ -2394,3 +2399,4 @@ Object.keys(draw).forEach(function (k) {
         get: function () { return draw[k]; }
     });
 });
+//# sourceMappingURL=web.cjs.map