Skip to content

Commit 1d3dcef

Browse files
committed
added removeEventListeners for useEffect
1 parent ef97344 commit 1d3dcef

File tree

7 files changed

+33
-22
lines changed

7 files changed

+33
-22
lines changed

app/src/components/left/HTMLPanel.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ const HTMLPanel = (props): JSX.Element => {
149149
}, []);
150150

151151
useEffect(() => {
152-
document.addEventListener("keydown", handleCreateElement);
152+
document.addEventListener('keydown', handleCreateElement);
153+
return () => {
154+
document.removeEventListener('keydown', handleCreateElement)
155+
}
153156
}, []);
154157

155158

app/src/components/login/SignIn.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,18 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
133133
});
134134
};
135135

136-
const keybindSignIn = useCallback((e) => {
136+
const keyBindSignIn = useCallback((e) => {
137137
if(e.key === 'Enter') {
138138
e.preventDefault();
139139
document.getElementById('SignIn').click();
140140
}
141141
}, []);
142142

143143
useEffect(() => {
144-
document.addEventListener("keydown", keybindSignIn);
144+
document.addEventListener('keydown', keyBindSignIn);
145+
return () => {
146+
document.removeEventListener('keydown', keyBindSignIn)
147+
}
145148
}, []);
146149

147150
// for users not wanting to make an account and use as guest

app/src/components/right/ComponentPanel.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ const ComponentPanel = ({isThemeLight}): JSX.Element => {
116116
}, []);
117117

118118
useEffect(() => {
119-
document.addEventListener("keydown", keyBindCreateComponent);
119+
document.addEventListener('keydown', keyBindCreateComponent);
120+
return () => {
121+
document.removeEventListener('keydown', keyBindCreateComponent)
122+
}
120123
}, []);
121124

122125
const isFocus = (targetId: Number) => {

app/src/components/right/DeleteProjects.tsx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,18 @@ export default function ProjectsFolder() {
9494
setOpen(false);
9595
};
9696

97-
const keybindDeleteProject = useCallback((e) => {
98-
//Mac
99-
if(e.key === 'Backspace' && e.metaKey) {
100-
e.preventDefault();
101-
handleClickOpen();
102-
}
103-
//Windows
104-
if(e.key === 'Backspace' && e.ctrlKey) {
97+
const keyBindDeleteProject = useCallback((e) => {
98+
if(e.key === 'Backspace' && e.metaKey || e.key === 'Backspace' && e.ctrlKey) {
10599
e.preventDefault();
106100
handleClickOpen();
107101
}
108102
}, []);
109103

110104
useEffect(() => {
111-
document.addEventListener("keydown", keybindDeleteProject);
105+
document.addEventListener('keydown', keyBindDeleteProject);
106+
return () => {
107+
document.removeEventListener('keydown', keyBindDeleteProject)
108+
}
112109
}, []);
113110

114111

app/src/components/right/OpenProjects.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,18 @@ export default function ProjectsFolder() {
8686
setOpen(false);
8787
};
8888

89-
const keybindOpenProject = useCallback((e) => {
90-
if(e.key === 'o' && e.metaKey) {
91-
e.preventDefault();
92-
handleClickOpen();
93-
}
94-
if(e.key === 'o' && e.ctrlKey) {
89+
const keyBindOpenProject = useCallback((e) => {
90+
if(e.key === 'o' && e.metaKey || e.key === 'o' && e.ctrlKey) {
9591
e.preventDefault();
9692
handleClickOpen();
9793
}
9894
}, []);
9995

10096
useEffect(() => {
101-
document.addEventListener("keydown", keybindOpenProject);
97+
document.addEventListener('keydown', keyBindOpenProject);
98+
return () => {
99+
document.removeEventListener('keydown', keyBindOpenProject)
100+
}
102101
}, []);
103102

104103
return (

app/src/components/right/SaveProjectButton.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ export default function FormDialog() {
5959
}, []);
6060

6161
useEffect(() => {
62-
document.addEventListener("keydown", saveKeyBind);
62+
document.addEventListener('keydown', saveKeyBind);
63+
return () => {
64+
document.removeEventListener('keydown', saveKeyBind)
65+
}
6366
}, []);
6467

6568
return (

app/src/containers/RightContainer.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,10 @@ const RightContainer = ({isThemeLight}): JSX.Element => {
304304
}, []);
305305

306306
useEffect(() => {
307-
document.addEventListener("keydown", keyBindedFunc);
307+
document.addEventListener('keydown', keyBindedFunc);
308+
return () => {
309+
document.removeEventListener('keydown', keyBindedFunc)
310+
}
308311
}, []);
309312

310313

0 commit comments

Comments
 (0)