@azrico/reactgrid 1.3.20 → 1.3.22

package/dist/src/views/DataGrid.js

@@ -291,23 +291,25 @@ 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('cols:', columns_to_search);
+      console.log('currentDS.current:', currentDS.current);
+      console.log('s:', lowerSearchText);
       if (!lowerSearchText) 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(); // get string value
+          const v = (p[col] + '').toLowerCase(); //value of column
           if (v && v.indexOf(lowerSearchText) == -1) return false;
         }
         return true;
       });
     } else newData = currentDS.current;
+    console.log('newData:', newData.length);
     set_filteredData(newData);
   }, 1000), []);
   _react.default.useEffect(() => {
     set_search('');
-    (0, _object.fn_eval)(props.dataSource).then(({
-      data
-    }) => {
-      currentDS.current = data;
+    (0, _object.fn_eval)(props.dataSource).then(r => {
+      currentDS.current = typeof r === 'object' ? r.data || r : r;
       searchIfNeeded();
     });
   }, [props.dataSource]);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.3.20",
+	"version": "1.3.22",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",

package/src/views/DataGrid.tsx

@@ -455,18 +455,22 @@ function DataGridSearchWrapper(props: DataGridWrapperProps) {
 					visibleColumns.map((r) => r.id)
 				);
 				const lowerSearchText = currentSearch.current.toLowerCase().trim();
+				console.log('cols:', columns_to_search);
+				console.log('currentDS.current:', currentDS.current);
+				console.log('s:', lowerSearchText);
 				if (!lowerSearchText) 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(); // get string value
+							const v = (p[col] + '').toLowerCase(); //value of column
 
 							if (v && v.indexOf(lowerSearchText) == -1) return false;
 						}
 						return true;
 					});
 			} else newData = currentDS.current;
+			console.log('newData:', newData.length);
 
 			set_filteredData(newData);
 		}, 1000),
@@ -474,8 +478,8 @@ function DataGridSearchWrapper(props: DataGridWrapperProps) {
 	);
 	React.useEffect(() => {
 		set_search('');
-		fn_eval(props.dataSource).then(({ data }) => {
-			currentDS.current = data;
+		fn_eval(props.dataSource).then((r) => {
+			currentDS.current = typeof r === 'object' ? r.data || r : r;
 			searchIfNeeded();
 		});
 	}, [props.dataSource]);