Skip to content

Commit 51ee416

Browse files
authored
Merge pull request #1597 from ghalestrilo/feature/mobile-save-toast
✨ add toast to MobileIDEView
2 parents cf5ed7f + 7a6d9fc commit 51ee416

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed
Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3+
import styled from 'styled-components';
4+
import { remSize } from '../../theme';
35

4-
const Screen = ({ children, fullscreen }) => (
5-
<div className={fullscreen && 'fullscreen-preview'}>
6+
const ScreenWrapper = styled.div`
7+
.toast {
8+
font-size: ${remSize(12)};
9+
padding: ${remSize(8)};
10+
11+
border-radius: ${remSize(4)};
12+
width: 92%;
13+
top: unset;
14+
min-width: unset;
15+
bottom: ${remSize(64)}
16+
}
17+
`;
18+
19+
const Screen = ({ children, fullscreen, slimheader }) => (
20+
<ScreenWrapper className={fullscreen && 'fullscreen-preview'} slimheader={slimheader}>
621
{children}
7-
</div>
22+
</ScreenWrapper>
823
);
924

1025
Screen.defaultProps = {
11-
fullscreen: false
26+
fullscreen: false,
27+
slimheader: false,
1228
};
1329

1430
Screen.propTypes = {
1531
children: PropTypes.node.isRequired,
16-
fullscreen: PropTypes.bool
32+
fullscreen: PropTypes.bool,
33+
slimheader: PropTypes.bool
1734
};
1835

1936
export default Screen;

client/modules/App/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class App extends React.Component {
4141
render() {
4242
return (
4343
<div className="app">
44-
{this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && <DevTools />}
44+
{false && this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && <DevTools />}
4545
{this.props.children}
4646
</div>
4747
);

client/modules/IDE/pages/MobileIDEView.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import UnsavedChangesDotIcon from '../../../images/unsaved-changes-dot.svg';
2222

2323
import IconButton from '../../../components/mobile/IconButton';
2424
import Header from '../../../components/mobile/Header';
25+
import Toast from '../components/Toast';
2526
import Screen from '../../../components/mobile/MobileScreen';
2627
import Footer from '../../../components/mobile/Footer';
2728
import IDEWrapper from '../../../components/mobile/IDEWrapper';
@@ -188,7 +189,7 @@ const MobileIDEView = (props) => {
188189
const {
189190
ide, preferences, project, selectedFile, user, params, unsavedChanges, expandConsole, collapseConsole,
190191
stopSketch, startSketch, getProject, clearPersistedState, autosaveProject, saveProject, files,
191-
toggleForceDesktop, logoutUser
192+
toggleForceDesktop, logoutUser, toast
192193
} = props;
193194

194195

@@ -266,6 +267,7 @@ const MobileIDEView = (props) => {
266267
<IconButton to="/preview" onClick={() => { startSketch(); }} icon={PlayIcon} aria-label="Run sketch" />
267268
</li>
268269
</Header>
270+
{toast.isVisible && <Toast />}
269271

270272
<IDEWrapper>
271273
<Editor provideController={setCmController} />
@@ -337,6 +339,10 @@ MobileIDEView.propTypes = {
337339
username: PropTypes.string,
338340
}).isRequired,
339341

342+
toast: PropTypes.shape({
343+
isVisible: PropTypes.bool
344+
}).isRequired,
345+
340346
logoutUser: PropTypes.func.isRequired,
341347

342348
getProject: PropTypes.func.isRequired,

0 commit comments

Comments
 (0)