Merge branch 'konvajs:master' into master

CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 9.3.20 (2025-03-20)
+
+- Fix text rendering when ellipses are used
+
+## 9.3.19 (2025-03-12)
+
+- Typescript fixes
+- Memory leak fixes
+
 ## 9.3.18 (2024-12-23)
 
 - Fixed emoji split in multiple lines

package.json

@@ -1,6 +1,6 @@
 {
   "name": "konva",
-  "version": "9.3.18",
+  "version": "9.3.20",
   "description": "HTML5 2d canvas library.",
   "author": "Anton Lavrenov",
   "files": [

release.sh

@@ -49,7 +49,7 @@ echo "build for $1"
 npm run build >/dev/null
 git commit -am "build for $1" --allow-empty >/dev/null
 
-echo "update CDN link in REAME"
+echo "update CDN link in README"
 perl -i -pe "s|${old_cdn_min}|${new_cdn_min}|g" ./README.md >/dev/null
 git commit -am "update cdn link" --allow-empty >/dev/null
 
@@ -61,17 +61,17 @@ git push >/dev/null
 git push --tags >/dev/null
 npm publish
 
-echo "copy konva.js into konva-site"
-cp ./konva.js ../konva-site/
-cd ../konva-site
+# echo "copy konva.js into konva-site"
+# cp ./konva.js ../konva-site/
+# cd ../konva-site
 
-echo "replace CDN links"
+# echo "replace CDN links"
 
 
-find source themes/hexo3/layout react-demos vue-demos main-demo -name "*.json" -exec perl -i -pe "s|${old_version}|${new_version}|g" {} + >/dev/null
-find source themes/hexo3/layout react-demos vue-demos main-demo -name "*.html" -exec perl -i -pe "s|${old_version}|${new_version}|g" {} + >/dev/null
+# find source themes/hexo3/layout react-demos vue-demos main-demo -name "*.json" -exec perl -i -pe "s|${old_version}|${new_version}|g" {} + >/dev/null
+# find source themes/hexo3/layout react-demos vue-demos main-demo -name "*.html" -exec perl -i -pe "s|${old_version}|${new_version}|g" {} + >/dev/null
 
-echo "regenerate site"
-./deploy.sh >/dev/null
+# echo "regenerate site"
+# ./deploy.sh >/dev/null
 
 echo "DONE!"

rollup.config.mjs

@@ -1,8 +1,6 @@
 // import resolve from 'rollup-plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
 
-const pkg = require('./package.json');
-
 export default {
   input: `src/index.ts`,
   output: [

src/FastLayer.ts

@@ -11,7 +11,7 @@ import { _registerNode } from './Global';
  * @constructor
  * @memberof Konva
  * @augments Konva.Layer
- * @@containerParams
+ @@containerParams
  * @example
  * var layer = new Konva.FastLayer();
  */

src/shapes/Image.ts

@@ -40,9 +40,16 @@ export interface ImageConfig extends ShapeConfig {
  * imageObj.src = '/path/to/image.jpg'
  */
 export class Image extends Shape<ImageConfig> {
+  private _loadListener: () => void;
+
   constructor(attrs: ImageConfig) {
     super(attrs);
-    this.on('imageChange.konva', () => {
+    this._loadListener = () => {
+      this._requestDraw();
+    };
+
+    this.on('imageChange.konva', (props: any) => {
+      this._removeImageLoad(props.oldVal);
       this._setImageLoad();
     });
 
@@ -59,11 +66,19 @@ export class Image extends Shape<ImageConfig> {
       return;
     }
     if (image && image['addEventListener']) {
-      image['addEventListener']('load', () => {
-        this._requestDraw();
-      });
+      image['addEventListener']('load', this._loadListener);
     }
   }
+  _removeImageLoad(image: any) {
+    if (image && image['removeEventListener']) {
+      image['removeEventListener']('load', this._loadListener);
+    }
+  }
+  destroy() {
+    this._removeImageLoad(this.image());
+    super.destroy();
+    return this;
+  }
   _useBufferCanvas() {
     const hasCornerRadius = !!this.cornerRadius();
     const hasShadow = this.hasShadow();

src/shapes/Text.ts

@@ -534,12 +534,23 @@ export class Text extends Shape<TextConfig> {
               // Convert array indices to string
               lineArray = stringToArray(line),
               substr = lineArray.slice(0, mid + 1).join(''),
-              substrWidth = this._getTextWidth(substr) + additionalWidth;
+              substrWidth = this._getTextWidth(substr);
 
-            if (substrWidth <= maxWidth) {
+            // Only add ellipsis width when we need to consider truncation
+            // for the current line (when it might be the last visible line)
+            const shouldConsiderEllipsis =
+              shouldAddEllipsis &&
+              fixedHeight &&
+              currentHeightPx + lineHeightPx > maxHeightPx;
+
+            const effectiveWidth = shouldConsiderEllipsis
+              ? substrWidth + additionalWidth
+              : substrWidth;
+
+            if (effectiveWidth <= maxWidth) {
               low = mid + 1;
               match = substr;
-              matchWidth = substrWidth;
+              matchWidth = substrWidth; // Store actual text width without ellipsis
             } else {
               high = mid;
             }

test/sandbox.html

@@ -17,25 +17,9 @@
         padding: 0;
         margin: 0;
       }
-
-      .test {
-        position: absolute;
-        color: red;
-        font-size: 20px;
-        font-family: Arial;
-        border: 0;
-        background-color: transparent;
-        outline: none;
-        resize: none;
-        overflow: hidden;
-        line-height: 1;
-        padding: 0px;
-        letter-spacing: 20px;
-        width: 500px;
-        text-align: center;
-      }
     </style>
     <!-- <script src="https://cdn.rawgit.com/hammerjs/touchemulator/master/touch-emulator.js"></script> -->
+    <script src="https://unpkg.com/gifler@0.1.0/gifler.min.js"></script>
     <script>
       // TouchEmulator();
     </script>
@@ -52,36 +36,49 @@
     <script type="module">
       import Konva from '../src/index.ts';
 
-      var stageWidth = window.innerWidth;
-      var stageHeight = window.innerHeight;
-
-      Konva._fixTextRendering = true;
+      var width = window.innerWidth;
+      var height = window.innerHeight;
 
       var stage = new Konva.Stage({
         container: 'container',
-        width: stageWidth,
-        height: stageHeight,
+        width: width,
+        height: height,
       });
 
-      Konva._fixTextRendering = true;
-
-      const layer = new Konva.Layer();
+      var layer = new Konva.Layer();
       stage.add(layer);
 
-      const shape = new Konva.Text({
-        x: 50,
-        y: 50,
-        text: 'Hello',
-        fontSize: 20,
-        fontFamily: 'Arial',
-        letterSpacing: 20,
-        align: 'center',
-        width: 500,
-      });
-      layer.add(shape);
+      var canvas = document.createElement('canvas');
+      // use external library to parse and draw gif animation
+      function onDrawFrame(ctx, frame) {
+        // update canvas size
+        canvas.width = frame.width;
+        canvas.height = frame.height;
+        // update canvas that we are using for Konva.Image
+        ctx.drawImage(frame.buffer, 0, 0);
+        // redraw the layer
+        layer.draw();
+      }
 
-      text.style.top = shape.y() + 'px';
-      text.style.left = shape.x() + 'px';
+      gifler('https://konvajs.org/assets/yoda.gif').frames(canvas, onDrawFrame);
+
+      function testKonvaImage() {
+        setInterval(() => {
+          const image = new Konva.Image({
+            image: canvas,
+            x: Math.random() * width,
+            y: Math.random() * height,
+          });
+          layer.add(image);
+
+          setTimeout(() => {
+            image.image(canvas);
+            image.destroy();
+          }, 500);
+        }, 10);
+      }
+
+      testKonvaImage();
     </script>
   </body>
 </html>

test/unit/Text-test.ts

@@ -572,7 +572,7 @@ describe('Text', function () {
     if (isBrowser) {
       assert.equal(
         layer.getContext().getTrace(false, true),
-        "clearRect(0,0,578,200);save();transform(1,0,0,1,10,10);font=normal normal 14px Arial;textBaseline=middle;textAlign=left;translate(0,0);save();fillStyle=black;fillText(HEADING,18,7);restore();save();fillStyle=black;fillText(,50,21);restore();save();fillStyle=black;fillText(All the world's,7,35);restore();save();fillStyle=black;fillText(a stage,,25,49);restore();save();fillStyle=black;fillText(merely,28,63);restore();save();fillStyle=black;fillText(players. They,7,77);restore();save();fillStyle=black;fillText(have…,27,91);restore();restore();"
+        "clearRect(0,0,578,200);save();transform(1,0,0,1,10,10);font=normal normal 14px Arial;textBaseline=middle;textAlign=left;translate(0,0);save();fillStyle=black;fillText(HEADING,18,7);restore();save();fillStyle=black;fillText(,50,21);restore();save();fillStyle=black;fillText(All the world's a,1,35);restore();save();fillStyle=black;fillText(stage, merely,7,49);restore();save();fillStyle=black;fillText(players. They,7,63);restore();save();fillStyle=black;fillText(have theirrrrrrr,5,77);restore();save();fillStyle=black;fillText(exits and…,14,91);restore();restore();"
       );
     }
   });