Merge remote-tracking branch 'origin/main' into svelte-module

Author: revomanik

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revolist/revogrid",
-  "version": "4.16.0",
+  "version": "4.17.1",
   "type": "module",
   "description": "Virtual reactive data grid spreadsheet component - RevoGrid.",
   "license": "MIT",

src/plugins/sorting/sorting.func.ts

@@ -48,8 +48,8 @@ export function sortIndexByItems(
 export function defaultCellCompare(this: { column?: ColumnRegular }, prop: ColumnProp, a: DataType, b: DataType) {
   const aRaw = this.column ? getCellRaw(a, this.column) : a?.[prop];
   const bRaw = this.column ? getCellRaw(b, this.column) : b?.[prop];
-  const av = aRaw?.toString().toLowerCase();
-  const bv = bRaw?.toString().toLowerCase();
+  const av = typeof aRaw === 'number' ? aRaw : aRaw?.toString().toLowerCase();
+  const bv = typeof bRaw === 'number' ? bRaw : bRaw?.toString().toLowerCase();
 
   if (av === bv) {
     return 0;
@@ -88,4 +88,4 @@ export function getComparer(column: Partial<ColumnRegular> | undefined, order: O
     return descCellCompare(cellCmp);
   }
   return undefined;
-}
+}

src/plugins/sorting/sorting.plugin.ts

@@ -195,23 +195,24 @@ export class SortingPlugin extends BasePlugin {
       const sorting: SortingOrder = {};
       const sortingFunc: SortingOrderFunction = {};
 
+      if (columnProp in sorting && size(sorting) > 1 && order === undefined) {
+        delete sorting[columnProp];
+        delete sortingFunc[columnProp];
+      } else {
+        sorting[columnProp] = order;
+        sortingFunc[columnProp] = cmp;
+      }      
+
       this.sorting = {
         ...this.sorting,
         ...sorting,
       };
+      
       // extend sorting function with new sorting for multiple columns sorting
       this.sortingFunc = {
         ...this.sortingFunc,
         ...sortingFunc,
       };
-
-      if (columnProp in sorting && size(sorting) > 1 && order === undefined) {
-        delete sorting[columnProp];
-        delete sortingFunc[columnProp];
-      } else {
-        sorting[columnProp] = order;
-        sortingFunc[columnProp] = cmp;
-      }
     } else {
       if (order) {
         // reset sorting