Fixed bug in lineClamp: 'auto' calculation

future-architect · Aug 6, 2018 · 78bd02b · 78bd02b
1 parent ec3d6cf
commit 78bd02b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/packages/cheetah-grid/package-lock.json b/packages/cheetah-grid/package-lock.json
diff --git a/packages/cheetah-grid/package.json b/packages/cheetah-grid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cheetah-grid",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Cheetah Grid is a high performance grid engine that works on canvas",
   "keywords": [
     "spreadsheet",

diff --git a/packages/cheetah-grid/src/js/GridCanvasHelper.js b/packages/cheetah-grid/src/js/GridCanvasHelper.js
@@ -250,7 +250,8 @@ function _multiInlineRect(grid, ctx, multiInlines, rect, col, row,
 	ctx.font = font || ctx.font;
 
 	if (lineClamp === 'auto') {
-		lineClamp = Math.max(Math.floor(rect.height / lineHeight), 1);
+		const rectHeight = rect.height - offset * 2 - 2/*offset added by Inline#draw*/;
+		lineClamp = Math.max(Math.floor(rectHeight / lineHeight), 1);
 	}
 
 	let buildedMultiInlines;

diff --git a/packages/cheetah-grid/src/test/specs/apis/textOverflow_spec.js b/packages/cheetah-grid/src/test/specs/apis/textOverflow_spec.js
@@ -233,7 +233,7 @@
 
 				const em = ctx.measureText('あ').width;
 
-				const lineClamp = Math.floor(50 / em);
+				const lineClamp = Math.floor((50 - 6) / em);
 
 				//TEXT
 				ctx.fillStyle = '#000';