uwap/mqtt-control-map
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Completely rework how icons work in mqtt control map

Browse source
This commit is contained in:
uwap 2018-06-24 16:34:59 +02:00
parent 8a37cf2c95
commit ed0f22645e
14 changed files with 216 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/ControlMap.js
View file

@ -4,7 +4,7 @@ import { Map, ImageOverlay, Marker, LayersControl } from "react-leaflet";
import { CRS, point, divIcon } from "leaflet";
import map from "lodash/map";
import mapValues from "lodash/mapValues";
import parseIconName, { controlGetIcon } from "utils/parseIconName";
import { toRawIcon } from "config/icon";
import type { Controls, Control } from "config/flowtypes";
@ -50,8 +50,8 @@ export default class ControlMap extends React.PureComponent<ControlMapProps> {
}
createLeafletIcon(control: Control) {
const icon = controlGetIcon(control, this.props.state);
const iconClass = parseIconName(`${icon} 36px`);
const icon = toRawIcon(control.icon, this.props.state);
const iconClass = `${icon} mdi-36px`;
return divIcon({
iconSize: point(36, 36),
iconAnchor: point(18, 18),