OHIF #83 Do not assign state reactive-dict to template data since template data is overwritten and previous state is lost when router is called multiple times

OHIFViewer/client/components/viewer/viewer.html

@@ -11,8 +11,8 @@
             {{>textEntryDialog}}
         </div>
         <div id="viewer">
-            {{>toolbarSection (clone this)}}
-            {{>flexboxLayout (clone this)}}
+            {{>toolbarSection (clone this state=state)}}
+            {{>flexboxLayout (clone this state=state)}}
         </div>
     {{else}}
         {{>loadingText}}

OHIFViewer/client/components/viewer/viewer.js

@@ -84,9 +84,9 @@ Template.viewer.onCreated(() => {
     // Define the OHIF.viewer.data global object
     OHIF.viewer.data = OHIF.viewer.data || Session.get('ViewerData') || {};
 
-    instance.data.state = new ReactiveDict();
-    instance.data.state.set('leftSidebar', Session.get('leftSidebar'));
-    instance.data.state.set('rightSidebar', Session.get('rightSidebar'));
+    instance.state = new ReactiveDict();
+    instance.state.set('leftSidebar', Session.get('leftSidebar'));
+    instance.state.set('rightSidebar', Session.get('rightSidebar'));
 
     if (OHIF.viewer.data && OHIF.viewer.data.loadedSeriesData) {
         OHIF.log.info('Reloading previous loadedSeriesData');
@@ -153,13 +153,19 @@ Template.viewer.onRendered(function() {
 Template.viewer.events({
     'click .js-toggle-studies'() {
         const instance = Template.instance();
-        const current = instance.data.state.get('leftSidebar');
-        instance.data.state.set('leftSidebar', !current);
+        const current = instance.state.get('leftSidebar');
+        instance.state.set('leftSidebar', !current);
     },
 
     'click .js-toggle-protocol-editor'() {
         const instance = Template.instance();
-        const current = instance.data.state.get('rightSidebar');
+        const current = instance.state.get('rightSidebar');
         instance.data.state.set('rightSidebar', !current);
     },
 });
+
+Template.viewer.helpers({
+    state() {
+        return Template.instance().state;
+    }
+});