Merge branch 'f7-v8.3.2' of github.com:RinteRface/shinyMobile into f7…

…-v8.3.2

NEWS.md

@@ -62,7 +62,7 @@ the check icon position. Default to left.
 - `f7Panel()` has new "floating"/"push" effects as well as a new `options` parameter
 to pass in extra configuration. See https://framework7.io/docs/panel#panel-parameters.
 - `f7VirtualList()` has new `outline`, `dividers` and `strong` styles. Additionally, `mode` was added with the following possible values: `simple`, `links`, `media` or `contacts`.
-- `f7Popup()` has a new `push` effect (pushing the main view behind on opening).
+- `f7Popup()` has a new `push` effect (pushing the main view behind on opening). There's also a new argument called `page` that can control whether or not the popup behaves as a page and can scroll- handy for popups with more content.
 - `f7Radio()` has a new `position` parameter to control
 the check icon position. Default to left (like `f7CheckboxGroup()`).
 Also, `f7Radio()` inherits from `f7List()` styling parameters such as `inset`, `outline`,`dividers`, `strong` for more styling option.
@@ -94,6 +94,7 @@ the new router layout. Items must be wrapped in a `shiny::tagList()`.
 - `updateF7App` can now also handle changes in app theme (ios or md), dark mode, and color.
 - `f7Fabs()` has a new argument `global` that can be used to make FABs persistent across different tabs in `f7TabLayout()`. 
 - `f7ExpandableCard()` has a new argument `buttonColor` that can be used to control the color of the close button.
+- `f7Login()` has a new argument `module` that can, optionally, be set to `FALSE` for more flexibility. For example, this allows you to use `f7Login()` inside your own modules, or without the provided `f7LoginServer()` module.
 - Fix various issues in documentation.
 - Include new vignettes.
 

R/f7Login.R

@@ -20,13 +20,18 @@
 #' @param startOpen Whether to open the login page at start. Default to TRUE. There
 #' are some cases where it is interesting to set up to FALSE, for instance when you want
 #' to have authentication only in a specific tab of your app (See example 2).
+#' @param module Whether or not to use in combination with \link{f7LoginServer}. Can be
+#' set to FALSE if you want to develop your own server functionality, or if you want to
+#' use \code{f7Login} inside a module yourself. Note that inputs, like user, password and submit,
+#' will need to be accessed with the id of \code{f7Login} with -user, -password or -submit appended.
 #'
 #' @export
 #' @rdname authentication
 #' @importFrom jsonlite toJSON
 #' @example inst/examples/login/app.R
 f7Login <- function(..., id, title, label = "Sign In", footer = NULL,
-                    startOpen = TRUE) {
+                    startOpen = TRUE, module = TRUE) {
+
   ns <- shiny::NS(id)
 
   submitBttn <- f7Button(inputId = ns("submit"), label = label)

R/f7Popup.R

@@ -22,6 +22,7 @@
 #' @param closeButton Add or not a button to easily close the popup.
 #'  Default to \code{TRUE}.
 #' @param push Push effect. Default to TRUE.
+#' @param page Allow content to be scrollable, as a page. Default to FALSE.
 #' @param session Shiny session object.
 #'
 #' @export
@@ -36,6 +37,7 @@ f7Popup <- function(..., id, title = NULL,
                     fullsize = FALSE,
                     closeButton = TRUE,
                     push = TRUE,
+                    page = FALSE,
                     session = shiny::getDefaultReactiveDomain()) {
   message <- dropNulls(
     list(
@@ -49,18 +51,32 @@ f7Popup <- function(..., id, title = NULL,
     )
   )
 
-  content <- shiny::tags$div(
-    class = "block",
-    if (!is.null(title)) shiny::tags$div(class = "block-title", title),
-    ...
-  )
+  if (page) {
+    content <- shiny::tags$div(
+      class = "page",
+      shiny::tags$div(
+        class = "page-content",
+        shiny::tags$div(
+          class = "block",
+          if (!is.null(title)) shiny::tags$div(class = "block-title", title),
+          ...
+        )
+      )
+    )
+  } else {
+    content <- shiny::tags$div(
+      class = "block",
+      if (!is.null(title)) shiny::tags$div(class = "block-title", title),
+      ...
+    )
+  }
 
   if (closeButton) {
     content <- htmltools::tagAppendChild(
       content,
       shiny::tags$a(
         class = "link popup-close",
-        style = "position: absolute; top: -15px; right: 10px;",
+        style = sprintf("position: absolute; top: %s; right: 10px;", ifelse(page, "15px", "-15px")),
         href = "#",
         f7Icon("multiply")
       )

inst/examples/popup/app.R

@@ -8,21 +8,75 @@ app <- shinyApp(
       navbar = f7Navbar(
         title = "f7Popup"
       ),
-      f7Block(f7Button("toggle", "Toggle Popup"))
+      f7Block(f7Button("toggle1", "Toggle Popup")),
+      br(),
+      f7Block(f7Button("toggle2", "Toggle Page Popup"))
     )
   ),
   server = function(input, output, session) {
-    output$res <- renderPrint(input$text)
 
-    observeEvent(input$toggle, {
+    output$res1 <- renderPrint(input$text)
+    output$res2 <- renderPrint(input$text2)
+
+    observeEvent(input$toggle1, {
       f7Popup(
-        id = "popup",
+        id = "popup1",
         title = "My first popup",
         f7Text(
-          "text", "Popup content",
+          "text1", "Popup content",
           "This is my first popup ever, I swear!"
         ),
-        verbatimTextOutput("res")
+        verbatimTextOutput("res1")
+      )
+    })
+
+    observeEvent(input$toggle2, {
+      f7Popup(
+        id = "popup2",
+        title = "My first popup",
+        page = TRUE,
+        f7Text(
+          "text2", "Popup content",
+          "Look at me, I can scroll!"
+        ),
+        verbatimTextOutput("res2"),
+        p("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse
+            hendrerit magna non sem iaculis, ac rhoncus est pulvinar. Interdum et
+            malesuada fames ac ante ipsum primis in faucibus. In sagittis vel lacus
+            ac bibendum. Maecenas mollis, diam nec fermentum sollicitudin, massa
+            lectus ullamcorper orci, in laoreet lectus quam nec lacus.
+            Nulla sollicitudin imperdiet metus, quis mollis justo finibus varius.
+            In mattis malesuada enim in tincidunt. Nulla vehicula dui lacus,
+            iaculis condimentum dui dapibus ac. Cras elit nunc, auctor vestibulum
+            odio id, iaculis posuere arcu. Mauris dignissim id lectus sit amet
+            vestibulum. Nam rutrum sit amet augue vel interdum. Donec sed orci vitae
+            eros eleifend posuere vitae id nibh. Donec faucibus erat in placerat
+            feugiat. Sed sodales facilisis eros, porta viverra purus pretium eu.
+            Morbi vehicula metus lacus, id commodo mauris posuere nec. Vivamus
+            ornare et lacus et lobortis. Etiam tristique elit id eros ornare,
+            vel faucibus mauris hendrerit. Nulla elit nulla, consequat sit amet
+            neque et, ultrices elementum diam. Etiam dignissim elit a arcu pulvinar,
+            ut dapibus elit maximus. Mauris ultricies nulla in mauris laoreet, at
+            lacinia lorem maximus. Nulla sed enim diam. In ac felis dignissim,
+            euismod augue nec, tempus augue. Maecenas eget aliquam mi.
+            In tincidunt massa a velit suscipit, ac dapibus mi laoreet. Vestibulum
+            lacinia nulla lorem, nec blandit quam sollicitudin at. Pellentesque
+            in vehicula lacus. Etiam vitae lectus malesuada, hendrerit mauris eu,
+            placerat elit. Mauris vehicula dictum pharetra. Etiam interdum vehicula
+            urna, ac blandit lectus posuere id. Nullam facilisis tincidunt sem et
+            pretium. Praesent pulvinar feugiat augue, quis pretium nunc vestibulum a.
+            Morbi id eros eget lectus placerat placerat. Morbi dapibus viverra
+            orci nec pellentesque. Vestibulum mollis gravida sem, quis tincidunt
+            sem maximus gravida. Nam id egestas augue, sit amet egestas orci. Duis
+            porttitor lectus sit amet efficitur auctor. Quisque dui ante, eleifend
+            eget nibh a, tincidunt interdum nisi. Integer varius tempor erat, in
+            commodo neque elementum ut. Maecenas eu lorem ultrices, posuere neque ac,
+            aliquam ante. Maecenas eu volutpat arcu. Morbi hendrerit sem sed vehicula
+            sodales. Quisque ultrices massa erat, vel accumsan risus vehicula eu.
+            Donec laoreet aliquet est, a consequat odio viverra lacinia. Suspendisse
+            id iaculis risus. Vestibulum posuere dignissim lacus quis ornare. Nam
+            dapibus efficitur neque sed tristique."
+        )
       )
     })
 
@@ -31,7 +85,7 @@ app <- shinyApp(
 
       f7Toast(
         position = "top",
-        text = paste("Popup is", popupStatus)
+        text = paste("Popup1 is", popupStatus)
       )
     })
   }

tests/testthat/_snaps/f7Popup/popup-app-001.json

@@ -1,5 +1,5 @@
 {
   "input": {
-    "popup": true
+    "popup1": true
   }
 }

tests/testthat/_snaps/f7Popup/popup-app-002.json

@@ -1,9 +1,9 @@
 {
   "input": {
-    "popup": true,
-    "text": "balbla"
+    "popup1": true,
+    "text1": "balbla"
   },
   "output": {
-    "res": "[1] \"balbla\""
+    "res1": "NULL"
   }
 }

tests/testthat/_snaps/f7Popup/popup-app-003.json

@@ -1,5 +1,5 @@
 {
   "input": {
-    "popup": false
+    "popup1": false
   }
 }

tests/testthat/_snaps/f7Popup/popup-app-004.json

@@ -0,0 +1,5 @@
+{
+  "input": {
+    "popup2": true
+  }
+}

tests/testthat/_snaps/f7Popup/popup-app-005.json

@@ -0,0 +1,9 @@
+{
+  "input": {
+    "popup2": true,
+    "text2": "balbla"
+  },
+  "output": {
+    "res2": "[1] \"balbla\""
+  }
+}

tests/testthat/_snaps/f7Popup/popup-app-006.json

@@ -0,0 +1,5 @@
+{
+  "input": {
+    "popup2": false
+  }
+}