diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsx index 581a7b6..30cdd88 100644 --- a/src/components/EditorCanvas/Canvas.jsx +++ b/src/components/EditorCanvas/Canvas.jsx @@ -387,7 +387,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/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsx index 2eaca9f..1e06791 100644 --- a/src/components/EditorHeader/ControlPanel.jsx +++ b/src/components/EditorHeader/ControlPanel.jsx @@ -129,7 +129,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, @@ -145,15 +145,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) { @@ -281,15 +281,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) { @@ -298,7 +298,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, @@ -557,13 +557,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; @@ -572,7 +572,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, @@ -580,7 +580,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, @@ -588,7 +588,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, @@ -630,21 +630,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/RelationshipsTab/RelationshipInfo.jsx b/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx index 549e8cd..0bd381c 100644 --- a/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx +++ b/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx @@ -238,7 +238,7 @@ export default function RelationshipInfo({ data }) { icon={} block type="danger" - onClick={() => deleteRelationship(data.id, true)} + onClick={() => deleteRelationship(data.id)} > {t("delete")} diff --git a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx b/src/components/EditorSidePanel/TablesTab/TablesTab.jsx index 772ee11..113c35d 100644 --- a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx +++ b/src/components/EditorSidePanel/TablesTab/TablesTab.jsx @@ -19,7 +19,7 @@ export default function TablesTab() { - diff --git a/src/components/EditorSidePanel/TypesTab/TypesTab.jsx b/src/components/EditorSidePanel/TypesTab/TypesTab.jsx index a1693be..aee15b2 100644 --- a/src/components/EditorSidePanel/TypesTab/TypesTab.jsx +++ b/src/components/EditorSidePanel/TypesTab/TypesTab.jsx @@ -19,7 +19,7 @@ export default function TypesTab() { - diff --git a/src/context/AreasContext.jsx b/src/context/AreasContext.jsx index 79ce3fb..1e4d068 100644 --- a/src/context/AreasContext.jsx +++ b/src/context/AreasContext.jsx @@ -15,7 +15,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 f6492b5..44950da 100644 --- a/src/context/NotesContext.jsx +++ b/src/context/NotesContext.jsx @@ -15,7 +15,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 e352aa8..7b6695f 100644 --- a/src/context/TablesContext.jsx +++ b/src/context/TablesContext.jsx @@ -16,7 +16,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 72c3785..539835e 100644 --- a/src/context/TypesContext.jsx +++ b/src/context/TypesContext.jsx @@ -11,7 +11,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();