diff options
Diffstat (limited to 'src/containers')
| -rw-r--r-- | src/containers/map/GrayContainer.js | 4 | ||||
| -rw-r--r-- | src/containers/map/RoomContainer.js | 8 | ||||
| -rw-r--r-- | src/containers/map/TileContainer.js | 26 |
3 files changed, 35 insertions, 3 deletions
diff --git a/src/containers/map/GrayContainer.js b/src/containers/map/GrayContainer.js index 27024147..bc1dcc59 100644 --- a/src/containers/map/GrayContainer.js +++ b/src/containers/map/GrayContainer.js @@ -1,10 +1,10 @@ import {connect} from "react-redux"; -import {goFromRoomToBuilding} from "../../actions/interaction-level"; +import {goDownOneInteractionLevel} from "../../actions/interaction-level"; import GrayLayer from "../../components/map/elements/GrayLayer"; const mapDispatchToProps = dispatch => { return { - onClick: () => dispatch(goFromRoomToBuilding()) + onClick: () => dispatch(goDownOneInteractionLevel()) }; }; diff --git a/src/containers/map/RoomContainer.js b/src/containers/map/RoomContainer.js index d3d9b7e0..d46324b2 100644 --- a/src/containers/map/RoomContainer.js +++ b/src/containers/map/RoomContainer.js @@ -2,6 +2,12 @@ import {connect} from "react-redux"; import {goFromBuildingToRoom} from "../../actions/interaction-level"; import RoomGroup from "../../components/map/groups/RoomGroup"; +const mapStateToProps = state => { + return { + interactionLevel: state.interactionLevel + }; +}; + const mapDispatchToProps = (dispatch, ownProps) => { return { onClick: () => dispatch(goFromBuildingToRoom(ownProps.room.id)) @@ -9,7 +15,7 @@ const mapDispatchToProps = (dispatch, ownProps) => { }; const RoomContainer = connect( - undefined, + mapStateToProps, mapDispatchToProps )(RoomGroup); diff --git a/src/containers/map/TileContainer.js b/src/containers/map/TileContainer.js new file mode 100644 index 00000000..0456c423 --- /dev/null +++ b/src/containers/map/TileContainer.js @@ -0,0 +1,26 @@ +import {connect} from "react-redux"; +import {goFromRoomToObject} from "../../actions/interaction-level"; +import TileGroup from "../../components/map/groups/TileGroup"; + +const mapStateToProps = state => { + return { + interactionLevel: state.interactionLevel + }; +}; + +const mapDispatchToProps = (dispatch, ownProps) => { + return { + onClick: () => { + if (ownProps.tile.objectType) { + dispatch(goFromRoomToObject(ownProps.tile.id)) + } + } + }; +}; + +const TileContainer = connect( + mapStateToProps, + mapDispatchToProps +)(TileGroup); + +export default TileContainer; |
