From 913b4787a1406518322ce320a3b1fa279c0e1efd Mon Sep 17 00:00:00 2001
From: Helene Rigner <hvs@qlik.com>
Date: Wed, 20 Feb 2019 13:40:59 +0100
Subject: [PATCH] Fixing problem with fake forceUpdate not updating with latest
 React versions

---
 src/components/cube.jsx            | 4 ++--
 src/components/cubes.jsx           | 4 ++--
 src/components/hypercube-table.jsx | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/cube.jsx b/src/components/cube.jsx
index 6597615e..2729761f 100644
--- a/src/components/cube.jsx
+++ b/src/components/cube.jsx
@@ -20,13 +20,13 @@ export default function Cube({ app, tableData: { initialColumns }, closeOnClickO
     }
     addOpen.current = false;
     columnToReplace.current = null;
-    forceUpdate();
+    forceUpdate(Date.now());
   }
 
   function openAdd() {
     currentHeader.current.classList.add('active');
     addOpen.current = true;
-    forceUpdate();
+    forceUpdate(Date.now());
   }
 
   function toggleAdd(e) {
diff --git a/src/components/cubes.jsx b/src/components/cubes.jsx
index 9d5306b9..fc5b7f60 100644
--- a/src/components/cubes.jsx
+++ b/src/components/cubes.jsx
@@ -30,7 +30,7 @@ export function Cubes({ app, closeOnClickOutside }) {
       ]);
     }
     addOpen.current = false;
-    forceUpdate();
+    forceUpdate(Date.now());
   }
 
   function removeCube(id) {
@@ -39,7 +39,7 @@ export function Cubes({ app, closeOnClickOutside }) {
 
   function openColumnChooser() {
     addOpen.current = true;
-    forceUpdate();
+    forceUpdate(Date.now());
   }
 
   const popup = addOpen.current ? <CubeColumnChooser arrowStyle="arrowRight" alignTo={addButtonRef.current} selectableColumns={selectableColumns} chooseColumn={column => addCube(column)} closeOnClickOutside={closeOnClickOutside} /> : null;
diff --git a/src/components/hypercube-table.jsx b/src/components/hypercube-table.jsx
index ba3c33fa..e8e1349c 100644
--- a/src/components/hypercube-table.jsx
+++ b/src/components/hypercube-table.jsx
@@ -165,7 +165,9 @@ export default function HypercubeTable({
   const hypercubeProps = createProperties(dimensions, measures);
   const model = useModel(app, hypercubeProps);
   const layout = useLayout(model);
-
+  if (!model) {
+    return null;
+  }
   const calculatedWidth = getTotalTableWidth(layout, dimensions, measures);
   if (layout && calculatedWidth > 0) {
     return (