From c703b24bfe901a86b7baeb0c1e313e249e4a8a1f Mon Sep 17 00:00:00 2001
From: MattMo <matt@montoyatech.com>
Date: Mon, 10 Jul 2023 09:47:30 -0700
Subject: [PATCH] Fixed a few typos, improved column searching, if a searcher
 is not defined, it will now make sure the value is a string before applying
 the regex, if a searcher is defined it now runs that.

---
 data-table.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/data-table.js b/data-table.js
index 36752a3..9e38979 100644
--- a/data-table.js
+++ b/data-table.js
@@ -37,7 +37,7 @@ class DataColumn extends IgniteObject {
     comparer = null;
 
     /**
-     * A custom function used for searching, default is null.
+     * A custom function(value, searchStr, regex) used for searching, default is null.
      * @type {IgniteProperty|Function}
      */
     searcher = null;
@@ -70,13 +70,13 @@ class DataColumn extends IgniteObject {
      * Creates a new DataColumn with a name and options.
      * @param {String} name The name of the column to display 
      * @param {Object} options The options for this data column.
-     * @param {Boolean|Function} options.searchable Whether or not this column can be searched. Default is false.
+     * @param {Boolean|Function} options.searchable Whether or not this column can be searched. Default is false. 
      * @param {String|Function} options.sortable Whether or not this column can be sorted. Default is false.
      * @param {String} options.sort The current sorting of this column. Possible values: asc, desc. Default is null.
      * @param {IgniteProperty|Function} options.selector A function to extract the column value from given data. Default is null.
      * @param {IgniteProperty|Function} options.converter A function to convert the column value to a custom component. Default is null.
      * @param {IgniteProperty|Function} options.comparer A function to compare two columns for sorting. Default is null.
-     * @param {IgniteProperty|Function} options.searcher A function to seatch a column. Default is null.
+     * @param {IgniteProperty|Function} options.searcher A function(value, searchStr, regex) to search a column. Default is null.
      */
     constructor(name, options = null) {
         super();
@@ -456,8 +456,12 @@ class DataTable extends IgniteElement {
                 for (var i = 0; i < this.columns.length; i++) {
                     var value = row.values[i] instanceof IgniteProperty ? row.values[i].value : row.values[i];
 
-                    if (this.columns[i].searchable && value && value.match(regex)) {
-                        return true;
+                    if (this.columns[i].searchable) {
+                        if (this.columns[i].searcher && this.columns[i].searcher(value, this.filterSearch, regex)) {
+                            return true;
+                        } else if (value && typeof value == 'string' && value.match(regex)) {
+                            return true;
+                        }
                     }
                 }