@azrico/reactgrid 1.3.25 → 1.3.27

package/dist/src/views/DataGrid.js

@@ -86,11 +86,14 @@ function AzGrid(props) {
     };
   }, [cached_columns, props.allowChildRows, props.editable, props.RowDetail, props.onEditComplete]);
   const static_gridOptions = _react.default.useMemo(() => {
-    return {
+    const finalres = {
       ...base_gridOptions,
       ...props.gridOptions,
       ...forcedOptions
     };
+    //append filter types instead of replacing it
+    if (finalres.filterTypes) finalres.filterTypes = Object.assign({}, _reactdatagridEnterprise.default.defaultProps.filterTypes, finalres.filterTypes);
+    return finalres;
   }, [props.gridOptions, base_gridOptions, forcedOptions]);
   const dynamic_gridOptions = _react.default.useMemo(() => {
     const res = {};
@@ -291,23 +294,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 || 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
-            if (v.indexOf(lowerSearchText) == -1) {
-              console.log('v NOT match:', v, v.indexOf(lowerSearchText));
-              return false;
+            if (v && v.indexOf(lowerSearchText) != -1) {
+              //if one column is matching then the row is a match
+              return true;
             }
-            console.log('v is matching', v, v.indexOf(lowerSearchText));
           }
-          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.25",
+	"version": "1.3.27",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",

package/src/views/DataGrid.tsx

@@ -223,7 +223,17 @@ export function AzGrid(props: AzGridProps) {
 	]);
 
 	const static_gridOptions = React.useMemo<AzGridOptions>(() => {
-		return { ...base_gridOptions, ...props.gridOptions, ...forcedOptions };
+		const finalres = { ...base_gridOptions, ...props.gridOptions, ...forcedOptions };
+
+		//append filter types instead of replacing it
+		if (finalres.filterTypes)
+			finalres.filterTypes = Object.assign(
+				{},
+				ReactDataGrid.defaultProps.filterTypes,
+				finalres.filterTypes
+			);
+
+		return finalres;
 	}, [props.gridOptions, base_gridOptions, forcedOptions]);
 
 	const dynamic_gridOptions = React.useMemo<AzGridOptions>(
@@ -455,8 +465,6 @@ function DataGridSearchWrapper(props: DataGridWrapperProps) {
 					visibleColumns.map((r) => r.id)
 				);
 				const lowerSearchText = currentSearch.current.toLowerCase().trim();
-				console.log('s:', lowerSearchText);
-
 				if (!lowerSearchText || columns_to_search.length === 0)
 					newData = currentDS.current;
 				else {
@@ -464,20 +472,15 @@ function DataGridSearchWrapper(props: DataGridWrapperProps) {
 						for (let index = 0; index < columns_to_search.length; index++) {
 							const col = columns_to_search[index];
 							const v = (p[col] + '').toLowerCase(); //value of column
-
-							if (v.indexOf(lowerSearchText) == -1) {
-								console.log('v NOT match:', v, v.indexOf(lowerSearchText));
-								return false;
+							if (v && v.indexOf(lowerSearchText) != -1) {
+								//if one column is matching then the row is a match
+								return true;
 							}
-							console.log('v is matching', v, v.indexOf(lowerSearchText));
 						}
-
-						return true;
+						return false;
 					});
 				}
 			} else newData = currentDS.current;
-			console.log('newData:', newData.length);
-
 			set_filteredData(newData);
 		}, 1000),
 		[]