jquery.dgtable 0.5.48 → 0.5.52

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jquery.dgtable",
   "description": "High-performance table View for jQuery",
-  "version": "0.5.48",
+  "version": "0.5.52",
   "main": "dist/jquery.dgtable.cjs.min.js",
   "module": "dist/jquery.dgtable.es6.min.js",
   "broswer": "dist/jquery.dgtable.umd.min.js",
@@ -34,21 +34,22 @@
     }
   ],
   "dependencies": {
-    "@danielgindi/dom-utils": "^1.0.3"
+    "@danielgindi/dom-utils": "^1.0.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/runtime": "^7.15.3",
+    "@babel/core": "^7.16.7",
+    "@babel/preset-env": "^7.16.7",
+    "@babel/runtime": "^7.16.7",
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^20.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.4",
-    "core-js": "^3.16.1",
-    "eslint": "^7.32.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "core-js": "^3.20.2",
+    "eslint": "^8.6.0",
+    "eslint-formatter-codeframe": "^7.32.1",
     "fs-extra": "^10.0.0",
-    "husky": "^7.0.1",
+    "husky": "^7.0.4",
     "pinst": "^2.1.6",
-    "rollup": "^2.56.2",
+    "rollup": "^2.63.0",
     "rollup-plugin-terser": "^7.0.2"
   }
 }

package/src/index.js

@@ -28,6 +28,8 @@ let hasIeDragAndDropBug = ieVersion && ieVersion < 10;
 let createElement = document.createElement.bind(document);
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 
+const IsSafeSymbol = ('safe');
+
 function webkitRenderBugfix(el) {
     // BUGFIX: WebKit has a bug where it does not relayout, and this affects us because scrollbars
     //   are still calculated even though they are not there yet. This is the last resort.
@@ -221,7 +223,7 @@ DGTable.prototype.initialize = function (options) {
 
     /**
      * @private
-     * @field {Function(String,Boolean)Function(a,b)Boolean} onComparatorRequired */
+     * @field {function(columnName: string, descending: boolean, defaultComparator: function(a,b):number):(function(a,b):number)} onComparatorRequired */
     o.onComparatorRequired = options.onComparatorRequired === undefined ? null : options.onComparatorRequired;
     if (!o.onComparatorRequired && typeof options['comparatorCallback'] === 'function') {
         o.onComparatorRequired = options['comparatorCallback'];
@@ -286,9 +288,9 @@ DGTable.prototype.initialize = function (options) {
 
     /** @field {RowCollection} _rows */
     p.rows = new RowCollection({ sortColumn: sortColumns });
-    p.rows.onComparatorRequired = function(column, descending){
+    p.rows.onComparatorRequired = (column, descending, defaultComparator) => {
         if (o.onComparatorRequired) {
-            return o.onComparatorRequired(column, descending);
+            return o.onComparatorRequired(column, descending, defaultComparator);
         }
     };
 
@@ -1116,12 +1118,15 @@ DGTable.prototype.removeColumn = function (column, render) {
  * @returns {DGTable} self
  */
 DGTable.prototype.setCellFormatter = function (formatter) {
+    if (!formatter) {
+        formatter = val => (typeof val === 'string') ? htmlEncode(val) : val;
+        formatter[IsSafeSymbol] = true;
+    }
+
     /**
      * @private
      * @field {Function} cellFormatter */
-    this.o.cellFormatter = formatter || function (val) {
-        return (typeof val === 'string') ? htmlEncode(val) : val;
-    };
+    this.o.cellFormatter = formatter;
 
     return this;
 };
@@ -1636,7 +1641,7 @@ DGTable.prototype.getResizableColumns = function () {
 /**
  * @public
  * @expose
- * @param {{function(string,boolean):{function(a:*,b:*):boolean}}} comparatorCallback a callback function that returns the comparator for a specific column
+ * @param {{function(columnName: string, descending: boolean, defaultComparator: function(a,b):number):{function(a,b):number}}} comparatorCallback a callback function that returns the comparator for a specific column
  * @returns {DGTable} self
  */
 DGTable.prototype.setComparatorCallback = function (comparatorCallback) {
@@ -1801,7 +1806,21 @@ DGTable.prototype._getHtmlForCell = function (rowData, column) {
         colValue = colValue && colValue[dataPath[dataPathIndex]];
     }
 
-    let content = this.o.cellFormatter(colValue, column.name, rowData);
+    const formatter = this.o.cellFormatter;
+    let content;
+
+    if (formatter[IsSafeSymbol]) {
+        content = formatter(colValue, column.name, rowData);
+    } else {
+        try {
+            content = formatter(colValue, column.name, rowData);
+        } catch (err) {
+            content = '[ERROR]';
+            // eslint-disable-next-line no-console
+            console.error('Failed to generate content for cell ' + column.name, err);
+        }
+    }
+
     if (content === undefined || content === null) {
         content = '';
     }
@@ -3981,25 +4000,10 @@ DGTable.prototype._cellMouseOverEvent = function(el) {
         p._bindCellHoverOut(el);
         p._bindCellHoverOut(previewCell);
 
-        $previewCell.on('mousewheel', (event) => {
-            let originalEvent = event.originalEvent;
-            let xy = originalEvent.wheelDelta || -originalEvent.detail,
-                x = originalEvent.wheelDeltaX || (originalEvent.axis === 1 ? xy : 0),
-                y = originalEvent.wheelDeltaY || (originalEvent.axis === 2 ? xy : 0);
-
-            if (xy) {
-                this.hideCellPreview();
-            }
-
-            if (y && p.table.scrollHeight > p.table.clientHeight) {
-                let scrollTop = (y * -1) + p.$table.scrollTop();
-                p.$table.scrollTop(scrollTop);
-            }
-
-            if (x && p.table.scrollWidth > p.table.clientWidth) {
-                let scrollLeft = (x * -1) + p.$table.scrollLeft();
-                p.$table.scrollLeft(scrollLeft);
-            }
+        // Avoid interfering with wheel scrolling the table
+        $previewCell.on('wheel', () => {
+            // Let the table naturally scroll with the wheel
+            this.hideCellPreview();
         });
     }
 };

package/src/row_collection.js

@@ -70,7 +70,7 @@ RowCollection.prototype.reset = function (rows) {
 RowCollection.prototype.filteredCollection = function (filterFunc, args) {
     if (filterFunc && args) {
         let rows = new RowCollection({ sortColumn: this.sortColumn });
-        
+
         for (let i = 0, len = this.length, row; i < len; i++) {
             row = this[i];
             if (filterFunc(row, args)) {
@@ -85,7 +85,7 @@ RowCollection.prototype.filteredCollection = function (filterFunc, args) {
 };
 
 /**
- * @type {Function|null|undefined}
+ * @type {function(columnName: string, descending: boolean, defaultComparator: function(a,b):number)|null|undefined}
  */
 RowCollection.prototype.onComparatorRequired = null;
 
@@ -134,11 +134,12 @@ RowCollection.prototype.sort = function (silent) {
 
         for (i = 0; i < this.sortColumn.length; i++) {
             comparator = null;
+            const defaultComparator = getDefaultComparator(this.sortColumn[i], this.sortColumn[i].descending);
             if (this.onComparatorRequired) {
-                comparator = this.onComparatorRequired(this.sortColumn[i].column, this.sortColumn[i].descending);
+                comparator = this.onComparatorRequired(this.sortColumn[i].column, this.sortColumn[i].descending, defaultComparator);
             }
             if (!comparator) {
-                comparator = getDefaultComparator(this.sortColumn[i], this.sortColumn[i].descending);
+                comparator = defaultComparator;
             }
             comparators.push(comparator.bind(this));
         }
@@ -171,4 +172,4 @@ RowCollection.prototype.sort = function (silent) {
     return this;
 };
 
-export default RowCollection;
+export default RowCollection;