From 3bd5abfc264c075f3ca22b8a9ea8ea9336cda2ca Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Wed, 9 May 2018 09:59:44 -0400
Subject: [PATCH] Consume mode info from the VM
---
src/components/monitor-list/monitor-list.jsx | 3 +++
src/containers/monitor.jsx | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/monitor-list/monitor-list.jsx b/src/components/monitor-list/monitor-list.jsx
index dd87ee7b4..4a16a9129 100644
--- a/src/components/monitor-list/monitor-list.jsx
+++ b/src/components/monitor-list/monitor-list.jsx
@@ -16,10 +16,13 @@ const MonitorList = props => (
<Monitor
id={monitorData.id}
key={monitorData.id}
+ mode={monitorData.mode}
opcode={monitorData.opcode}
params={monitorData.params}
spriteName={monitorData.spriteName}
value={monitorData.value}
+ x={monitorData.x}
+ y={monitorData.y}
onDragEnd={props.onMonitorChange}
/>
))}
diff --git a/src/containers/monitor.jsx b/src/containers/monitor.jsx
index 807a33c4b..3e75f9ae1 100644
--- a/src/containers/monitor.jsx
+++ b/src/containers/monitor.jsx
@@ -19,9 +19,9 @@ class Monitor extends React.Component {
'setElement'
]);
- // @todo this eventually will be stored in the VM
+ // @todo consume from VM, but need to store until there are APIs to update vm
this.state = {
- type: 'default'
+ type: props.mode
};
}
componentDidMount () {
@@ -101,6 +101,7 @@ class Monitor extends React.Component {
Monitor.propTypes = {
addMonitorRect: PropTypes.func.isRequired,
id: PropTypes.string.isRequired,
+ mode: PropTypes.oneOf(['default', 'slider', 'large', 'list']),
monitorLayout: PropTypes.shape({
monitors: PropTypes.object,
savedMonitorPositions: PropTypes.object
--
GitLab