Skip to content

Commit efa645c

Browse files
committed
refactored keybindings for shorter code and cleaned up console log
1 parent e359e75 commit efa645c

File tree

3 files changed

+10
-17
lines changed

3 files changed

+10
-17
lines changed

app/src/components/right/SaveProjectButton.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,8 @@ export default function FormDialog() {
5151
};
5252

5353
const saveKeyBind = useCallback((e) => {
54-
//Save Project As
55-
//Mac
56-
(e.key === 's' && e.metaKey && !e.shiftKey) ? handleClickOpen() :
57-
//Windows
58-
(e.key === 's' && e.ctrlKey && !e.shiftKey) ? handleClickOpen() : '';
54+
//Save Project As, the || is for Mac or Windows
55+
(e.key === 's' && e.metaKey && !e.shiftKey || e.key === 's' && e.ctrlKey && !e.shiftKey) ? handleClickOpen() : '';
5956
}, []);
6057

6158
useEffect(() => {

app/src/containers/RightContainer.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -289,18 +289,15 @@ const RightContainer = ({isThemeLight}): JSX.Element => {
289289
};
290290

291291
const keyBindedFunc = useCallback((e) => {
292-
const index = 1;
293-
//Mac
294-
(e.key === 'z' && e.metaKey && !e.shiftKey) ? handleUndo() :
295-
(e.key === 'z' && e.ctrlKey && !e.shiftKey) ? handleUndo() :
296-
//Windows
297-
(e.shiftKey && e.metaKey && e.key === 'z') ? handleRedo() :
298-
(e.shiftKey && e.ctrlKey && e.key === 'z') ? handleRedo() :
299-
//Delete HTML tag off canvas
292+
// the || is for either Mac or Windows OS
293+
//Undo
294+
(e.key === 'z' && e.metaKey && !e.shiftKey || e.key === 'z' && e.ctrlKey && !e.shiftKey) ? handleUndo() :
295+
//Redo
296+
(e.shiftKey && e.metaKey && e.key === 'z' || e.shiftKey && e.ctrlKey && e.key === 'z') ? handleRedo() :
297+
//Delete HTML tag off canvas
300298
(e.key === 'Backspace') ? handleDelete() :
301-
//Save Mac + Windows
302-
(e.key === 's' && e.ctrlKey && e.shiftKey) ? handleSave() : '';
303-
(e.key === 's' && e.metaKey && e.shiftKey) ? handleSave() : '';
299+
//Save
300+
(e.key === 's' && e.ctrlKey && e.shiftKey || e.key === 's' && e.metaKey && e.shiftKey) ? handleSave() : '';
304301
}, []);
305302

306303
useEffect(() => {

app/src/reducers/componentReducer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ const reducer = (state: State, action: Action) => {
399399

400400
if (childId < 1000) { // makes separators not selectable
401401
let canvasFocus = { ...state.canvasFocus, componentId, childId};
402-
console.log('canvasFocus', canvasFocus)
403402
return {...state, canvasFocus}
404403
}
405404
return { ...state };

0 commit comments

Comments
 (0)