Skip to content
Snippets Groups Projects
Commit cd47f89e authored by DD Liu's avatar DD Liu
Browse files

switch to ordered map of monitor records

parent 9f4988a4
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ const React = require('react'); ...@@ -2,7 +2,7 @@ const React = require('react');
const Box = require('../box/box.jsx'); const Box = require('../box/box.jsx');
const Monitor = require('../../containers/monitor.jsx'); const Monitor = require('../../containers/monitor.jsx');
const PropTypes = require('prop-types'); const PropTypes = require('prop-types');
const {Map} = require('immutable'); const {OrderedMap} = require('immutable');
const styles = require('./monitor-list.css'); const styles = require('./monitor-list.css');
...@@ -13,12 +13,12 @@ const MonitorList = props => ( ...@@ -13,12 +13,12 @@ const MonitorList = props => (
> >
{props.monitors.valueSeq().map(monitorData => ( {props.monitors.valueSeq().map(monitorData => (
<Monitor <Monitor
color={monitorData.get('color')} color={monitorData.color}
key={monitorData.get('id')} key={monitorData.id}
label={monitorData.get('label')} label={monitorData.label}
value={monitorData.get('value')} value={monitorData.value}
x={monitorData.get('x')} x={monitorData.x}
y={monitorData.get('y')} y={monitorData.y}
onDragEnd={props.onMonitorChange} onDragEnd={props.onMonitorChange}
/> />
))} ))}
...@@ -26,7 +26,7 @@ const MonitorList = props => ( ...@@ -26,7 +26,7 @@ const MonitorList = props => (
); );
MonitorList.propTypes = { MonitorList.propTypes = {
monitors: PropTypes.instanceOf(Map), monitors: PropTypes.instanceOf(OrderedMap),
onMonitorChange: PropTypes.func.isRequired onMonitorChange: PropTypes.func.isRequired
}; };
......
const UPDATE_MONITORS = 'scratch-gui/monitors/UPDATE_MONITORS'; const UPDATE_MONITORS = 'scratch-gui/monitors/UPDATE_MONITORS';
const {Map} = require('immutable'); const {OrderedMap} = require('immutable');
const initialState = Map(); const initialState = OrderedMap();
const reducer = function (state, action) { const reducer = function (state, action) {
if (typeof state === 'undefined') state = initialState; if (typeof state === 'undefined') state = initialState;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment