random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Display container component structure

Browse Source 
• Updated:
- Display container component structure
This commit is contained in:
mgabdev 2020-08-14 12:47:10 -05:00
parent 3369f559a7
commit ad8b8d68ff
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/javascript/gabsocial/containers/display.js
View File

@ -5,24 +5,8 @@ import {
DEFAULT_FONT_SIZE, DEFAULT_FONT_SIZE,
} from '../constants' } from '../constants'
const mapStateToProps = (state) => ({
fontSize: state.getIn(['settings', 'displayOptions', 'fontSize']),
radiusSmallDisabled: state.getIn(['settings', 'displayOptions', 'radiusSmallDisabled']),
radiusCircleDisabled: state.getIn(['settings', 'displayOptions', 'radiusCircleDisabled']),
theme: state.getIn(['settings', 'displayOptions', 'theme']),
})
export default
@connect(mapStateToProps)
class Display extends PureComponent { class Display extends PureComponent {
static propTypes = {
fontSize: PropTypes.string.isRequired,
radiusSmallDisabled: PropTypes.bool.isRequired,
radiusCircleDisabled: PropTypes.bool.isRequired,
theme: PropTypes.string.isRequired,
}
state = { state = {
theme: this.props.theme, theme: this.props.theme,
radiusSmallDisabled: this.props.radiusSmallDisabled, radiusSmallDisabled: this.props.radiusSmallDisabled,
@ -30,13 +14,6 @@ class Display extends PureComponent {
fontSize: this.props.fontSize, fontSize: this.props.fontSize,
} }
static defaultProps = {
theme: 'light',
radiusSmallDisabled: true,
radiusCircleDisabled: true,
fontSize: 'normal',
}
componentDidMount() { componentDidMount() {
this.updateTheme(this.state.theme) this.updateTheme(this.state.theme)
this.updateRadiusSmallDisabled(this.state.radiusSmallDisabled) this.updateRadiusSmallDisabled(this.state.radiusSmallDisabled)
@ -116,4 +93,27 @@ class Display extends PureComponent {
return this.props.children return this.props.children
} }
} }
const mapStateToProps = (state) => ({
fontSize: state.getIn(['settings', 'displayOptions', 'fontSize']),
radiusSmallDisabled: state.getIn(['settings', 'displayOptions', 'radiusSmallDisabled']),
radiusCircleDisabled: state.getIn(['settings', 'displayOptions', 'radiusCircleDisabled']),
theme: state.getIn(['settings', 'displayOptions', 'theme']),
})
Display.propTypes = {
fontSize: PropTypes.string.isRequired,
radiusSmallDisabled: PropTypes.bool.isRequired,
radiusCircleDisabled: PropTypes.bool.isRequired,
theme: PropTypes.string.isRequired,
}
Display.defaultProps = {
theme: 'light',
radiusSmallDisabled: true,
radiusCircleDisabled: true,
fontSize: 'normal',
}
export default connect(mapStateToProps)(Display)