From ac3818be817f765b69df0c8985a17fea35eaafee Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 07:39:37 +0800 Subject: [PATCH 01/13] zi-9331 fix missing import --- src/components/DataGrid/DataGrid.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx index c82dad3..6b79fc3 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,7 @@ function DataGrid({ const domRef = useRef(); const [checkListState, checkListDispatch] = useContext(CheckboxContext); - const [dataGridState, dataGridDispatch] = useContext(DataGridContext); + const [dataGridState, dataGridDispatch=()=>{}] = useContext(DataGridContext); const [columns, setColumns] = useState(dataGridState.columns); const [filters, setFilters] = useState({}); From 9423cb7f974422057d8d3815febae04d7a9ffcff Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 09:21:42 +0800 Subject: [PATCH 02/13] zi-9331 react 17 implicit react import being stripped --- src/components/DataGrid/DataGridContext.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DataGrid/DataGridContext.jsx b/src/components/DataGrid/DataGridContext.jsx index 989c325..99c1272 100644 --- a/src/components/DataGrid/DataGridContext.jsx +++ b/src/components/DataGrid/DataGridContext.jsx @@ -67,7 +67,7 @@ export function dataGridReducer(state, action) { } } -const DataGridProvider = ({ children }) => { +export const DataGridProvider = ({ children }) => { const [state, dispatch] = useReducer(dataGridReducer, initState); return ( From eef9401c4aebae876cfb18f7430a3587edd110f3 Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 09:54:43 +0800 Subject: [PATCH 03/13] zi-9331 react 17 implicit react import being stripped --- src/components/DataGrid/DataGrid.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx index 6b79fc3..097aee8 100644 --- a/src/components/DataGrid/DataGrid.jsx +++ b/src/components/DataGrid/DataGrid.jsx @@ -283,6 +283,7 @@ function DataGrid({ }); }, [dataGridDispatch, filters]); + console.log("📢[DataGrid.jsx:286]: ", draggableColumns, dataGridState); return ( } From 18abd7fd06c5d9b284b4e71eb0be2f6380e160c9 Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 09:59:32 +0800 Subject: [PATCH 04/13] zi-9331 context remains null why? --- src/components/DataGrid/DataGrid.jsx | 2 +- src/components/DataGrid/DataGridContext.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx index 097aee8..0a45d1f 100644 --- a/src/components/DataGrid/DataGrid.jsx +++ b/src/components/DataGrid/DataGrid.jsx @@ -72,7 +72,7 @@ function DataGrid({ const domRef = useRef(); const [checkListState, checkListDispatch] = useContext(CheckboxContext); - const [dataGridState, dataGridDispatch=()=>{}] = useContext(DataGridContext); + const [dataGridState, dataGridDispatch] = useContext(DataGridContext); const [columns, setColumns] = useState(dataGridState.columns); const [filters, setFilters] = useState({}); diff --git a/src/components/DataGrid/DataGridContext.jsx b/src/components/DataGrid/DataGridContext.jsx index 99c1272..0d44e97 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(); function setDefaultFilterValues(columns, filterColumns) { const keystore = Object.keys(filterColumns) From 8f3e09da52421f80a9913509c4d31ee338fa74bf Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 10:10:20 +0800 Subject: [PATCH 05/13] zi-9331 context remains null why? --- src/components/DataGrid/DataGrid.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx index 0a45d1f..df2acf4 100644 --- a/src/components/DataGrid/DataGrid.jsx +++ b/src/components/DataGrid/DataGrid.jsx @@ -72,7 +72,8 @@ function DataGrid({ const domRef = useRef(); const [checkListState, checkListDispatch] = useContext(CheckboxContext); - const [dataGridState, dataGridDispatch] = useContext(DataGridContext); + const dataContext = useContext(DataGridContext); + const [dataGridState, dataGridDispatch] = dataContext; const [columns, setColumns] = useState(dataGridState.columns); const [filters, setFilters] = useState({}); From bf60e3eca6256afb2b32d6243e8a3b115031f06f Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 10:32:28 +0800 Subject: [PATCH 06/13] zi-9331 context remains null why? --- src/components/DataGrid/DataGridContext.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DataGrid/DataGridContext.jsx b/src/components/DataGrid/DataGridContext.jsx index 0d44e97..8f5cf15 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(); +export const DataGridContext = createContext(0); function setDefaultFilterValues(columns, filterColumns) { const keystore = Object.keys(filterColumns) From d74b87c0ffeb2c23e3abb1aedaf1e6130d66948c Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 10:34:47 +0800 Subject: [PATCH 07/13] zi-9331 context remains null why? --- src/components/DataGrid/DataGridContext.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DataGrid/DataGridContext.jsx b/src/components/DataGrid/DataGridContext.jsx index 8f5cf15..59d86e4 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(0); +export const DataGridContext = createContext([{}, () => {}]); function setDefaultFilterValues(columns, filterColumns) { const keystore = Object.keys(filterColumns) From ce8684a47a8cc48ade84d0ee922bdb65259a9c1e Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 10:36:49 +0800 Subject: [PATCH 08/13] zi-9331 context remains null why? --- src/components/DataGrid/DataGridContext.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DataGrid/DataGridContext.jsx b/src/components/DataGrid/DataGridContext.jsx index 59d86e4..a46b816 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([{}, () => {}]); +export const DataGridContext = createContext([initState, () => {}]); function setDefaultFilterValues(columns, filterColumns) { const keystore = Object.keys(filterColumns) From 4d17d2847d8844f3ff9de266328b33d130740629 Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 16:09:31 +0800 Subject: [PATCH 09/13] zi-9331 context remains null why? --- src/components/DataGrid/DataGrid.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx index df2acf4..a6a5481 100644 --- a/src/components/DataGrid/DataGrid.jsx +++ b/src/components/DataGrid/DataGrid.jsx @@ -309,7 +309,6 @@ function DataGrid({ className={"rdg-light"} headerFiltersHeight={50} rowRenderer={RowRenderer} - {...gridProps} style={{ ...style }} columns={draggableColumns} rows={dataGridState.rows} @@ -322,6 +321,7 @@ function DataGrid({ onFiltersChange={(a) => { setFilters({ ...filters, ...a }); }} + {...gridProps} /> {contextMenu?.contextItems() ?? <>} From 478f514ddd3bc7e7cb2f9a5f9165717554fbfa7d Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 16:52:36 +0800 Subject: [PATCH 10/13] zi-9331 hmr context investigate --- src/components/DataGrid/DataGrid.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx index a6a5481..4535edd 100644 --- a/src/components/DataGrid/DataGrid.jsx +++ b/src/components/DataGrid/DataGrid.jsx @@ -17,7 +17,7 @@ import CheckboxProvider, { CheckboxContext, } from "../CheckList/checklistContext"; import "./context.scss"; -import { actions as dataGridActions, DataGridContext } from "./DataGridContext"; +import DataGridProvider, { actions as dataGridActions, DataGridContext } from "./DataGridContext"; import DataGridToolbar from "./DataGridToolbar"; import { DraggableHeaderRenderer } from "./DraggableHeaderRenderer"; import { @@ -331,7 +331,9 @@ function DataGrid({ function DGWrapper(props) { return ( - + + + ); } From 4a9b0dc371603e91fb5fe30ddf654b5b0f5aa771 Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 17:00:18 +0800 Subject: [PATCH 11/13] Revert "zi-9331 hmr context investigate" This reverts commit 478f514ddd3bc7e7cb2f9a5f9165717554fbfa7d. --- src/components/DataGrid/DataGrid.jsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx index 4535edd..a6a5481 100644 --- a/src/components/DataGrid/DataGrid.jsx +++ b/src/components/DataGrid/DataGrid.jsx @@ -17,7 +17,7 @@ import CheckboxProvider, { CheckboxContext, } from "../CheckList/checklistContext"; import "./context.scss"; -import DataGridProvider, { actions as dataGridActions, DataGridContext } from "./DataGridContext"; +import { actions as dataGridActions, DataGridContext } from "./DataGridContext"; import DataGridToolbar from "./DataGridToolbar"; import { DraggableHeaderRenderer } from "./DraggableHeaderRenderer"; import { @@ -331,9 +331,7 @@ function DataGrid({ function DGWrapper(props) { return ( - - - + ); } From 7bbecc988d97af139efd55e5197584bdc0be6199 Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 17:10:40 +0800 Subject: [PATCH 12/13] zi-9331 hmr context investigate --- src/components/DataGrid/DataGridContext.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/DataGrid/DataGridContext.jsx b/src/components/DataGrid/DataGridContext.jsx index a46b816..680fe8e 100644 --- a/src/components/DataGrid/DataGridContext.jsx +++ b/src/components/DataGrid/DataGridContext.jsx @@ -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 }; @@ -69,6 +70,7 @@ export function dataGridReducer(state, action) { export const DataGridProvider = ({ children }) => { const [state, dispatch] = useReducer(dataGridReducer, initState); + console.log("📢[DataGridContext.provider:72]: ", state, dispatch); return ( {children} From 54dff65081b0aec059c7f5e936e4887149e49138 Mon Sep 17 00:00:00 2001 From: Ray Arvin Rimorin Date: Fri, 20 Aug 2021 17:13:06 +0800 Subject: [PATCH 13/13] zi-9331 hmr context investigate --- src/components/DataGrid/DataGrid.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/DataGrid/DataGrid.jsx b/src/components/DataGrid/DataGrid.jsx index a6a5481..7450c15 100644 --- a/src/components/DataGrid/DataGrid.jsx +++ b/src/components/DataGrid/DataGrid.jsx @@ -73,6 +73,7 @@ function DataGrid({ const [checkListState, checkListDispatch] = useContext(CheckboxContext); const dataContext = useContext(DataGridContext); + console.log("📢[DataGrid.jsx:dataContext]: ", dataContext); const [dataGridState, dataGridDispatch] = dataContext; const [columns, setColumns] = useState(dataGridState.columns);