Make queueOfDialogs a non-observable array to fix crash in umd build …

…from embedded apps (#2469) Co-authored-by: Colin Diesh <colin.diesh@gmail.com>
GMOD · Nov 1, 2021 · d7ce8d6 · d7ce8d6
1 parent a9e7f59
commit d7ce8d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/products/jbrowse-react-circular-genome-view/src/createModel/createSessionModel.ts b/products/jbrowse-react-circular-genome-view/src/createModel/createSessionModel.ts
@@ -60,7 +60,7 @@ export default function sessionModelFactory(pluginManager: PluginManager) {
        */
       task: undefined,
 
-      queueOfDialogs: observable.array([] as [DialogComponentType, any][]),
+      queueOfDialogs: [] as [DialogComponentType, any][],
     }))
     .views(self => ({
       get DialogComponent() {
@@ -150,9 +150,12 @@ export default function sessionModelFactory(pluginManager: PluginManager) {
         callback: (doneCallback: Function) => [DialogComponentType, any],
       ): void {
         const [component, props] = callback(() => {
-          self.queueOfDialogs.shift()
+          this.removeActiveDialog()
         })
-        self.queueOfDialogs.push([component, props])
+        self.queueOfDialogs = [...self.queueOfDialogs, [component, props]]
+      },
+      removeActiveDialog() {
+        self.queueOfDialogs = self.queueOfDialogs.slice(1)
       },
       makeConnection(
         configuration: AnyConfigurationModel,

diff --git a/products/jbrowse-react-linear-genome-view/src/createModel/createSessionModel.ts b/products/jbrowse-react-linear-genome-view/src/createModel/createSessionModel.ts
@@ -62,7 +62,7 @@ export default function sessionModelFactory(pluginManager: PluginManager) {
        */
       task: undefined,
 
-      queueOfDialogs: observable.array([] as [DialogComponentType, any][]),
+      queueOfDialogs: [] as [DialogComponentType, any][],
     }))
     .views(self => ({
       get DialogComponent() {
@@ -155,9 +155,12 @@ export default function sessionModelFactory(pluginManager: PluginManager) {
         callback: (doneCallback: Function) => [DialogComponentType, any],
       ): void {
         const [component, props] = callback(() => {
-          self.queueOfDialogs.shift()
+          this.removeActiveDialog()
         })
-        self.queueOfDialogs.push([component, props])
+        self.queueOfDialogs = [...self.queueOfDialogs, [component, props]]
+      },
+      removeActiveDialog() {
+        self.queueOfDialogs = self.queueOfDialogs.slice(1)
       },
       makeConnection(
         configuration: AnyConfigurationModel,