r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

🐛 fix hook not detecting user authenticated

Browse source
This commit is contained in:
ghalestrilo 2020-08-13 18:57:42 -03:00
parent a0b302fdcd
commit 074334e14a
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/modules/App/App.jsx
View file

@ -34,8 +34,7 @@ class App extends React.Component {
render() { render() {
return ( return (
<div className="app"> <div className="app">
{false && {this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && <DevTools />}
this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && <DevTools />}
{this.props.children} {this.props.children}
</div> </div>
); );

8
client/modules/IDE/pages/MobileIDEView.jsx
View file

@ -73,6 +73,9 @@ const getNatOptions = (username = undefined) =>
const isUserOwner = ({ project, user }) => const isUserOwner = ({ project, user }) =>
project && project.owner && project.owner.id === user.id; project && project.owner && project.owner.id === user.id;
const canSaveProject = (project, user) =>
isUserOwner({ project, user }) || (user.authenticated && !project.owner);
// TODO: This could go into <Editor /> // TODO: This could go into <Editor />
const handleGlobalKeydown = (props, cmController) => (e) => { const handleGlobalKeydown = (props, cmController) => (e) => {
const { const {
@ -113,7 +116,7 @@ const handleGlobalKeydown = (props, cmController) => (e) => {
// 83 === s // 83 === s
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (isUserOwner(props) || (user.authenticated && !project.owner)) saveProject(cmController.getContent()); if (canSaveProject(props)) saveProject(cmController.getContent());
else if (user.authenticated) cloneProject(); else if (user.authenticated) cloneProject();
else showErrorModal('forceAuthentication'); else showErrorModal('forceAuthentication');
@ -205,8 +208,7 @@ const MobileIDEView = (props) => {
autosaveProject, preferences, ide, selectedFile autosaveProject, preferences, ide, selectedFile
}); });
// useEventListener('keydown', () => alert('haha')); useEventListener('keydown', handleGlobalKeydown(props, cmController), false, [props]);
useEventListener('keydown', handleGlobalKeydown(props, cmController));
return ( return (

4
client/utils/custom-hooks.js
View file

@ -53,7 +53,7 @@ export const useEffectWithComparison = (fn, props) => {
}, Object.values(props)); }, Object.values(props));
}; };
export const useEventListener = (event, callback, useCapture = false) => useEffect(() => { export const useEventListener = (event, callback, useCapture = false, list = []) => useEffect(() => {
document.addEventListener(event, callback, useCapture); document.addEventListener(event, callback, useCapture);
return () => document.removeEventListener(event, callback, useCapture); return () => document.removeEventListener(event, callback, useCapture);
}, []); }, list);