Merge branch 'input-binding' of github.com:react-R/reactR into input-binding

Author: alandipert

.gitignore

@@ -9,3 +9,4 @@ node_modules
 reactR.Rcheck
 reactR_*.tar.gz
 *.swp
+.DS_Store

R/reacttools.R

@@ -1,3 +1,9 @@
+# A robust name string is a valid
+# - CSS class
+# - JavaScript variable name
+# - R variable name
+robustName <- "^[[:alpha:]_][[:alnum:]_]*$"
+
 isUpper <- function(s) {
   grepl("^[[:upper:]]+$", s)
 }

R/scaffold_input.R

@@ -68,9 +68,9 @@ scaffoldReactShinyInput <- function(name, npmPkgs = NULL, edit = interactive())
     )
   )
 
-  usethis::use_build_ignore(c("node_modules", "srcjs"))
+  usethis::use_build_ignore(c("node_modules", "srcjs", "app.R", "package.json", "webpack.config.js", "yarn.lock"))
   usethis::use_git_ignore(c("node_modules"))
-  lapply(c("htmltools", "htmlwidgets", "reactR"), usethis::use_package)
+  lapply(c("htmltools", "shiny", "reactR"), usethis::use_package)
 
   message("To install dependencies from npm run: yarn install")
   message("To build JavaScript run: yarn run webpack --mode=development")

R/scaffold_utils.R

@@ -53,14 +53,10 @@ getPackage <- function() {
   read.dcf('DESCRIPTION')[[1,"Package"]]
 }
 
-validName <- function(name) {
-  grepl("^[[:alpha:]_][[:alnum:]_]*$", name)
-}
-
 # Constraining names prevents the user from encountering obscure CSS problems
 # and JavaScript errors after scaffolding.
 assertNameValid <- function(name) {
-  if (!validName(name)) {
+  if (!grepl(robustName, name)) {
     msg <- sprintf("Name '%s' is invalid, names must begin with an alphabetic character and must contain only alphabetic and numeric characters", name)
     stop(msg, call. = FALSE)
   }

R/scaffold_widget.R

@@ -26,7 +26,7 @@ scaffoldReactWidget <- function(name, npmPkgs = NULL, edit = interactive()){
   addWidgetJS(name, edit)
   addExampleApp(name)
 
-  usethis::use_build_ignore(c("node_modules", "srcjs"))
+  usethis::use_build_ignore(c("node_modules", "srcjs", "app.R", "package.json", "webpack.config.js", "yarn.lock"))
   usethis::use_git_ignore(c("node_modules"))
   lapply(c("htmltools", "htmlwidgets", "reactR"), usethis::use_package)
 

inst/www/react-tools/react-tools.js

@@ -120,9 +120,9 @@ devtools::document()
 devtools::install(quick = TRUE)
 ```
 
-In RStudio, you can use the keyboard shortcuts `Ctrl+Shift+D` and
+In RStudio, you can use the keyboard shortcuts `Ctrl-Shift-D` and
 `Ctrl-Shift-B` to document and build the package. (On macOS, the shortcuts are
-`Cmd+Shift+D` and `Cmd+Shift+B`)
+`Cmd-Shift-D` and `Cmd-Shift-B`)
 
 ## Run the included demo
 
@@ -235,7 +235,9 @@ package.
 After rebuilding the JavaScript and the package, try running `app.R` again. You
 should see something like this:
 
-![](./input_sketchpicker.gif)
+<video autoplay muted>
+  <source src="./input_sketchpicker.mp4"/>
+</video>
 
 When you select new colors, you should see the `textOutput` update accordingly.