Skip to content

Commit ca945b5

Browse files
committed
Merge branch 'next' into ROU-12161-2
2 parents 27638e0 + 28caeff commit ca945b5

File tree

6 files changed

+17
-1
lines changed

6 files changed

+17
-1
lines changed

core/src/components/item/item.ionic.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ slot[name="end"]::slotted(*) {
7171

7272
// Item: Focused
7373
// --------------------------------------------------
74-
7574
:host(.ion-focused) .item-native::after {
7675
@include globals.border-radius(inherit);
7776
@include globals.position(0, 0, 0, 0);
@@ -112,3 +111,14 @@ slot[name="end"]::slotted(*) {
112111
:host(.item-lines-none) {
113112
--inner-border-width: #{globals.$ion-border-size-0};
114113
}
114+
115+
// Item in Select Modal
116+
// --------------------------------------------------
117+
:host(.in-select-modal) {
118+
--background-focused: #{globals.$ion-bg-neutral-subtlest-press};
119+
--background-focused-opacity: 0;
120+
}
121+
122+
:host(.in-select-modal.ion-focused) .item-native {
123+
--border-radius: #{globals.$ion-border-radius-400};
124+
}

core/src/components/item/item.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ export class Item implements ComponentInterface, AnchorInterface, ButtonInterfac
407407
'item-control-needs-pointer-cursor': firstInteractiveNeedsPointerCursor,
408408
'item-disabled': disabled,
409409
'in-list': inList,
410+
'in-select-modal': hostContext('ion-select-modal', this.el),
410411
'item-multiple-inputs': this.multipleInputs,
411412
'ion-activatable': canActivate,
412413
'ion-focusable': this.focusable,
-1.02 KB
Loading
1.93 KB
Loading
492 Bytes
Loading

core/src/components/select-modal/select-modal.ionic.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,9 @@ ion-content {
6767
--padding-end: #{globals.$ion-space-400} !important;
6868
/* stylelint-disable-next-line declaration-no-important */
6969
--padding-bottom: #{globals.$ion-space-1200} !important;
70+
71+
// Set the background to the focused element within a radio group only when there is a checked radio
72+
&:has(.radio-checked) .ion-focused:not(.item-radio-checked) {
73+
--background-focused-opacity: 1;
74+
}
7075
}

0 commit comments

Comments
 (0)