rstudio · gadenbuie · May 19, 2023 · May 15, 2023 · May 17, 2023 · May 17, 2023
diff --git a/R/data-apps-deps.R b/R/data-apps-deps.R
@@ -60,4 +60,5 @@ apps_deps_map <- list(`001-hello` = "rsconnect", `012-datatables` = "ggplot2",
     "rversions"), `305-bslib-value-box` = c("rlang", "rversions"
     ), `309-flexdashboard-tabs-navs` = "rmarkdown", `310-bslib-sidebar-dynamic` = c("rversions", 
     "testthat"), `311-bslib-sidebar-toggle-methods` = c("rversions", 
-    "testthat"))
+    "testthat"), `313-bslib-card-tab-focus` = c("rversions", 
+    "testthat", "withr"))
diff --git a/inst/apps/311-bslib-sidebar-toggle-methods/app.R b/inst/apps/311-bslib-sidebar-toggle-methods/app.R
@@ -17,59 +17,57 @@ animals <- c(
   "otter", "panda", "panther", "penguin", "zebra"
 )
 
-sb <- layout_column_wrap(
-  width = 500,
-  id = "sidebar-here",
-  layout_sidebar(
-    id = "main_outer",
-    sidebar = sidebar(
-      "Outer Sidebar",
-      id = "sidebar_outer",
-      width = 150,
-      bg = color_pairs[[1]]$dark,
-      open = "desktop",
-      max_height_mobile = "300px",
-      selectInput(
-        "adjective",
-        "Adjective",
-        choices = adjectives,
-        selected = adjectives[1]
-      )
-    ),
-    height = 300,
-    class = "p-0",
-    fillable = TRUE,
+ui <- page_fixed(
+  h1("Dynamic Sidebars"),
+  tags$head(tags$title("bslib | Tests | Dynamic Sidebars")),
+  p(
+    "Test tab focus order: main, inner sidebar, outer sidebar.",
+    "Test server-side open and close of sidebars."
+  ),
+  layout_column_wrap(
+    width = 500,
+    id = "sidebar-here",
     layout_sidebar(
-      id = "main_inner",
+      id = "main_outer",
       sidebar = sidebar(
-        "Inner Sidebar",
-        id = "sidebar_inner",
+        "Outer Sidebar",
+        id = "sidebar_outer",
         width = 150,
-        bg = color_pairs[[1]]$light,
+        bg = color_pairs[[1]]$dark,
         open = "desktop",
+        max_height_mobile = "300px",
         selectInput(
-          "animal",
-          "Animal",
-          choices = animals,
-          selected = animals[1]
+          "adjective",
+          "Adjective",
+          choices = adjectives,
+          selected = adjectives[1]
         )
       ),
-      border = FALSE,
-      border_radius = FALSE,
-      h2("Sidebar Layout"),
-      uiOutput("ui_content", tabindex = 0)
+      height = 300,
+      class = "p-0",
+      fillable = TRUE,
+      layout_sidebar(
+        id = "main_inner",
+        sidebar = sidebar(
+          "Inner Sidebar",
+          id = "sidebar_inner",
+          width = 150,
+          bg = color_pairs[[1]]$light,
+          open = "desktop",
+          selectInput(
+            "animal",
+            "Animal",
+            choices = animals,
+            selected = animals[1]
+          )
+        ),
+        border = FALSE,
+        border_radius = FALSE,
+        h2("Sidebar Layout"),
+        uiOutput("ui_content", tabindex = 0),
+      )
     )
-  )
-)
-
-ui <- page_fixed(
-  h1("Dynamic Sidebars"),
-  tags$head(tags$title("bslib | Tests | Dynamic Sidebars")),
-  p(
-    "Test tab focus order: main, inner sidebar, outer sidebar.",
-    "Test server-side open and close of sidebars."
   ),
-  tagAppendAttributes(sb, class = "mb-4", id = "layout"),
   div(
     class = "my-2",
     actionButton("show_all", "Show all"),

diff --git a/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-001.json b/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-001.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 0,
+    "sidebar_inner": true,
+    "sidebar_outer": false,
+    "toggle_inner": 0,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-002.json b/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-002.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 0,
+    "sidebar_inner": true,
+    "sidebar_outer": true,
+    "toggle_inner": 0,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-003.json b/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-003.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 1,
+    "sidebar_inner": false,
+    "sidebar_outer": false,
+    "toggle_inner": 0,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-004.json b/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-004.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 1,
+    "sidebar_inner": true,
+    "sidebar_outer": false,
+    "toggle_inner": 1,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-005.json b/...hods/tests/testthat/_snaps/linux-3.6/shinytest2/311-bslib-sidebar-toggle-methods-005.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 1,
+    "sidebar_inner": true,
+    "sidebar_outer": true,
+    "toggle_inner": 1,
+    "toggle_outer": 1
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-001.json b/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-001.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 0,
+    "sidebar_inner": true,
+    "sidebar_outer": false,
+    "toggle_inner": 0,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-002.json b/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-002.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 0,
+    "sidebar_inner": true,
+    "sidebar_outer": true,
+    "toggle_inner": 0,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-003.json b/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-003.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 1,
+    "sidebar_inner": false,
+    "sidebar_outer": false,
+    "toggle_inner": 0,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-004.json b/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-004.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 1,
+    "sidebar_inner": true,
+    "sidebar_outer": false,
+    "toggle_inner": 1,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-005.json b/...hods/tests/testthat/_snaps/linux-4.0/shinytest2/311-bslib-sidebar-toggle-methods-005.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 1,
+    "sidebar_inner": true,
+    "sidebar_outer": true,
+    "toggle_inner": 1,
+    "toggle_outer": 1
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...ethods/tests/testthat/_snaps/mac-4.0/shinytest2/311-bslib-sidebar-toggle-methods-001.json b/...ethods/tests/testthat/_snaps/mac-4.0/shinytest2/311-bslib-sidebar-toggle-methods-001.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 0,
+    "sidebar_inner": true,
+    "sidebar_outer": false,
+    "toggle_inner": 0,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}
diff --git a/...ethods/tests/testthat/_snaps/mac-4.0/shinytest2/311-bslib-sidebar-toggle-methods-002.json b/...ethods/tests/testthat/_snaps/mac-4.0/shinytest2/311-bslib-sidebar-toggle-methods-002.json
@@ -0,0 +1,22 @@
+{
+  "input": {
+    "adjective": "charming",
+    "animal": "elephant",
+    "show_all": 0,
+    "sidebar_inner": true,
+    "sidebar_outer": true,
+    "toggle_inner": 0,
+    "toggle_outer": 0
+  },
+  "output": {
+    "ui_content": {
+      "html": "<p>Hello, charming elephant!<\/p>",
+      "deps": [
+
+      ]
+    }
+  },
+  "export": {
+
+  }
+}