datatables.net-searchbuilder 1.6.0 → 1.7.0

package/js/dataTables.searchBuilder.mjs

@@ -1,5 +1,5 @@
-/*! SearchBuilder 1.6.0
- * ©SpryMedia Ltd - datatables.net/license/mit
+/*! SearchBuilder 1.7.0
+-dev * ©SpryMedia Ltd - datatables.net/license/mit
  */
 
 import jQuery from 'jquery';
@@ -33,11 +33,11 @@ let $ = jQuery;
      */
     var Criteria = /** @class */ (function () {
         function Criteria(table, opts, topGroup, index, depth, serverData, liveSearch) {
-            var _this = this;
             if (index === void 0) { index = 0; }
             if (depth === void 0) { depth = 1; }
             if (serverData === void 0) { serverData = undefined; }
             if (liveSearch === void 0) { liveSearch = false; }
+            var _this = this;
             // Check that the required version of DataTables is included
             if (!dataTable$3 || !dataTable$3.versionCheck || !dataTable$3.versionCheck('1.10.0')) {
                 throw new Error('SearchPane requires DataTables 1.10 or newer');
@@ -161,7 +161,9 @@ let $ = jQuery;
             }
         };
         /**
-         * Parses formatted numbers down to a form where they can be compared
+         * Parses formatted numbers down to a form where they can be compared.
+         * Note that this does not account for different decimal characters. Use
+         * parseNumber instead on the instance.
          *
          * @param val the value to convert
          * @returns the converted value
@@ -183,11 +185,11 @@ let $ = jQuery;
             this.setListeners();
             // Trigger the inserted events for the value elements as they are inserted
             if (this.dom.value[0] !== undefined) {
-                this.dom.value[0].trigger('dtsb-inserted');
+                $$3(this.dom.value[0]).trigger('dtsb-inserted');
             }
             for (var i = 1; i < this.dom.value.length; i++) {
                 this.dom.inputCont.append(this.dom.value[i]);
-                this.dom.value[i].trigger('dtsb-inserted');
+                $$3(this.dom.value[i]).trigger('dtsb-inserted');
             }
             // If this is a top level criteria then don't let it move left
             if (this.s.depth > 1) {
@@ -225,28 +227,28 @@ let $ = jQuery;
          * @returns boolean Whether the criteria has passed
          */
         Criteria.prototype.search = function (rowData, rowIdx) {
+            var settings = this.s.dt.settings()[0];
             var condition = this.s.conditions[this.s.condition];
             if (this.s.condition !== undefined && condition !== undefined) {
                 var filter = rowData[this.s.dataIdx];
                 // This check is in place for if a custom decimal character is in place
                 if (this.s.type.includes('num') &&
-                    (this.s.dt.settings()[0].oLanguage.sDecimal !== '' ||
-                        this.s.dt.settings()[0].oLanguage.sThousands !== '')) {
+                    (settings.oLanguage.sDecimal !== '' ||
+                        settings.oLanguage.sThousands !== '')) {
                     var splitRD = [rowData[this.s.dataIdx]];
-                    if (this.s.dt.settings()[0].oLanguage.sDecimal !== '') {
-                        splitRD = rowData[this.s.dataIdx].split(this.s.dt.settings()[0].oLanguage.sDecimal);
+                    if (settings.oLanguage.sDecimal !== '') {
+                        splitRD = rowData[this.s.dataIdx].split(settings.oLanguage.sDecimal);
                     }
-                    if (this.s.dt.settings()[0].oLanguage.sThousands !== '') {
+                    if (settings.oLanguage.sThousands !== '') {
                         for (var i = 0; i < splitRD.length; i++) {
-                            splitRD[i] = splitRD[i].replace(this.s.dt.settings()[0].oLanguage.sThousands, ',');
+                            splitRD[i] = splitRD[i].replace(settings.oLanguage.sThousands, ',');
                         }
                     }
                     filter = splitRD.join('.');
                 }
                 // If orthogonal data is in place we need to get it's values for searching
                 if (this.c.orthogonal.search !== 'filter') {
-                    var settings = this.s.dt.settings()[0];
-                    filter = settings.oApi._fnGetCellData(settings, rowIdx, this.s.dataIdx, typeof this.c.orthogonal === 'string' ?
+                    filter = settings.fastData(rowIdx, this.s.dataIdx, typeof this.c.orthogonal === 'string' ?
                         this.c.orthogonal :
                         this.c.orthogonal.search);
                 }
@@ -282,18 +284,20 @@ let $ = jQuery;
          */
         Criteria.prototype.getDetails = function (deFormatDates) {
             if (deFormatDates === void 0) { deFormatDates = false; }
+            var i;
+            var settings = this.s.dt.settings()[0];
             // This check is in place for if a custom decimal character is in place
             if (this.s.type !== null &&
                 this.s.type.includes('num') &&
-                (this.s.dt.settings()[0].oLanguage.sDecimal !== '' || this.s.dt.settings()[0].oLanguage.sThousands !== '')) {
-                for (var i = 0; i < this.s.value.length; i++) {
+                (settings.oLanguage.sDecimal !== '' || settings.oLanguage.sThousands !== '')) {
+                for (i = 0; i < this.s.value.length; i++) {
                     var splitRD = [this.s.value[i].toString()];
-                    if (this.s.dt.settings()[0].oLanguage.sDecimal !== '') {
-                        splitRD = this.s.value[i].split(this.s.dt.settings()[0].oLanguage.sDecimal);
+                    if (settings.oLanguage.sDecimal !== '') {
+                        splitRD = this.s.value[i].split(settings.oLanguage.sDecimal);
                     }
-                    if (this.s.dt.settings()[0].oLanguage.sThousands !== '') {
+                    if (settings.oLanguage.sThousands !== '') {
                         for (var j = 0; j < splitRD.length; j++) {
-                            splitRD[j] = splitRD[j].replace(this.s.dt.settings()[0].oLanguage.sThousands, ',');
+                            splitRD[j] = splitRD[j].replace(settings.oLanguage.sThousands, ',');
                         }
                     }
                     this.s.value[i] = splitRD.join('.');
@@ -302,14 +306,14 @@ let $ = jQuery;
             else if (this.s.type !== null && deFormatDates) {
                 if (this.s.type.includes('date') ||
                     this.s.type.includes('time')) {
-                    for (var i = 0; i < this.s.value.length; i++) {
+                    for (i = 0; i < this.s.value.length; i++) {
                         if (this.s.value[i].match(/^\d{4}-([0]\d|1[0-2])-([0-2]\d|3[01])$/g) === null) {
                             this.s.value[i] = '';
                         }
                     }
                 }
                 else if (this.s.type.includes('moment')) {
-                    for (var i = 0; i < this.s.value.length; i++) {
+                    for (i = 0; i < this.s.value.length; i++) {
                         if (this.s.value[i] &&
                             this.s.value[i].length > 0 &&
                             moment()(this.s.value[i], this.s.dateFormat, true).isValid()) {
@@ -318,7 +322,7 @@ let $ = jQuery;
                     }
                 }
                 else if (this.s.type.includes('luxon')) {
-                    for (var i = 0; i < this.s.value.length; i++) {
+                    for (i = 0; i < this.s.value.length; i++) {
                         if (this.s.value[i] &&
                             this.s.value[i].length > 0 &&
                             luxon().DateTime.fromFormat(this.s.value[i], this.s.dateFormat).invalid === null) {
@@ -328,7 +332,7 @@ let $ = jQuery;
                 }
             }
             if (this.s.type.includes('num') && this.s.dt.page.info().serverSide) {
-                for (var i = 0; i < this.s.value.length; i++) {
+                for (i = 0; i < this.s.value.length; i++) {
                     this.s.value[i] = this.s.value[i].replace(/[^0-9.\-]/g, '');
                 }
             }
@@ -348,6 +352,20 @@ let $ = jQuery;
         Criteria.prototype.getNode = function () {
             return this.dom.container;
         };
+        /**
+         * Parses formatted numbers down to a form where they can be compared
+         *
+         * @param val the value to convert
+         * @returns the converted value
+         */
+        Criteria.prototype.parseNumber = function (val) {
+            var decimal = this.s.dt.i18n('decimal');
+            // Remove any periods and then replace the decimal with a period
+            if (decimal && decimal !== '.') {
+                val = val.replace(/\./g, '').replace(decimal, '.');
+            }
+            return +val.replace(/(?!^-)[^0-9.]/g, '');
+        };
         /**
          * Populates the criteria data, condition and value(s) as far as has been selected
          */
@@ -370,7 +388,7 @@ let $ = jQuery;
         Criteria.prototype.rebuild = function (loadedCriteria) {
             // Check to see if the previously selected data exists, if so select it
             var foundData = false;
-            var dataIdx;
+            var dataIdx, i;
             this._populateData();
             // If a data selection has previously been made attempt to find and select it
             if (loadedCriteria.data !== undefined) {
@@ -402,8 +420,7 @@ let $ = jQuery;
                 var condition = void 0;
                 // Check to see if the previously selected condition exists, if so select it
                 var options = this.dom.condition.children('option');
-                // eslint-disable-next-line @typescript-eslint/prefer-for-of
-                for (var i = 0; i < options.length; i++) {
+                for (i = 0; i < options.length; i++) {
                     var option = $$3(options[i]);
                     if (loadedCriteria.condition !== undefined &&
                         option.val() === loadedCriteria.condition &&
@@ -421,11 +438,10 @@ let $ = jQuery;
                     this.dom.conditionTitle.removeProp('selected');
                     this.dom.conditionTitle.remove();
                     this.dom.condition.removeClass(this.classes.italic);
-                    // eslint-disable-next-line @typescript-eslint/prefer-for-of
-                    for (var i = 0; i < options.length; i++) {
-                        var option = $$3(options[i]);
-                        if (option.val() !== this.s.condition) {
-                            option.removeProp('selected');
+                    for (i = 0; i < options.length; i++) {
+                        var opt = $$3(options[i]);
+                        if (opt.val() !== this.s.condition) {
+                            opt.removeProp('selected');
                         }
                     }
                     this._populateValue(loadedCriteria);
@@ -446,7 +462,6 @@ let $ = jQuery;
                 _this.dom.dataTitle.removeProp('selected');
                 // Need to go over every option to identify the correct selection
                 var options = _this.dom.data.children('option.' + _this.classes.option);
-                // eslint-disable-next-line @typescript-eslint/prefer-for-of
                 for (var i = 0; i < options.length; i++) {
                     var option = $$3(options[i]);
                     if (option.val() === _this.dom.data.val()) {
@@ -481,7 +496,6 @@ let $ = jQuery;
                 _this.dom.conditionTitle.removeProp('selected');
                 // Need to go over every option to identify the correct selection
                 var options = _this.dom.condition.children('option.' + _this.classes.option);
-                // eslint-disable-next-line @typescript-eslint/prefer-for-of
                 for (var i = 0; i < options.length; i++) {
                     var option = $$3(options[i]);
                     if (option.val() === _this.dom.condition.val()) {
@@ -570,20 +584,18 @@ let $ = jQuery;
          * Clears the value elements
          */
         Criteria.prototype._clearValue = function () {
+            var val;
             if (this.s.condition !== undefined) {
                 if (this.dom.value.length > 0 && this.dom.value[0] !== undefined) {
-                    var _loop_1 = function (val) {
+                    // Remove all of the value elements
+                    for (var _i = 0, _a = this.dom.value; _i < _a.length; _i++) {
+                        val = _a[_i];
                         if (val !== undefined) {
                             // Timeout is annoying but because of IOS
                             setTimeout(function () {
                                 val.remove();
                             }, 50);
                         }
-                    };
-                    // Remove all of the value elements
-                    for (var _i = 0, _a = this.dom.value; _i < _a.length; _i++) {
-                        var val = _a[_i];
-                        _loop_1(val);
                     }
                 }
                 // Call the init function to get the value elements for this condition
@@ -593,27 +605,24 @@ let $ = jQuery;
                         .empty()
                         .append(this.dom.value[0])
                         .insertAfter(this.dom.condition);
-                    this.dom.value[0].trigger('dtsb-inserted');
+                    $$3(this.dom.value[0]).trigger('dtsb-inserted');
                     // Insert all of the value elements
                     for (var i = 1; i < this.dom.value.length; i++) {
                         this.dom.inputCont.append(this.dom.value[i]);
-                        this.dom.value[i].trigger('dtsb-inserted');
+                        $$3(this.dom.value[i]).trigger('dtsb-inserted');
                     }
                 }
             }
             else {
-                var _loop_2 = function (val) {
+                // Remove all of the value elements
+                for (var _b = 0, _c = this.dom.value; _b < _c.length; _b++) {
+                    val = _c[_b];
                     if (val !== undefined) {
                         // Timeout is annoying but because of IOS
                         setTimeout(function () {
                             val.remove();
                         }, 50);
                     }
-                };
-                // Remove all of the value elements
-                for (var _b = 0, _c = this.dom.value; _b < _c.length; _b++) {
-                    var val = _c[_b];
-                    _loop_2(val);
                 }
                 // Append the default valueTitle to the default select element
                 this.dom.valueTitle
@@ -649,9 +658,10 @@ let $ = jQuery;
             var conditionsLength = Object.keys(this.s.conditions).length;
             var colInits = this.s.dt.settings()[0].aoColumns;
             var column = +this.dom.data.children('option:selected').val();
+            var condition, condName;
             // If there are no conditions stored then we need to get them from the appropriate type
             if (conditionsLength === 0) {
-                this.s.type = this.s.dt.columns().type().toArray()[column];
+                this.s.type = this.s.dt.column(column).type();
                 if (colInits !== undefined) {
                     var colInit = colInits[column];
                     if (colInit.searchBuilderType !== undefined && colInit.searchBuilderType !== null) {
@@ -661,10 +671,13 @@ let $ = jQuery;
                         this.s.type = colInit.sType;
                     }
                 }
-                // If the column type is still unknown, call a draw to try reading it again
+                // If the column type is still unknown use the internal API to detect type
                 if (this.s.type === null || this.s.type === undefined) {
-                    $$3.fn.dataTable.ext.oApi._fnColumnTypes(this.s.dt.settings()[0]);
-                    this.s.type = this.s.dt.columns().type().toArray()[column];
+                    // This can only happen in DT1 - DT2 will do the invalidation of the type itself
+                    if ($$3.fn.dataTable.ext.oApi) {
+                        $$3.fn.dataTable.ext.oApi._fnColumnTypes(this.s.dt.settings()[0]);
+                    }
+                    this.s.type = this.s.dt.column(column).type();
                 }
                 // Enable the condition element
                 this.dom.condition
@@ -701,7 +714,7 @@ let $ = jQuery;
                 }
                 // Add all of the conditions to the select element
                 for (var _i = 0, _a = Object.keys(conditionObj); _i < _a.length; _i++) {
-                    var condition = _a[_i];
+                    condition = _a[_i];
                     if (conditionObj[condition] !== null) {
                         // Serverside processing does not supply the options for the select elements
                         // Instead input elements need to be used for these instead
@@ -719,7 +732,7 @@ let $ = jQuery;
                             }
                         }
                         this.s.conditions[condition] = conditionObj[condition];
-                        var condName = conditionObj[condition].conditionName;
+                        condName = conditionObj[condition].conditionName;
                         if (typeof condName === 'function') {
                             condName = condName(this.s.dt, this.c.i18n);
                         }
@@ -736,18 +749,18 @@ let $ = jQuery;
             else if (conditionsLength > 0) {
                 this.dom.condition.empty().removeAttr('disabled').addClass(this.classes.italic);
                 for (var _b = 0, _c = Object.keys(this.s.conditions); _b < _c.length; _b++) {
-                    var condition = _c[_b];
-                    var condName = this.s.conditions[condition].conditionName;
-                    if (typeof condName === 'function') {
-                        condName = condName(this.s.dt, this.c.i18n);
+                    condition = _c[_b];
+                    var name_1 = this.s.conditions[condition].conditionName;
+                    if (typeof name_1 === 'function') {
+                        name_1 = name_1(this.s.dt, this.c.i18n);
                     }
                     var newOpt = $$3('<option>', {
-                        text: condName,
+                        text: name_1,
                         value: condition
                     })
                         .addClass(this.classes.option)
                         .addClass(this.classes.notItalic);
-                    if (this.s.condition !== undefined && this.s.condition === condName) {
+                    if (this.s.condition !== undefined && this.s.condition === name_1) {
                         newOpt.prop('selected', true);
                         this.dom.condition.removeClass(this.classes.italic);
                     }
@@ -779,7 +792,7 @@ let $ = jQuery;
                         // Need to check against the stored conditions so we can match the token "cond" to the option
                         for (var _e = 0, _f = Object.keys(this.s.conditions); _e < _f.length; _e++) {
                             var cond = _f[_e];
-                            var condName = this.s.conditions[cond].conditionName;
+                            condName = this.s.conditions[cond].conditionName;
                             if (
                             // If the conditionName matches the text of the option
                             (typeof condName === 'string' ? condName : condName(this.s.dt, this.c.i18n)) ===
@@ -842,13 +855,14 @@ let $ = jQuery;
         Criteria.prototype._populateValue = function (loadedCriteria) {
             var _this = this;
             var prevFilled = this.s.filled;
+            var i;
             this.s.filled = false;
             // Remove any previous value elements
             // Timeout is annoying but because of IOS
             setTimeout(function () {
                 _this.dom.defaultValue.remove();
             }, 50);
-            var _loop_3 = function (val) {
+            var _loop_1 = function (val) {
                 // Timeout is annoying but because of IOS
                 setTimeout(function () {
                     if (val !== undefined) {
@@ -858,12 +872,11 @@ let $ = jQuery;
             };
             for (var _i = 0, _a = this.dom.value; _i < _a.length; _i++) {
                 var val = _a[_i];
-                _loop_3(val);
+                _loop_1(val);
             }
             var children = this.dom.inputCont.children();
             if (children.length > 1) {
-                // eslint-disable-next-line @typescript-eslint/prefer-for-of
-                for (var i = 0; i < children.length; i++) {
+                for (i = 0; i < children.length; i++) {
                     $$3(children[i]).remove();
                 }
             }
@@ -883,12 +896,12 @@ let $ = jQuery;
             this.dom.inputCont.empty();
             // Insert value elements and trigger the inserted event
             if (this.dom.value[0] !== undefined) {
-                this.dom.value[0]
+                $$3(this.dom.value[0])
                     .appendTo(this.dom.inputCont)
                     .trigger('dtsb-inserted');
             }
-            for (var i = 1; i < this.dom.value.length; i++) {
-                this.dom.value[i]
+            for (i = 1; i < this.dom.value.length; i++) {
+                $$3(this.dom.value[i])
                     .insertAfter(this.dom.value[i - 1])
                     .trigger('dtsb-inserted');
             }
@@ -968,7 +981,7 @@ let $ = jQuery;
             if (array === void 0) { array = false; }
             var column = that.dom.data.children('option:selected').val();
             var indexArray = that.s.dt.rows().indexes().toArray();
-            var settings = that.s.dt.settings()[0];
+            var fastData = that.s.dt.settings()[0].fastData;
             that.dom.valueTitle.prop('selected', true);
             // Declare select element to be used with all of the default classes and listeners.
             var el = $$3('<select/>')
@@ -990,7 +1003,7 @@ let $ = jQuery;
             // Only add one option for each possible value
             for (var _i = 0, indexArray_1 = indexArray; _i < indexArray_1.length; _i++) {
                 var index = indexArray_1[_i];
-                var filter = settings.oApi._fnGetCellData(settings, index, column, typeof that.c.orthogonal === 'string' ?
+                var filter = fastData(index, column, typeof that.c.orthogonal === 'string' ?
                     that.c.orthogonal :
                     that.c.orthogonal.search);
                 var value = {
@@ -998,7 +1011,7 @@ let $ = jQuery;
                         filter.replace(/[\r\n\u2028]/g, ' ') : // Need to replace certain characters to match search values
                         filter,
                     index: index,
-                    text: settings.oApi._fnGetCellData(settings, index, column, typeof that.c.orthogonal === 'string' ?
+                    text: fastData(index, column, typeof that.c.orthogonal === 'string' ?
                         that.c.orthogonal :
                         that.c.orthogonal.display)
                 };
@@ -1291,14 +1304,14 @@ let $ = jQuery;
                     i18n: i18n
                 })
                     .on('change.dtsb', searchDelay !== null ?
-                    that.s.dt.settings()[0].oApi._fnThrottle(function () {
+                    DataTable.util.throttle(function () {
                         return fn(that, this);
                     }, searchDelay) :
                     function () {
                         fn(that, _this);
                     })
                     .on('input.dtsb keypress.dtsb', function (e) {
-                    that.s.dt.settings()[0].oApi._fnThrottle(function () {
+                    DataTable.util.throttle(function () {
                         var code = e.keyCode || e.which;
                         return fn(that, this, code);
                     }, searchDelay === null ? 0 : searchDelay);
@@ -1315,7 +1328,7 @@ let $ = jQuery;
                     i18n: i18n
                 })
                     .on('change.dtsb', searchDelay !== null ?
-                    that.s.dt.settings()[0].oApi._fnThrottle(function () {
+                    DataTable.util.throttle(function () {
                         return fn(that, this);
                     }, searchDelay) :
                     function () {
@@ -1325,7 +1338,7 @@ let $ = jQuery;
                     !(that.s.dt.settings()[0].oInit.search !== undefined &&
                         that.s.dt.settings()[0].oInit.search["return"]) &&
                     searchDelay !== null ?
-                    that.s.dt.settings()[0].oApi._fnThrottle(function () {
+                    DataTable.util.throttle(function () {
                         return fn(that, this);
                     }, searchDelay) :
                     function (e) {
@@ -1415,6 +1428,7 @@ let $ = jQuery;
             // When the value is changed the criteria is now complete so can be included in searches
             // Get the condition from the map based on the key that has been selected for the condition
             var condition = that.s.conditions[that.s.condition];
+            var i;
             that.s.filled = condition.isInputValid(that.dom.value, that);
             that.s.value = condition.inputValue(that.dom.value, that);
             if (!that.s.filled) {
@@ -1429,31 +1443,16 @@ let $ = jQuery;
             if (!Array.isArray(that.s.value)) {
                 that.s.value = [that.s.value];
             }
-            for (var i = 0; i < that.s.value.length; i++) {
+            for (i = 0; i < that.s.value.length; i++) {
                 // If the value is an array we need to sort it
                 if (Array.isArray(that.s.value[i])) {
                     that.s.value[i].sort();
                 }
-                // Otherwise replace the decimal place character for i18n
-                else if (that.s.type.includes('num') &&
-                    (that.s.dt.settings()[0].oLanguage.sDecimal !== '' ||
-                        that.s.dt.settings()[0].oLanguage.sThousands !== '')) {
-                    var splitRD = [that.s.value[i].toString()];
-                    if (that.s.dt.settings()[0].oLanguage.sDecimal !== '') {
-                        splitRD = that.s.value[i].split(that.s.dt.settings()[0].oLanguage.sDecimal);
-                    }
-                    if (that.s.dt.settings()[0].oLanguage.sThousands !== '') {
-                        for (var j = 0; j < splitRD.length; j++) {
-                            splitRD[j] = splitRD[j].replace(that.s.dt.settings()[0].oLanguage.sThousands, ',');
-                        }
-                    }
-                    that.s.value[i] = splitRD.join('.');
-                }
             }
             // Take note of the cursor position so that we can refocus there later
             var idx = null;
             var cursorPos = null;
-            for (var i = 0; i < that.dom.value.length; i++) {
+            for (i = 0; i < that.dom.value.length; i++) {
                 if (el === that.dom.value[i][0]) {
                     idx = i;
                     if (el.selectionStart !== undefined) {
@@ -1480,7 +1479,6 @@ let $ = jQuery;
         // The order of the conditions will make eslint sad :(
         // Has to be in this order so that they are displayed correctly in select elements
         // Also have to disable member ordering for this as the private methods used are not yet declared otherwise
-        // eslint-disable-next-line @typescript-eslint/member-ordering
         Criteria.dateConditions = {
             '=': {
                 conditionName: function (dt, i18n) {
@@ -1494,7 +1492,6 @@ let $ = jQuery;
                     return value === comparison[0];
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!=': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.not', i18n.conditions.date.not);
@@ -1548,7 +1545,6 @@ let $ = jQuery;
                     }
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!between': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.notBetween', i18n.conditions.date.notBetween);
@@ -1581,7 +1577,6 @@ let $ = jQuery;
                     return value === null || value === undefined || value.length === 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!null': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.notEmpty', i18n.conditions.date.notEmpty);
@@ -1601,7 +1596,6 @@ let $ = jQuery;
         // The order of the conditions will make eslint sad :(
         // Has to be in this order so that they are displayed correctly in select elements
         // Also have to disable member ordering for this as the private methods used are not yet declared otherwise
-        // eslint-disable-next-line @typescript-eslint/member-ordering
         Criteria.momentDateConditions = {
             '=': {
                 conditionName: function (dt, i18n) {
@@ -1615,7 +1609,6 @@ let $ = jQuery;
                         moment()(comparison[0], that.s.dateFormat).valueOf();
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!=': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.not', i18n.conditions.date.not);
@@ -1669,7 +1662,6 @@ let $ = jQuery;
                     }
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!between': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.notBetween', i18n.conditions.date.notBetween);
@@ -1704,7 +1696,6 @@ let $ = jQuery;
                     return value === null || value === undefined || value.length === 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!null': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.notEmpty', i18n.conditions.date.notEmpty);
@@ -1724,7 +1715,6 @@ let $ = jQuery;
         // The order of the conditions will make eslint sad :(
         // Has to be in this order so that they are displayed correctly in select elements
         // Also have to disable member ordering for this as the private methods used are not yet declared otherwise
-        // eslint-disable-next-line @typescript-eslint/member-ordering
         Criteria.luxonDateConditions = {
             '=': {
                 conditionName: function (dt, i18n) {
@@ -1738,7 +1728,6 @@ let $ = jQuery;
                         === luxon().DateTime.fromFormat(comparison[0], that.s.dateFormat).ts;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!=': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.not', i18n.conditions.date.not);
@@ -1794,7 +1783,6 @@ let $ = jQuery;
                     }
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!between': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.notBetween', i18n.conditions.date.notBetween);
@@ -1829,7 +1817,6 @@ let $ = jQuery;
                     return value === null || value === undefined || value.length === 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!null': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.date.notEmpty', i18n.conditions.date.notEmpty);
@@ -1849,7 +1836,6 @@ let $ = jQuery;
         // The order of the conditions will make eslint sad :(
         // Has to be in this order so that they are displayed correctly in select elements
         // Also have to disable member ordering for this as the private methods used are not yet declared otherwise
-        // eslint-disable-next-line @typescript-eslint/member-ordering
         Criteria.numConditions = {
             '=': {
                 conditionName: function (dt, i18n) {
@@ -1862,7 +1848,6 @@ let $ = jQuery;
                     return +value === +comparison[0];
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!=': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.number.not', i18n.conditions.number.not);
@@ -1907,7 +1892,6 @@ let $ = jQuery;
                     return +value >= +comparison[0];
                 }
             },
-            // eslint-disable-next-line sort-keys
             '>': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.number.gt', i18n.conditions.number.gt);
@@ -1935,7 +1919,6 @@ let $ = jQuery;
                     }
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!between': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.number.notBetween', i18n.conditions.number.notBetween);
@@ -1967,7 +1950,6 @@ let $ = jQuery;
                     return value === null || value === undefined || value.length === 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!null': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.number.notEmpty', i18n.conditions.number.notEmpty);
@@ -1987,7 +1969,6 @@ let $ = jQuery;
         // The order of the conditions will make eslint sad :(
         // Has to be in this order so that they are displayed correctly in select elements
         // Also have to disable member ordering for this as the private methods used are not yet declared otherwise
-        // eslint-disable-next-line @typescript-eslint/member-ordering
         Criteria.numFmtConditions = {
             '=': {
                 conditionName: function (dt, i18n) {
@@ -1996,11 +1977,10 @@ let $ = jQuery;
                 init: Criteria.initSelect,
                 inputValue: Criteria.inputValueSelect,
                 isInputValid: Criteria.isInputValidSelect,
-                search: function (value, comparison) {
-                    return Criteria.parseNumFmt(value) === Criteria.parseNumFmt(comparison[0]);
+                search: function (value, comparison, criteria) {
+                    return criteria.parseNumber(value) === criteria.parseNumber(comparison[0]);
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!=': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.number.not', i18n.conditions.number.not);
@@ -2008,8 +1988,8 @@ let $ = jQuery;
                 init: Criteria.initSelect,
                 inputValue: Criteria.inputValueSelect,
                 isInputValid: Criteria.isInputValidSelect,
-                search: function (value, comparison) {
-                    return Criteria.parseNumFmt(value) !== Criteria.parseNumFmt(comparison[0]);
+                search: function (value, comparison, criteria) {
+                    return criteria.parseNumber(value) !== criteria.parseNumber(comparison[0]);
                 }
             },
             '<': {
@@ -2019,8 +1999,8 @@ let $ = jQuery;
                 init: Criteria.initInput,
                 inputValue: Criteria.inputValueInput,
                 isInputValid: Criteria.isInputValidInput,
-                search: function (value, comparison) {
-                    return Criteria.parseNumFmt(value) < Criteria.parseNumFmt(comparison[0]);
+                search: function (value, comparison, criteria) {
+                    return criteria.parseNumber(value) < criteria.parseNumber(comparison[0]);
                 }
             },
             '<=': {
@@ -2030,8 +2010,8 @@ let $ = jQuery;
                 init: Criteria.initInput,
                 inputValue: Criteria.inputValueInput,
                 isInputValid: Criteria.isInputValidInput,
-                search: function (value, comparison) {
-                    return Criteria.parseNumFmt(value) <= Criteria.parseNumFmt(comparison[0]);
+                search: function (value, comparison, criteria) {
+                    return criteria.parseNumber(value) <= criteria.parseNumber(comparison[0]);
                 }
             },
             '>=': {
@@ -2041,11 +2021,10 @@ let $ = jQuery;
                 init: Criteria.initInput,
                 inputValue: Criteria.inputValueInput,
                 isInputValid: Criteria.isInputValidInput,
-                search: function (value, comparison) {
-                    return Criteria.parseNumFmt(value) >= Criteria.parseNumFmt(comparison[0]);
+                search: function (value, comparison, criteria) {
+                    return criteria.parseNumber(value) >= criteria.parseNumber(comparison[0]);
                 }
             },
-            // eslint-disable-next-line sort-keys
             '>': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.number.gt', i18n.conditions.number.gt);
@@ -2053,8 +2032,8 @@ let $ = jQuery;
                 init: Criteria.initInput,
                 inputValue: Criteria.inputValueInput,
                 isInputValid: Criteria.isInputValidInput,
-                search: function (value, comparison) {
-                    return Criteria.parseNumFmt(value) > Criteria.parseNumFmt(comparison[0]);
+                search: function (value, comparison, criteria) {
+                    return criteria.parseNumber(value) > criteria.parseNumber(comparison[0]);
                 }
             },
             'between': {
@@ -2064,10 +2043,10 @@ let $ = jQuery;
                 init: Criteria.init2Input,
                 inputValue: Criteria.inputValueInput,
                 isInputValid: Criteria.isInputValidInput,
-                search: function (value, comparison) {
-                    var val = Criteria.parseNumFmt(value);
-                    var comp0 = Criteria.parseNumFmt(comparison[0]);
-                    var comp1 = Criteria.parseNumFmt(comparison[1]);
+                search: function (value, comparison, criteria) {
+                    var val = criteria.parseNumber(value);
+                    var comp0 = criteria.parseNumber(comparison[0]);
+                    var comp1 = criteria.parseNumber(comparison[1]);
                     if (+comp0 < +comp1) {
                         return +comp0 <= +val && +val <= +comp1;
                     }
@@ -2076,7 +2055,6 @@ let $ = jQuery;
                     }
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!between': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.number.notBetween', i18n.conditions.number.notBetween);
@@ -2084,10 +2062,10 @@ let $ = jQuery;
                 init: Criteria.init2Input,
                 inputValue: Criteria.inputValueInput,
                 isInputValid: Criteria.isInputValidInput,
-                search: function (value, comparison) {
-                    var val = Criteria.parseNumFmt(value);
-                    var comp0 = Criteria.parseNumFmt(comparison[0]);
-                    var comp1 = Criteria.parseNumFmt(comparison[1]);
+                search: function (value, comparison, criteria) {
+                    var val = criteria.parseNumber(value);
+                    var comp0 = criteria.parseNumber(comparison[0]);
+                    var comp1 = criteria.parseNumber(comparison[1]);
                     if (+comp0 < +comp1) {
                         return !(+comp0 <= +val && +val <= +comp1);
                     }
@@ -2111,7 +2089,6 @@ let $ = jQuery;
                     return value === null || value === undefined || value.length === 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!null': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.number.notEmpty', i18n.conditions.number.notEmpty);
@@ -2131,7 +2108,6 @@ let $ = jQuery;
         // The order of the conditions will make eslint sad :(
         // Has to be in this order so that they are displayed correctly in select elements
         // Also have to disable member ordering for this as the private methods used are not yet declared otherwise
-        // eslint-disable-next-line @typescript-eslint/member-ordering
         Criteria.stringConditions = {
             '=': {
                 conditionName: function (dt, i18n) {
@@ -2144,7 +2120,6 @@ let $ = jQuery;
                     return value === comparison[0];
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!=': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.string.not', i18n.conditions.string.not);
@@ -2167,7 +2142,6 @@ let $ = jQuery;
                     return value.toLowerCase().indexOf(comparison[0].toLowerCase()) === 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!starts': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.string.notStartsWith', i18n.conditions.string.notStartsWith);
@@ -2179,7 +2153,6 @@ let $ = jQuery;
                     return value.toLowerCase().indexOf(comparison[0].toLowerCase()) !== 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             'contains': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.string.contains', i18n.conditions.string.contains);
@@ -2191,7 +2164,6 @@ let $ = jQuery;
                     return value.toLowerCase().includes(comparison[0].toLowerCase());
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!contains': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.string.notContains', i18n.conditions.string.notContains);
@@ -2214,7 +2186,6 @@ let $ = jQuery;
                     return value.toLowerCase().endsWith(comparison[0].toLowerCase());
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!ends': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.string.notEndsWith', i18n.conditions.string.notEndsWith);
@@ -2241,7 +2212,6 @@ let $ = jQuery;
                     return value === null || value === undefined || value.length === 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!null': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.string.notEmpty', i18n.conditions.string.notEmpty);
@@ -2260,7 +2230,6 @@ let $ = jQuery;
         };
         // The order of the conditions will make eslint sad :(
         // Also have to disable member ordering for this as the private methods used are not yet declared otherwise
-        // eslint-disable-next-line @typescript-eslint/member-ordering
         Criteria.arrayConditions = {
             'contains': {
                 conditionName: function (dt, i18n) {
@@ -2284,7 +2253,6 @@ let $ = jQuery;
                     return value.indexOf(comparison[0]) === -1;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '=': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.array.equals', i18n.conditions.array.equals);
@@ -2304,7 +2272,6 @@ let $ = jQuery;
                     return false;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!=': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.array.not', i18n.conditions.array.not);
@@ -2339,7 +2306,6 @@ let $ = jQuery;
                     return value === null || value === undefined || value.length === 0;
                 }
             },
-            // eslint-disable-next-line sort-keys
             '!null': {
                 conditionName: function (dt, i18n) {
                     return dt.i18n('searchBuilder.conditions.array.notEmpty', i18n.conditions.array.notEmpty);
@@ -2358,7 +2324,6 @@ let $ = jQuery;
         };
         // eslint will be sad because we have to disable member ordering for this as the
         // private static properties used are not yet declared otherwise
-        // eslint-disable-next-line @typescript-eslint/member-ordering
         Criteria.defaults = {
             columns: true,
             conditions: {
@@ -2402,6 +2367,7 @@ let $ = jQuery;
                 value: 'Value',
                 valueJoiner: 'and'
             },
+            liveSearch: true,
             logic: 'AND',
             orthogonal: {
                 display: 'display',
@@ -2500,7 +2466,6 @@ let $ = jQuery;
          * Gets the details required to rebuild the group
          */
         // Eslint upset at empty object but needs to be done
-        // eslint-disable-next-line @typescript-eslint/ban-types
         Group.prototype.getDetails = function (deFormatDates) {
             if (deFormatDates === void 0) { deFormatDates = false; }
             if (this.s.criteria.length === 0) {
@@ -2531,6 +2496,7 @@ let $ = jQuery;
          * @param loadedDetails the details required to rebuild the group
          */
         Group.prototype.rebuild = function (loadedDetails) {
+            var crit;
             // If no criteria are stored then just return
             if (loadedDetails.criteria === undefined ||
                 loadedDetails.criteria === null ||
@@ -2544,7 +2510,7 @@ let $ = jQuery;
             // Add all of the criteria, be it a sub group or a criteria
             if (Array.isArray(loadedDetails.criteria)) {
                 for (var _i = 0, _a = loadedDetails.criteria; _i < _a.length; _i++) {
-                    var crit = _a[_i];
+                    crit = _a[_i];
                     if (crit.logic !== undefined) {
                         this._addPrevGroup(crit);
                     }
@@ -2555,7 +2521,7 @@ let $ = jQuery;
             }
             // For all of the criteria children, update the arrows incase they require changing and set the listeners
             for (var _b = 0, _c = this.s.criteria; _b < _c.length; _b++) {
-                var crit = _c[_b];
+                crit = _c[_b];
                 if (crit.criteria instanceof Criteria) {
                     crit.criteria.updateArrows(this.s.criteria.length > 1);
                     this._setCriteriaListeners(crit.criteria);
@@ -2573,8 +2539,10 @@ let $ = jQuery;
             this.dom.container.children().detach();
             this.dom.container
                 .append(this.dom.logicContainer)
-                .append(this.dom.add)
-                .append(this.dom.search);
+                .append(this.dom.add);
+            if (!this.c.liveSearch) {
+                this.dom.container.append(this.dom.search);
+            }
             // Sort the criteria by index so that they appear in the correct order
             this.s.criteria.sort(function (a, b) {
                 if (a.criteria.s.index < b.criteria.s.index) {
@@ -2716,7 +2684,9 @@ let $ = jQuery;
                 _this.s.dt.state.save();
                 return false;
             });
-            this.dom.search.on('click.dtsb', function () {
+            this.dom.search
+                .off('click.dtsb')
+                .on('click.dtsb', function () {
                 _this.s.dt.draw();
             });
             for (var _i = 0, _a = this.s.criteria; _i < _a.length; _i++) {
@@ -2915,6 +2885,7 @@ let $ = jQuery;
          */
         Group.prototype._removeCriteria = function (criteria, group) {
             if (group === void 0) { group = false; }
+            var i;
             // If removing a criteria and there is only then then just destroy the group
             if (this.s.criteria.length <= 1 && this.s.isChild) {
                 this.destroy();
@@ -2922,7 +2893,7 @@ let $ = jQuery;
             else {
                 // Otherwise splice the given criteria out and redo the indexes
                 var last = void 0;
-                for (var i = 0; i < this.s.criteria.length; i++) {
+                for (i = 0; i < this.s.criteria.length; i++) {
                     if (this.s.criteria[i].index === criteria.s.index &&
                         (!group || this.s.criteria[i].criteria instanceof Group)) {
                         last = i;
@@ -2932,7 +2903,7 @@ let $ = jQuery;
                 if (last !== undefined) {
                     this.s.criteria.splice(last, 1);
                 }
-                for (var i = 0; i < this.s.criteria.length; i++) {
+                for (i = 0; i < this.s.criteria.length; i++) {
                     this.s.criteria[i].index = i;
                     this.s.criteria[i].criteria.s.index = i;
                 }
@@ -3073,9 +3044,10 @@ let $ = jQuery;
             if (this.s.isChild) {
                 this.dom.container.append(this.dom.logicContainer);
             }
-            this.dom.container
-                .append(this.dom.add)
-                .append(this.dom.search);
+            this.dom.container.append(this.dom.add);
+            if (!this.c.liveSearch) {
+                this.dom.container.append(this.dom.search);
+            }
         };
         /**
          * Sets the listener for the logic button
@@ -3251,7 +3223,6 @@ let $ = jQuery;
          * Gets the details required to rebuild the SearchBuilder as it currently is
          */
         // eslint upset at empty object but that is what it is
-        // eslint-disable-next-line @typescript-eslint/ban-types
         SearchBuilder.prototype.getDetails = function (deFormatDates) {
             if (deFormatDates === void 0) { deFormatDates = false; }
             return this.s.topGroup.getDetails(deFormatDates);
@@ -3321,16 +3292,19 @@ let $ = jQuery;
         SearchBuilder.prototype._setUp = function (loadState) {
             var _this = this;
             if (loadState === void 0) { loadState = true; }
-            // Register an Api method for getting the column type
-            $$1.fn.DataTable.Api.registerPlural('columns().type()', 'column().type()', function () {
-                return this.iterator('column', function (settings, column) {
-                    return settings.aoColumns[column].sType;
-                }, 1);
-            });
+            // Register an Api method for getting the column type. DataTables 2 has
+            // this built in
+            if (typeof this.s.dt.column().type !== 'function') {
+                DataTable.Api.registerPlural('columns().types()', 'column().type()', function () {
+                    return this.iterator('column', function (settings, column) {
+                        return settings.aoColumns[column].sType;
+                    }, 1);
+                });
+            }
             // Check that DateTime is included, If not need to check if it could be used
             // eslint-disable-next-line no-extra-parens
             if (!dataTable$1.DateTime) {
-                var types = this.s.dt.columns().type().toArray();
+                var types = this.s.dt.columns().types().toArray();
                 if (types === undefined || types.includes(undefined) || types.includes(null)) {
                     types = [];
                     for (var _i = 0, _a = this.s.dt.settings()[0].aoColumns; _i < _a.length; _i++) {
@@ -3339,10 +3313,13 @@ let $ = jQuery;
                     }
                 }
                 var columnIdxs = this.s.dt.columns().toArray();
-                // If the types are not yet set then draw to see if they can be retrieved then
+                // If the column type is still unknown use the internal API to detect type
                 if (types === undefined || types.includes(undefined) || types.includes(null)) {
-                    $$1.fn.dataTable.ext.oApi._fnColumnTypes(this.s.dt.settings()[0]);
-                    types = this.s.dt.columns().type().toArray();
+                    // This can only happen in DT1 - DT2 will do the invalidation of the type itself
+                    if ($$1.fn.dataTable.ext.oApi) {
+                        $$1.fn.dataTable.ext.oApi._fnColumnTypes(this.s.dt.settings()[0]);
+                    }
+                    types = this.s.dt.columns().types().toArray();
                 }
                 for (var i = 0; i < columnIdxs[0].length; i++) {
                     var column = columnIdxs[0][i];
@@ -3381,7 +3358,9 @@ let $ = jQuery;
                     data.searchBuilder = _this._collapseArray(_this.getDetails(true));
                 }
             });
-            this.s.dt.on('column-reorder', function () {
+            this.s.dt.on(dataTable$1.versionCheck('2')
+                ? 'columns-reordered'
+                : 'column-reorder', function () {
                 _this.rebuild(_this.getDetails());
             });
             if (loadState) {
@@ -3596,7 +3575,7 @@ let $ = jQuery;
                 _this.dom.clearAll.remove();
             });
         };
-        SearchBuilder.version = '1.6.0';
+        SearchBuilder.version = '1.7.0';
         SearchBuilder.classes = {
             button: 'dtsb-button',
             clearAll: 'dtsb-clearAll',
@@ -3704,8 +3683,8 @@ let $ = jQuery;
         return SearchBuilder;
     }());
 
-    /*! SearchBuilder 1.6.0
-     * ©SpryMedia Ltd - datatables.net/license/mit
+    /*! SearchBuilder 1.7.0
+    -dev * ©SpryMedia Ltd - datatables.net/license/mit
      */
     setJQuery($);
     setJQuery$1($);
@@ -3815,11 +3794,11 @@ let $ = jQuery;
         fnInit: _init
     });
     // DataTables 2 layout feature
-    if (DataTable.ext.features) {
-        DataTable.ext.features.register('searchBuilder', _init);
+    if (DataTable.feature) {
+        DataTable.feature.register('searchBuilder', _init);
     }
 
-}());
+})();
 
 
 export default DataTable;