Merge pull request #105 from l123wx/place-optional-argument-at-the-end

place optional parameters of functions at the end(#104)
drawdb-io · May 14, 2024 · 30886ac · 30886ac
2 parents 9de091c + a33b68b
commit 30886ac
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,23 +575,23 @@ 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,
           id: tables.length,
         });
         break;
       case ObjectType.NOTE:
-        addNote(true, {
+        addNote({
           ...notes[selectedElement.id],
           x: notes[selectedElement.id].x + 20,
           y: notes[selectedElement.id].y + 20,
           id: notes.length,
         });
         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
@@ -92,7 +92,7 @@ export default function AreaInfo({ data, i }) {
           type="danger"
           onClick={() => {
             Toast.success(`Area deleted!`);
-            deleteArea(i, true);
+            deleteArea(i);
           }}
         />
       </Col>

diff --git a/src/components/EditorSidePanel/AreasTab/AreasTab.jsx b/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
@@ -15,7 +15,7 @@ export default function AreasTab() {
           <SearchBar />
         </Col>
         <Col span={8}>
-          <Button icon={<IconPlus />} block onClick={addArea}>
+          <Button icon={<IconPlus />} block onClick={() => addArea()}>
             Add area
           </Button>
         </Col>

diff --git 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);
             }}
           />
         </div>

diff --git a/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx b/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx
@@ -221,7 +221,7 @@ export default function RelationshipInfo({ data }) {
           icon={<IconDeleteStroked />}
           block
           type="danger"
-          onClick={() => deleteRelationship(data.id, true)}
+          onClick={() => deleteRelationship(data.id)}
         >
           Delete
         </Button>

diff --git a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx b/src/components/EditorSidePanel/TablesTab/TablesTab.jsx
@@ -17,7 +17,7 @@ export default function TablesTab() {
           <SearchBar tables={tables} />
         </Col>
         <Col span={8}>
-          <Button icon={<IconPlus />} block onClick={() => addTable(true)}>
+          <Button icon={<IconPlus />} block onClick={() => addTable()}>
             Add table
           </Button>
         </Col>

diff --git a/src/components/EditorSidePanel/TypesTab/TypesTab.jsx b/src/components/EditorSidePanel/TypesTab/TypesTab.jsx
@@ -17,7 +17,7 @@ export default function TypesTab() {
           <Searchbar />
         </Col>
         <Col span={8}>
-          <Button icon={<IconPlus />} block onClick={() => addType(true)}>
+          <Button icon={<IconPlus />} block onClick={() => addType()}>
             Add type
           </Button>
         </Col>

diff --git 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
@@ -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
@@ -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
@@ -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();