Skip to content

Commit 23acdf7

Browse files
Merge branch 'next' into FW-6912-card
2 parents 1a9f99f + 0361bf0 commit 23acdf7

File tree

94 files changed

+48
-43
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+48
-43
lines changed

core/package-lock.json

Lines changed: 4 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
],
3333
"dependencies": {
3434
"@phosphor-icons/core": "^2.1.1",
35-
"@stencil/core": "4.33.1",
35+
"@stencil/core": "4.38.0",
3636
"ionicons": "^8.0.13",
3737
"tslib": "^2.1.0"
3838
},

core/src/components/input-otp/input-otp.common.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,6 @@
129129
background: var(--separator-color);
130130
}
131131

132-
// Fills
133-
// --------------------------------------------------
134-
135-
:host(.input-otp-fill-outline) {
136-
--background: none;
137-
}
138-
139132
// States
140133
// --------------------------------------------------
141134

core/src/components/input-otp/input-otp.ionic.scss

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,24 @@
6868
// --------------------------------------------------
6969

7070
:host(.input-otp-shape-round) {
71-
--border-radius: #{globals.$ion-border-radius-400};
71+
--border-radius: #{globals.$ion-round-xl};
7272
}
7373

7474
:host(.input-otp-shape-soft) {
75-
--border-radius: #{globals.$ion-border-radius-200};
75+
--border-radius: #{globals.$ion-soft-xl};
7676
}
7777

7878
:host(.input-otp-shape-rectangular) {
79-
--border-radius: #{globals.$ion-border-radius-0};
79+
--border-radius: #{globals.$ion-rectangular-xl};
8080
}
8181

8282
// Fills
8383
// --------------------------------------------------
8484

85+
:host(.input-otp-fill-outline) {
86+
--background: #{globals.$ion-bg-input-default};
87+
}
88+
8589
:host(.input-otp-fill-solid) {
8690
--border-color: #{globals.$ion-bg-input-bold-default};
8791
--background: #{globals.$ion-bg-input-bold-default};

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
1.93 KB
492 Bytes

0 commit comments

Comments
 (0)