canvas-datagrid 0.3.14 → 0.3.18

package/CHANGELOG.md

@@ -7,6 +7,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.3.18 - 2021-11-18
+
+No changes; had to bump version number because race condition caused 0.3.16 to be published instead of 0.3.17.
+
+## 0.3.17 - 2021-11-18
+
+### Fixed
+
+- Do not render row gaps when sorting (ndrsn, #391)
+
+## 0.3.16 - 2021-11-18
+
+### Fixed
+
+- Fix string sort when value is null/undefined (faimaklg, #388)
+
+## 0.3.15 - 2021-11-18
+
+### Fixed
+
+- Fix highlighting incorrect column after repositioning column (xianzhi3, #399)
+- Reverse sort order icon (faimaklg, #387)
+- Fix link in tutorials (slominskir, #386)
+
 ## 0.3.14 - 2021-10-20
 
 ### Added

package/dist/canvas-datagrid.debug.js

@@ -1892,15 +1892,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     y = y + mt;
 
     if (self.orderDirection === 'asc') {
-      self.ctx.moveTo(x, y);
-      self.ctx.lineTo(x + aw, y);
-      self.ctx.lineTo(x + aw * 0.5, y + ah);
-      self.ctx.moveTo(x, y);
-    } else {
       self.ctx.lineTo(x, y + ah);
       self.ctx.lineTo(x + aw, y + ah);
       self.ctx.lineTo(x + aw * 0.5, y);
       self.ctx.lineTo(x, y + ah);
+    } else {
+      self.ctx.moveTo(x, y);
+      self.ctx.lineTo(x + aw, y);
+      self.ctx.lineTo(x + aw * 0.5, y + ah);
+      self.ctx.moveTo(x, y);
     }
 
     self.ctx.stroke();
@@ -2796,9 +2796,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
         self.ctx.restore(); // Gaps may occur in row numbers between consecutively rendered rows
         // when we are filtering. We draw attention to this by drawing a thick
-        // border overlapping the two consecutive row headers.
+        // border overlapping the two consecutive row headers. If sorting, visible
+        // row numbers stay the same (i.e. they don't correspond to the underlying
+        // data's row number), so we do not show row gaps in that case.
+
+        var isSorting = self.orderings.columns && self.orderings.columns.length > 0;
 
-        if (isRowHeader && self.attributes.showRowNumbers && self.attributes.showRowNumberGaps) {
+        if (isRowHeader && self.attributes.showRowNumbers && self.attributes.showRowNumberGaps && isSorting === false) {
           var previousRowNumber = self.getBoundRowIndexFromViewRowIndex(rowOrderIndex - 1);
           var hasRowGap = previousRowNumber !== undefined && cell.boundRowIndex > 0 && cell.boundRowIndex - previousRowNumber > 1;
 
@@ -4365,6 +4369,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
   self.stopDragReorder = function (e) {
     var oIndex,
         tIndex,
+        odata,
         cr = {
       'row-reorder': self.orders.rows,
       'column-reorder': self.orders.columns
@@ -4385,13 +4390,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       self.ignoreNextClick = true;
       oIndex = cr[self.dragMode].indexOf(self.reorderObject[i]);
       tIndex = cr[self.dragMode].indexOf(self.reorderTarget[i]);
-      cr[self.dragMode].splice(oIndex, 1);
-      cr[self.dragMode].splice(tIndex, 0, self.reorderObject[i]);
 
       if (self.dragMode === 'column-reorder') {
+        cr[self.dragMode].splice(oIndex, 1);
+        cr[self.dragMode].splice(tIndex, 0, self.reorderObject[i]);
         self.orders.columns = cr[self.dragMode];
       } else {
-        self.orders.rows = cr[self.dragMode];
+        // self.orders.rows = cr[self.dragMode];
+        odata = self.viewData[oIndex];
+        self.viewData[oIndex] = self.viewData[tIndex];
+        self.viewData[tIndex] = odata;
       }
 
       self.resize();
@@ -4617,6 +4625,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
     if (['row-reorder', 'column-reorder'].indexOf(self.dragMode) !== -1) {
       self.draggingItem = self.dragStartObject;
+
+      if (self.dragMode === 'column-reorder' && self.attributes.columnHeaderClickBehavior === 'select') {
+        self.selectColumn(self.currentCell.header.index, ctrl, e.shiftKey);
+        self.draw();
+      }
+
       document.body.addEventListener('mousemove', self.dragReorder, false);
       document.body.addEventListener('mouseup', self.stopDragReorder, false);
       return;
@@ -4625,9 +4639,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
   self.mouseup = function (e) {
     clearTimeout(self.scrollTimer);
+    var ctrl = e.ctrlKey || e.metaKey;
     self.cellBoundaryCrossed = true;
     self.rowBoundaryCrossed = true;
     self.columnBoundaryCrossed = true;
+
+    if (self.draggingItem) {
+      self.selectColumn(self.currentCell.header.index, ctrl, e.shiftKey);
+      self.draw();
+    }
+
     self.selecting = undefined;
     self.draggingItem = undefined;
     self.dragStartObject = undefined;
@@ -8717,27 +8738,22 @@ __webpack_require__.r(__webpack_exports__);
   self.sorters.string = function (columnName, direction) {
     var asc = direction === 'asc';
     return function (a, b) {
-      if (a[columnName] === undefined || a[columnName] === null) {
-        return 1;
-      }
-
-      if (b[columnName] === undefined || b[columnName] === null) {
-        return 0;
-      }
+      var aValue = a[columnName] || '';
+      var bValue = b[columnName] || '';
 
       if (asc) {
-        if (!a[columnName].localeCompare) {
+        if (!aValue.localeCompare) {
           return 1;
         }
 
-        return a[columnName].localeCompare(b[columnName]);
+        return aValue.localeCompare(bValue);
       }
 
-      if (!b[columnName].localeCompare) {
+      if (!bValue.localeCompare) {
         return 1;
       }
 
-      return b[columnName].localeCompare(a[columnName]);
+      return bValue.localeCompare(aValue);
     };
   };