Skip to content
Open
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
11 changes: 9 additions & 2 deletions core/src/components/select-modal/select-modal.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@
@import "./select-modal";
@import "../../themes/ionic.mixins.scss";
@import "../item/item.md.vars";
@import "../list/list.md.vars";

ion-list ion-radio::part(container) {
ion-radio::part(container) {
display: none;
}

ion-list ion-radio::part(label) {
ion-radio::part(label) {
@include margin(0);
}

ion-radio-group {
@include padding($list-md-padding-top, null, $list-md-padding-bottom, null);

display: block;
}

ion-item {
--inner-border-width: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/select-modal/select-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export class SelectModal implements ComponentInterface {
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>{this.multiple === true ? this.renderCheckboxOptions() : this.renderRadioOptions()}</ion-list>
{this.multiple === true ? <ion-list>{this.renderCheckboxOptions()}</ion-list> : this.renderRadioOptions()}
</ion-content>
</Host>
);
Expand Down
32 changes: 32 additions & 0 deletions core/src/components/select-modal/test/basic/select-modal.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,38 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
await selectModalPage.ionModalDidDismiss.next();
await expect(selectModalPage.modal).not.toBeVisible();
});

test('should render a radio group without a wrapping ion-list', async () => {
await selectModalPage.setup(config, options, false);

const radioGroup = selectModalPage.selectModal.locator('ion-radio-group');
await expect(radioGroup).toHaveAttribute('role', 'radiogroup');

const list = selectModalPage.selectModal.locator('ion-list');
await expect(list).toHaveCount(0);
});
});

test.describe('multiple selection', () => {
let selectModalPage: SelectModalPage;

test.beforeEach(async ({ page }) => {
selectModalPage = new SelectModalPage(page);
});

test('should render checkboxes inside an ion-list', async () => {
await selectModalPage.setup(config, options, true);

const list = selectModalPage.selectModal.locator('ion-list');
await expect(list).toBeVisible();
await expect(list).toHaveAttribute('role', 'list');

const checkboxes = selectModalPage.selectModal.locator('ion-checkbox');
await expect(checkboxes).toHaveCount(options.length);

const radioGroup = selectModalPage.selectModal.locator('ion-radio-group');
await expect(radioGroup).toHaveCount(0);
});
});
});
});
Expand Down