Merge branch 'main' into bump_versions

Author: cpsievert

.github/workflows/conventional-commits.yaml

@@ -22,8 +22,9 @@ jobs:
             feat
             fix
             perf
-            style
             refactor
+            release
+            style
             test
       - uses: marocchino/sticky-pull-request-comment@v2
         if: always() && (steps.lint.outputs.error_message != null)

.github/workflows/deploy-tests.yaml

@@ -109,7 +109,7 @@ jobs:
       - name: Deploy apps and run tests (on `push` or `deploy**` branches)
         env:
           DEPLOY_APPS: "true"
-          DEPLOY_CONNECT_SERVER_URL: "${{ (matrix.config.released_connect_server && 'https://connect.posit.it/') || 'https://rsc.radixu.com/' }}"
+          DEPLOY_CONNECT_SERVER_URL: "${{ (matrix.config.released_connect_server && 'https://connect.posit.it/') || 'https://dogfood.team.pct.posit.it/' }}"
           DEPLOY_CONNECT_SERVER_API_KEY: "${{ (matrix.config.released_connect_server && secrets.DEPLOY_CONNECT_POSIT_SERVER_API_KEY) || secrets.DEPLOY_CONNECT_SERVER_API_KEY }}"
           DEPLOY_SHINYAPPS_NAME: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_NAME }}"
           DEPLOY_SHINYAPPS_TOKEN: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_TOKEN }}"

.github/workflows/pytest.yaml

@@ -191,6 +191,17 @@ jobs:
         working-directory: examples/brownian/shinymediapipe
         run: |
           npm ci
+      - name: Checkout py-shiny-templates repository
+        uses: actions/checkout@v4
+        with:
+          repository: posit-dev/py-shiny-templates
+          path: py-shiny-templates
+
+      - name: Install py-shiny-templates dependencies
+        if: matrix.python-version != '3.9'
+        # Scikit-learn 1.7.0+ requires Python 3.10+
+        run: |
+          make ci-install-py-shiny-templates-deps
 
       - name: Run example app tests
         timeout-minutes: 60

.gitignore

@@ -111,6 +111,9 @@ docs/source/reference/
 
 /.luarc.json
 
+# uv
+/uv.lock
+
 # Developer scratch area
 _dev/
 tests/playwright/deploys/**/requirements.txt

CHANGELOG.md

@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
+### New features
+
+* `ui.sidebar()` is now interactively resizable. (#2020)
+
+* `ui.update_*()` functions now accept `ui.TagChild` (i.e., HTML) as input to the `label` and `icon` arguments. (#2020)
+
+* `playwright.controller.InputActionButton` gains a `expect_icon()` method. As a result, the already existing `expect_label()` no longer includes the icon. (#2020)
+
+### Improvements
+
+* Improved the styling and readability of markdown tables rendered by `ui.Chat()` and `ui.MarkdownStream()`. (#1973)
+
+* `selectize`, `remove_button`, and `options` parameters of `ui.input_select()` have been deprecated; use `ui.input_selectize()` instead. (Thanks, @ErdaradunGaztea!) (#1947)
+
+* Added `timeout_secs` parameter to `create_app_fixture` to allow testing apps with longer startup times. (#2033)
+
+### Bug fixes
+
+* Fixed an issue with `ui.Chat()` sometimes wanting to scroll a parent element. (#1996)
+
+* Explicitly call out module usage in UI input bookmark button documentation. (#1983)
+
+* Fix missing session when trying to display an error duing bookmarking. (#1984)
+
+
+## [1.4.0] - 2025-04-08
+
 ## New features
 
 * Added support for bookmarking Shiny applications. Bookmarking allows users to save the current state of an application and return to it later. This feature is available in both Shiny Core and Shiny Express. (#1870, #1915, #1919, #1920, #1922, #1934, #1938, #1945, #1955)
@@ -17,8 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Both `ui.Chat()` and `ui.MarkdownStream()` now support the inclusion of Shiny UI elements inside of messages. This allows for gathering input from the user (e.g., `ui.input_select()`), displaying of rich output (e.g., `render.DataGrid()`), and more. (#1868)
 
-* Added a new `.message_stream_context()` method to `ui.Chat()`. This context manager is a useful alternative to `.append_message_stream()` when you want to: (1) Nest a stream within another and/or
-(2) Overwrite/replace streaming content. (#1906)
+* Added a new `.message_stream_context()` method to `ui.Chat()`. This context manager is a useful alternative to `.append_message_stream()` when you want to: (1) Nest a stream within another and/or (2) Overwrite/replace streaming content. (#1906)
 
 ### Changes
 
@@ -32,6 +58,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+* Fixed issue where apps run in Workbench were unexpectedly crashing. Apps running in Workbench will now have `ws_per_message_deflate=False` enforced. (#2005)
+
 * Fixed an issue where the `<main>` areas of `ui.page_sidebar()` and `ui.page_navbar()` (with a `sidebar`) were made to be a fillable containers even when `fillable=False`. (#1816)
 
 * Fixed an issue where the `.update_user_input()` method on `ui.Chat()` isn't working in shinylive.  (#1891)

Makefile

@@ -56,9 +56,6 @@ clean-test: FORCE
 	rm -fr .pytest_cache
 	rm -rf typings/
 
-typings/appdirs:
-	@echo "Creating appdirs stubs"
-	pyright --createstub appdirs
 typings/folium:
 	@echo "Creating folium stubs"
 	pyright --createstub folium
@@ -75,7 +72,7 @@ typings/matplotlib/__init__.pyi:
 	mv typings/python-type-stubs/stubs/matplotlib typings/
 	rm -rf typings/python-type-stubs
 
-pyright-typings: typings/appdirs typings/folium typings/uvicorn typings/seaborn typings/matplotlib/__init__.pyi
+pyright-typings: typings/folium typings/uvicorn typings/seaborn typings/matplotlib/__init__.pyi
 
 check: check-format check-lint check-types check-tests  ## check code, style, types, and test (basic CI)
 check-fix: format check-lint check-types check-tests ## check and format code, style, types, and test
@@ -223,6 +220,8 @@ install-deps: FORCE ## install dependencies
 	pip install -e ".[dev,test]" --upgrade
 ci-install-deps: FORCE
 	uv pip install -e ".[dev,test]"
+ci-install-py-shiny-templates-deps: FORCE
+	uv pip install -r py-shiny-templates/requirements.txt
 
 install-docs: FORCE
 	pip install -e ".[dev,test,doc]"

docs/_quartodoc-testing.yml

@@ -26,6 +26,7 @@ quartodoc:
       contents:
         - playwright.controller.InputActionButton
         - playwright.controller.InputActionLink
+        - playwright.controller.InputBookmarkButton
         - playwright.controller.InputCheckbox
         - playwright.controller.InputCheckboxGroup
         - playwright.controller.InputDarkMode
@@ -59,6 +60,7 @@ quartodoc:
         - playwright.controller.NavsetTab
         - playwright.controller.NavsetUnderline
         - playwright.controller.NavPanel
+        - playwright.controller.PageNavbar
     - title: Upload and download
       desc: Methods for interacting with Shiny app uploading and downloading controller.
       contents:

js/build.ts

@@ -93,11 +93,6 @@ const opts: Array<BuildOptions> = [
     entryPoints: { "data-frame/data-frame": "data-frame/index.tsx" },
     plugins: [sassPlugin({ type: "css-text", sourceMap: false })],
   },
-  {
-    entryPoints: {
-      "text-area/textarea-autoresize": "text-area/textarea-autoresize.ts",
-    },
-  },
   {
     entryPoints: {
       "page-output/page-output": "page-output/page-output.ts",

js/chat/chat.ts

@@ -131,8 +131,6 @@ interface ChatInputSetInputOptions {
 }
 
 class ChatInput extends LightElement {
-  private _disabled = false;
-
   @property() placeholder = "Enter a message...";
   // disabled is reflected manually because `reflect: true` doesn't work with LightElement
   @property({ type: Boolean })
@@ -155,6 +153,27 @@ class ChatInput extends LightElement {
     this.#onInput();
   }
 
+  private _disabled = false;
+  inputVisibleObserver?: IntersectionObserver;
+
+  connectedCallback(): void {
+    super.connectedCallback();
+
+    this.inputVisibleObserver = new IntersectionObserver((entries) => {
+      entries.forEach((entry) => {
+        if (entry.isIntersecting) this.#updateHeight();
+      });
+    });
+
+    this.inputVisibleObserver.observe(this);
+  }
+
+  disconnectedCallback(): void {
+    super.disconnectedCallback();
+    this.inputVisibleObserver?.disconnect();
+    this.inputVisibleObserver = undefined;
+  }
+
   attributeChangedCallback(
     name: string,
     _old: string | null,
@@ -189,7 +208,7 @@ class ChatInput extends LightElement {
     return html`
       <textarea
         id="${this.id}"
-        class="form-control textarea-autoresize"
+        class="form-control"
         rows="1"
         placeholder="${this.placeholder}"
         @keydown=${this.#onKeyDown}
@@ -217,6 +236,7 @@ class ChatInput extends LightElement {
   }
 
   #onInput(): void {
+    this.#updateHeight();
     this.button.disabled = this.disabled
       ? true
       : this.value.trim().length === 0;
@@ -247,6 +267,15 @@ class ChatInput extends LightElement {
     if (focus) this.textarea.focus();
   }
 
+  #updateHeight(): void {
+    const el = this.textarea;
+    if (el.scrollHeight == 0) {
+      return;
+    }
+    el.style.height = "auto";
+    el.style.height = `${el.scrollHeight}px`;
+  }
+
   setInputValue(
     value: string,
     { submit = false, focus = false }: ChatInputSetInputOptions = {}
@@ -528,11 +557,19 @@ class ChatContainer extends LightElement {
 
 // ------- Register custom elements and shiny bindings ---------
 
-customElements.define(CHAT_MESSAGE_TAG, ChatMessage);
-customElements.define(CHAT_USER_MESSAGE_TAG, ChatUserMessage);
-customElements.define(CHAT_MESSAGES_TAG, ChatMessages);
-customElements.define(CHAT_INPUT_TAG, ChatInput);
-customElements.define(CHAT_CONTAINER_TAG, ChatContainer);
+const chatCustomElements = [
+  { tag: CHAT_MESSAGE_TAG, component: ChatMessage },
+  { tag: CHAT_USER_MESSAGE_TAG, component: ChatUserMessage },
+  { tag: CHAT_MESSAGES_TAG, component: ChatMessages },
+  { tag: CHAT_INPUT_TAG, component: ChatInput },
+  { tag: CHAT_CONTAINER_TAG, component: ChatContainer }
+];
+
+chatCustomElements.forEach(({ tag, component }) => {
+  if (!customElements.get(tag)) {
+    customElements.define(tag, component);
+  }
+});
 
 window.Shiny.addCustomMessageHandler(
   "shinyChatMessage",
@@ -561,3 +598,5 @@ window.Shiny.addCustomMessageHandler(
     el.dispatchEvent(evt);
   }
 );
+
+export { CHAT_CONTAINER_TAG };

js/markdown-stream/markdown-stream.ts

@@ -6,6 +6,8 @@ import ClipboardJS from "clipboard";
 import hljs from "highlight.js/lib/common";
 import { Renderer, parse } from "marked";
 
+import { CHAT_CONTAINER_TAG } from "../chat/chat";
+
 import {
   LightElement,
   createElement,
@@ -45,28 +47,38 @@ const SVG_DOT = createSVGIcon(
   `<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" class="${SVG_DOT_CLASS}" style="margin-left:.25em;margin-top:-.25em"><circle cx="6" cy="6" r="6"/></svg>`
 );
 
-// For rendering chat output, we use typical Markdown behavior of passing through raw
-// HTML (albeit sanitizing afterwards).
-//
-// For echoing chat input, we escape HTML. This is not for security reasons but just
-// because it's confusing if the user is using tag-like syntax to demarcate parts of
-// their prompt for other reasons (like <User>/<Assistant> for providing examples to the
-// chat model), and those tags simply vanish.
-const rendererEscapeHTML = new Renderer();
-rendererEscapeHTML.html = (html: string) =>
+// 'markdown' renderer (for assistant messages)
+const markdownRenderer = new Renderer();
+
+// Add some basic Bootstrap styling to markdown tables
+markdownRenderer.table = (header: string, body: string) => {
+  return `<table class="table table-striped table-bordered">
+      <thead>${header}</thead>
+      <tbody>${body}</tbody>
+    </table>`;
+};
+
+// 'semi-markdown' renderer (for user messages)
+const semiMarkdownRenderer = new Renderer();
+
+// Escape HTML, not for security reasons, but just because it's confusing if the user is
+// using tag-like syntax to demarcate parts of their prompt for other reasons (like
+// <User>/<Assistant> for providing examples to the model), and those tags vanish.
+semiMarkdownRenderer.html = (html: string) =>
   html
     .replaceAll("&", "&amp;")
     .replaceAll("<", "&lt;")
     .replaceAll(">", "&gt;")
     .replaceAll('"', "&quot;")
     .replaceAll("'", "&#039;");
-const markedEscapeOpts = { renderer: rendererEscapeHTML };
 
 function contentToHTML(content: string, content_type: ContentType) {
   if (content_type === "markdown") {
-    return unsafeHTML(sanitizeHTML(parse(content) as string));
+    const html = parse(content, { renderer: markdownRenderer });
+    return unsafeHTML(sanitizeHTML(html as string));
   } else if (content_type === "semi-markdown") {
-    return unsafeHTML(sanitizeHTML(parse(content, markedEscapeOpts) as string));
+    const html = parse(content, { renderer: semiMarkdownRenderer });
+    return unsafeHTML(sanitizeHTML(html as string));
   } else if (content_type === "html") {
     return unsafeHTML(sanitizeHTML(content));
   } else if (content_type === "text") {
@@ -272,6 +284,12 @@ class MarkdownElement extends LightElement {
     while (el) {
       if (el.scrollHeight > el.clientHeight) return el;
       el = el.parentElement;
+      if (el?.tagName?.toLowerCase() === CHAT_CONTAINER_TAG.toLowerCase()) {
+        // This ensures that we do not accidentally scroll a parent element of the chat
+        // container. If the chat container itself is scrollable, a scrollable element
+        // would already have been identified.
+        break;
+      }
     }
     return null;
   }