summaryrefslogtreecommitdiff
path: root/opendc-web/opendc-web-ui/src/containers/app/map/RoomContainer.js
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-05-10 21:32:54 +0200
committerGitHub <noreply@github.com>2021-05-10 21:32:54 +0200
commit1ce710ebaa8b071a3b30447d431f4af422f25156 (patch)
treed0d202eb1166f151113258d06199710fbd8324ec /opendc-web/opendc-web-ui/src/containers/app/map/RoomContainer.js
parentddefa23e8e86c4eab2d2218646bcef21d547f4bc (diff)
parent09e5fe5a7f9ce8452fa9c042cb493e6fb4de221f (diff)
ui: Update frontend dependencies
This pull request updates the React dependencies used in the OpenDC frontend. * Actualize React, react-konva and react-scripts * Actualize Bootstrap and Reactstrap * Migrate to Redux hooks to reduce clutter
Diffstat (limited to 'opendc-web/opendc-web-ui/src/containers/app/map/RoomContainer.js')
-rw-r--r--opendc-web/opendc-web-ui/src/containers/app/map/RoomContainer.js27
1 files changed, 12 insertions, 15 deletions
diff --git a/opendc-web/opendc-web-ui/src/containers/app/map/RoomContainer.js b/opendc-web/opendc-web-ui/src/containers/app/map/RoomContainer.js
index 91bf4e5d..877233fc 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/map/RoomContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/map/RoomContainer.js
@@ -1,21 +1,18 @@
-import { connect } from 'react-redux'
+import React from 'react'
+import { useDispatch, useSelector } from 'react-redux'
import { goFromBuildingToRoom } from '../../../actions/interaction-level'
import RoomGroup from '../../../components/app/map/groups/RoomGroup'
-const mapStateToProps = (state, ownProps) => {
- return {
- interactionLevel: state.interactionLevel,
- currentRoomInConstruction: state.construction.currentRoomInConstruction,
- room: state.objects.room[ownProps.roomId],
- }
+const RoomContainer = (props) => {
+ const state = useSelector((state) => {
+ return {
+ interactionLevel: state.interactionLevel,
+ currentRoomInConstruction: state.construction.currentRoomInConstruction,
+ room: state.objects.room[props.roomId],
+ }
+ })
+ const dispatch = useDispatch()
+ return <RoomGroup {...props} {...state} onClick={() => dispatch(goFromBuildingToRoom(props.roomId))} />
}
-const mapDispatchToProps = (dispatch, ownProps) => {
- return {
- onClick: () => dispatch(goFromBuildingToRoom(ownProps.roomId)),
- }
-}
-
-const RoomContainer = connect(mapStateToProps, mapDispatchToProps)(RoomGroup)
-
export default RoomContainer