Merge pull request #1214 from andrewn/feature/theme-sync

Keep theme in sync with state across the app
This commit is contained in:
Cassie Tarakajian 2019-11-25 10:41:08 -05:00 committed by GitHub
commit 7ec30ddee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 17 deletions

View File

@ -14,7 +14,7 @@ class App extends React.Component {
componentDidMount() {
this.setState({ isMounted: true }); // eslint-disable-line react/no-did-mount-set-state
document.body.className = 'light';
document.body.className = this.props.theme;
}
componentWillReceiveProps(nextProps) {
@ -23,6 +23,12 @@ class App extends React.Component {
}
}
componentDidUpdate(prevProps) {
if (this.props.theme !== prevProps.theme) {
document.body.className = this.props.theme;
}
}
render() {
return (
<div className="app">
@ -39,10 +45,18 @@ App.propTypes = {
pathname: PropTypes.string
}).isRequired,
setPreviousPath: PropTypes.func.isRequired,
theme: PropTypes.string,
};
App.defaultProps = {
children: null
children: null,
theme: 'light'
};
export default connect(() => ({}), { setPreviousPath })(App);
const mapStateToProps = state => ({
theme: state.preferences.theme,
});
const mapDispatchToProps = { setPreviousPath };
export default connect(mapStateToProps, mapDispatchToProps)(App);

View File

@ -11,13 +11,6 @@ import * as ProjectActions from '../actions/project';
class FullView extends React.Component {
componentDidMount() {
this.props.getProject(this.props.params.project_id);
document.body.className = this.props.theme;
}
componentWillUpdate(nextProps) {
if (nextProps.theme !== this.props.theme) {
document.body.className = nextProps.theme;
}
}
ident = () => {}
@ -62,7 +55,6 @@ class FullView extends React.Component {
}
FullView.propTypes = {
theme: PropTypes.string.isRequired,
params: PropTypes.shape({
project_id: PropTypes.string
}).isRequired,
@ -98,7 +90,6 @@ FullView.propTypes = {
function mapStateToProps(state) {
return {
user: state.user,
theme: state.preferences.theme,
htmlFile: getHTMLFile(state.files),
jsFiles: getJSFiles(state.files),
cssFiles: getCSSFiles(state.files),

View File

@ -66,7 +66,6 @@ class IDEView extends React.Component {
window.onbeforeunload = () => this.warnIfUnsavedChanges();
document.body.className = this.props.preferences.theme;
this.autosaveInterval = null;
}
@ -90,10 +89,6 @@ class IDEView extends React.Component {
this.props.getProject(nextProps.params.project_id);
}
}
if (nextProps.preferences.theme !== this.props.preferences.theme) {
document.body.className = nextProps.preferences.theme;
}
}
componentDidUpdate(prevProps) {