Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
import * as React from 'react'
import { Provider } from 'react-redux'
import createStore from '../state/createStore'
import { getSettings } from '../state/workspace/reducers'
import { setSettingsString } from '../state/general/actions'
import PlaygroundWrapper, { PlaygroundWrapperProps } from './PlaygroundWrapper'

const store = createStore()

export default class MiddlewareApp extends React.Component<
PlaygroundWrapperProps
> {
componentDidMount() {
const initialSettings = getSettings(store.getState())
const mergedSettings = { ...initialSettings, ...this.props.settings }
const settingsString = JSON.stringify(mergedSettings, null, 2)
store.dispatch(setSettingsString(settingsString))
}
render() {
return (
<Provider store={store}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ class PlaygroundWrapper extends React.Component<

const mapStateToProps = (state, ownProps) => {
const theme = ownProps.theme || getTheme(state, ownProps.settings)
const settings = ownProps.settings || getSettings(state)
const settings = getSettings(state)
return { theme, settings }
}

Expand Down