diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx
index c82dad3..7450c15 100644
--- a/src/components/DataGrid/DataGrid.jsx
+++ b/src/components/DataGrid/DataGrid.jsx
@@ -21,7 +21,6 @@ import { actions as dataGridActions, DataGridContext } from "./DataGridContext";
 import DataGridToolbar from "./DataGridToolbar";
 import { DraggableHeaderRenderer } from "./DraggableHeaderRenderer";
 import {
-  FilterRendererWrapper,
   OptionFilterRenderer,
   TextFilterRenderer,
 } from "./FilterRenderer";
@@ -73,7 +72,9 @@ function DataGrid({
   const domRef = useRef();
 
   const [checkListState, checkListDispatch] = useContext(CheckboxContext);
-  const [dataGridState, dataGridDispatch] = useContext(DataGridContext);
+  const dataContext = useContext(DataGridContext);
+  console.log("📢[DataGrid.jsx:dataContext]: ", dataContext);
+  const [dataGridState, dataGridDispatch] = dataContext;
 
   const [columns, setColumns] = useState(dataGridState.columns);
   const [filters, setFilters] = useState({});
@@ -284,6 +285,7 @@ function DataGrid({
     });
   }, [dataGridDispatch, filters]);
 
+  console.log("📢[DataGrid.jsx:286]: ", draggableColumns, dataGridState);
   return (
     <BlockUi
       message={<CircularProgress />}
@@ -308,7 +310,6 @@ function DataGrid({
         className={"rdg-light"}
         headerFiltersHeight={50}
         rowRenderer={RowRenderer}
-        {...gridProps}
         style={{ ...style }}
         columns={draggableColumns}
         rows={dataGridState.rows}
@@ -321,6 +322,7 @@ function DataGrid({
         onFiltersChange={(a) => {
           setFilters({ ...filters, ...a });
         }}
+        {...gridProps}
       />
       {contextMenu?.contextItems() ?? <></>}
     </BlockUi>
diff --git a/src/components/DataGrid/DataGridContext.jsx b/src/components/DataGrid/DataGridContext.jsx
index 989c325..680fe8e 100644
--- a/src/components/DataGrid/DataGridContext.jsx
+++ b/src/components/DataGrid/DataGridContext.jsx
@@ -20,7 +20,7 @@ export const actions = {
   CLEAR_FILTER_COLUMN: 'CLEAR_FILTER_COLUMN'
 };
 
-export const DataGridContext = createContext([initState, undefined]);
+export const DataGridContext = createContext([initState, () => {}]);
 
 function setDefaultFilterValues(columns, filterColumns) {
   const keystore = Object.keys(filterColumns)
@@ -33,6 +33,7 @@ function setDefaultFilterValues(columns, filterColumns) {
 }
 
 export function dataGridReducer(state, action) {
+  console.log("📢[DataGridContext.reducer:35]: ", state, action);
   switch (action.type) {
     case actions.SET_LOADING:
       return { ...state, loading: true };
@@ -67,8 +68,9 @@ export function dataGridReducer(state, action) {
   }
 }
 
-const DataGridProvider = ({ children }) => {
+export const DataGridProvider = ({ children }) => {
   const [state, dispatch] = useReducer(dataGridReducer, initState);
+  console.log("📢[DataGridContext.provider:72]: ", state, dispatch);
   return (
     <DataGridContext.Provider value={[state, dispatch]}>
       {children}