Bring in JS/CSS source from RShiny repo

Author: cpsievert

examples/busy_indicators/app.py

@@ -19,18 +19,14 @@
 
 # -- Reusable card module --
 @module.ui
-def card_ui(title="Tadpole", spinner_type="tadpole"):
+def card_ui():
     return ui.card(
         ui.card_header(
-            title,
+            "A plot",
             ui.input_task_button("simulate", "Simulate", icon=icon_svg("shuffle")),
             class_="d-flex justify-content-between align-items-center",
         ),
-        ui.busy_indicators.spinner_options(
-            spinner_type, css_selector="." + spinner_type
-        ),
         ui.output_plot("plot"),
-        class_=spinner_type,
     )
 
 
@@ -81,13 +77,13 @@ def plot():
         ui.input_slider("length", "Simulation length", 0, 500, 5),
     ),
     ui.layout_columns(
-        card_ui("a", "Tadpole", "tadpole"),
-        card_ui("b", "Disc", "disc"),
-        card_ui("c", "Dots", "dots"),
-        card_ui("d", "Dot track", "dot-track"),
+        card_ui("a"),
+        card_ui("b"),
+        card_ui("c"),
+        card_ui("d"),
         col_widths=[6, 6],
     ),
-    card_ui("e", "Ball", "bounce"),
+    card_ui("e"),
     ui.output_ui("indicator_types_ui"),
     fillable=True,
     title="Busy indicators + extended tasks = ❤️",

js/build.ts

@@ -74,21 +74,6 @@ const opts: Array<BuildOptions> = [
     plugins: [sassPlugin({ type: "css", sourceMap: false })],
     metafile: true,
   },
-  {
-    entryPoints: {
-      "busy-indicators/busy-indicators": "busy-indicators/busy-indicators.scss",
-    },
-    loader: { ".svg": "dataurl" },
-    plugins: [sassPlugin({ type: "css", sourceMap: false })],
-    metafile: true,
-  },
-  {
-    entryPoints: {
-      "busy-indicators/busy-indicators": "busy-indicators/busy-indicators.ts",
-    },
-    minify: false,
-    sourcemap: false,
-  },
 ];
 
 // Run function to avoid top level await

js/busy-indicators/ball.svg

@@ -19,7 +19,7 @@ withr::local_temp_libpaths()
 ignore <- capture.output({
   pak::pkg_install(c(
     "rstudio/bslib@main",
-    "rstudio/shiny@main",
+    "rstudio/shiny@busy-indicators",
     "rstudio/sass@main",
     "rstudio/htmltools@main"
   ))

js/busy-indicators/busy-indicators.scss

@@ -1,4 +1,4 @@
-shiny_html_deps = "1.8.1.9000"
+shiny_html_deps = "1.8.1.9001"
 bslib = "0.7.0.9000"
 htmltools = "0.5.8.9000"
 bootstrap = "5.3.1"

js/busy-indicators/busy-indicators.ts

@@ -15,7 +15,7 @@
             multiple=True,
             selected=["spinners", "pulse"],
         ),
-        ui.busy_indicators.spinner_options(color="orange"),
+        ui.busy_indicators.options(spinner_color="orange"),
         ui.download_button("download", "Download source"),
     ),
     ui.card(

js/busy-indicators/disc-spinner.svg

@@ -59,7 +59,7 @@ def busy_indicators_dep() -> HTMLDependency:
     return HTMLDependency(
         "shiny-busy-indicators",
         __version__,
-        source={"package": "shiny", "subdir": "www/shared/py-shiny/busy-indicators"},
+        source={"package": "shiny", "subdir": "www/shared/busy-indicators"},
         stylesheet={"href": "busy-indicators.css"},
         script={"src": "busy-indicators.js"},
         head=busy_indicators.use(),  # Enable busy indicators by default.