diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-05-10 21:32:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 21:32:54 +0200 |
| commit | 1ce710ebaa8b071a3b30447d431f4af422f25156 (patch) | |
| tree | d0d202eb1166f151113258d06199710fbd8324ec /opendc-web/opendc-web-ui/src/components/app/map | |
| parent | ddefa23e8e86c4eab2d2218646bcef21d547f4bc (diff) | |
| parent | 09e5fe5a7f9ce8452fa9c042cb493e6fb4de221f (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/components/app/map')
| -rw-r--r-- | opendc-web/opendc-web-ui/src/components/app/map/MapStageComponent.js | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/opendc-web/opendc-web-ui/src/components/app/map/MapStageComponent.js b/opendc-web/opendc-web-ui/src/components/app/map/MapStageComponent.js index 2cd0ed6e..7ca10792 100644 --- a/opendc-web/opendc-web-ui/src/components/app/map/MapStageComponent.js +++ b/opendc-web/opendc-web-ui/src/components/app/map/MapStageComponent.js @@ -1,6 +1,6 @@ import React from 'react' +import { HotKeys } from 'react-hotkeys' import { Stage } from 'react-konva' -import { Shortcuts } from 'react-shortcuts' import MapLayer from '../../../containers/app/map/layers/MapLayer' import ObjectHoverLayer from '../../../containers/app/map/layers/ObjectHoverLayer' import RoomHoverLayer from '../../../containers/app/map/layers/RoomHoverLayer' @@ -46,7 +46,6 @@ class MapStageComponent extends React.Component { } updateScale(e) { - e.preventDefault() this.props.zoomInOnPosition(e.deltaY < 0, this.state.mouseX, this.state.mouseY) } @@ -55,23 +54,11 @@ class MapStageComponent extends React.Component { this.setState({ mouseX: mousePos.x, mouseY: mousePos.y }) } - handleShortcuts(action) { - switch (action) { - case 'MOVE_LEFT': - this.moveWithDelta(MAP_MOVE_PIXELS_PER_EVENT, 0) - break - case 'MOVE_RIGHT': - this.moveWithDelta(-MAP_MOVE_PIXELS_PER_EVENT, 0) - break - case 'MOVE_UP': - this.moveWithDelta(0, MAP_MOVE_PIXELS_PER_EVENT) - break - case 'MOVE_DOWN': - this.moveWithDelta(0, -MAP_MOVE_PIXELS_PER_EVENT) - break - default: - break - } + handlers = { + MOVE_LEFT: () => this.moveWithDelta(MAP_MOVE_PIXELS_PER_EVENT, 0), + MOVE_RIGHT: () => this.moveWithDelta(-MAP_MOVE_PIXELS_PER_EVENT, 0), + MOVE_UP: () => this.moveWithDelta(0, MAP_MOVE_PIXELS_PER_EVENT), + MOVE_DOWN: () => this.moveWithDelta(0, -MAP_MOVE_PIXELS_PER_EVENT), } moveWithDelta(deltaX, deltaY) { @@ -80,7 +67,7 @@ class MapStageComponent extends React.Component { render() { return ( - <Shortcuts name="MAP" handler={this.handleShortcuts.bind(this)} targetNodeSelector="body"> + <HotKeys handlers={this.handlers}> <Stage ref={(stage) => { this.stage = stage @@ -95,7 +82,7 @@ class MapStageComponent extends React.Component { <ObjectHoverLayer mouseX={this.state.mouseX} mouseY={this.state.mouseY} /> </Provider> </Stage> - </Shortcuts> + </HotKeys> ) } } |
