Skip to content

Commit 9a4d1e6

Browse files
committed
changed name of grid related states
1 parent e8fb599 commit 9a4d1e6

File tree

9 files changed

+62
-62
lines changed

9 files changed

+62
-62
lines changed

src/components/Editor.tsx

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import { MaxNumberOfStates } from "../consts/MaxNumberOfStates";
2020
const Editor = () => {
2121
console.log("re rendering Editor");
2222

23-
const [gridRowId, setGridRowId] = useState(0);
24-
const [gridData, setGridData] = useState<RowModel[]>([]);
25-
const gridColumns: GridColumns = [
23+
const [rowId, setRowId] = useState(0);
24+
const [rows, setRows] = useState<RowModel[]>([]);
25+
const columns: GridColumns = [
2626
{ field: "id", hide: true, hideable: false },
2727
{
2828
field: "node",
@@ -103,8 +103,8 @@ const Editor = () => {
103103
alert(`Maximum ${MaxNumberOfStates} states allowed`);
104104
return;
105105
}
106-
setGridData((prev) => [...prev, row]);
107-
setGridRowId((prev) => prev + 1);
106+
setRows((prev) => [...prev, row]);
107+
setRowId((prev) => prev + 1);
108108
console.log(
109109
"added row, now adding new state at: ",
110110
size.width,
@@ -123,7 +123,7 @@ const Editor = () => {
123123
console.log("handleDeleteRow", row);
124124
console.log(
125125
"resultant data",
126-
gridData
126+
rows
127127
.filter((r) => r.id !== row.id)
128128
.map((r) => {
129129
return {
@@ -142,7 +142,7 @@ const Editor = () => {
142142
})
143143
);
144144

145-
setGridData((rows) =>
145+
setRows((rows) =>
146146
rows
147147
.filter((r) => r.id !== row.id)
148148
.map((r) => {
@@ -177,14 +177,14 @@ const Editor = () => {
177177

178178
const handleSaveRow = (row: RowModel) => {
179179
console.log("handleSaveRow", row);
180-
console.log("handleSaveRow", gridData);
180+
console.log("handleSaveRow", rows);
181181

182182
if (isRowEmpty(row)) {
183183
alert("Cannot save empty row.");
184184
return;
185185
}
186186

187-
const oldRow = gridData.find((r) => r.id === row.id);
187+
const oldRow = rows.find((r) => r.id === row.id);
188188
if (!oldRow) {
189189
alert("Cannot save row.");
190190
return;
@@ -193,7 +193,7 @@ const Editor = () => {
193193
if (row.node.length > StateNameMaxLength) {
194194
alert(`State name cannot be more than ${StateNameMaxLength} characters.`);
195195
if (oldRow) {
196-
setGridData((prev) => prev.map((r) => (r.id === row.id ? oldRow : r)));
196+
setRows((prev) => prev.map((r) => (r.id === row.id ? oldRow : r)));
197197
}
198198
return;
199199
}
@@ -210,17 +210,17 @@ const Editor = () => {
210210
`Cannot change state name when transition values are added/updated/removed.`
211211
);
212212
if (oldRow) {
213-
setGridData((prev) => prev.map((r) => (r.id === row.id ? oldRow : r)));
213+
setRows((prev) => prev.map((r) => (r.id === row.id ? oldRow : r)));
214214
}
215215
return;
216216
}
217217

218218
const nulPossibleTransitionValues = PossibleTransitionValues.map((v) =>
219219
v === "^" ? "nul" : v
220220
);
221-
let updatedGridData: RowModel[] = [];
221+
let updatedRows: RowModel[] = [];
222222
let errorWhileSavingRow = false;
223-
setGridData((prev) => {
223+
setRows((prev) => {
224224
console.log("handleSaveRow prev", prev);
225225
let availableNodeValues = prev.map((r) => r.node).filter((v) => v !== "");
226226
// if (oldRow.node !== row.node)
@@ -266,7 +266,7 @@ const Editor = () => {
266266
return prev;
267267
}
268268

269-
updatedGridData = prev.map((r) =>
269+
updatedRows = prev.map((r) =>
270270
r.id === row.id
271271
? {
272272
...r,
@@ -299,7 +299,7 @@ const Editor = () => {
299299
}
300300
);
301301

302-
return updatedGridData;
302+
return updatedRows;
303303
});
304304

305305
if (!errorWhileSavingRow) {
@@ -511,7 +511,7 @@ const Editor = () => {
511511

512512
const toggleInitialState = (row: RowModel) => {
513513
console.log("toggleInitialState", row);
514-
setGridData((prev) => {
514+
setRows((prev) => {
515515
console.log("toggleInitialState prev", prev);
516516
if (!prev || isRowEmpty(row)) {
517517
alert("Cannot make empty row initial state.");
@@ -543,7 +543,7 @@ const Editor = () => {
543543

544544
const toggleFinalState = (row: RowModel) => {
545545
console.log("toggleFinalState", row);
546-
setGridData((prev) => {
546+
setRows((prev) => {
547547
console.log("toggleFinalState prev", prev);
548548
if (!prev || isRowEmpty(row)) {
549549
alert("Cannot make empty row final state.");
@@ -590,7 +590,7 @@ const Editor = () => {
590590
}
591591

592592
let { x, y } = e.target.getBoundingClientRect();
593-
const stateName = promptNewStateName(states, `q${gridRowId}`);
593+
const stateName = promptNewStateName(states, `q${rowId}`);
594594
if (stateName) {
595595
let newState = new DraggableStateModel(
596596
stateName,
@@ -607,19 +607,19 @@ const Editor = () => {
607607
}
608608
console.log("states", states);
609609

610-
setGridData((prev) => [
610+
setRows((prev) => [
611611
...prev,
612-
new RowModel(gridRowId, stateName, "", "", "", false, false),
612+
new RowModel(rowId, stateName, "", "", "", false, false),
613613
]);
614-
setGridRowId((prev) => prev + 1);
614+
setRowId((prev) => prev + 1);
615615
};
616616

617617
const transitionTableProps: TransitionTableProps = {
618-
gridData,
619-
setGridData,
620-
gridColumns,
621-
gridRowId,
622-
setGridRowId,
618+
rows,
619+
setRows,
620+
columns,
621+
rowId,
622+
setRowId,
623623
handleAddRow,
624624
};
625625

@@ -635,8 +635,8 @@ const Editor = () => {
635635
handleSelect,
636636
checkExsitence,
637637
handleDropDynamic,
638-
gridData,
639-
setGridData,
638+
rows,
639+
setRows,
640640
handleDeleteRow,
641641
toggleInitialState,
642642
toggleFinalState,

src/features/Playground.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ const Playground = (props: PlaygroundProps) => {
2929
handleSelect: props.handleSelect,
3030
actionState: props.actionState,
3131
setActionState: props.setActionState,
32-
gridData: props.gridData,
33-
setGridData: props.setGridData,
32+
rows: props.rows,
33+
setRows: props.setRows,
3434
handleDeleteRow: props.handleDeleteRow,
3535
toggleInitialState: props.toggleInitialState,
3636
toggleFinalState: props.toggleFinalState,
@@ -44,8 +44,8 @@ const Playground = (props: PlaygroundProps) => {
4444
selected: props.selected,
4545
handleSelect: props.handleSelect,
4646
actionState: props.actionState,
47-
gridData: props.gridData,
48-
setGridData: props.setGridData,
47+
rows: props.rows,
48+
setRows: props.setRows,
4949
};
5050

5151
return (

src/features/TransitionTable.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ const TransitionTable = (props: TransitionTableProps) => {
1414

1515
useEffect(() => {
1616
console.log(
17-
"useEffect of transition table due to props.gridData: props",
17+
"useEffect of transition table due to props.rows: props",
1818
props
1919
);
20-
}, [props.gridData]);
20+
}, [props.rows]);
2121

2222
return (
2323
<>
@@ -26,8 +26,8 @@ const TransitionTable = (props: TransitionTableProps) => {
2626
onClick={() =>
2727
props.handleAddRow(
2828
new RowModel(
29-
props.gridRowId,
30-
`q${props.gridRowId}`,
29+
props.rowId,
30+
`q${props.rowId}`,
3131
"",
3232
"",
3333
"",
@@ -67,8 +67,8 @@ const TransitionTable = (props: TransitionTableProps) => {
6767
}}
6868
>
6969
<DataGrid
70-
rows={props.gridData}
71-
columns={props.gridColumns}
70+
rows={props.rows}
71+
columns={props.columns}
7272
autoHeight
7373
hideFooter
7474
experimentalFeatures={{ newEditingApi: true }}

src/features/components/playground/State.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@ export const State = (props: any) => {
8686
}
8787
// link for these color names and codes: https://mui.com/material-ui/customization/palette/
8888
else if (
89-
props.gridData.find(
89+
props.rows.find(
9090
(row: RowModel) =>
9191
row.node === props.state.id && row.isInitial && row.isFinal
9292
)
9393
) {
9494
background = "#4fc3f7"; // mui theme.palette.info.light
9595
} else if (
96-
props.gridData.find(
96+
props.rows.find(
9797
(row: RowModel) => row.node === props.state.id && row.isInitial
9898
)
9999
) {
100100
background = "#ffb74d"; // mui theme.palette.warning.light
101101
} else if (
102-
props.gridData.find(
102+
props.rows.find(
103103
(row: RowModel) => row.node === props.state.id && row.isFinal
104104
)
105105
) {

src/features/components/playground/TopBar.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const TopBar = (props: TopBarProps) => {
2727
props.selected?.id as string
2828
);
2929

30-
props.setGridData((rows) =>
30+
props.setRows((rows) =>
3131
rows.map((row) =>
3232
props.selected
3333
? {
@@ -120,7 +120,7 @@ export const TopBar = (props: TopBarProps) => {
120120
)
121121
);
122122

123-
props.setGridData((rows) =>
123+
props.setRows((rows) =>
124124
rows.map((row) =>
125125
props.selected && row.node === props.selected?.id
126126
? // if row found, remove all its transition values
@@ -198,7 +198,7 @@ export const TopBar = (props: TopBarProps) => {
198198
if (props.selected) {
199199
console.log("selected id", props.selected?.id);
200200
props.handleDeleteRow(
201-
props.gridData.find(
201+
props.rows.find(
202202
(row) => row.node === (props.selected?.id as string)
203203
) as RowModel
204204
);
@@ -208,7 +208,7 @@ export const TopBar = (props: TopBarProps) => {
208208
break;
209209

210210
case "Toggle Initial State":
211-
const initialStateRow = [...props.gridData].find(
211+
const initialStateRow = [...props.rows].find(
212212
(row) => props.selected && row.node === (props.selected?.id as string)
213213
);
214214
if (initialStateRow) {
@@ -219,7 +219,7 @@ export const TopBar = (props: TopBarProps) => {
219219
break;
220220

221221
case "Toggle Final State":
222-
const finalStateRow = props.gridData.find(
222+
const finalStateRow = props.rows.find(
223223
(row) => props.selected && row.node === (props.selected?.id as string)
224224
);
225225
if (finalStateRow) {
@@ -258,7 +258,7 @@ export const TopBar = (props: TopBarProps) => {
258258
)
259259
);
260260

261-
props.setGridData((rows) =>
261+
props.setRows((rows) =>
262262
rows.map((row) =>
263263
props.selected &&
264264
row.node === (props.selected?.id as SelectedElementTypeId).start
@@ -360,9 +360,9 @@ export const TopBar = (props: TopBarProps) => {
360360
);
361361
console.log("transitionValues", transitionValues);
362362

363-
// console.log("setGridData edit value")
364-
props.setGridData((rows) => {
365-
console.log("starting setGridData");
363+
// console.log("setRows edit value")
364+
props.setRows((rows) => {
365+
console.log("starting setRows");
366366
let newRows = [...rows];
367367
newRows.map((row) => {
368368
if (
@@ -432,7 +432,7 @@ export const TopBar = (props: TopBarProps) => {
432432
return row;
433433
});
434434

435-
console.log("ending setGridData");
435+
console.log("ending setRows");
436436
return newRows;
437437
});
438438

src/features/components/playground/props/StateProps.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ export type StateProps = {
1313
selected: SelectedElementType | null;
1414
handleSelect: (e: any) => void;
1515
actionState: string;
16-
gridData: RowModel[];
17-
setGridData: React.Dispatch<React.SetStateAction<RowModel[]>>;
16+
rows: RowModel[];
17+
setRows: React.Dispatch<React.SetStateAction<RowModel[]>>;
1818
};

src/features/components/playground/props/TopBarProps.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export type TopBarProps = {
1515
handleSelect: (e: any) => void;
1616
actionState: string;
1717
setActionState: React.Dispatch<React.SetStateAction<string>>;
18-
gridData: RowModel[];
19-
setGridData: React.Dispatch<React.SetStateAction<RowModel[]>>;
18+
rows: RowModel[];
19+
setRows: React.Dispatch<React.SetStateAction<RowModel[]>>;
2020
handleDeleteRow: (row: RowModel) => void;
2121
toggleInitialState: (row: RowModel) => void;
2222
toggleFinalState: (row: RowModel) => void;

src/features/props/PlaygroundProps.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export type PlaygroundProps = {
1414
handleSelect: (e: any) => void;
1515
checkExsitence: (id: string) => boolean;
1616
handleDropDynamic: (e: any) => void;
17-
gridData: RowModel[];
18-
setGridData: React.Dispatch<React.SetStateAction<RowModel[]>>;
17+
rows: RowModel[];
18+
setRows: React.Dispatch<React.SetStateAction<RowModel[]>>;
1919
handleDeleteRow: (row: RowModel) => void;
2020
toggleInitialState: (row: RowModel) => void;
2121
toggleFinalState: (row: RowModel) => void;

src/features/props/TransitionTableProps.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { GridColumns } from "@mui/x-data-grid";
22
import { RowModel } from "../../models";
33

44
export type TransitionTableProps = {
5-
gridData: RowModel[];
6-
setGridData: React.Dispatch<React.SetStateAction<RowModel[]>>;
7-
gridColumns: GridColumns;
8-
gridRowId: number;
9-
setGridRowId: React.Dispatch<React.SetStateAction<number>>;
5+
rows: RowModel[];
6+
setRows: React.Dispatch<React.SetStateAction<RowModel[]>>;
7+
columns: Columns;
8+
rowId: number;
9+
setRowId: React.Dispatch<React.SetStateAction<number>>;
1010
handleAddRow: (row: RowModel) => void;
1111
};

0 commit comments

Comments
 (0)