Skip to content

Commit 074334e

Browse files
committed
🐛 fix hook not detecting user authenticated
1 parent a0b302f commit 074334e

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

client/modules/App/App.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ class App extends React.Component {
3434
render() {
3535
return (
3636
<div className="app">
37-
{false &&
38-
this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && <DevTools />}
37+
{this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && <DevTools />}
3938
{this.props.children}
4039
</div>
4140
);

client/modules/IDE/pages/MobileIDEView.jsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ const getNatOptions = (username = undefined) =>
7373
const isUserOwner = ({ project, user }) =>
7474
project && project.owner && project.owner.id === user.id;
7575

76+
const canSaveProject = (project, user) =>
77+
isUserOwner({ project, user }) || (user.authenticated && !project.owner);
78+
7679
// TODO: This could go into <Editor />
7780
const handleGlobalKeydown = (props, cmController) => (e) => {
7881
const {
@@ -113,7 +116,7 @@ const handleGlobalKeydown = (props, cmController) => (e) => {
113116
// 83 === s
114117
e.preventDefault();
115118
e.stopPropagation();
116-
if (isUserOwner(props) || (user.authenticated && !project.owner)) saveProject(cmController.getContent());
119+
if (canSaveProject(props)) saveProject(cmController.getContent());
117120
else if (user.authenticated) cloneProject();
118121
else showErrorModal('forceAuthentication');
119122

@@ -205,8 +208,7 @@ const MobileIDEView = (props) => {
205208
autosaveProject, preferences, ide, selectedFile
206209
});
207210

208-
// useEventListener('keydown', () => alert('haha'));
209-
useEventListener('keydown', handleGlobalKeydown(props, cmController));
211+
useEventListener('keydown', handleGlobalKeydown(props, cmController), false, [props]);
210212

211213

212214
return (

client/utils/custom-hooks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export const useEffectWithComparison = (fn, props) => {
5353
}, Object.values(props));
5454
};
5555

56-
export const useEventListener = (event, callback, useCapture = false) => useEffect(() => {
56+
export const useEventListener = (event, callback, useCapture = false, list = []) => useEffect(() => {
5757
document.addEventListener(event, callback, useCapture);
5858
return () => document.removeEventListener(event, callback, useCapture);
59-
}, []);
59+
}, list);

0 commit comments

Comments
 (0)