Skip to content

Commit 76d9c8a

Browse files
committed
[ResourceItem] Fix focus styles for BulkActions
1 parent b332eb7 commit 76d9c8a

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

polaris-react/src/components/ResourceItem/ResourceItem.scss

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,28 @@
152152
}
153153
}
154154

155-
// stylelint-disable-next-line selector-max-class -- override border radius for selectable items
155+
// stylelint-disable-next-line selector-max-class -- set border radius for selectable items
156156
&.selectable {
157157
border-radius: var(--p-border-radius-0-experimental);
158158

159159
@media #{$p-breakpoints-sm-up} {
160-
// stylelint-disable-next-line -- override border radius for last selectable item to match ResourceList border radius
160+
// stylelint-disable-next-line -- set border radius for last selectable item to match ResourceList border radius
161161
&:last-child {
162162
border-bottom-left-radius: var(--p-border-radius-3);
163163
border-bottom-right-radius: var(--p-border-radius-3);
164164
}
165+
166+
// stylelint-disable-next-line -- set border radius for last selectable item to match BulkActions border radius
167+
&.hasBulkActions {
168+
// stylelint-disable-next-line -- set border radius for last selectable item to match BulkActions border radius
169+
&:last-child {
170+
// stylelint-disable-next-line -- set border radius for last selectable item to match BulkActions border radius
171+
&.selected {
172+
border-bottom-left-radius: var(--p-border-radius-0-experimental);
173+
border-bottom-right-radius: var(--p-border-radius-0-experimental);
174+
}
175+
}
176+
}
165177
}
166178
}
167179
}

polaris-react/src/components/ResourceItem/ResourceItem.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ class BaseResourceItem extends Component<CombinedProps, State> {
225225
styles.ListItem,
226226
focused && !focusedInner && styles.focused,
227227
hasBulkActions && styles.hasBulkActions,
228+
selected && styles.selected,
228229
selectable && styles.selectable,
229230
);
230231

0 commit comments

Comments
 (0)