Skip to content

Feature/zi 9331 convert js to jsx for vite #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
avwave wants to merge 13 commits into
base: staging
Choose a base branch
from
Draft

Feature/zi 9331 convert js to jsx for vite #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ac3818b
zi-9331 fix missing import
avwave Aug 19, 2021
9423cb7
zi-9331 react 17 implicit react import being stripped
avwave Aug 20, 2021
eef9401
zi-9331 react 17 implicit react import being stripped
avwave Aug 20, 2021
18abd7f
zi-9331 context remains null why?
avwave Aug 20, 2021
8f3e09d
zi-9331 context remains null why?
avwave Aug 20, 2021
bf60e3e
zi-9331 context remains null why?
avwave Aug 20, 2021
d74b87c
zi-9331 context remains null why?
avwave Aug 20, 2021
ce8684a
zi-9331 context remains null why?
avwave Aug 20, 2021
4d17d28
zi-9331 context remains null why?
avwave Aug 20, 2021
478f514
zi-9331 hmr context investigate
avwave Aug 20, 2021
4a9b0dc
Revert "zi-9331 hmr context investigate"
avwave Aug 20, 2021
7bbecc9
zi-9331 hmr context investigate
avwave Aug 20, 2021
54dff65
zi-9331 hmr context investigate
avwave Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/components/DataGrid/DataGrid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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({});
Expand Down Expand Up @@ -284,6 +285,7 @@ function DataGrid({
});
}, [dataGridDispatch, filters]);

console.log("📢[DataGrid.jsx:286]: ", draggableColumns, dataGridState);
return (
<BlockUi
message={<CircularProgress />}
Expand All @@ -308,7 +310,6 @@ function DataGrid({
className={"rdg-light"}
headerFiltersHeight={50}
rowRenderer={RowRenderer}
{...gridProps}
style={{ ...style }}
columns={draggableColumns}
rows={dataGridState.rows}
Expand All @@ -321,6 +322,7 @@ function DataGrid({
onFiltersChange={(a) => {
setFilters({ ...filters, ...a });
}}
{...gridProps}
/>
{contextMenu?.contextItems() ?? <></>}
</BlockUi>
Expand Down
6 changes: 4 additions & 2 deletions src/components/DataGrid/DataGridContext.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 };
Expand Down Expand Up @@ -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}
Expand Down