accordion: Preserve disabled state of individual items - #3141
Merged
huacnlee merged 1 commit intoSep 20, 2026
Merged
Conversation
Member
|
Thanks |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
An enabled Accordion overwrote each item's own disabled flag, making
.disabled(true)items interactive. Combine the group and item flags so either one can disable the item. Add a regression covering enabled siblings and disabling/re-enabling the group, plus a disabled item in the Accordion story.Public API
gpui-component(existing signatures, corrected behavior):Accordion::disabled(self, disabled: bool) -> Self: disables the group while preserving independently disabled children.AccordionItem::disabled(self, disabled: bool) -> Self: an item's disabled flag remains effective inside an enabled group.Breaking Changes
Code relying on the old accidental enabling behavior must explicitly enable the item. Builder signatures are unchanged.
Accordion::new("settings").item(|item| item.title("Advanced").disabled(true)) -// Clicking Advanced can expand it. +// Clicking Advanced leaves it closed.How to Test
cargo test -p gpui-kit --features test-support --test disclosure --locked: 5 passed. The new regression failed on main before the fix../script/run-story-macos Accordion: click Disabled item (stays closed), click Can it hold any content? (expands), toggle Options > Disabled (all triggers ignore clicks), re-enable the group (Disabled item stays closed).AI-assisted implementation with Codex; diff reviewed and regression/native checks run.