From b72f6d483faa3343f8e63cef077306eca67b7ee8 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Fri, 30 Oct 2020 12:01:46 +1100
Subject: [PATCH] Added null checks to token menu state changes

---
 src/components/token/TokenMenu.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/token/TokenMenu.js b/src/components/token/TokenMenu.js
index fc901b6..bf9679e 100644
--- a/src/components/token/TokenMenu.js
+++ b/src/components/token/TokenMenu.js
@@ -49,10 +49,14 @@ function TokenMenu({
 
   function handleLabelChange(event) {
     const label = event.target.value;
-    onTokenStateChange({ [tokenState.id]: { ...tokenState, label: label } });
+    tokenState &&
+      onTokenStateChange({ [tokenState.id]: { ...tokenState, label: label } });
   }
 
   function handleStatusChange(status) {
+    if (!tokenState) {
+      return;
+    }
     const statuses = tokenState.statuses;
     let newStatuses = [];
     if (statuses.includes(status)) {
@@ -67,26 +71,30 @@ function TokenMenu({
 
   function handleSizeChange(event) {
     const newSize = parseInt(event.target.value);
-    onTokenStateChange({ [tokenState.id]: { ...tokenState, size: newSize } });
+    tokenState &&
+      onTokenStateChange({ [tokenState.id]: { ...tokenState, size: newSize } });
   }
 
   function handleRotationChange(event) {
     const newRotation = parseInt(event.target.value);
-    onTokenStateChange({
-      [tokenState.id]: { ...tokenState, rotation: newRotation },
-    });
+    tokenState &&
+      onTokenStateChange({
+        [tokenState.id]: { ...tokenState, rotation: newRotation },
+      });
   }
 
   function handleVisibleChange() {
-    onTokenStateChange({
-      [tokenState.id]: { ...tokenState, visible: !tokenState.visible },
-    });
+    tokenState &&
+      onTokenStateChange({
+        [tokenState.id]: { ...tokenState, visible: !tokenState.visible },
+      });
   }
 
   function handleLockChange() {
-    onTokenStateChange({
-      [tokenState.id]: { ...tokenState, locked: !tokenState.locked },
-    });
+    tokenState &&
+      onTokenStateChange({
+        [tokenState.id]: { ...tokenState, locked: !tokenState.locked },
+      });
   }
 
   function handleModalContent(node) {