Merge branch 'ControlCore-Project:main' into author_fix

Author: parteekcoder

src/toolbarActions/toolbarFunctions.js

@@ -68,11 +68,10 @@ const editElement = (state, setState) => {
     }
 };
 
-const deleteElem = (state) => {
+const deleteElem = (state, dispatcher) => {
     const tid = new Date().getTime();
     state.eleSelectedPayload.ids.forEach((id) => getGraphFun(state).deleteElem(id, tid));
-    // eslint-disable-next-line
-    state.eleSelectedPayload.type = 'MIX';
+    dispatcher({ type: T.ELE_UNSELECTED, payload: null });
 };
 
 const downloadImg = (state, setState, format) => {

src/toolbarActions/toolbarList.js

@@ -65,7 +65,7 @@ const toolbarList = (state, dispatcher) => [
         text: 'Empty',
         icon: FaThermometerEmpty,
         action: clearAll,
-        active: true,
+        active: state.curGraphInstance,
         visibility: true,
         hotkey: 'Ctrl+Backspace',
     },
@@ -94,15 +94,15 @@ const toolbarList = (state, dispatcher) => [
         text: 'Edit',
         icon: FaEdit,
         action: editElement,
-        active: (state.eleSelected && state.eleSelectedPayload.type !== 'MIX'),
+        active: state.curGraphInstance && state.eleSelected,
         visibility: true,
         hotkey: 'Ctrl+E',
     },
     {
         type: 'action',
         text: 'Delete',
         icon: FaTrash,
-        action: deleteElem,
+        action: () => deleteElem(state, dispatcher),
         active: state.eleSelected,
         visibility: true,
         hotkey: 'Delete,Backspace,Del,Clear',