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:
mgabdev
2021-01-08 00:15:53 -05:00
parent 8744868190
commit 152e59a66f
13 changed files with 76 additions and 271 deletions

View File

@@ -1,5 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import {
CX,
BREAKPOINT_EXTRA_SMALL,
@@ -9,33 +10,11 @@ import Button from '../components/button'
import Text from '../components/text'
import DeckSidebar from '../components/sidebar/deck_sidebar'
import WrappedBundle from '../features/ui/util/wrapped_bundle'
import { getWindowDimension } from '../utils/is_mobile'
const initialState = getWindowDimension()
class DeckLayout 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 { children, title } = this.props
const { width } = this.state
const { children, title, width } = this.props
const isXS = width <= BREAKPOINT_EXTRA_SMALL
@@ -73,8 +52,12 @@ class DeckLayout extends React.PureComponent {
}
const mapStateToProps = (state) => ({
width: state.getIn(['settings', 'window_dimensions', 'width']),
})
DeckLayout.propTypes = {
title: PropTypes.string,
}
export default DeckLayout
export default connect(mapStateToProps)(DeckLayout)

View File

@@ -10,7 +10,6 @@ import {
POPOVER_CHAT_SETTINGS,
MODAL_CHAT_CONVERSATION_CREATE,
} from '../constants'
import { getWindowDimension } from '../utils/is_mobile'
import Layout from './layout'
import Responsive from '../features/ui/util/responsive_component'
import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
@@ -23,28 +22,8 @@ import ChatMessageScrollingList from '../features/messages/components/chat_messa
import ChatMessageComposeForm from '../features/messages/components/chat_message_compose_form'
import ChatConversationRequestApproveBar from '../features/messages/components/chat_conversation_request_approve_bar'
const initialState = getWindowDimension()
class MessagesLayout 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 })
}
handleOpenSettingsOptionsPopover = () => {
this.props.onOpenSettingsOptionsPopover()
}
@@ -55,6 +34,7 @@ class MessagesLayout extends React.PureComponent {
render() {
const {
width,
title,
children,
isSettings,
@@ -63,7 +43,6 @@ class MessagesLayout extends React.PureComponent {
currentConversationIsRequest,
selectedChatConversationId,
} = this.props
const { width } = this.state
const isXS = width <= BREAKPOINT_EXTRA_SMALL
@@ -184,6 +163,7 @@ const mapStateToProps = (state) => {
return {
selectedChatConversationId,
currentConversationIsRequest,
width: state.getIn(['settings', 'window_dimensions', 'width']),
}
}