From 9cc4dcf48fb2f5e2ca6f3fc159e9c8017012d2b1 Mon Sep 17 00:00:00 2001
From: Tim Mickel <tim.mickel@gmail.com>
Date: Thu, 20 Oct 2016 13:44:16 -0400
Subject: [PATCH] Fix id for selected item, return when CostumeCanvas draw
fails
---
src/components/costume-canvas.js | 3 +++
src/components/library.js | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/costume-canvas.js b/src/components/costume-canvas.js
index ac0646756..368d52a9b 100644
--- a/src/components/costume-canvas.js
+++ b/src/components/costume-canvas.js
@@ -25,6 +25,9 @@ class CostumeCanvas extends React.Component {
}
}
draw () {
+ if (!this.refs.costumeCanvas) {
+ return;
+ }
// Draw the costume to the rendered canvas.
const img = this.img;
const context = this.refs.costumeCanvas.getContext('2d');
diff --git a/src/components/library.js b/src/components/library.js
index 203c7aa5f..f301329ce 100644
--- a/src/components/library.js
+++ b/src/components/library.js
@@ -28,8 +28,8 @@ class LibraryComponent extends React.Component {
return <LibraryItem
name={dataItem.name}
iconURL={scratchURL}
- key={'item_' + itemId}
- selected={this.state.selectedItem == itemId}
+ key={'item_' + id}
+ selected={this.state.selectedItem == id}
onSelect={this.onSelect}
id={id} />;
});
--
GitLab