canvas-datagrid 0.3.15 → 0.3.17

package/lib/draw.js

@@ -1102,11 +1102,17 @@ export default function (self) {
 
         // 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.
+        const isSorting =
+          self.orderings.columns && self.orderings.columns.length > 0;
+
         if (
           isRowHeader &&
           self.attributes.showRowNumbers &&
-          self.attributes.showRowNumberGaps
+          self.attributes.showRowNumberGaps &&
+          isSorting === false
         ) {
           const previousRowNumber = self.getBoundRowIndexFromViewRowIndex(
             rowOrderIndex - 1,

package/lib/publicMethods.js

@@ -1367,22 +1367,18 @@ export default function (self) {
   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;
-      }
+      const aValue = a[columnName] || '';
+      const 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);
     };
   };
   self.sorters.number = function (columnName, direction) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvas-datagrid",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "description": "Canvas based data grid web component. Capable of displaying millions of contiguous hierarchical rows and columns without paging or loading, on a single canvas element.",
   "main": "./dist/canvas-datagrid.js",
   "module": "./dist/canvas-datagrid.module.js",