@azrico/reactgrid 1.3.24 → 1.3.26

package/dist/src/views/DataGrid.js

@@ -291,20 +291,20 @@ function DataGridSearchWrapper(props) {
       const visibleColumns = props.gridRef.current.visibleColumns;
       const columns_to_search = (0, _object.array_intersection)(props.advancedFilterFields || [], visibleColumns.map(r => r.id));
       const lowerSearchText = currentSearch.current.toLowerCase().trim();
-      console.log('s:', lowerSearchText);
-      if (!lowerSearchText) newData = currentDS.current;else {
+      if (!lowerSearchText || columns_to_search.length === 0) newData = currentDS.current;else {
         newData = currentDS.current.filter(p => {
           for (let index = 0; index < columns_to_search.length; index++) {
             const col = columns_to_search[index];
             const v = (p[col] + '').toLowerCase(); //value of column
-            console.log('v:', v, v.indexOf(lowerSearchText));
-            if (v && v.indexOf(lowerSearchText) == -1) return false;
+            if (v && v.indexOf(lowerSearchText) != -1) {
+              //if one column is matching then the row is a match
+              return true;
+            }
           }
-          return true;
+          return false;
         });
       }
     } else newData = currentDS.current;
-    console.log('newData:', newData.length);
     set_filteredData(newData);
   }, 1000), []);
   _react.default.useEffect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.3.24",
+	"version": "1.3.26",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",
@@ -29,7 +29,7 @@
 		"typescript": "^4.8.4"
 	},
 	"dependencies": {
-		"@azrico/controls": "^1.5.60",
+		"@azrico/controls": "^1.5.62",
 		"@azrico/object": "^1.4.67",
 		"@emotion/react": "^11.9.3",
 		"@emotion/styled": "^11.9.3",

package/src/views/DataGrid.tsx

@@ -455,22 +455,22 @@ function DataGridSearchWrapper(props: DataGridWrapperProps) {
 					visibleColumns.map((r) => r.id)
 				);
 				const lowerSearchText = currentSearch.current.toLowerCase().trim();
-				console.log('s:', lowerSearchText);
-				if (!lowerSearchText) newData = currentDS.current;
+				if (!lowerSearchText || columns_to_search.length === 0)
+					newData = currentDS.current;
 				else {
 					newData = currentDS.current.filter((p) => {
 						for (let index = 0; index < columns_to_search.length; index++) {
 							const col = columns_to_search[index];
 							const v = (p[col] + '').toLowerCase(); //value of column
-							console.log('v:', v, v.indexOf(lowerSearchText));
-							if (v && v.indexOf(lowerSearchText) == -1) return false;
+							if (v && v.indexOf(lowerSearchText) != -1) {
+								//if one column is matching then the row is a match
+								return true;
+							}
 						}
-						return true;
+						return false;
 					});
 				}
 			} else newData = currentDS.current;
-			console.log('newData:', newData.length);
-
 			set_filteredData(newData);
 		}, 1000),
 		[]