fixed multi-select. Altered several events to include an event object…

… beforerendercell, renderorderbyarrow, rendertreearrow, beforeendedit, endedit, beforebeginedit, resizecolumn so e.preventDefault is a thing.
TonyGermaneri · Mar 17, 2017 · 3c98323 · 3c98323
1 parent 33cda05
commit 3c98323
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 25 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -306,6 +306,7 @@
  * You would only use this if you want to completely stop the cell from being drawn and generally muck up everything.
  * @event
  * @name canvasDataGrid#beforerendercell
+ * @param {object} e Event object
  * @param {object} ctx Canvas context.
  * @param {object} value Current cell value.
  * @param {object} row Current row data.
@@ -345,6 +346,7 @@
  * to completely replace the order arrow graphic.  Call `e.preventDefault()` to stop the default arrow from being drawn.
  * @event
  * @name canvasDataGrid#renderorderbyarrow
+ * @param {object} e Event object
  * @param {object} ctx Canvas context.
  * @param {object} [cell](#cell) Current cell.
  */
@@ -353,6 +355,7 @@
  * to completely replace the tree arrow graphic.  Call `e.preventDefault()` to stop the default arrow from being drawn.
  * @event
  * @name canvasDataGrid#rendertreearrow
+ * @param {object} e Event object
  * @param {object} ctx Canvas context.
  * @param {object} [cell](#cell) Current cell.
  */
@@ -407,27 +410,30 @@
  * `e.preventDefault();` will cause the edit to not end and row data will not be written back to the `data` array.
  * @event
  * @name canvasDataGrid#beforeendedit
+ * @param {object} e Event object.
+ * @param {object} [cell](#cell) Cell object.
  * @param {object} value New value.
  * @param {object} originalValue Original value.
  * @param {object} abort Abort edit function.  Call this function to abort the edit.
- * @param {object} [cell](#cell) Cell object.
- * @param {object} textarea Textarea or input HTMLElement depending on `attributes.multiLine`.
+  * @param {object} textarea Textarea or input HTMLElement depending on `attributes.multiLine`.
  */
  /**
  * Fires when the edit has ended.  This event gives you a chance to abort the edit
  * preserving original row data, or modify the value of the row data prior to being written.
  * @event
  * @name canvasDataGrid#endedit
+ * @param {object} e Event object.
+ * @param {object} [cell](#cell) Cell object.
  * @param {object} value New value.
  * @param {object} abort When true, the edit was aborted.
- * @param {object} [cell](#cell) Cell object.
- * @param {object} textarea Textarea HTMLElement.
+  * @param {object} textarea Textarea HTMLElement.
  */
  /**
  * Fires before a edit cell has been created giving you a chance to abort it.
  * `e.preventDefault();` will abort the edit cell from being created.
  * @event
  * @name canvasDataGrid#beforebeginedit
+ * @param {object} e Event object.
  * @param {object} [cell](#cell) Cell object.
  */
  /**
@@ -449,6 +455,7 @@
  * `e.preventDefault();` will abort the resize.
  * @event
  * @name canvasDataGrid#resizecolumn
+ * @param {object} e Event object.
  * @param {object} x x pixel position of the resize.
  * @param {object} y y pixel position of the resize.
  * @param {object} [cell](#cell) The mutable cell to be resized.
@@ -504,11 +511,9 @@
  */
  /**
  * Fires when grid is being resized.
- * `e.preventDefault();` will abort the resizing.
  * @event
  * @name canvasDataGrid#resize
- * @param {object} e height.
- * @param {cell} width.
+ * @param {object} e Resize events.
  */
   /**
  * Fires when the mouse enters a cell.
@@ -964,9 +969,9 @@
             if (!ctrl) {
                 selections = [];
             }
-            if (selectionBounds.top < 0
+            if (selectionBounds.top < -1
                     || selectionBounds.bottom > data.length
-                    || selectionBounds.left < 0
+                    || selectionBounds.left < -1
                     || selectionBounds.right > s.length) {
                 throw new Error('Impossible selection area');
             }
@@ -1329,7 +1334,7 @@
                         visibleRows.push(rowIndex);
                     }
                     val = dispatchEvent('formatcellvalue', [ctx, d[header.name], d, header, cx, cy], intf);
-                    if (!dispatchEvent('beforerendercell', [ctx, d[header.name], d, header, cx, cy], intf)) {
+                    if (!dispatchEvent('beforerendercell', [{}, ctx, d[header.name], d, header, cx, cy], intf)) {
                         cx = x - scrollBox.scrollLeft;
                         cy = y;
                         if (cellStyle === 'cornerCell') {
@@ -1419,7 +1424,7 @@
                             checkScrollHeight = true;
                         }
                         if (cellStyle === 'rowHeaderCell' && attributes.tree) {
-                            if (!dispatchEvent('rendertreearrow', [ctx, cell], intf)) {
+                            if (!dispatchEvent('rendertreearrow', [{}, ctx, cell], intf)) {
                                 treeArrowSize = drawTreeArrow(cell, style[cellStyle + 'PaddingLeft'], cy, 0);
                             }
                         }
@@ -1452,7 +1457,7 @@
                                         + header.type + ' add a cellFormater');
                                 }
                                 if (cellStyle === 'headerCell' && orderBy === header.name) {
-                                    if (!dispatchEvent('renderorderbyarrow', [ctx, cell], intf)) {
+                                    if (!dispatchEvent('renderorderbyarrow', [{}, ctx, cell], intf)) {
                                         orderByArrowSize = drawOrderByArrow(cx + style[cellStyle + 'PaddingLeft'], 0);
                                     }
                                 }
@@ -1760,7 +1765,7 @@
             if (drawAfterResize) {
                 draw(true);
             }
-            dispatchEvent('resize', [], intf);
+            dispatchEvent('resize', [{}], intf);
             return true;
         }
         function getClippingRect(ele) {
@@ -1821,9 +1826,8 @@
          * @param {boolean} supressSelectionchangedEvent When true, prevents the selectionchanged event from firing.
          */
         function selectRow(rowIndex, ctrl, supressEvent) {
-            if (!schema) { return; }
             var s = getSchema();
-            if (selections[rowIndex] && selections[rowIndex].length - 1 === schema.length) {
+            if (selections[rowIndex] && selections[rowIndex].length - 1 === s.length) {
                 if (ctrl) {
                     selections[rowIndex] = [];
                     return;
@@ -2668,11 +2672,11 @@
             draw(true);
         }
         /**
-         * Sets the height of a given row by index number.
+         * Sets the width of a given column by index number.
          * @memberof canvasDataGrid#
          * @method
-         * @param {number} rowIndex The index of the row to set.
-         * @param {number} height Height to set the row to.
+         * @param {number} colIndex The index of the column to set.
+         * @param {number} width Width to set the column to.
          */
         function setColumnWidth(colIndex, width) {
             var s = getSchema();
@@ -2711,8 +2715,8 @@
             function abortEdit() {
                 abort = true;
             }
-            if (dispatchEvent('beforeendedit', [input.value, cell.value,
-                    abortEdit, cell, input], intf)) { return false; }
+            if (dispatchEvent('beforeendedit', [{}, cell, input.value, cell.value,
+                    abortEdit, input], intf)) { return false; }
             if (input.value !== cell.value && !abort) {
                 changes[y] = changes[y] || {};
                 changes[y][cell.header.name] = input.value;
@@ -2728,7 +2732,7 @@
             }
             document.body.removeChild(input);
             controlInput.focus();
-            dispatchEvent('endedit', [input.value, abort, cell, input], intf);
+            dispatchEvent('endedit', [{}, cell, input.value, abort, input], intf);
             input = undefined;
             return true;
         }
@@ -2745,7 +2749,7 @@
             cell = visibleCells.filter(function (vCell) {
                 return vCell.columnIndex === x && vCell.rowIndex === y;
             })[0];
-            if (dispatchEvent('beforebeginedit', [cell], intf)) { return false; }
+            if (dispatchEvent('beforebeginedit', [{}, cell], intf)) { return false; }
             scrollIntoView(x, y);
             setActiveCell(x, y);
             function postDraw() {
@@ -2909,7 +2913,7 @@
             if (y < style.minRowHeight) {
                 y = style.minRowHeight;
             }
-            if (dispatchEvent('resizecolumn', [x, y, resizingItem], intf)) { return false; }
+            if (dispatchEvent('resizecolumn', [{}, x, y, resizingItem], intf)) { return false; }
             if (scrollBox.scrollLeft > scrollBox.scrollWidth - attributes.resizeScrollZone
                     && resizeMode === 'ew-resize') {
                 resize(true);
@@ -3050,7 +3054,7 @@
             if (resizeMode === 'cell') {
                 selecting = true;
                 if (attributes.rowSelectionMode) {
-                    selectRow(dragStartObject.rowIndex, false, true);
+                    selectRow(dragStartObject.rowIndex, ctrl, true);
                 }
                 return mousemove(e);
             }

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

diff --git a/tutorials/sample.js b/tutorials/sample.js