Skip to content

[CP Staging] Make selection button clickable in SelectableListItem when item is selected but disabled #89708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beamanator merged 6 commits into from
May 6, 2026
Merged

[CP Staging] Make selection button clickable in SelectableListItem when item is selected but disabled #89708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4887dc
Make selection button clickable in SelectableListItem when item is se…
mhawryluk May 6, 2026
9864ae8
Make the button still appear dimmed when row disabled but selected
mhawryluk May 6, 2026
13fe49c
Make disabled but selected items not muted
mhawryluk May 6, 2026
20612f9
Make the disabled but selected item highlighted on hover
mhawryluk May 6, 2026
56f0f9b
Update InviteMemberListItem
mhawryluk May 6, 2026
d57c8d6
Merge branch 'main' into fix/disabled-selected-item-button
mhawryluk May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/SelectionList/BaseSelectionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ function BaseSelectionList<TItem extends ListItem>({
};

const renderItem: ListRenderItem<TItem> = ({item, index}: ListRenderItemInfo<TItem>) => {
const isItemDisabled = isDisabled || item.isDisabled;
const selected = isItemSelected(item);
const isItemDisabled = isDisabled || (!!item.isDisabled && !selected);
const isItemFocused = (!isDisabled || selected) && focusedIndex === index;
const isItemVisuallyFocused = isItemFocused && (shouldHighlightInitiallyFocusedItem || isKeyboardNavigating);
const isItemHighlighted = !!itemsToHighlight?.has(item.keyForList);
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectionList/ListItem/BaseListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ function BaseListItem<TItem extends ListItem>({
isNested
hoverDimmingValue={1}
pressDimmingValue={item.isInteractive === false ? 1 : variables.pressDimValue}
hoverStyle={!shouldDisableHoverStyle ? [!item.isDisabled && item.isInteractive !== false && styles.hoveredComponentBG, hoverStyle] : undefined}
hoverStyle={!shouldDisableHoverStyle ? [(!item.isDisabled || item.isSelected) && item.isInteractive !== false && styles.hoveredComponentBG, hoverStyle] : undefined}
dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: shouldShowBlueBorderOnFocus}}
onMouseDown={(e) => {
if ((e?.target as HTMLElement)?.tagName === CONST.ELEMENT_NAME.INPUT) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectionList/ListItem/InviteMemberListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function InviteMemberListItem<TItem extends ListItem>({
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const accountID = !item.reportID ? item.accountID || firstItemIconID : undefined;

const ListItemWrapper = item.isDisabled ? BaseListItem : SelectableListItem;
const ListItemWrapper = item.isDisabled && !item.isSelected ? BaseListItem : SelectableListItem;

return (
<ListItemWrapper
Expand Down
6 changes: 2 additions & 4 deletions src/components/SelectionList/ListItem/SelectableListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ function SelectableListItem<TItem extends ListItem>({
<ButtonComponent
item={item}
onSelectRow={onSelectionButtonPress ?? onSelectRow}
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- disabled if either of the optional booleans are true
disabled={isDisabled || item.isDisabledCheckbox}
disabled={!!isDisabled || !!item.isDisabledCheckbox}
style={styles.ml3}
/>
{typeof rightHandSideComponent === 'function' ? rightHandSideComponent(item, isFocused) : rightHandSideComponent}
Expand All @@ -58,8 +57,7 @@ function SelectableListItem<TItem extends ListItem>({
<ButtonComponent
item={item}
onSelectRow={onSelectionButtonPress ?? onSelectRow}
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- disabled if either of the optional booleans are true
disabled={isDisabled || item.isDisabledCheckbox}
disabled={!!isDisabled || item.isDisabledCheckbox}
style={styles.mr3}
/>
{typeof children === 'function' ? children(hovered) : children}
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ function BaseSelectionListWithSections<TItem extends ListItem>({
case CONST.SECTION_LIST_ITEM_TYPE.ROW: {
const isItemFocused = index === focusedIndex;
const isItemVisuallyFocused = isItemFocused && (shouldHighlightInitiallyFocusedItem || isKeyboardNavigating);
const isDisabled = !!item.isDisabled;
const isDisabled = !!item.isDisabled && !item.isSelected;

return (
<ListItemRenderer
Expand Down
Loading