From a2e5b66dc48265bbfd19a43ae03ca2e8c5a9de5b Mon Sep 17 00:00:00 2001
From: Colin <colin.diesh@gmail.com>
Date: Wed, 21 Aug 2024 15:58:00 -0400
Subject: [PATCH] Back with main

---
 .../app-core/src/ui/App/FloatingViewPanel.tsx |  1 -
 packages/app-core/src/ui/App/ViewPanel.tsx    | 70 +++++++++++++++++++
 .../app-core/src/ui/App/ViewsContainer.tsx    | 21 ++++--
 3 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 packages/app-core/src/ui/App/ViewPanel.tsx

diff --git a/packages/app-core/src/ui/App/FloatingViewPanel.tsx b/packages/app-core/src/ui/App/FloatingViewPanel.tsx
index 5521e1f8d8..1be7deb15e 100644
--- a/packages/app-core/src/ui/App/FloatingViewPanel.tsx
+++ b/packages/app-core/src/ui/App/FloatingViewPanel.tsx
@@ -41,7 +41,6 @@ const FloatingViewPanel = observer(function ({
     }
   }, [h, height])
 
-  console.log(view.floatingX, view.floatingY)
   return (
     <DraggableDialog zIndex={zIndex}>
       <ResizableBox
diff --git a/packages/app-core/src/ui/App/ViewPanel.tsx b/packages/app-core/src/ui/App/ViewPanel.tsx
new file mode 100644
index 0000000000..098065cd97
--- /dev/null
+++ b/packages/app-core/src/ui/App/ViewPanel.tsx
@@ -0,0 +1,70 @@
+import React, { Suspense } from 'react'
+import { ErrorBoundary } from 'react-error-boundary'
+import { observer } from 'mobx-react'
+
+// locals
+import {
+  getEnv,
+  AbstractViewModel,
+  SessionWithDrawerWidgets,
+} from '@jbrowse/core/util'
+import { SnackbarMessage } from '@jbrowse/core/ui/SnackbarModel'
+
+// ui elements
+import ErrorMessage from '@jbrowse/core/ui/ErrorMessage'
+import LoadingEllipses from '@jbrowse/core/ui/LoadingEllipses'
+import { MenuItem as JBMenuItem } from '@jbrowse/core/ui/Menu'
+
+// locals
+import ViewContainer from './ViewContainer'
+
+type AppSession = SessionWithDrawerWidgets & {
+  savedSessionNames: string[]
+  menus: {
+    label: string
+    menuItems: JBMenuItem[]
+  }[]
+  snackbarMessages: SnackbarMessage[]
+  renameCurrentSession: (arg: string) => void
+  popSnackbarMessage: () => unknown
+}
+
+const ViewPanel = observer(function ({
+  view,
+  session,
+}: {
+  view: AbstractViewModel
+  session: AppSession
+}) {
+  const { pluginManager } = getEnv(session)
+  const viewType = pluginManager.getViewType(view.type)
+  if (!viewType) {
+    throw new Error(`unknown view type ${view.type}`)
+  }
+  const { ReactComponent } = viewType
+  return (
+    <ViewContainer
+      view={view}
+      onClose={() => {
+        session.removeView(view)
+      }}
+      onMinimize={() => {
+        view.setMinimized(!view.minimized)
+      }}
+    >
+      {!view.minimized ? (
+        <ErrorBoundary
+          FallbackComponent={({ error }) => <ErrorMessage error={error} />}
+        >
+          <Suspense fallback={<LoadingEllipses variant="h6" />}>
+            <ReactComponent model={view} session={session} />
+          </Suspense>
+        </ErrorBoundary>
+      ) : (
+        false
+      )}
+    </ViewContainer>
+  )
+})
+
+export default ViewPanel
diff --git a/packages/app-core/src/ui/App/ViewsContainer.tsx b/packages/app-core/src/ui/App/ViewsContainer.tsx
index caafdc9bc2..ff23713c0c 100644
--- a/packages/app-core/src/ui/App/ViewsContainer.tsx
+++ b/packages/app-core/src/ui/App/ViewsContainer.tsx
@@ -7,7 +7,8 @@ import { MenuItem as JBMenuItem } from '@jbrowse/core/ui/Menu'
 
 // locals
 import ViewLauncher from './ViewLauncher'
-import ViewPanel from './ViewPanel'
+import FloatingViewPanel from './FloatingViewPanel'
+import StaticViewPanel from './StaticViewPanel'
 
 const useStyles = makeStyles()({
   viewsContainer: {
@@ -34,9 +35,21 @@ const ViewsContainer = observer(function ViewsContainer(props: Props) {
   return (
     <div className={classes.viewsContainer}>
       {views.length > 0 ? (
-        views.map(view => (
-          <ViewPanel key={`view-${view.id}`} view={view} session={session} />
-        ))
+        views.map(view =>
+          view.isFloating ? (
+            <FloatingViewPanel
+              key={`view-${view.id}`}
+              view={view}
+              session={session}
+            />
+          ) : (
+            <StaticViewPanel
+              key={`view-${view.id}`}
+              view={view}
+              session={session}
+            />
+          ),
+        )
       ) : (
         <ViewLauncher {...props} />
       )}