manage autonumeric.js with packer

dreamRs · Sep 9, 2022 · fd23d25 · fd23d25
1 parent 6a41dcf
commit fd23d25
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 26 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: shinyWidgets
 Title: Custom Inputs Widgets for Shiny
-Version: 0.7.3.9000
+Version: 0.7.3.9100
 Authors@R: c(
   person("Victor", "Perrier", email = "[email protected]", role = c("aut", "cre", "cph")),
   person("Fanny", "Meyer", role = "aut"),

diff --git a/R/dependencies.R b/R/dependencies.R
@@ -454,9 +454,8 @@ html_dependency_autonumeric <- function() {
   htmlDependency(
     name = "autonumeric",
     version = "4.6.0",
-    package = "shinyWidgets",
-    src = c(href = "shinyWidgets/autonumeric", file = "assets/autonumeric"),
-    script = "autoNumeric.min.js"
+    src = c(file = system.file("packer", package = "shinyWidgets")),
+    script = "autonumeric.js"
   )
 }
 

diff --git a/R/input-autonumeric.R b/R/input-autonumeric.R
@@ -112,7 +112,6 @@ currencyInput <- function(inputId, label, value, format = "euro",
         json_verbatim = TRUE
       )
     ),
-    html_dependency_shinyWidgets(),
     html_dependency_autonumeric()
   )
 }
@@ -511,7 +510,6 @@ autonumericInput <- function(inputId, label, value,
       `data-for` = inputId,
       data
     ),
-    html_dependency_shinyWidgets(),
     html_dependency_autonumeric()
   )
 }

diff --git a/inst/assets/autonumeric/autoNumeric.min.js b/inst/assets/autonumeric/autoNumeric.min.js
diff --git a/inst/assets/shinyWidgets-bindings.min.js b/inst/assets/shinyWidgets-bindings.min.js
diff --git a/inst/packer/autonumeric.js b/inst/packer/autonumeric.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
   "homepage": "https://github.com/dreamRs/shinyWidgets#readme",
   "devDependencies": {
     "air-datepicker": "^3.2.1",
+    "autonumeric": "^4.6.0",
     "css-loader": "^6.5.1",
     "dayjs": "^1.11.4",
     "dayjs-plugin-utc": "^0.1.2",

diff --git a/srcjs/config/entry_points.json b/srcjs/config/entry_points.json
@@ -1,5 +1,6 @@
 {
   "virtual-select": "./srcjs/inputs/virtual-select.js",
   "air-datepicker": "./srcjs/inputs/air-datepicker.js",
-  "multi": "./srcjs/inputs/multi.js"
+  "multi": "./srcjs/inputs/multi.js",
+  "autonumeric": "./srcjs/inputs/autonumeric.js"
 }
diff --git a/...ssets/autonumeric/autonumeric-bindings.js → srcjs/inputs/autonumeric.js b/...ssets/autonumeric/autonumeric-bindings.js → srcjs/inputs/autonumeric.js
@@ -1,9 +1,7 @@
-/*jshint
-  jquery:true
-*/
-/*global AutoNumeric, Shiny */
+import $ from "jquery";
+import "shiny";
+import AutoNumeric from "autonumeric";
 
-// Autonumeric Input Binding
 Shiny.InputBinding.prototype.store = [];
 Shiny.InputBinding.prototype.updateStore = function(el, instance) {
   this.store[el.id] = instance;

diff --git a/tests/testthat/test-autonumeric.R b/tests/testthat/test-autonumeric.R
@@ -20,11 +20,9 @@ test_that("default", {
   )
 
   expect_is(tagauto, "shiny.tag")
-  expect_length(htmltools::findDependencies(tagauto), 2)
-  expect_identical(htmltools::findDependencies(tagauto)[[2]]$script, "autoNumeric.min.js")
+  expect_length(htmltools::findDependencies(tagauto), 1)
   expect_true(htmltools::tagHasAttribute(tagauto$children[[2]], "id"))
   expect_identical(htmltools::tagGetAttribute(tagauto$children[[2]], "id"), "id1")
-  expect_identical(tagauto$children[[5]]$name, "autonumeric")
 })
 
 
@@ -75,11 +73,9 @@ test_that("default", {
   )
 
   expect_is(tagauto, "shiny.tag")
-  expect_length(htmltools::findDependencies(tagauto), 2)
-  expect_identical(htmltools::findDependencies(tagauto)[[2]]$script, "autoNumeric.min.js")
+  expect_length(htmltools::findDependencies(tagauto), 1)
   expect_true(htmltools::tagHasAttribute(tagauto$children[[2]], "id"))
   expect_identical(htmltools::tagGetAttribute(tagauto$children[[2]], "id"), "id1")
-  expect_identical(tagauto$children[[5]]$name, "autonumeric")
 })