Skip to content

Commit 9f8b41c

Browse files
committed
✨ make dropdown menu open and close
1 parent 371e4cc commit 9f8b41c

File tree

2 files changed

+75
-50
lines changed

2 files changed

+75
-50
lines changed

client/components/OverlayManager.jsx

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
import React, { useRef, useEffect } from 'react';
2+
import PropTypes from 'prop-types';
3+
import { createPortal } from 'react-dom';
4+
5+
import Dropdown from './Dropdown';
6+
7+
8+
import { PreferencesIcon } from '../common/icons';
9+
10+
const OverlayManager = ({ overlay, hideOverlay }) => {
11+
const ref = useRef({});
12+
13+
const handleClickOutside = ({ target }) => {
14+
if (ref && ref.current && !ref.current.contains(target)) {
15+
hideOverlay();
16+
}
17+
};
18+
19+
useEffect(() => {
20+
document.addEventListener('mousedown', handleClickOutside);
21+
22+
return () => document.removeEventListener('mousedown', handleClickOutside);
23+
}, [ref]);
24+
25+
const headerNavOptions = [
26+
{
27+
icon: PreferencesIcon,
28+
title: 'Preferences',
29+
href: '/mobile/preferences',
30+
},
31+
{ icon: PreferencesIcon, title: 'Examples', href: '/mobile/examples' },
32+
{
33+
icon: PreferencesIcon,
34+
title: 'Original View',
35+
href: '/mobile/preferences',
36+
},
37+
];
38+
39+
const jsx = (
40+
<React.Fragment>
41+
<div ref={(r) => { ref.current = r; }} >
42+
{overlay === 'dropdown' && <Dropdown items={headerNavOptions} />}
43+
</div>
44+
</React.Fragment>
45+
);
46+
47+
return jsx && createPortal(jsx, document.body);
48+
};
49+
50+
// const refPropType = PropTypes.oneOfType([
51+
// PropTypes.func,
52+
// PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
53+
// ]);
54+
55+
OverlayManager.propTypes = {
56+
// ref: refPropType.isRequired,
57+
overlay: PropTypes.string,
58+
hideOverlay: PropTypes.func.isRequired,
59+
};
60+
61+
OverlayManager.defaultProps = { overlay: null };
62+
63+
export default OverlayManager;

client/modules/IDE/pages/MobileIDEView.jsx

Lines changed: 12 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import styled from 'styled-components';
77

88
// Imports to be Refactored
99
import { bindActionCreators } from 'redux';
10+
1011
import * as FileActions from '../actions/files';
1112
import * as IDEActions from '../actions/ide';
1213
import * as ProjectActions from '../actions/project';
@@ -19,7 +20,7 @@ import { getHTMLFile } from '../reducers/files';
1920

2021
// Local Imports
2122
import Editor from '../components/Editor';
22-
import { PreferencesIcon, PlayIcon, ExitIcon, MoreIcon } from '../../../common/icons';
23+
import { PlayIcon, ExitIcon, MoreIcon } from '../../../common/icons';
2324

2425
import IconButton from '../../../components/mobile/IconButton';
2526
import Header from '../../../components/mobile/Header';
@@ -28,7 +29,7 @@ import Footer from '../../../components/mobile/Footer';
2829
import IDEWrapper from '../../../components/mobile/IDEWrapper';
2930
import Console from '../components/Console';
3031
import { remSize } from '../../../theme';
31-
import Dropdown from '../../../components/Dropdown';
32+
import OverlayManager from '../../../components/OverlayManager';
3233

3334
const isUserOwner = ({ project, user }) => (project.owner && project.owner.id === user.id);
3435

@@ -38,47 +39,6 @@ const BottomBarContent = styled.h2`
3839
`;
3940

4041

41-
// TODO: Move to new file?
42-
// const overlays = {};
43-
// const OverlayManager = name => overlays[name] || null;
44-
45-
const OverlayManager = ({ ref, overlay, hideOverlay }) => {
46-
useEffect(() => {
47-
const handleClickOutside = ({ target }) => {
48-
if (ref && ref.current && !ref.current.contains(target)) { hideOverlay(); console.log('click'); }
49-
};
50-
51-
document.addEventListener('mousedown', handleClickOutside);
52-
return () => { document.removeEventListener('mousedown', handleClickOutside); };
53-
}, [ref]);
54-
55-
const headerNavOptions = [
56-
{ icon: PreferencesIcon, title: 'Preferences', href: '/mobile/preferences' },
57-
{ icon: PreferencesIcon, title: 'Examples', href: '/mobile/examples' },
58-
{ icon: PreferencesIcon, title: 'Original View', href: '/mobile/preferences' }
59-
];
60-
61-
return (
62-
<div ref={(r) => { if (ref) { ref.current = r; } }}>
63-
{(overlay === 'dropdown') && <Dropdown items={headerNavOptions} />}
64-
</div>
65-
);
66-
};
67-
68-
const refPropType = PropTypes.oneOfType([
69-
PropTypes.func,
70-
PropTypes.shape({ current: PropTypes.instanceOf(Element) })
71-
]);
72-
73-
OverlayManager.propTypes = {
74-
ref: refPropType.isRequired,
75-
overlay: PropTypes.string,
76-
hideOverlay: PropTypes.func.isRequired
77-
};
78-
79-
OverlayManager.defaultProps = { overlay: null };
80-
81-
8242
const MobileIDEView = (props) => {
8343
const {
8444
preferences, ide, editorAccessibility, project, updateLintMessage, clearLintMessage,
@@ -93,11 +53,10 @@ const MobileIDEView = (props) => {
9353

9454
// TODO: Move this to OverlayController (?)
9555
const hideOverlay = () => setOverlay(null);
96-
const overlayRef = useRef();
97-
56+
// const overlayRef = useRef({});
9857

9958
return (
100-
<Screen fullscreen >
59+
<Screen fullscreen>
10160
<Header
10261
title={project.name}
10362
subtitle={selectedFile.name}
@@ -151,12 +110,15 @@ const MobileIDEView = (props) => {
151110
/>
152111
</IDEWrapper>
153112

154-
{/* TODO: Create Overlay Manager */}
155-
{<OverlayManager
156-
ref={overlayRef}
113+
<Footer>
114+
<Console />
115+
</Footer>
116+
117+
<OverlayManager
118+
// ref={overlayRef}
157119
overlay={overlayName}
158120
hideOverlay={hideOverlay}
159-
/>}
121+
/>
160122
</Screen>
161123
);
162124
};

0 commit comments

Comments
 (0)