DataEditR v0.1.1.

DillonHammill · May 10, 2021 · 0f48c9b · 0f48c9b
1 parent f0e0945
commit 0f48c9b
Show file tree

Hide file tree

Showing 21 changed files with 66 additions and 32 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: DataEditR
 Title: An Interactive Editor for Viewing, Entering, Filtering & Editing Data
-Version: 0.1.0
-Date: 2020-12-17
+Version: 0.1.1
+Date: 2021-05-10
 Authors@R: 
     person(given = "Dillon",
            family = "Hammill",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# DataEditR 0.1.1
+
+* Ensure `dataInput()` searches for data outside `data_edit()`.
+* Prevent loading of highlighted data object in RStudio when data has been supplied to `data_edit()` directly.
+
 # DataEditR 0.1.0
 
 * Make the switch to GitHub Actions for continuous integration.

diff --git a/R/dataInput.R b/R/dataInput.R
@@ -16,6 +16,8 @@
 #'   \code{read_fun} when reading in files.
 #' @param hide logical indicating whether the data input user interface should
 #'   be hidden from the user, set to FALSE by default.
+#' @param envir the environment in which to search for the supplied data, set to
+#'   the \code{parent.frame()} of \code{dataInput} by default.
 #'
 #' @importFrom shiny fluidRow splitLayout textInput fileInput NS moduleServer
 #'   reactive updateTextInput observeEvent eventReactive
@@ -89,7 +91,8 @@ dataInputServer <- function(id,
                             data = NULL,
                             read_fun = "read.csv",
                             read_args = NULL,
-                            hide = FALSE) {
+                            hide = FALSE,
+                            envir = parent.frame()) {
 
   # SERVER
   moduleServer(id, function(input,
@@ -148,7 +151,8 @@ dataInputServer <- function(id,
     # DATA INPUT
     data_input <- eventReactive(input$data, {
       tryCatch(
-        eval(parse(text = input$data)),
+        eval(parse(text = input$data),
+             envir = envir),
         error = function(e) {
           return(NULL)
         }

diff --git a/R/data_edit.R b/R/data_edit.R
@@ -154,11 +154,16 @@ data_edit <- function(x = NULL,
                       code = FALSE,
                       ...) {
 
+  # DATA ENVIRONMENT -----------------------------------------------------------
+
+  # SEARCH DATA OUTSIDE DATA_EDIT
+  envir <- parent.frame()
+
   # PREPARE DATA ---------------------------------------------------------------
 
   # RSTUDIO ADDIN/DATA
   context <- getActiveDocumentContext()
-  if(nzchar(context$selection[[1]]$text)) {
+  if(is.null(x) & nzchar(context$selection[[1]]$text)) {
     data <- context$selection[[1]]$text
   } else {
     if(!is.null(dim(x))) {
@@ -280,7 +285,8 @@ data_edit <- function(x = NULL,
                                   data = data,
                                   read_fun = read_fun,
                                   read_args = read_args,
-                                  hide = hide)
+                                  hide = hide,
+                                  envir = envir) # search in parent frame
 
     # RESET FILTERS
     observeEvent(data_input(), {

diff --git a/README.md b/README.md
@@ -132,17 +132,17 @@ citation("DataEditR")
 #> 
 #> To cite package 'DataEditR' in publications use:
 #> 
-#>   Dillon Hammill (2020). DataEditR: An Interactive Editor for Viewing,
-#>   Entering, Filtering & Editing Data. R package version 0.1.0.
+#>   Dillon Hammill (2021). DataEditR: An Interactive Editor for Viewing,
+#>   Entering, Filtering & Editing Data. R package version 0.1.1.
 #>   https://github.com/DillonHammill/DataEditR
 #> 
 #> A BibTeX entry for LaTeX users is
 #> 
 #>   @Manual{,
 #>     title = {DataEditR: An Interactive Editor for Viewing, Entering, Filtering & Editing Data},
 #>     author = {Dillon Hammill},
-#>     year = {2020},
-#>     note = {R package version 0.1.0},
+#>     year = {2021},
+#>     note = {R package version 0.1.1},
 #>     url = {https://github.com/DillonHammill/DataEditR},
 #>   }
 ```
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/articles/DataEditR.html b/docs/articles/DataEditR.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 1.6.1
 pkgdown_sha: ~
 articles:
   DataEditR: DataEditR.html
-last_built: 2020-12-17T06:38Z
+last_built: 2021-05-10T03:12Z
 
diff --git a/docs/reference/dataEdit.html b/docs/reference/dataEdit.html
diff --git a/docs/reference/dataFilter.html b/docs/reference/dataFilter.html
diff --git a/docs/reference/dataInput.html b/docs/reference/dataInput.html
diff --git a/docs/reference/dataOutput.html b/docs/reference/dataOutput.html
diff --git a/docs/reference/dataSelect.html b/docs/reference/dataSelect.html
diff --git a/docs/reference/data_edit.html b/docs/reference/data_edit.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/man/dataInput.Rd b/man/dataInput.Rd