From cd47f89ef61736b6a05ead1d0ff822192ed85798 Mon Sep 17 00:00:00 2001
From: DD Liu <liudi@media.mit.edu>
Date: Wed, 24 May 2017 15:46:41 -0400
Subject: [PATCH] switch to ordered map of monitor records
---
src/components/monitor-list/monitor-list.jsx | 16 ++++++++--------
src/reducers/monitors.js | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/components/monitor-list/monitor-list.jsx b/src/components/monitor-list/monitor-list.jsx
index 32090070e..cc6a53e93 100644
--- a/src/components/monitor-list/monitor-list.jsx
+++ b/src/components/monitor-list/monitor-list.jsx
@@ -2,7 +2,7 @@ const React = require('react');
const Box = require('../box/box.jsx');
const Monitor = require('../../containers/monitor.jsx');
const PropTypes = require('prop-types');
-const {Map} = require('immutable');
+const {OrderedMap} = require('immutable');
const styles = require('./monitor-list.css');
@@ -13,12 +13,12 @@ const MonitorList = props => (
>
{props.monitors.valueSeq().map(monitorData => (
<Monitor
- color={monitorData.get('color')}
- key={monitorData.get('id')}
- label={monitorData.get('label')}
- value={monitorData.get('value')}
- x={monitorData.get('x')}
- y={monitorData.get('y')}
+ color={monitorData.color}
+ key={monitorData.id}
+ label={monitorData.label}
+ value={monitorData.value}
+ x={monitorData.x}
+ y={monitorData.y}
onDragEnd={props.onMonitorChange}
/>
))}
@@ -26,7 +26,7 @@ const MonitorList = props => (
);
MonitorList.propTypes = {
- monitors: PropTypes.instanceOf(Map),
+ monitors: PropTypes.instanceOf(OrderedMap),
onMonitorChange: PropTypes.func.isRequired
};
diff --git a/src/reducers/monitors.js b/src/reducers/monitors.js
index 80cf3a2fb..e21e67a01 100644
--- a/src/reducers/monitors.js
+++ b/src/reducers/monitors.js
@@ -1,7 +1,7 @@
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) {
if (typeof state === 'undefined') state = initialState;
--
GitLab