From a33b68bfd0211b42496eb035e78fbf9d8cabd714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?liao=E6=96=87=E7=A6=A7?= <1219585136@qq.com>
Date: Tue, 14 May 2024 11:22:13 +0800
Subject: [PATCH] place optional parameters of functions at the end(#104)
---
src/components/EditorCanvas/Area.jsx | 2 +-
src/components/EditorCanvas/Canvas.jsx | 2 +-
src/components/EditorCanvas/Note.jsx | 2 +-
src/components/EditorHeader/ControlPanel.jsx | 38 +++++++++----------
.../EditorSidePanel/AreasTab/AreaDetails.jsx | 2 +-
.../EditorSidePanel/AreasTab/AreasTab.jsx | 2 +-
.../EditorSidePanel/NotesTab/NoteInfo.jsx | 2 +-
.../RelationshipsTab/RelationshipInfo.jsx | 2 +-
.../EditorSidePanel/TablesTab/TablesTab.jsx | 2 +-
.../EditorSidePanel/TypesTab/TypesTab.jsx | 2 +-
src/context/AreasContext.jsx | 2 +-
src/context/NotesContext.jsx | 2 +-
src/context/TablesContext.jsx | 2 +-
src/context/TypesContext.jsx | 2 +-
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/components/EditorCanvas/Area.jsx b/src/components/EditorCanvas/Area.jsx
index 0d5ecd5..efb9bf7 100644
--- a/src/components/EditorCanvas/Area.jsx
+++ b/src/components/EditorCanvas/Area.jsx
@@ -265,7 +265,7 @@ function EditPopoverContent({ data }) {
block
onClick={() => {
Toast.success(`Area deleted!`);
- deleteArea(data.id, true);
+ deleteArea(data.id);
}}
>
Delete
diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsx
index 90febb7..a941fae 100644
--- a/src/components/EditorCanvas/Canvas.jsx
+++ b/src/components/EditorCanvas/Canvas.jsx
@@ -375,7 +375,7 @@ export default function Canvas() {
delete newRelationship.startY;
delete newRelationship.endX;
delete newRelationship.endY;
- addRelationship(newRelationship, true);
+ addRelationship(newRelationship);
};
const handleMouseWheel = (e) => {
diff --git a/src/components/EditorCanvas/Note.jsx b/src/components/EditorCanvas/Note.jsx
index f3abc28..d4fcb04 100644
--- a/src/components/EditorCanvas/Note.jsx
+++ b/src/components/EditorCanvas/Note.jsx
@@ -251,7 +251,7 @@ export default function Note({ data, onMouseDown }) {
block
onClick={() => {
Toast.success(`Note deleted!`);
- deleteNote(data.id, true);
+ deleteNote(data.id);
}}
>
Delete
diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsx
index 5ebabd9..86b633d 100644
--- a/src/components/EditorHeader/ControlPanel.jsx
+++ b/src/components/EditorHeader/ControlPanel.jsx
@@ -128,7 +128,7 @@ export default function ControlPanel({
...prev,
{ ...a, x: tables[a.id].x, y: tables[a.id].y },
]);
- updateTable(a.id, { x: a.x, y: a.y }, true);
+ updateTable(a.id, { x: a.x, y: a.y });
} else if (a.element === ObjectType.AREA) {
setRedoStack((prev) => [
...prev,
@@ -144,15 +144,15 @@ export default function ControlPanel({
}
} else if (a.action === Action.DELETE) {
if (a.element === ObjectType.TABLE) {
- addTable(false, a.data);
+ addTable(a.data, false);
} else if (a.element === ObjectType.RELATIONSHIP) {
addRelationship(a.data, false);
} else if (a.element === ObjectType.NOTE) {
- addNote(false, a.data);
+ addNote(a.data, false);
} else if (a.element === ObjectType.AREA) {
- addArea(false, a.data);
+ addArea(a.data, false);
} else if (a.element === ObjectType.TYPE) {
- addType(false, { id: a.id, ...a.data });
+ addType({ id: a.id, ...a.data }, false);
}
setRedoStack((prev) => [...prev, a]);
} else if (a.action === Action.EDIT) {
@@ -280,15 +280,15 @@ export default function ControlPanel({
setRedoStack((prev) => prev.filter((e, i) => i !== prev.length - 1));
if (a.action === Action.ADD) {
if (a.element === ObjectType.TABLE) {
- addTable(false);
+ addTable(null, false);
} else if (a.element === ObjectType.AREA) {
- addArea(false);
+ addArea(null, false);
} else if (a.element === ObjectType.NOTE) {
- addNote(false);
+ addNote(null, false);
} else if (a.element === ObjectType.RELATIONSHIP) {
addRelationship(a.data, false);
} else if (a.element === ObjectType.TYPE) {
- addType(false);
+ addType(null, false);
}
setUndoStack((prev) => [...prev, a]);
} else if (a.action === Action.MOVE) {
@@ -297,7 +297,7 @@ export default function ControlPanel({
...prev,
{ ...a, x: tables[a.id].x, y: tables[a.id].y },
]);
- updateTable(a.id, { x: a.x, y: a.y }, true);
+ updateTable(a.id, { x: a.x, y: a.y });
} else if (a.element === ObjectType.AREA) {
setUndoStack((prev) => [
...prev,
@@ -560,13 +560,13 @@ export default function ControlPanel({
const del = () => {
switch (selectedElement.element) {
case ObjectType.TABLE:
- deleteTable(selectedElement.id, true);
+ deleteTable(selectedElement.id);
break;
case ObjectType.NOTE:
- deleteNote(selectedElement.id, true);
+ deleteNote(selectedElement.id);
break;
case ObjectType.AREA:
- deleteArea(selectedElement.id, true);
+ deleteArea(selectedElement.id);
break;
default:
break;
@@ -575,7 +575,7 @@ export default function ControlPanel({
const duplicate = () => {
switch (selectedElement.element) {
case ObjectType.TABLE:
- addTable(true, {
+ addTable({
...tables[selectedElement.id],
x: tables[selectedElement.id].x + 20,
y: tables[selectedElement.id].y + 20,
@@ -583,7 +583,7 @@ export default function ControlPanel({
});
break;
case ObjectType.NOTE:
- addNote(true, {
+ addNote({
...notes[selectedElement.id],
x: notes[selectedElement.id].x + 20,
y: notes[selectedElement.id].y + 20,
@@ -591,7 +591,7 @@ export default function ControlPanel({
});
break;
case ObjectType.AREA:
- addArea(true, {
+ addArea({
...areas[selectedElement.id],
x: areas[selectedElement.id].x + 20,
y: areas[selectedElement.id].y + 20,
@@ -639,21 +639,21 @@ export default function ControlPanel({
}
const v = new Validator();
if (v.validate(obj, tableSchema).valid) {
- addTable(true, {
+ addTable({
...obj,
x: obj.x + 20,
y: obj.y + 20,
id: tables.length,
});
} else if (v.validate(obj, areaSchema).valid) {
- addArea(true, {
+ addArea({
...obj,
x: obj.x + 20,
y: obj.y + 20,
id: areas.length,
});
} else if (v.validate(obj, noteSchema)) {
- addNote(true, {
+ addNote({
...obj,
x: obj.x + 20,
y: obj.y + 20,
diff --git a/src/components/EditorSidePanel/AreasTab/AreaDetails.jsx b/src/components/EditorSidePanel/AreasTab/AreaDetails.jsx
index 2e5351e..20f3c3e 100644
--- a/src/components/EditorSidePanel/AreasTab/AreaDetails.jsx
+++ b/src/components/EditorSidePanel/AreasTab/AreaDetails.jsx
@@ -92,7 +92,7 @@ export default function AreaInfo({ data, i }) {
type="danger"
onClick={() => {
Toast.success(`Area deleted!`);
- deleteArea(i, true);
+ deleteArea(i);
}}
/>
diff --git a/src/components/EditorSidePanel/AreasTab/AreasTab.jsx b/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
index a049d43..62523af 100644
--- a/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
+++ b/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
@@ -15,7 +15,7 @@ export default function AreasTab() {
- } block onClick={addArea}>
+ } block onClick={() => addArea()}>
Add area
diff --git a/src/components/EditorSidePanel/NotesTab/NoteInfo.jsx b/src/components/EditorSidePanel/NotesTab/NoteInfo.jsx
index ea73b63..8091a3d 100644
--- a/src/components/EditorSidePanel/NotesTab/NoteInfo.jsx
+++ b/src/components/EditorSidePanel/NotesTab/NoteInfo.jsx
@@ -138,7 +138,7 @@ export default function NoteInfo({ data, nid }) {
type="danger"
onClick={() => {
Toast.success(`Note deleted!`);
- deleteNote(nid, true);
+ deleteNote(nid);
}}
/>
diff --git a/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx b/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx
index f270c2d..8e1e371 100644
--- a/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx
+++ b/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx
@@ -221,7 +221,7 @@ export default function RelationshipInfo({ data }) {
icon={}
block
type="danger"
- onClick={() => deleteRelationship(data.id, true)}
+ onClick={() => deleteRelationship(data.id)}
>
Delete
diff --git a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx b/src/components/EditorSidePanel/TablesTab/TablesTab.jsx
index d673c86..a070584 100644
--- a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx
+++ b/src/components/EditorSidePanel/TablesTab/TablesTab.jsx
@@ -17,7 +17,7 @@ export default function TablesTab() {
- } block onClick={() => addTable(true)}>
+ } block onClick={() => addTable()}>
Add table
diff --git a/src/components/EditorSidePanel/TypesTab/TypesTab.jsx b/src/components/EditorSidePanel/TypesTab/TypesTab.jsx
index 2c84151..f63d28e 100644
--- a/src/components/EditorSidePanel/TypesTab/TypesTab.jsx
+++ b/src/components/EditorSidePanel/TypesTab/TypesTab.jsx
@@ -17,7 +17,7 @@ export default function TypesTab() {
- } block onClick={() => addType(true)}>
+ } block onClick={() => addType()}>
Add type
diff --git a/src/context/AreasContext.jsx b/src/context/AreasContext.jsx
index 18d149b..fddfbd7 100644
--- a/src/context/AreasContext.jsx
+++ b/src/context/AreasContext.jsx
@@ -12,7 +12,7 @@ export default function AreasContextProvider({ children }) {
const { selectedElement, setSelectedElement } = useSelect();
const { setUndoStack, setRedoStack } = useUndoRedo();
- const addArea = (addToHistory = true, data) => {
+ const addArea = (data, addToHistory = true) => {
if (data) {
setAreas((prev) => {
const temp = prev.slice();
diff --git a/src/context/NotesContext.jsx b/src/context/NotesContext.jsx
index b9c34d3..a4af188 100644
--- a/src/context/NotesContext.jsx
+++ b/src/context/NotesContext.jsx
@@ -12,7 +12,7 @@ export default function NotesContextProvider({ children }) {
const { setUndoStack, setRedoStack } = useUndoRedo();
const { selectedElement, setSelectedElement } = useSelect();
- const addNote = (addToHistory = true, data) => {
+ const addNote = (data, addToHistory = true) => {
if (data) {
setNotes((prev) => {
const temp = prev.slice();
diff --git a/src/context/TablesContext.jsx b/src/context/TablesContext.jsx
index 36667b1..e660f7b 100644
--- a/src/context/TablesContext.jsx
+++ b/src/context/TablesContext.jsx
@@ -13,7 +13,7 @@ export default function TablesContextProvider({ children }) {
const { setUndoStack, setRedoStack } = useUndoRedo();
const { selectedElement, setSelectedElement } = useSelect();
- const addTable = (addToHistory = true, data) => {
+ const addTable = (data, addToHistory = true) => {
if (data) {
setTables((prev) => {
const temp = prev.slice();
diff --git a/src/context/TypesContext.jsx b/src/context/TypesContext.jsx
index 0aaab0a..c9d3869 100644
--- a/src/context/TypesContext.jsx
+++ b/src/context/TypesContext.jsx
@@ -8,7 +8,7 @@ export default function TypesContextProvider({ children }) {
const [types, setTypes] = useState([]);
const { setUndoStack, setRedoStack } = useUndoRedo();
- const addType = (addToHistory = true, data) => {
+ const addType = (data, addToHistory = true) => {
if (data) {
setTypes((prev) => {
const temp = prev.slice();