Skip to content

Commit 05959e0

Browse files
authored
Fixed an issue where using em units for column widths could sometimes result in incorrect calculations. (#449)
* Fixed an issue where using em units for column widths could sometimes result in incorrect calculations. * update
1 parent dbcc999 commit 05959e0

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

packages/cheetah-grid/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cheetah-grid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cheetah-grid",
3-
"version": "1.16.6",
3+
"version": "1.16.7",
44
"description": "Cheetah Grid is a high performance grid engine that works on canvas",
55
"keywords": [
66
"spreadsheet",

packages/cheetah-grid/src/js/ListGrid.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,6 @@ export class ListGrid<T> extends DrawGrid implements ListGridAPI<T> {
915915
_setRecords(this, options.records);
916916
}
917917
protectedSpace.allowRangePaste = options.allowRangePaste ?? false;
918-
_refreshHeader(this);
919918
protectedSpace.sortState = {
920919
col: -1,
921920
row: -1,
@@ -928,6 +927,7 @@ export class ListGrid<T> extends DrawGrid implements ListGridAPI<T> {
928927
(col: number, row: number): Message => _getCellMessage(this, col, row)
929928
);
930929
protectedSpace.tooltipHandler = new TooltipHandler(this);
930+
_refreshHeader(this);
931931
this.invalidate();
932932
protectedSpace.handler.on(window, "resize", () => {
933933
this.updateSize();

packages/cheetah-grid/src/js/core/DrawGrid.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2944,7 +2944,6 @@ interface DrawGridProtected {
29442944
};
29452945
};
29462946
calcWidthContext: {
2947-
_: DrawGridProtected;
29482947
full: number;
29492948
em: number;
29502949
};
@@ -3065,13 +3064,14 @@ export abstract class DrawGrid extends EventTarget implements DrawGridAPI {
30653064
protectedSpace.rowHeightsMap = new NumberMap();
30663065
protectedSpace.colWidthsMap = new NumberMap();
30673066
protectedSpace.colWidthsLimit = {};
3067+
3068+
const getEm = () => getFontSize(protectedSpace.context, this.font).width;
30683069
protectedSpace.calcWidthContext = {
3069-
_: protectedSpace,
30703070
get full(): number {
3071-
return this._.canvas.width;
3071+
return protectedSpace.canvas.width;
30723072
},
30733073
get em(): number {
3074-
return getFontSize(this._.context, this._.font).width;
3074+
return getEm();
30753075
},
30763076
};
30773077

packages/vue-cheetah-grid/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/vue-cheetah-grid/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-cheetah-grid",
3-
"version": "1.16.6",
3+
"version": "1.16.7",
44
"description": "Cheetah Grid for Vue.js",
55
"main": "lib/index.js",
66
"unpkg": "dist/vueCheetahGrid.js",
@@ -51,7 +51,7 @@
5151
},
5252
"homepage": "https://github.com/future-architect/cheetah-grid/tree/master/packages/vue-cheetah-grid",
5353
"dependencies": {
54-
"cheetah-grid": "^1.16.5"
54+
"cheetah-grid": "^1.16.6"
5555
},
5656
"devDependencies": {
5757
"@babel/core": "^7.11.1",

0 commit comments

Comments
 (0)