Fix previous data remaining when updating max-width. (#367)

Author: ota-meshi

packages/cheetah-grid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cheetah-grid",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Cheetah Grid is a high performance grid engine that works on canvas",
   "keywords": [
     "spreadsheet",

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

@@ -486,12 +486,18 @@ function _refreshHeader<T>(grid: ListGrid<T>): void {
     const { width, minWidth, maxWidth } = column;
     if (width && (width > 0 || typeof width === "string")) {
       grid.setColWidth(col, width);
+    } else {
+      grid.setColWidth(col, null);
     }
     if (minWidth && (minWidth > 0 || typeof minWidth === "string")) {
       grid.setMinColWidth(col, minWidth);
+    } else {
+      grid.setMinColWidth(col, null);
     }
     if (maxWidth && (maxWidth > 0 || typeof maxWidth === "string")) {
       grid.setMaxColWidth(col, maxWidth);
+    } else {
+      grid.setMaxColWidth(col, null);
     }
   }
   const { headerRowHeight } = grid[_];
@@ -501,6 +507,8 @@ function _refreshHeader<T>(grid: ListGrid<T>): void {
       : headerRowHeight;
     if (height && height > 0) {
       grid.setRowHeight(row, height);
+    } else {
+      grid.setRowHeight(row, null);
     }
   }
   grid.colCount = layoutMap.colCount;

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

@@ -793,9 +793,13 @@ function _getColWidth(grid: DrawGrid, col: number): number {
 function _setColWidth(
   grid: DrawGrid,
   col: number,
-  width: string | number
+  width: string | number | null
 ): void {
-  grid[_].colWidthsMap.put(col, width);
+  if (width != null) {
+    grid[_].colWidthsMap.put(col, width);
+  } else {
+    grid[_].colWidthsMap.remove(col);
+  }
 }
 
 /**
@@ -859,8 +863,16 @@ function _getRowHeight(this: DrawGrid, row: number): number {
   return this[_].defaultRowHeight;
 }
 /** @private */
-function _setRowHeight(grid: DrawGrid, row: number, height: number): void {
-  grid[_].rowHeightsMap.put(row, height);
+function _setRowHeight(
+  grid: DrawGrid,
+  row: number,
+  height: number | null
+): void {
+  if (height != null) {
+    grid[_].rowHeightsMap.put(row, height);
+  } else {
+    grid[_].rowHeightsMap.remove(row);
+  }
 }
 /** @private */
 function _getRowsHeight(
@@ -3217,7 +3229,7 @@ export abstract class DrawGrid extends EventTarget implements DrawGridAPI {
    * @param  {number} height The row height
    * @return {void}
    */
-  setRowHeight(row: number, height: number): void {
+  setRowHeight(row: number, height: number | null): void {
     _setRowHeight(this, row, height);
   }
   /**
@@ -3234,7 +3246,7 @@ export abstract class DrawGrid extends EventTarget implements DrawGridAPI {
    * @param  {number} width The column width
    * @return {void}
    */
-  setColWidth(col: number, width: string | number): void {
+  setColWidth(col: number, width: string | number | null): void {
     _setColWidth(this, col, width);
   }
   /**
@@ -3252,10 +3264,14 @@ export abstract class DrawGrid extends EventTarget implements DrawGridAPI {
    * @param  {number} maxwidth The column max width
    * @return {void}
    */
-  setMaxColWidth(col: number, maxwidth: string | number): void {
+  setMaxColWidth(col: number, maxwidth: string | number | null): void {
     const obj =
       this[_].colWidthsLimit[col] || (this[_].colWidthsLimit[col] = {});
-    obj.max = maxwidth;
+    if (maxwidth != null) {
+      obj.max = maxwidth;
+    } else {
+      delete obj.max;
+    }
   }
   /**
    * Get the column min width of the given the column index.
@@ -3272,10 +3288,14 @@ export abstract class DrawGrid extends EventTarget implements DrawGridAPI {
    * @param  {number} minwidth The column min width
    * @return {void}
    */
-  setMinColWidth(col: number, minwidth: string | number): void {
+  setMinColWidth(col: number, minwidth: string | number | null): void {
     const obj =
       this[_].colWidthsLimit[col] || (this[_].colWidthsLimit[col] = {});
-    obj.min = minwidth;
+    if (minwidth != null) {
+      obj.min = minwidth;
+    } else {
+      delete obj.min;
+    }
   }
   /**
    * Get the rect of the cell.

packages/cheetah-grid/src/js/internal/NumberMap.ts

@@ -25,6 +25,15 @@ export class NumberMap<T> {
     }
     this._vals[key] = value;
   }
+  remove(key: number): void {
+    delete this._vals[key];
+    const index = this._keys.indexOf(key);
+    if (index < 0) {
+      return;
+    }
+    this._keys.splice(index, 1);
+    this._sorted = false;
+  }
   get(key: number): T | undefined {
     return this._vals[key];
   }

packages/cheetah-grid/src/js/ts-types/grid-engine.ts

@@ -83,7 +83,7 @@ export interface DrawGridAPI {
   getRowHeight(row: number): number;
   setRowHeight(row: number, height: number): void;
   getColWidth(col: number): number;
-  setColWidth(col: number, width: number): void;
+  setColWidth(col: number, width: string | number | null): void;
   getMaxColWidth(col: number): string | number | undefined;
   setMaxColWidth(col: number, maxwidth: string | number): void;
   getMinColWidth(col: number): string | number | undefined;

packages/vue-cheetah-grid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-cheetah-grid",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Cheetah Grid for Vue.js",
   "main": "lib/index.js",
   "unpkg": "dist/vueCheetahGrid.js",