simplify controls lims

dreamRs · Apr 16, 2024 · a9f4820 · a9f4820
1 parent 993d678
commit a9f4820
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/R/esquisse-server.R b/R/esquisse-server.R
@@ -262,12 +262,6 @@ esquisse_server <- function(id,
             scales_args <- c(scales_args, list(y_continuous = controls_rv$transY$args))
           }
 
-          xlim <- if (isTRUE(controls_rv$limits$x)) {
-            controls_rv$limits$xlim
-          }
-          ylim <- if (isTRUE(controls_rv$limits$y)) {
-            controls_rv$limits$ylim
-          }
           data_name <- data_chart$name %||% "data"
           gg_call <- ggcall(
             data = data_name,
@@ -284,8 +278,8 @@ esquisse_server <- function(id,
             facet_row = aes_r()$facet_row,
             facet_col = aes_r()$facet_col,
             facet_args = controls_rv$facet,
-            xlim = xlim,
-            ylim = ylim
+            xlim = controls_rv$limits$xlim,
+            ylim = controls_rv$limits$ylim
           )
 
           ggplotCall$code <- deparse2(gg_call)

diff --git a/R/module-controls-axes.R b/R/module-controls-axes.R
@@ -119,10 +119,8 @@ controls_axes_server <- function(id,
 
       limits_r <- reactive({
         list(
-          x = use_transX() & !anyNA(input$xlim),
-          xlim = input$xlim,
-          y = use_transY() & !anyNA(input$ylim),
-          ylim = input$ylim
+          xlim = if (use_transX() & !anyNA(input$xlim)) input$xlim,
+          ylim = if (use_transY() & !anyNA(input$ylim)) input$ylim
         )
       })