Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix custom theme and settings #759

Merged
merged 5 commits into from
Jul 6, 2018
Merged

Fix custom theme and settings #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b36270
Fix announcement link
BrunoScheufler Jun 1, 2018
819653d
Merge remote-tracking branch 'upstream/master'
Jun 19, 2018
6c45fa8
fix: allow custom theme and settings from connect props
Jul 4, 2018
8563ea7
fix: update getTheme to use custom supplied settings
Jul 4, 2018
4fffb6c
fix: removed unnecessary import
Jul 4, 2018
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
10 changes: 5 additions & 5 deletions packages/graphql-playground-react/src/components/PlaygroundWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
import OldThemeProvider from './Theme/ThemeProvider'
import { getActiveEndpoints } from './util'
import { ISettings } from '../types'
import { createStructuredSelector } from 'reselect'
import { connect } from 'react-redux'
import { getTheme, getSettings } from '../state/workspace/reducers'
import { Session, Tab } from '../state/sessions/reducers'
Expand Down Expand Up @@ -511,10 +510,11 @@ class PlaygroundWrapper extends React.Component<
}
}

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

export default connect(
mapStateToProps,
Expand Down
8 changes: 4 additions & 4 deletions packages/graphql-playground-react/src/state/workspace/reducers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export function normalizeSettingsString(settingsString) {
return JSON.stringify(parseSettingsString(settingsString), null, 2)
}

export const getTheme = createSelector(
[getSettings],
s => s['editor.theme'] || 'dark',
)
export const getTheme = (state, customSettings) => {
const settings = customSettings || getSettings(state)
return settings['editor.theme'] || 'dark'
}