@azrico/reactgrid 1.3.21 → 1.3.23

package/dist/src/views/DataGrid.js

@@ -291,26 +291,26 @@ 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('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
-          if (v && v.indexOf(lowerSearchText) == -1) return false;
-        }
-        return true;
-      });
+      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(); //value of column
+            console.log('v:', v);
+            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.21",
+	"version": "1.3.23",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",

package/src/views/DataGrid.tsx

@@ -455,19 +455,19 @@ function DataGridSearchWrapper(props: DataGridWrapperProps) {
 					visibleColumns.map((r) => r.id)
 				);
 				const lowerSearchText = currentSearch.current.toLowerCase().trim();
-				console.log('cols:', columns_to_search);
 				console.log('s:', lowerSearchText);
 				if (!lowerSearchText) newData = currentDS.current;
-				else
+				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
+							console.log('v:', v);
 							if (v && v.indexOf(lowerSearchText) == -1) return false;
 						}
 						return true;
 					});
+				}
 			} else newData = currentDS.current;
 			console.log('newData:', newData.length);
 
@@ -477,8 +477,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]);