Merge branch 'dev-grid-cards' of https://github.com/bigomics/omicspla…

…yground into dev-grid-cards
bigomics · Mar 20, 2023 · 2e2ac9c · 2e2ac9c
2 parents 50c2997 + 78e668a
commit 2e2ac9c
Showing 1 changed file with 37 additions and 43 deletions.
diff --git a/components/base/R/ui-PlotModule.R b/components/base/R/ui-PlotModule.R
@@ -241,48 +241,42 @@ PlotModuleUI <- function(id,
         caption <- shiny::HTML(caption)
         caption <- shiny::div(caption, class="caption")
     }
-    # div( class="plotmodule",
-    #     # shiny::fillCol(
-    #     #        flex = c(NA,1,NA,0.001,NA),
-
-        bslib::card(
-          full_screen = TRUE,
-          bslib::card_body_fill(
-                    class = "plotmodule",
-                    div( header, class="plotmodule-header"),
-                    outputFunc(ns("renderfigure")) %>%
-                      shinycssloaders::withSpinner(),
-                    caption,
-                    shiny::div(class="popup-modal",
-                                modalUI(
-                                      id = ns("plotPopup"),
-                                      title = title,
-                                      size = "fullscreen",
-                                      footer = NULL,
-                                      popupfigUI()
-                                  )
-                                ),
-                    shiny::div(class="popup-modal",
-                                modalUI(
-                                      id = ns("plotPopup_editor"),
-                                      title = "Editor",
-                                      size = "fullscreen",
-                                      footer = NULL,
-                                      popupfigUI_editor()
-                                  )
-                                ),
-                    shiny::tagList(
-                                shiny::tags$head(shiny::tags$style(modaldialog.style)),
-                                shiny::tags$head(shiny::tags$style(modalbody.style)),
-                                shiny::tags$head(shiny::tags$style(modalcontent.style)),
-                                shiny::tags$head(shiny::tags$style(modalfooter.none))
-                            )
-              ),
-              bslib::card_footer(shiny::HTML(info.text))
-
-
-
-        )
+    div(
+      class = "plotmodule",
+      bslib::card(
+        bslib::card_body_fill(
+                  div( header, class="plotmodule-header"),
+                  outputFunc(ns("renderfigure")) %>%
+                    shinycssloaders::withSpinner(),
+                  caption,
+                  shiny::div(class="popup-modal",
+                              modalUI(
+                                    id = ns("plotPopup"),
+                                    title = title,
+                                    size = "fullscreen",
+                                    footer = NULL,
+                                    popupfigUI()
+                                )
+                              ),
+                  shiny::div(class="popup-modal",
+                              modalUI(
+                                    id = ns("plotPopup_editor"),
+                                    title = "Editor",
+                                    size = "fullscreen",
+                                    footer = NULL,
+                                    popupfigUI_editor()
+                                )
+                              ),
+                  shiny::tagList(
+                              shiny::tags$head(shiny::tags$style(modaldialog.style)),
+                              shiny::tags$head(shiny::tags$style(modalbody.style)),
+                              shiny::tags$head(shiny::tags$style(modalcontent.style)),
+                              shiny::tags$head(shiny::tags$style(modalfooter.none))
+                          )
+            ),
+             bslib::card_footer(shiny::HTML(info.text))
+      )
+    )
 
 }
 
@@ -314,7 +308,7 @@ PlotModuleServer <- function(
       id,
       function(input, output, session) {
 
-        
+
 
           ns <- session$ns