fix: uirender uses semantic.assets.

Appsilon · Dec 22, 2023 · d88aafb · d88aafb
1 parent d0ded2c
commit d88aafb
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 53 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: shiny.semantic
 Type: Package
 Title: Semantic UI Support for Shiny
-Version: 0.4.3.9001
+Version: 0.4.3.9002
 Authors@R: c(person("Filip", "Stachura", email = "filip@appsilon.com", role = "aut"),
   person("Dominik", "Krzeminski", email = "dominik@appsilon.com", role = "aut"),
   person("Krystian", "Igras", email = "krystian@appsilon.com", role = "aut"),
@@ -40,7 +40,7 @@ Imports:
     grDevices,
     glue,
     R6,
-    semantic.assets
+    semantic.assets (>= 1.1.0)
 Suggests:
     dplyr,
     tibble,

diff --git a/NEWS.md b/NEWS.md
@@ -6,6 +6,8 @@
 
 - Remove unnecessary warning in `checkboxInput` when `width` is set to `NULL`.
 
+- `uirender` uses assets from `semantic.assets`.
+
 # [shiny.semantic 0.4.3](https://github.com/Appsilon/shiny.semantic/releases/tag/0.4.3)
 
 - Removed inline-styled min-height from `<body>`.

diff --git a/R/uirender.R b/R/uirender.R
@@ -5,7 +5,7 @@
 #'
 #' @import htmlwidgets
 #'
-#' @param ui UI, which will be wraped in an htmlwidget.
+#' @param ui UI, which will be wrapped in an htmlwidget.
 #' @param width Fixed width for widget (in css units). The default is NULL,
 #' which results in intelligent automatic sizing.
 #' @param height Fixed height for widget (in css units). The default is NULL,
@@ -15,27 +15,18 @@
 #' @examples
 #' library(shiny)
 #' library(shiny.semantic)
-#' uirender(card(div(class="content",
-#'                   div(class="header", "Elliot Fu"),
-#'                   div(class="meta", "Friend"),
-#'                   div(class="description", "Elliot Fu is a film-maker from New York."))))
+#' uirender(
+#'   card(
+#'     div(
+#'       class="content",
+#'       div(class="header", "Elliot Fu"),
+#'       div(class="meta", "Friend"),
+#'       div(class="description", "Elliot Fu is a film-maker from New York.")
+#'     )
+#'   )
+#' )
 #'
 #' @export
 uirender <- function(ui, width = NULL, height = NULL, element_id = NULL) {
-
-  # forward options using x
-  args <- list(
-    ui = toString(ui),
-    shiny_custom_semantic = get_dependencies_path()$src[[1]]
-  )
-
-  # create widget
-  htmlwidgets::createWidget(
-    name = "uirender",
-    args,
-    width = width,
-    height = height,
-    package = "shiny.semantic",
-    elementId = element_id
-  )
+  semantic.assets::uirender(ui, width = width, height = height, element_id = element_id)
 }
diff --git a/examples/uirender/uirender.Rmd b/examples/uirender/uirender.Rmd
@@ -0,0 +1,24 @@
+---
+title: "Test renderui"
+output: html_document
+---
+
+```{r setup, include=FALSE}
+knitr::opts_chunk$set(echo = TRUE)
+
+library(shiny)
+library(shiny.semantic)
+```
+
+```{r}
+uirender(
+  card(
+    div(
+      class = "content",
+      div(class = "header", "Elliot Fu"),
+      div(class = "meta", "Friend"),
+      div(class = "description", "Elliot Fu is a film-maker from New York.")
+    )
+  )
+)
+```
diff --git a/inst/htmlwidgets/uirender.js b/inst/htmlwidgets/uirender.js
diff --git a/inst/htmlwidgets/uirender.yaml b/inst/htmlwidgets/uirender.yaml
diff --git a/man/uirender.Rd b/man/uirender.Rd