Merge pull request #164 from Appsilon/develop

Version 0.3.0

Author: galachad

.Rbuildignore

@@ -12,3 +12,5 @@
 ^readme_assets$
 ^docs$
 ^examples$
+^index.html$
+^README.md$

.gitattributes

@@ -0,0 +1,4 @@
+/inst/www/shared/semantic/semantic.js -merge -diff
+/inst/www/shared/semantic/semantic.css -merge -diff
+*.min.js -merge -diff
+*.min.css -merge -diff

.github/workflows/main.yml

@@ -0,0 +1,70 @@
+on: push
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+        - { os: windows-latest, r: '3.6'}
+        - { os: macOS-latest, r: '3.6'}
+        - { os: ubuntu-18.04, r: '3.4', cran: "https://demo.rstudiopm.com/all/__linux__/bionic/latest"}
+        - { os: ubuntu-18.04, r: '3.5', cran: "https://demo.rstudiopm.com/all/__linux__/bionic/latest"}
+        - { os: ubuntu-18.04, r: '3.6', cran: "https://demo.rstudiopm.com/all/__linux__/bionic/latest"}
+
+    env:
+      R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
+      CRAN: ${{ matrix.config.cran }}
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: r-lib/actions/setup-r@master
+        with:
+          r-version: ${{ matrix.config.r }}
+
+      - uses: r-lib/actions/setup-pandoc@master
+
+      - name: Query dependencies
+        run: Rscript -e "install.packages('remotes')" -e "saveRDS(remotes::dev_package_deps(dependencies = TRUE), 'depends.Rds', version = 2)"
+
+      - name: Cache R packages
+        if: runner.os != 'Windows'
+        uses: actions/cache@v1
+        with:
+          path: ${{ env.R_LIBS_USER }}
+          key: ${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
+          restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-
+
+      - name: Install system dependencies
+        if: runner.os == 'Linux'
+        env:
+          RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
+        run: |
+          Rscript -e "remotes::install_github('r-hub/sysreqs')"
+          sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
+          sudo -s eval "$sysreqs"
+
+      - name: Install dependencies
+        run: Rscript -e "library(remotes)" -e "update(readRDS('depends.Rds'))" -e "remotes::install_cran('rcmdcheck')"
+
+      - name: Check
+        run: Rscript -e "rcmdcheck::rcmdcheck(args = c('--no-manual', '--as-cran'), error_on = 'error', check_dir = 'check')"
+
+      - name: Upload check results
+        if: failure()
+        uses: actions/upload-artifact@master
+        with:
+          name: ${{ runner.os }}-r${{ matrix.config.r }}-results
+          path: check
+
+      - name: Test coverage
+        if: matrix.config.os == 'macOS-latest' && matrix.config.r == '3.6'
+        run: |
+          Rscript -e 'covr::codecov(token = "${{secrets.CODECOV_TOKEN}}")'

.lintr

@@ -1,6 +1,25 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.3.0]
+
+- Migrate to fomantic 2.8.3
+
+- checkbox_ui was completely removed. Use simple_checkbox instead.
+
+- slider_input was removed
+
+- shiny.custom.semantic.cdn options introduced to get dependencies from custom location.
+
+- added semantic modal
+
+- updated slider
+
+- added calendar
+
+## [0.2.4]
+### Added
+-  shiny.custom.semantic.cdn options introduced to get dependencies from custom location.
 
 ## [0.1.2]
 ### Added

.travis.yml

@@ -1,11 +1,12 @@
 Package: shiny.semantic
 Type: Package
 Title: Semantic UI Support for Shiny
-Version: 0.2.4
-Authors@R: c(person("Filip", "Stachura", email = "[email protected]",
-  role = "aut"),
-  person("Dominik", "Krzeminski", email = "[email protected]",
-  role = "cre"))
+Version: 0.3.0
+Authors@R: c(person("Filip", "Stachura", email = "[email protected]", role = "aut"),
+  person("Krystian", "Igras", email = "[email protected]", role = "aut"),
+  person("Adam", "Forys", email = "[email protected]", role = "aut"),
+  person("Dominik", "Krzeminski", email = "[email protected]", role = "cre"),
+  person(family = "Appsilon Sp. z o.o.", role = c("cph")))
 Description: Creating a great user interface for your Shiny apps
     can be a hassle, especially if you want to work purely in R
     and don't want to use, for instance HTML templates. This
@@ -17,7 +18,6 @@ Encoding: UTF-8
 LazyData: TRUE
 License: MIT + file LICENSE
 Imports:
-    utils,
     shiny (>= 0.12.1),
     htmltools (>= 0.2.6),
     htmlwidgets (>= 0.8),
@@ -30,4 +30,4 @@ Suggests:
     testthat,
     lintr,
     covr
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.2.9000

CHANGELOG.md

@@ -4,7 +4,6 @@ export(SUPPORTED_THEMES)
 export(check_proper_color)
 export(check_semantic_theme)
 export(checkbox_positions)
-export(checkbox_types)
 export(create_modal)
 export(date_input)
 export(dropdown)
@@ -15,6 +14,7 @@ export(menu_header)
 export(menu_item)
 export(modal)
 export(multiple_checkbox)
+export(multiple_radio)
 export(parse_val)
 export(register_search)
 export(remove_modal)
@@ -27,8 +27,9 @@ export(shiny_input)
 export(shiny_text_input)
 export(show_modal)
 export(simple_checkbox)
-export(slider_input)
 export(tabset)
+export(uibutton)
+export(uicalendar)
 export(uicard)
 export(uicards)
 export(uicheckbox)
@@ -38,12 +39,21 @@ export(uifields)
 export(uiform)
 export(uiheader)
 export(uiicon)
+export(uiinput)
 export(uilabel)
 export(uilist)
 export(uimenu)
 export(uimessage)
+export(uinumericinput)
+export(uirange)
 export(uirender)
 export(uisegment)
+export(uislider)
+export(uitextinput)
+export(update_calendar)
+export(update_dropdown)
+export(update_range)
+export(update_slider)
 import(htmlwidgets)
 import(magrittr)
 import(shiny)

DESCRIPTION

@@ -0,0 +1,15 @@
+#' Create Semantic UI Button
+#'
+#' @param name The \code{input} slot that will be used to access the value.
+#' @param label The contents of the button or link
+#' @param icon An optional \code{\link{uiicon}()} to appear on the button.
+#' @param type An optional attribute to be added to the button's class.
+#' @param ... Named attributes to be applied to the button
+#'
+#' @examples
+#' uibutton("simple_button", "Press Me!")
+#'
+#' @export
+uibutton <- function(name, label, icon = NULL, type = NULL, ...) {
+  tags$button(id = name, class = paste("ui", type, "button"), label, icon, ...)
+}

NAMESPACE

@@ -0,0 +1,89 @@
+#' Create Semantic UI Calendar
+#'
+#' This creates a default calendar input using Semantic UI. The input is available
+#' under \code{input[[name]]}.
+#'
+#' @param name Input name. Reactive value is available under \code{input[[name]]}.
+#' @param value Initial value of the numeric input.
+#' @param placeholder Text visible in the input when nothing is inputted.
+#' @param type Select from \code{'year'}, \code{'month'}, \code{'date'} and \code{'time'}
+#' @param min Minimum allowed value.
+#' @param max Maximum allowed value.
+#'
+#' @examples
+#' # Basic calendar
+#' if (interactive()) {
+#'
+#'   library(shiny)
+#'   library(shiny.semantic)
+#'
+#'   ui <- shinyUI(
+#'     semanticPage(
+#'       title = "Calendar example",
+#'       uicalendar("date"),
+#'       p("Selected date:"),
+#'       textOutput("selected_date")
+#'     )
+#'   )
+#'
+#'    server <- shinyServer(function(input, output, session) {
+#'      output$selected_date <- renderText(
+#'        as.character(input$date)
+#'      )
+#'    })
+#'
+#'    shinyApp(ui = ui, server = server)
+#'  }
+#'
+#' \dontrun{
+#' # Calendar with max and min
+#' uicalendar(
+#'   name = "date_finish",
+#'   placeholder = "Select End Date",
+#'   min = "2019-01-01",
+#'   max = "2020-01-01"
+#' )
+#'
+#' # Selecting month
+#' uicalendar(
+#'   name = "month",
+#'   type = "month"
+#' )
+#' }
+#' @rdname uicalendar
+#' @export
+uicalendar <- function(name, value = NULL, placeholder = NULL, type = "date", min = NA, max = NA) {
+  cal_widget <-
+    div(
+      id = name, class = "ui calendar ss-input-date", `data-type` = type, `data-date` = value,
+      div(
+        class = "ui input left icon",
+        tags$i(class = "calendar icon"),
+        tags$input(type = "text", placeholder = placeholder)
+      )
+    )
+
+  if (!is.na(min)) cal_widget$attribs[["data-min-date"]] <- min
+  if (!is.na(max)) cal_widget$attribs[["data-max-date"]] <- max
+
+  cal_widget
+}
+
+#' Update UI calendar
+#'
+#' This function updates the date on a calendar
+#'
+#' @param session The \code{session} object passed to function given to
+#'   \code{shinyServer}.
+#' @param id ID of the calendar that will be updated
+#' @param value The date to be set, default NULL
+#' @param min Minimum date that will be possible to set, default NULL
+#' @param max Maximum date that will be possible to set, default NULL
+#'
+#' @rdname uicalendar
+#'
+#' @export
+update_calendar <- function(session, id, value = NULL, min = NULL, max = NULL) {
+  message <- list(value = value, min = min, max = max)
+  session$sendInputMessage(id, message = message)
+}