Skip to content

Commit

Permalink
Merge pull request #7 from RinteRface/feat-multi-tabs
Browse files Browse the repository at this point in the history
Feat multi tabs
  • Loading branch information
DivadNojnarg authored Jan 27, 2023
2 parents fa9918f + 0b7d107 commit e33967f
Show file tree
Hide file tree
Showing 36 changed files with 981 additions and 963 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
^\.github$
^LICENSE\.md$
inst/examples/basic/www
inst/examples/navbar/www
inst/examples/bs4Dash/www
inst/examples/commute-explorer/www
inst/examples/options/www
Expand All @@ -19,3 +20,4 @@ inst/examples/test/www
^_pkgdown\.yml$
^docs$
^pkgdown$
^inst/examples/.*./rsconnect$
6 changes: 3 additions & 3 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck

- uses: r-lib/actions/check-r-package@v1
- uses: r-lib/actions/check-r-package@v2
6 changes: 3 additions & 3 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-pandoc@v1
- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: pkgdown
needs: website
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ node_modules
.DS_Store
docs
inst/doc
inst/examples/**/www
inst/examples/**/rsconnect
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: shinyHeatmap
Title: Usage Heatmap for Shiny apps
Version: 0.0.0.9000
Version: 0.2.0.9000
Authors@R:
person("David", "Granjon", , "dgranjon@ymail.com", role = c("aut", "cre"))
Description: Have you ever wondered how people are enjoying your Shiny app?
Expand All @@ -10,7 +10,7 @@ Description: Have you ever wondered how people are enjoying your Shiny app?
License: MIT + file LICENSE
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.2
RoxygenNote: 7.2.1
Imports:
htmltools,
jsonlite,
Expand Down
7 changes: 4 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# Generated by roxygen2: do not edit by hand

export(download_heatmap)
export(download_heatmap_ui)
export(get_heatmap_records)
export(read_heatmap_records)
export(process_heatmap)
export(record_heatmap)
export(with_heatmap)
importFrom(htmltools,htmlDependency)
Expand All @@ -18,7 +16,10 @@ importFrom(shiny,actionButton)
importFrom(shiny,animationOptions)
importFrom(shiny,div)
importFrom(shiny,h1)
importFrom(shiny,is.reactive)
importFrom(shiny,observeEvent)
importFrom(shiny,reactive)
importFrom(shiny,reactiveVal)
importFrom(shiny,renderPrint)
importFrom(shiny,req)
importFrom(shiny,sliderInput)
Expand Down
22 changes: 21 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# shinyHeatmap 0.2.0.9000

## New feature
- Introducing `process_heatmap()`, a wrapper around `record_heatmap()`
and `download_heatmap()`. `process_heatmap()` will record the heatmap
by default unless you specify a query parameter `?get_heatmap`,
which will allow to display the results.
- You can now toggle the heatmap visibility while running
`record_heatmap()` so as to be able to change page in multi-tabs
apps. This is necessary because the heatmap z-index is set to the maximum and
you can't click anywhere else after, expect the toggle heatmap button.

## Breaking changes
- Added new `trigger` parameter for `record_heatmap()` and `download_heatmap()` as first parameters. This allows to record heatmaps for multi-tabs apps like with `shiny::navbarPage()` (See `inst/examples/navbar`).
Leave `trigger` NULL for one page apps. `trigger` expects a reactive expression like `reactive(input$navbar)`.
- The `target` value is now removed from `record_heatmap()`.
Instead, it is written in a file `www/*/target.txt` by `record_heatmap()`,
and subsequently read by `record_heatmap()`. For old apps without this file,
you can manually create one `touch www/<WHATEVER_SUBFOLDER>/target.txt` and type in the DOM selector value, for instance `.container-fluid`.

# shinyHeatmap 0.0.0.9000

* Added a `NEWS.md` file to track changes to the package.
- Added a `NEWS.md` file to track changes to the package.
Loading

0 comments on commit e33967f

Please sign in to comment.