Skip to content

Commit

Permalink
Allow esquisse_server() to be initialized with NULL without forcing…
Browse files Browse the repository at this point in the history
… the import module to appear using `import_from = NULL`, fix #232
  • Loading branch information
pvictor committed Nov 24, 2022
1 parent 5861cfe commit b06eb6c
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 27 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: esquisse
Type: Package
Title: Explore and Visualize Your Data Interactively
Version: 1.1.2.9010
Version: 1.1.2.9100
Authors@R: c(person("Fanny", "Meyer", role = c("aut")),
person("Victor", "Perrier", email = "[email protected]", role = c("aut", "cre")),
person("Ian", "Carroll", comment = "Faceting support", role = "ctb"),
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# esquisse 1.2.0

* Allow `esquisse_server()` to be initialized with NULL without forcing the import module to appear using `import_from = NULL` [#232](https://github.com/dreamRs/esquisse/issues/232)


# esquisse 1.1.2

* i18n: new translations added:
Expand Down
4 changes: 2 additions & 2 deletions R/esquisse-server.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#' @param default_aes Default aesthetics to be used, can be a `character`
#' vector or `reactive` function returning one.
#' @param import_from From where to import data, argument passed
#' to \code{\link[datamods:import-modal]{datamods::import_ui}}.
#' to [datamods::import_server()].
#'
#' @export
#'
Expand Down Expand Up @@ -85,7 +85,7 @@ esquisse_server <- function(id,
}, ignoreInit = FALSE)

# Launch import modal if no data at start
if (is.null(isolate(data_rv$data))) {
if (!is.null(import_from) && is.null(isolate(data_rv$data))) {
datamods::import_modal(
id = ns("import-data"),
from = import_from,
Expand Down
18 changes: 9 additions & 9 deletions man/dropInput.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions man/updateDropInput.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b06eb6c

Please sign in to comment.