fixed bug where zero rows caused a benign error. Fixed last header ce…

…ll graphical problem.
TonyGermaneri · Jan 17, 2017 · 4ffd635 · 4ffd635
1 parent c68b3f8
commit 4ffd635
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "canvas-datagrid",
   "main": "lib/main.js",
-  "version": "0.9.24",
+  "version": "0.9.26",
   "ignore": [
     "**/.*",
     "node_modules",

diff --git a/lib/main.js b/lib/main.js
@@ -906,10 +906,23 @@
                     d[uniqueId] = header[uniqueId];
                     drawCell(headerCell, -1)(d, index);
                 });
+                // fill in the space right of the headers
+                if (x < w) {
+                    c = {
+                        name: '',
+                        width: w - x,
+                        style: 'headerCell',
+                        type: 'string',
+                        index: s.length
+                    };
+                    c[uniqueId] = 'headerCell';
+                    drawCell({endCap: ''}, -1)(c, -1);
+                }
+                // fill in the space left of the headers
                 if (attributes.showRowHeaders) {
-                    x = parentNode.offsetLeft;
                     cornerCell = {'cornerCell': '' };
                     cornerCell[uniqueId] = 'cornerCell';
+                    x = parentNode.offsetLeft;
                     c = {
                         name: 'cornerCell',
                         width: style.headerRowWidth,
@@ -1111,9 +1124,11 @@
                     + cellBorder;
                 scrollIndexTop += 1;
             }
-            scrollIndexTop = Math.max(scrollIndexTop - 1, 0);
-            scrollPixelTop = Math.max(scrollPixelTop
-                - (sizes.rows[data[scrollIndexTop][uniqueId]] || style.cellHeight), 0);
+            if (data.length > 0) {
+                scrollIndexTop = Math.max(scrollIndexTop - 1, 0);
+                scrollPixelTop = Math.max(scrollPixelTop
+                    - (sizes.rows[data[scrollIndexTop][uniqueId]] || style.cellHeight), 0);
+            }
             ellipsisCache = {};
             draw(true);
             if (input) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canvas-datagrid",
-  "version": "0.9.25",
+  "version": "0.9.26",
   "description": "Canvas based data grid",
   "main": "./lib/main.js",
   "scripts": {