Skip to content

Commit

Permalink
[Feature] Add new st.pills widget (streamlit#9283)
Browse files Browse the repository at this point in the history
## Describe your changes

Add new `st.pills` command that leverages the button_group mechanics we
have added during the `st.feedback` project
(streamlit#8915).

This also prepares the underlying proto, classes and tests for
`st.segments` and a more generic `st.button_group` command.

Following changes are made:
- exposes the `st.pills` command
- updates the `ButtonGroup.proto` message with additional fields (label,
label_visibility, style-update, ...)
- refactors the existing unit tests to be shareable between the
different commands that are built on top of button_group
- adds a new e2e test
- some nits such as increasing test coverage for `st.feedback`
specifically
- add the possibility to unselect an option which will also affect
`st.feedback`
- use the new `useBasicWidgetState` hook that was introduced in
streamlit#9359
- wrap `ButtonGroup` in `memo`

## GitHub Issue Link (if applicable)

## Testing Plan

- Explanation of why no additional tests are needed
- Unit Tests (JS and/or Python)
- Update / extend existing Python button_group unit tests to be
parameterized so that `st.pills` is automatically tested as well
  - Update / extend JS ButtonGroup unit tests
- E2E Tests
  - Add new `st_pills` e2e test
- Any manual testing needed?

---

**Contribution License Agreement**

By submitting this pull request you agree that all contributions to this
project are made under the Apache 2.0 license.
  • Loading branch information
raethlein authored Sep 20, 2024
1 parent df147ea commit daa0d3c
Show file tree
Hide file tree
Showing 35 changed files with 1,775 additions and 399 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion e2e_playwright/st_feedback_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ def test_clicking_on_stars_shows_sentiment_and_take_snapshot(
assert_snapshot(stars, name="st_feedback-stars")


def test_feedback_buttons_are_disabled(app: Page):
def test_feedback_buttons_are_disabled(
app: Page, assert_snapshot: ImageCompareFunction
):
"""Test that feedback buttons are disabled when `disabled=True` and that
they cannot be interacted with."""

Expand All @@ -87,6 +89,8 @@ def test_feedback_buttons_are_disabled(app: Page):
text = get_markdown(app, "feedback-disabled: None")
expect(text).to_be_attached()

assert_snapshot(stars, name="st_feedback-disabled")


def test_feedback_works_in_forms(app: Page):
expect(app.get_by_text("feedback-in-form: None")).to_be_visible()
Expand Down
147 changes: 147 additions & 0 deletions e2e_playwright/st_pills.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022-2024)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import time

import streamlit as st

st.header("Pills - standard")

if st.checkbox("Set default values", value=False):
st.session_state.default_pills = ["🧰 General widgets", "📊 Charts", "🧊 3D"]
else:
st.session_state.default_pills = []

default = st.session_state.default_pills

pills_options = [
"🧰 General widgets",
"📊 Charts",
"🌇 Images",
"🎥 Video",
"📝 Text",
"🗺️ Maps & geospatial",
"🧮 Dataframes & tables",
"🧬 Molecules & genes",
"🪢 Graphs",
"🧊 3D",
"✏️ Code & editors",
"📃 Page navigation",
"🔐 Authentication",
"🎨 Style & layout",
"🛠️ Developer tools",
"🏗️ App builders",
"🔌 Integrations with other tools",
"📦 Collections of components",
"📦 Very very long text" * 20, # pill with very long text
]
selection = st.pills(
"Select some options",
pills_options,
key="pills",
selection_mode="multiple",
default=default,
help="This is for choosing options",
)
st.write(f"Multi selection: {selection}")


st.header("Pills - starting with icons")
option_to_icon_map = {
0: ":material/add:",
1: ":material/zoom_in:",
2: ":material/zoom_out:",
3: ":material/zoom_out_map:",
}
selection = st.pills(
"Select a single option",
options=[0, 1, 2, 3],
format_func=lambda option: option_to_icon_map[option],
key="icon_only_pills",
selection_mode="single",
)
st.write(f"Single selection: {selection}")


st.header("Pills - on_change callback")
st.pills(
"Elements (label collapsed)",
["Water", "Fire", "Earth", "Air"],
key="pills_on_change",
on_change=lambda: st.write(
f"on_change selection: {st.session_state.pills_on_change}"
),
label_visibility="collapsed",
)


st.header("Pills - disabled")
selection = st.pills(
"Elements",
["Water", "Fire", "Earth", "Air"],
key="pills_disabled",
disabled=True,
)
st.write("pills-disabled:", str(selection))


st.header("Pills in form")
with st.form(key="my_form", clear_on_submit=True):
selection = st.pills(
"Elements (label hidden)",
["Water", "Fire", "Earth", "Air"],
key="pills_in_form",
label_visibility="hidden",
)
st.form_submit_button("Submit")

st.write(
"pills-in-form:",
str(st.session_state.pills_in_form)
if "pills_in_form" in st.session_state
else None,
)

st.header("Pills in fragment")


@st.experimental_fragment()
def test_fragment():
selection = st.pills(
"Elements", ["Water", "Fire", "Earth", "Air"], key="pills_in_fragment"
)
st.write("pills-in-fragment:", str(selection))


test_fragment()


st.header("Pills - unmount")
if st.button("Create some elements to unmount component"):
for _ in range(3):
# The sleep here is needed, because it won't unmount the
# component if this is too fast.
time.sleep(1)
st.write("Another element")

selection = st.pills(
"Elements", ["Water", "Fire", "Earth", "Air"], key="pills_after_sleep"
)
st.write("pills-after-sleep:", str(selection))


if "runs" not in st.session_state:
st.session_state.runs = 0
st.session_state.runs += 1
st.write("Runs:", st.session_state.runs)
205 changes: 205 additions & 0 deletions e2e_playwright/st_pills_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022-2024)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import re

from playwright.sync_api import Locator, Page, expect

from e2e_playwright.conftest import ImageCompareFunction, wait_for_app_run
from e2e_playwright.shared.app_utils import (
check_top_level_class,
click_button,
click_checkbox,
click_form_button,
expect_help_tooltip,
expect_markdown,
get_element_by_key,
)


def get_button_group(app: Page, index: int) -> Locator:
return app.get_by_test_id("stButtonGroup").nth(index)


def get_pill_button(locator: Locator, text: str) -> Locator:
return locator.get_by_test_id(re.compile("stBaseButton-pills(Active)?")).filter(
has_text=text
)


def test_click_multiple_pills_and_take_snapshot(
themed_app: Page, assert_snapshot: ImageCompareFunction
):
"""Test multiselect pills and take a screenshot.
Click on same pill multiple times to test unselect.
"""

pills = get_button_group(themed_app, 0)
get_pill_button(pills, "📝").click()
wait_for_app_run(themed_app)
# click on second element to test multiselect
get_pill_button(pills, "🪢").click()
wait_for_app_run(themed_app)
expect_markdown(themed_app, "Multi selection: ['📝 Text', '🪢 Graphs']")

# click on same element to test unselect
get_pill_button(pills, "🪢").click()
wait_for_app_run(themed_app)
expect_markdown(themed_app, "Multi selection: ['📝 Text']")

# click on same element and take screenshot of multiple selected pills
get_pill_button(pills, "🪢").click()
# take away hover focus of button
themed_app.get_by_test_id("stApp").click(position={"x": 0, "y": 0})
wait_for_app_run(themed_app)
expect_markdown(themed_app, "Multi selection: ['📝 Text', '🪢 Graphs']")

assert_snapshot(pills, name="st_pills-multiselect")


def test_click_single_icon_pill_and_take_snapshot(
themed_app: Page, assert_snapshot: ImageCompareFunction
):
"""Test icon only pills (via format_func) and take a screenshot.
Click on same element to test unselect.
Click on two different elements to validate single select.
"""

pills = get_button_group(themed_app, 1)

# the icon's span element has the respective text
# (e.g. :material/zoom_out_map: -> zoom_out_map)
get_pill_button(pills, "zoom_out_map").click()
expect_markdown(themed_app, "Single selection: 3")

# test unselect in single-select mode
get_pill_button(pills, "zoom_out_map").click()
expect_markdown(themed_app, "Single selection: None")

get_pill_button(pills, "zoom_in").click()
# take away hover focus of button
themed_app.get_by_test_id("stApp").click(position={"x": 0, "y": 0})
wait_for_app_run(themed_app)
expect_markdown(themed_app, "Single selection: 1")

assert_snapshot(pills, name="st_pills-singleselect_icon_only")


def test_pills_are_disabled_and_take_screenshot(
app: Page, assert_snapshot: ImageCompareFunction
):
pills = get_button_group(app, 3)
for pill in pills.locator("button").all():
expect(pill).to_have_js_property("disabled", True)
selected_pill = get_pill_button(pills, "Air")
selected_pill.click(force=True)
wait_for_app_run(app)
expect(selected_pill).not_to_have_css(
"color", re.compile("rgb\\(\\d+, \\d+, \\d+\\)")
)
expect_markdown(app, "pills-disabled: None")
assert_snapshot(pills, name="st_pills-disabled")


def test_pass_default_selections(app: Page):
"""Test that passed defaults are rendered correctly."""
expect_markdown(app, "Multi selection: []")

click_checkbox(app, "Set default values")
expect_markdown(
app, "Multi selection: ['🧰 General widgets', '📊 Charts', '🧊 3D']"
)

click_checkbox(app, "Set default values")
expect_markdown(app, "Multi selection: []")


def test_selection_via_on_change_callback(app: Page):
"""Test that the on_change callback is triggered when a pill is clicked."""
pills = get_button_group(app, 2)
get_pill_button(pills, "Air").click()
wait_for_app_run(app)
expect_markdown(app, "on_change selection: Air")


def test_pills_work_in_forms(app: Page):
expect_markdown(app, "pills-in-form: None")
pills = get_button_group(app, 4)
get_pill_button(pills, "Air").click()
click_form_button(app, "Submit")
wait_for_app_run(app)
expect_markdown(app, "pills-in-form: Air")


def test_pills_work_with_fragments(app: Page):
expect_markdown(app, "pills-in-fragment: None")
pills = get_button_group(app, 5)
get_pill_button(pills, "Air").click()
wait_for_app_run(app)
expect_markdown(app, "pills-in-fragment: Air")
expect(app.get_by_text("Runs: 1")).to_be_visible()


def test_pills_remount_keep_value(app: Page):
expect_markdown(app, "pills-after-sleep: None")
pills = get_button_group(app, 6)
selected_pill = get_pill_button(pills, "Air")
selected_pill.click()
wait_for_app_run(app)
expect_markdown(app, "pills-after-sleep: Air")
click_button(app, "Create some elements to unmount component")
expect_markdown(app, "pills-after-sleep: Air")


def test_help_tooltip_works(app: Page):
expect_help_tooltip(app, get_button_group(app, 0), "This is for choosing options")


def test_check_top_level_class(app: Page):
"""Check that the top level class is correctly set."""
check_top_level_class(app, "stButtonGroup")


def test_custom_css_class_via_key(app: Page):
"""Test that the element can have a custom css class via the key argument."""
expect(get_element_by_key(app, "pills")).to_be_visible()


def test_pills_with_labels(app: Page):
"""Test that labels are rendered correctly."""

# visible label
visible_label = app.get_by_test_id("stWidgetLabel").filter(
has_text="Select some options"
)
expect(visible_label).to_be_visible()

# collapsed label
markdown_el = app.get_by_test_id("stWidgetLabel").filter(
has_text="Elements (label collapsed)"
)
expect(markdown_el).to_be_attached()
expect(markdown_el).not_to_be_visible()
expect(markdown_el).to_have_css("display", "none")

# hidden label
markdown_el = app.get_by_test_id("stWidgetLabel").filter(
has_text="Elements (label hidden)"
)
expect(markdown_el).to_be_attached()
expect(markdown_el).not_to_be_visible()
expect(markdown_el).to_have_css("display", "flex")
expect(markdown_el).to_have_css("visibility", "hidden")
Loading

0 comments on commit daa0d3c

Please sign in to comment.