Skip to content
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.

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

fix(input, textarea, select): account for multiple start/end slot elements #29172

Merged
merged 6 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions core/src/components/input/input.scss
Original file line number Diff line number Diff line change
Expand Up @@ -596,12 +596,12 @@
// Start/End Slots
// ----------------------------------------------------------------

::slotted([slot="start"]) {
::slotted([slot="start"]:last-of-type) {
margin-inline-end: $form-control-label-margin;
margin-inline-start: 0;
}

::slotted([slot="end"]) {
::slotted([slot="end"]:first-of-type) {
margin-inline-start: $form-control-label-margin;
margin-inline-end: 0;
}
8 changes: 8 additions & 0 deletions core/src/components/input/test/slot/input.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ configs().forEach(({ title, screenshot, config }) => {
`
<ion-input label-placement="start" fill="solid" value="100" label="Weight" clear-input="true">
<ion-icon slot="start" name="barbell" aria-hidden="true"></ion-icon>
<ion-icon slot="start" name="heart" aria-hidden="true"></ion-icon>
<ion-button slot="end" aria-label="Show/hide password">
<ion-icon slot="icon-only" name="lock-closed" aria-hidden="true"></ion-icon>
</ion-button>
<ion-button slot="end">
<ion-icon slot="icon-only" name="trash" aria-hidden="true"></ion-icon>
</ion-button>
</ion-input>
`,
config
Expand All @@ -25,9 +29,13 @@ configs().forEach(({ title, screenshot, config }) => {
`
<ion-input label-placement="floating" fill="solid" value="100" label="Weight" clear-input="true">
<ion-icon slot="start" name="barbell" aria-hidden="true"></ion-icon>
<ion-icon slot="start" name="heart" aria-hidden="true"></ion-icon>
<ion-button slot="end" aria-label="Show/hide password">
<ion-icon slot="icon-only" name="lock-closed" aria-hidden="true"></ion-icon>
</ion-button>
<ion-button slot="end">
<ion-icon slot="icon-only" name="trash" aria-hidden="true"></ion-icon>
</ion-button>
</ion-input>
`,
config
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions core/src/components/select/select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -556,12 +556,12 @@ button {
flex-shrink: 0;
}

::slotted([slot="start"]) {
::slotted([slot="start"]:last-of-type) {
margin-inline-end: $form-control-label-margin;
margin-inline-start: 0;
}

::slotted([slot="end"]) {
::slotted([slot="end"]:first-of-type) {
margin-inline-start: $form-control-label-margin;
margin-inline-end: 0;
}
8 changes: 8 additions & 0 deletions core/src/components/select/test/slot/select.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ configs().forEach(({ title, screenshot, config }) => {
`
<ion-select label-placement="start" fill="solid" placeholder="Select weight" label="Weight">
<ion-icon slot="start" name="barbell" aria-hidden="true"></ion-icon>
<ion-icon slot="start" name="heart" aria-hidden="true"></ion-icon>
<ion-button slot="end" aria-label="Show/hide password">
<ion-icon slot="icon-only" name="lock-closed" aria-hidden="true"></ion-icon>
</ion-button>
<ion-button slot="end">
<ion-icon slot="icon-only" name="trash" aria-hidden="true"></ion-icon>
</ion-button>
</ion-select>
`,
config
Expand All @@ -25,9 +29,13 @@ configs().forEach(({ title, screenshot, config }) => {
`
<ion-select label-placement="floating" fill="solid" placeholder="Select weight" label="Weight">
<ion-icon slot="start" name="barbell" aria-hidden="true"></ion-icon>
<ion-icon slot="start" name="heart" aria-hidden="true"></ion-icon>
<ion-button slot="end" aria-label="Show/hide password">
<ion-icon slot="icon-only" name="lock-closed" aria-hidden="true"></ion-icon>
</ion-button>
<ion-button slot="end">
<ion-icon slot="icon-only" name="trash" aria-hidden="true"></ion-icon>
</ion-button>
</ion-select>
`,
config
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions core/src/components/textarea/test/slot/textarea.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ configs().forEach(({ title, screenshot, config }) => {
`
<ion-textarea label-placement="start" fill="solid" value="100" label="Weight">
<ion-icon slot="start" name="barbell" aria-hidden="true"></ion-icon>
<ion-icon slot="start" name="heart" aria-hidden="true"></ion-icon>
<ion-button slot="end" aria-label="Show/hide password">
<ion-icon slot="icon-only" name="lock-closed" aria-hidden="true"></ion-icon>
</ion-button>
<ion-button slot="end">
<ion-icon slot="icon-only" name="trash" aria-hidden="true"></ion-icon>
</ion-button>
</ion-textarea>
`,
config
Expand All @@ -25,9 +29,13 @@ configs().forEach(({ title, screenshot, config }) => {
`
<ion-textarea label-placement="floating" fill="solid" value="100" label="Weight">
<ion-icon slot="start" name="barbell" aria-hidden="true"></ion-icon>
<ion-icon slot="start" name="heart" aria-hidden="true"></ion-icon>
<ion-button slot="end" aria-label="Show/hide password">
<ion-icon slot="icon-only" name="lock-closed" aria-hidden="true"></ion-icon>
</ion-button>
<ion-button slot="end">
<ion-icon slot="icon-only" name="trash" aria-hidden="true"></ion-icon>
</ion-button>
</ion-textarea>
`,
config
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/textarea/textarea.scss
Original file line number Diff line number Diff line change
Expand Up @@ -684,12 +684,12 @@
margin-top: 0; // ensure slot content is vertically aligned with label
}

::slotted([slot="start"]) {
::slotted([slot="start"]:last-of-type) {
margin-inline-end: $form-control-label-margin;
margin-inline-start: 0;
}

::slotted([slot="end"]) {
::slotted([slot="end"]:first-of-type) {
margin-inline-start: $form-control-label-margin;
margin-inline-end: 0;
}
Loading