Skip to content

Commit 6d12149

Browse files
committed
🚧 improve useAsModal rendering
1 parent 1680c0c commit 6d12149

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

client/components/Sidebar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const SidebarWrapper = styled.div`
2323
const Sidebar = ({ title, onPressClose }) => (
2424
<SidebarWrapper>
2525
{title &&
26-
<Header slim title={title}>
26+
<Header slim title={title} fixed={false}>
2727
<IconButton onPress={onPressClose} icon={ExitIcon} aria-label="Return to ide view" />
2828
</Header>}
2929
</SidebarWrapper>

client/components/mobile/Header.jsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const textColor = ({ transparent, inverted }) => prop((transparent === false &&
1414

1515

1616
const HeaderDiv = styled.div`
17-
position: fixed;
17+
${props => props.fixed && 'position: fixed;'}
1818
width: 100%;
1919
background: ${props => background(props)};
2020
color: ${textColor};
@@ -57,9 +57,9 @@ const TitleContainer = styled.div`
5757

5858
const Header = ({
5959
title, subtitle, leftButton, children,
60-
transparent, inverted, slim
60+
transparent, inverted, slim, fixed
6161
}) => (
62-
<HeaderDiv transparent={transparent} slim={slim} inverted={inverted}>
62+
<HeaderDiv transparent={transparent} slim={slim} inverted={inverted} fixed={fixed}>
6363
{leftButton}
6464
<TitleContainer padded={subtitle === null}>
6565
{title && <h2>{title}</h2>}
@@ -79,6 +79,7 @@ Header.propTypes = {
7979
transparent: PropTypes.bool,
8080
inverted: PropTypes.bool,
8181
slim: PropTypes.bool,
82+
fixed: PropTypes.bool,
8283
};
8384

8485
Header.defaultProps = {
@@ -88,7 +89,8 @@ Header.defaultProps = {
8889
children: [],
8990
transparent: false,
9091
inverted: false,
91-
slim: false
92+
slim: false,
93+
fixed: true
9294
};
9395

9496
export default Header;

client/components/useAsModal.jsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@ const BackgroundOverlay = styled.div`
1212
opacity: 0.3;
1313
`;
1414

15-
export default (component, hasOverlay = false) => {
15+
export default (Element, hasOverlay = false) => {
1616
const [visible, toggle, setRef] = useModalBehavior();
1717

18-
const wrapper = () => (<div>
19-
{hasOverlay && visible && <BackgroundOverlay />}
20-
<div ref={setRef}> {visible && component} </div>
21-
</div>); // eslint-disable-line
18+
// const Comp = styled(() => Element).attrs({ onPressClose: toggle });
19+
20+
const wrapper = () => (visible &&
21+
<div>
22+
{hasOverlay && <BackgroundOverlay />}
23+
<div ref={setRef}> {Element} </div>
24+
</div>); // eslint-disable-line}
2225

2326
return [toggle, wrapper];
2427
};

client/modules/IDE/pages/MobileIDEView.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ const MobileIDEView = (props) => {
9797
/>);
9898

9999
const [toggleExplorer, Explorer] = useAsModal(<Sidebar
100-
title="hahaha"
101-
onPressClose={() => {}}
100+
title="Files"
102101
/>, true);
103102

104103
// toggle sidebar starting opened

0 commit comments

Comments
 (0)