✨ make dropdown menu open and close
This commit is contained in:
parent
371e4ccdde
commit
9f8b41c092
2 changed files with 75 additions and 50 deletions
63
client/components/OverlayManager.jsx
Normal file
63
client/components/OverlayManager.jsx
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
import React, { useRef, useEffect } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { createPortal } from 'react-dom';
|
||||||
|
|
||||||
|
import Dropdown from './Dropdown';
|
||||||
|
|
||||||
|
|
||||||
|
import { PreferencesIcon } from '../common/icons';
|
||||||
|
|
||||||
|
const OverlayManager = ({ overlay, hideOverlay }) => {
|
||||||
|
const ref = useRef({});
|
||||||
|
|
||||||
|
const handleClickOutside = ({ target }) => {
|
||||||
|
if (ref && ref.current && !ref.current.contains(target)) {
|
||||||
|
hideOverlay();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
document.addEventListener('mousedown', handleClickOutside);
|
||||||
|
|
||||||
|
return () => document.removeEventListener('mousedown', handleClickOutside);
|
||||||
|
}, [ref]);
|
||||||
|
|
||||||
|
const headerNavOptions = [
|
||||||
|
{
|
||||||
|
icon: PreferencesIcon,
|
||||||
|
title: 'Preferences',
|
||||||
|
href: '/mobile/preferences',
|
||||||
|
},
|
||||||
|
{ icon: PreferencesIcon, title: 'Examples', href: '/mobile/examples' },
|
||||||
|
{
|
||||||
|
icon: PreferencesIcon,
|
||||||
|
title: 'Original View',
|
||||||
|
href: '/mobile/preferences',
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const jsx = (
|
||||||
|
<React.Fragment>
|
||||||
|
<div ref={(r) => { ref.current = r; }} >
|
||||||
|
{overlay === 'dropdown' && <Dropdown items={headerNavOptions} />}
|
||||||
|
</div>
|
||||||
|
</React.Fragment>
|
||||||
|
);
|
||||||
|
|
||||||
|
return jsx && createPortal(jsx, document.body);
|
||||||
|
};
|
||||||
|
|
||||||
|
// const refPropType = PropTypes.oneOfType([
|
||||||
|
// PropTypes.func,
|
||||||
|
// PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
|
||||||
|
// ]);
|
||||||
|
|
||||||
|
OverlayManager.propTypes = {
|
||||||
|
// ref: refPropType.isRequired,
|
||||||
|
overlay: PropTypes.string,
|
||||||
|
hideOverlay: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
OverlayManager.defaultProps = { overlay: null };
|
||||||
|
|
||||||
|
export default OverlayManager;
|
|
@ -7,6 +7,7 @@ import styled from 'styled-components';
|
||||||
|
|
||||||
// Imports to be Refactored
|
// Imports to be Refactored
|
||||||
import { bindActionCreators } from 'redux';
|
import { bindActionCreators } from 'redux';
|
||||||
|
|
||||||
import * as FileActions from '../actions/files';
|
import * as FileActions from '../actions/files';
|
||||||
import * as IDEActions from '../actions/ide';
|
import * as IDEActions from '../actions/ide';
|
||||||
import * as ProjectActions from '../actions/project';
|
import * as ProjectActions from '../actions/project';
|
||||||
|
@ -19,7 +20,7 @@ import { getHTMLFile } from '../reducers/files';
|
||||||
|
|
||||||
// Local Imports
|
// Local Imports
|
||||||
import Editor from '../components/Editor';
|
import Editor from '../components/Editor';
|
||||||
import { PreferencesIcon, PlayIcon, ExitIcon, MoreIcon } from '../../../common/icons';
|
import { PlayIcon, ExitIcon, MoreIcon } from '../../../common/icons';
|
||||||
|
|
||||||
import IconButton from '../../../components/mobile/IconButton';
|
import IconButton from '../../../components/mobile/IconButton';
|
||||||
import Header from '../../../components/mobile/Header';
|
import Header from '../../../components/mobile/Header';
|
||||||
|
@ -28,7 +29,7 @@ import Footer from '../../../components/mobile/Footer';
|
||||||
import IDEWrapper from '../../../components/mobile/IDEWrapper';
|
import IDEWrapper from '../../../components/mobile/IDEWrapper';
|
||||||
import Console from '../components/Console';
|
import Console from '../components/Console';
|
||||||
import { remSize } from '../../../theme';
|
import { remSize } from '../../../theme';
|
||||||
import Dropdown from '../../../components/Dropdown';
|
import OverlayManager from '../../../components/OverlayManager';
|
||||||
|
|
||||||
const isUserOwner = ({ project, user }) => (project.owner && project.owner.id === user.id);
|
const isUserOwner = ({ project, user }) => (project.owner && project.owner.id === user.id);
|
||||||
|
|
||||||
|
@ -38,47 +39,6 @@ const BottomBarContent = styled.h2`
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|
||||||
// TODO: Move to new file?
|
|
||||||
// const overlays = {};
|
|
||||||
// const OverlayManager = name => overlays[name] || null;
|
|
||||||
|
|
||||||
const OverlayManager = ({ ref, overlay, hideOverlay }) => {
|
|
||||||
useEffect(() => {
|
|
||||||
const handleClickOutside = ({ target }) => {
|
|
||||||
if (ref && ref.current && !ref.current.contains(target)) { hideOverlay(); console.log('click'); }
|
|
||||||
};
|
|
||||||
|
|
||||||
document.addEventListener('mousedown', handleClickOutside);
|
|
||||||
return () => { document.removeEventListener('mousedown', handleClickOutside); };
|
|
||||||
}, [ref]);
|
|
||||||
|
|
||||||
const headerNavOptions = [
|
|
||||||
{ icon: PreferencesIcon, title: 'Preferences', href: '/mobile/preferences' },
|
|
||||||
{ icon: PreferencesIcon, title: 'Examples', href: '/mobile/examples' },
|
|
||||||
{ icon: PreferencesIcon, title: 'Original View', href: '/mobile/preferences' }
|
|
||||||
];
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div ref={(r) => { if (ref) { ref.current = r; } }}>
|
|
||||||
{(overlay === 'dropdown') && <Dropdown items={headerNavOptions} />}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const refPropType = PropTypes.oneOfType([
|
|
||||||
PropTypes.func,
|
|
||||||
PropTypes.shape({ current: PropTypes.instanceOf(Element) })
|
|
||||||
]);
|
|
||||||
|
|
||||||
OverlayManager.propTypes = {
|
|
||||||
ref: refPropType.isRequired,
|
|
||||||
overlay: PropTypes.string,
|
|
||||||
hideOverlay: PropTypes.func.isRequired
|
|
||||||
};
|
|
||||||
|
|
||||||
OverlayManager.defaultProps = { overlay: null };
|
|
||||||
|
|
||||||
|
|
||||||
const MobileIDEView = (props) => {
|
const MobileIDEView = (props) => {
|
||||||
const {
|
const {
|
||||||
preferences, ide, editorAccessibility, project, updateLintMessage, clearLintMessage,
|
preferences, ide, editorAccessibility, project, updateLintMessage, clearLintMessage,
|
||||||
|
@ -93,8 +53,7 @@ const MobileIDEView = (props) => {
|
||||||
|
|
||||||
// TODO: Move this to OverlayController (?)
|
// TODO: Move this to OverlayController (?)
|
||||||
const hideOverlay = () => setOverlay(null);
|
const hideOverlay = () => setOverlay(null);
|
||||||
const overlayRef = useRef();
|
// const overlayRef = useRef({});
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Screen fullscreen>
|
<Screen fullscreen>
|
||||||
|
@ -151,12 +110,15 @@ const MobileIDEView = (props) => {
|
||||||
/>
|
/>
|
||||||
</IDEWrapper>
|
</IDEWrapper>
|
||||||
|
|
||||||
{/* TODO: Create Overlay Manager */}
|
<Footer>
|
||||||
{<OverlayManager
|
<Console />
|
||||||
ref={overlayRef}
|
</Footer>
|
||||||
|
|
||||||
|
<OverlayManager
|
||||||
|
// ref={overlayRef}
|
||||||
overlay={overlayName}
|
overlay={overlayName}
|
||||||
hideOverlay={hideOverlay}
|
hideOverlay={hideOverlay}
|
||||||
/>}
|
/>
|
||||||
</Screen>
|
</Screen>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue