Updated all components that implement window resize to use redux dimensions
• Updated: - all components that implement window resize to use redux dimensions
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { connect } from 'react-redux'
|
||||
import {
|
||||
BREAKPOINT_EXTRA_LARGE,
|
||||
BREAKPOINT_LARGE,
|
||||
@@ -7,33 +8,12 @@ import {
|
||||
BREAKPOINT_SMALL,
|
||||
BREAKPOINT_EXTRA_SMALL,
|
||||
} from '../../../constants'
|
||||
import { getWindowDimension } from '../../../utils/is_mobile'
|
||||
|
||||
const initialState = getWindowDimension()
|
||||
|
||||
class ResponsiveClassesComponent extends React.PureComponent {
|
||||
|
||||
state = {
|
||||
width: initialState.width,
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.handleResize()
|
||||
window.addEventListener('resize', this.handleResize, false)
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
window.removeEventListener('resize', this.handleResize, false)
|
||||
}
|
||||
|
||||
handleResize = () => {
|
||||
const { width } = getWindowDimension()
|
||||
|
||||
this.setState({ width })
|
||||
}
|
||||
|
||||
render() {
|
||||
const {
|
||||
width,
|
||||
children,
|
||||
classNames,
|
||||
classNamesXL,
|
||||
@@ -42,7 +22,6 @@ class ResponsiveClassesComponent extends React.PureComponent {
|
||||
classNamesSmall,
|
||||
classNamesXS,
|
||||
} = this.props
|
||||
const { width } = this.state
|
||||
|
||||
let classes;
|
||||
if (width >= BREAKPOINT_EXTRA_LARGE) {
|
||||
@@ -68,6 +47,10 @@ class ResponsiveClassesComponent extends React.PureComponent {
|
||||
|
||||
}
|
||||
|
||||
const mapStateToProps = (state) => ({
|
||||
width: state.getIn(['settings', 'window_dimensions', 'width']),
|
||||
})
|
||||
|
||||
ResponsiveClassesComponent.propTypes = {
|
||||
classNames: PropTypes.string,
|
||||
classNamesXL: PropTypes.string,
|
||||
@@ -77,4 +60,4 @@ ResponsiveClassesComponent.propTypes = {
|
||||
classNamesXS: PropTypes.string,
|
||||
}
|
||||
|
||||
export default ResponsiveClassesComponent
|
||||
export default connect(mapStateToProps)(ResponsiveClassesComponent)
|
||||
@@ -1,37 +1,15 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { getWindowDimension } from '../../../utils/is_mobile'
|
||||
|
||||
const initialState = getWindowDimension()
|
||||
import { connect } from 'react-redux'
|
||||
|
||||
class Responsive extends React.PureComponent {
|
||||
|
||||
state = {
|
||||
width: initialState.width,
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.handleResize()
|
||||
window.addEventListener('resize', this.handleResize, false)
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
window.removeEventListener('resize', this.handleResize, false)
|
||||
}
|
||||
|
||||
handleResize = () => {
|
||||
const { width } = getWindowDimension()
|
||||
|
||||
this.setState({ width })
|
||||
}
|
||||
|
||||
shouldRender = (min, max, width) => {
|
||||
return width > min && width < max
|
||||
}
|
||||
|
||||
render() {
|
||||
const { children, min, max } = this.props
|
||||
const { width } = this.state
|
||||
const { children, min, max, width } = this.props
|
||||
|
||||
const shouldRender = this.shouldRender(min, max, width)
|
||||
|
||||
@@ -40,6 +18,10 @@ class Responsive extends React.PureComponent {
|
||||
|
||||
}
|
||||
|
||||
const mapStateToProps = (state) => ({
|
||||
width: state.getIn(['settings', 'window_dimensions', 'width']),
|
||||
})
|
||||
|
||||
Responsive.propTypes = {
|
||||
min: PropTypes.number,
|
||||
max: PropTypes.number,
|
||||
@@ -50,4 +32,4 @@ Responsive.defaultProps = {
|
||||
max: Infinity,
|
||||
}
|
||||
|
||||
export default Responsive
|
||||
export default connect(mapStateToProps)(Responsive)
|
||||
Reference in New Issue
Block a user