Skip to content

Commit 30886ac

Browse files
1ilit1ilit
authored
Merge pull request #105 from l123wx/place-optional-argument-at-the-end
place optional parameters of functions at the end(#104)
2 parents 9de091c + a33b68b commit 30886ac

File tree

14 files changed

+32
-32
lines changed

14 files changed

+32
-32
lines changed

‎src/components/EditorCanvas/Area.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ function EditPopoverContent({ data }) {
265265
block
266266
onClick={() => {
267267
Toast.success(`Area deleted!`);
268-
deleteArea(data.id, true);
268+
deleteArea(data.id);
269269
}}
270270
>
271271
Delete

‎src/components/EditorCanvas/Canvas.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ export default function Canvas() {
375375
delete newRelationship.startY;
376376
delete newRelationship.endX;
377377
delete newRelationship.endY;
378-
addRelationship(newRelationship, true);
378+
addRelationship(newRelationship);
379379
};
380380

381381
const handleMouseWheel = (e) => {

‎src/components/EditorCanvas/Note.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export default function Note({ data, onMouseDown }) {
251251
block
252252
onClick={() => {
253253
Toast.success(`Note deleted!`);
254-
deleteNote(data.id, true);
254+
deleteNote(data.id);
255255
}}
256256
>
257257
Delete

‎src/components/EditorHeader/ControlPanel.jsx

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export default function ControlPanel({
128128
...prev,
129129
{ ...a, x: tables[a.id].x, y: tables[a.id].y },
130130
]);
131-
updateTable(a.id, { x: a.x, y: a.y }, true);
131+
updateTable(a.id, { x: a.x, y: a.y });
132132
} else if (a.element === ObjectType.AREA) {
133133
setRedoStack((prev) => [
134134
...prev,
@@ -144,15 +144,15 @@ export default function ControlPanel({
144144
}
145145
} else if (a.action === Action.DELETE) {
146146
if (a.element === ObjectType.TABLE) {
147-
addTable(false, a.data);
147+
addTable(a.data, false);
148148
} else if (a.element === ObjectType.RELATIONSHIP) {
149149
addRelationship(a.data, false);
150150
} else if (a.element === ObjectType.NOTE) {
151-
addNote(false, a.data);
151+
addNote(a.data, false);
152152
} else if (a.element === ObjectType.AREA) {
153-
addArea(false, a.data);
153+
addArea(a.data, false);
154154
} else if (a.element === ObjectType.TYPE) {
155-
addType(false, { id: a.id, ...a.data });
155+
addType({ id: a.id, ...a.data }, false);
156156
}
157157
setRedoStack((prev) => [...prev, a]);
158158
} else if (a.action === Action.EDIT) {
@@ -280,15 +280,15 @@ export default function ControlPanel({
280280
setRedoStack((prev) => prev.filter((e, i) => i !== prev.length - 1));
281281
if (a.action === Action.ADD) {
282282
if (a.element === ObjectType.TABLE) {
283-
addTable(false);
283+
addTable(null, false);
284284
} else if (a.element === ObjectType.AREA) {
285-
addArea(false);
285+
addArea(null, false);
286286
} else if (a.element === ObjectType.NOTE) {
287-
addNote(false);
287+
addNote(null, false);
288288
} else if (a.element === ObjectType.RELATIONSHIP) {
289289
addRelationship(a.data, false);
290290
} else if (a.element === ObjectType.TYPE) {
291-
addType(false);
291+
addType(null, false);
292292
}
293293
setUndoStack((prev) => [...prev, a]);
294294
} else if (a.action === Action.MOVE) {
@@ -297,7 +297,7 @@ export default function ControlPanel({
297297
...prev,
298298
{ ...a, x: tables[a.id].x, y: tables[a.id].y },
299299
]);
300-
updateTable(a.id, { x: a.x, y: a.y }, true);
300+
updateTable(a.id, { x: a.x, y: a.y });
301301
} else if (a.element === ObjectType.AREA) {
302302
setUndoStack((prev) => [
303303
...prev,
@@ -560,13 +560,13 @@ export default function ControlPanel({
560560
const del = () => {
561561
switch (selectedElement.element) {
562562
case ObjectType.TABLE:
563-
deleteTable(selectedElement.id, true);
563+
deleteTable(selectedElement.id);
564564
break;
565565
case ObjectType.NOTE:
566-
deleteNote(selectedElement.id, true);
566+
deleteNote(selectedElement.id);
567567
break;
568568
case ObjectType.AREA:
569-
deleteArea(selectedElement.id, true);
569+
deleteArea(selectedElement.id);
570570
break;
571571
default:
572572
break;
@@ -575,23 +575,23 @@ export default function ControlPanel({
575575
const duplicate = () => {
576576
switch (selectedElement.element) {
577577
case ObjectType.TABLE:
578-
addTable(true, {
578+
addTable({
579579
...tables[selectedElement.id],
580580
x: tables[selectedElement.id].x + 20,
581581
y: tables[selectedElement.id].y + 20,
582582
id: tables.length,
583583
});
584584
break;
585585
case ObjectType.NOTE:
586-
addNote(true, {
586+
addNote({
587587
...notes[selectedElement.id],
588588
x: notes[selectedElement.id].x + 20,
589589
y: notes[selectedElement.id].y + 20,
590590
id: notes.length,
591591
});
592592
break;
593593
case ObjectType.AREA:
594-
addArea(true, {
594+
addArea({
595595
...areas[selectedElement.id],
596596
x: areas[selectedElement.id].x + 20,
597597
y: areas[selectedElement.id].y + 20,
@@ -639,21 +639,21 @@ export default function ControlPanel({
639639
}
640640
const v = new Validator();
641641
if (v.validate(obj, tableSchema).valid) {
642-
addTable(true, {
642+
addTable({
643643
...obj,
644644
x: obj.x + 20,
645645
y: obj.y + 20,
646646
id: tables.length,
647647
});
648648
} else if (v.validate(obj, areaSchema).valid) {
649-
addArea(true, {
649+
addArea({
650650
...obj,
651651
x: obj.x + 20,
652652
y: obj.y + 20,
653653
id: areas.length,
654654
});
655655
} else if (v.validate(obj, noteSchema)) {
656-
addNote(true, {
656+
addNote({
657657
...obj,
658658
x: obj.x + 20,
659659
y: obj.y + 20,

‎src/components/EditorSidePanel/AreasTab/AreaDetails.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export default function AreaInfo({ data, i }) {
9292
type="danger"
9393
onClick={() => {
9494
Toast.success(`Area deleted!`);
95-
deleteArea(i, true);
95+
deleteArea(i);
9696
}}
9797
/>
9898
</Col>

‎src/components/EditorSidePanel/AreasTab/AreasTab.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function AreasTab() {
1515
<SearchBar />
1616
</Col>
1717
<Col span={8}>
18-
<Button icon={<IconPlus />} block onClick={addArea}>
18+
<Button icon={<IconPlus />} block onClick={() => addArea()}>
1919
Add area
2020
</Button>
2121
</Col>

‎src/components/EditorSidePanel/NotesTab/NoteInfo.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export default function NoteInfo({ data, nid }) {
138138
type="danger"
139139
onClick={() => {
140140
Toast.success(`Note deleted!`);
141-
deleteNote(nid, true);
141+
deleteNote(nid);
142142
}}
143143
/>
144144
</div>

‎src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export default function RelationshipInfo({ data }) {
221221
icon={<IconDeleteStroked />}
222222
block
223223
type="danger"
224-
onClick={() => deleteRelationship(data.id, true)}
224+
onClick={() => deleteRelationship(data.id)}
225225
>
226226
Delete
227227
</Button>

‎src/components/EditorSidePanel/TablesTab/TablesTab.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function TablesTab() {
1717
<SearchBar tables={tables} />
1818
</Col>
1919
<Col span={8}>
20-
<Button icon={<IconPlus />} block onClick={() => addTable(true)}>
20+
<Button icon={<IconPlus />} block onClick={() => addTable()}>
2121
Add table
2222
</Button>
2323
</Col>

‎src/components/EditorSidePanel/TypesTab/TypesTab.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function TypesTab() {
1717
<Searchbar />
1818
</Col>
1919
<Col span={8}>
20-
<Button icon={<IconPlus />} block onClick={() => addType(true)}>
20+
<Button icon={<IconPlus />} block onClick={() => addType()}>
2121
Add type
2222
</Button>
2323
</Col>

‎src/context/AreasContext.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function AreasContextProvider({ children }) {
1212
const { selectedElement, setSelectedElement } = useSelect();
1313
const { setUndoStack, setRedoStack } = useUndoRedo();
1414

15-
const addArea = (addToHistory = true, data) => {
15+
const addArea = (data, addToHistory = true) => {
1616
if (data) {
1717
setAreas((prev) => {
1818
const temp = prev.slice();

‎src/context/NotesContext.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function NotesContextProvider({ children }) {
1212
const { setUndoStack, setRedoStack } = useUndoRedo();
1313
const { selectedElement, setSelectedElement } = useSelect();
1414

15-
const addNote = (addToHistory = true, data) => {
15+
const addNote = (data, addToHistory = true) => {
1616
if (data) {
1717
setNotes((prev) => {
1818
const temp = prev.slice();

‎src/context/TablesContext.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default function TablesContextProvider({ children }) {
1313
const { setUndoStack, setRedoStack } = useUndoRedo();
1414
const { selectedElement, setSelectedElement } = useSelect();
1515

16-
const addTable = (addToHistory = true, data) => {
16+
const addTable = (data, addToHistory = true) => {
1717
if (data) {
1818
setTables((prev) => {
1919
const temp = prev.slice();

‎src/context/TypesContext.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default function TypesContextProvider({ children }) {
88
const [types, setTypes] = useState([]);
99
const { setUndoStack, setRedoStack } = useUndoRedo();
1010

11-
const addType = (addToHistory = true, data) => {
11+
const addType = (data, addToHistory = true) => {
1212
if (data) {
1313
setTypes((prev) => {
1414
const temp = prev.slice();

0 commit comments

Comments
 (0)