leafer-ui 1.3.3 → 1.4.0

package/dist/web.cjs

@@ -122,7 +122,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;
@@ -151,11 +151,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 = {};
@@ -176,6 +174,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)
@@ -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,7 +252,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;
@@ -1053,6 +1058,7 @@ class Interaction extends core$1.InteractionBase {
             'pointerdown': this.onPointerDown,
             'mousedown': this.onMouseDown,
             'touchstart': this.onTouchStart,
+            'pointerleave': this.onPointerLeave,
             'contextmenu': this.onContextMenu,
             'wheel': this.onWheel,
             'gesturestart': this.onGesturestart,
@@ -1135,11 +1141,15 @@ class Interaction extends core$1.InteractionBase {
         this.usePointer || (this.usePointer = true);
         this.pointerDown(PointerEventHelper.convert(e, this.getLocal(e)));
     }
-    onPointerMove(e) {
+    onPointerMove(e, isLeave) {
         if (this.config.pointer.touch || this.useMultiTouch || this.preventWindowPointer(e))
             return;
         this.usePointer || (this.usePointer = true);
-        this.pointerMove(PointerEventHelper.convert(e, this.getLocal(e, true)));
+        const data = PointerEventHelper.convert(e, this.getLocal(e, true));
+        isLeave ? this.pointerHover(data) : this.pointerMove(data);
+    }
+    onPointerLeave(e) {
+        this.onPointerMove(e, true);
     }
     onPointerUp(e) {
         if (this.downData)
@@ -2557,11 +2567,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;
@@ -2573,7 +2583,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);
@@ -2583,7 +2593,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;
                     }
@@ -2863,3 +2873,4 @@ Object.keys(core$1).forEach(function (k) {
         get: function () { return core$1[k]; }
     });
 });
+//# sourceMappingURL=web.cjs.map