Skip to content
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: 4 additions & 0 deletions core/src/components/checkbox/checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ export class Checkbox implements ComponentInterface {
};

private onClick = (ev: MouseEvent) => {
if (this.disabled) {
return;
}

this.toggleChecked(ev);
};

Expand Down
24 changes: 24 additions & 0 deletions core/src/components/checkbox/test/checkbox.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { newSpecPage } from '@stencil/core/testing';

import { Checkbox } from '../checkbox';

describe('ion-checkbox: disabled', () => {
it('clicking disabled checkbox should not toggle checked state', async () => {
const page = await newSpecPage({
components: [Checkbox],
html: `
<ion-checkbox disabled="true">Checkbox</ion-checkbox>
`,
});

const checkbox = page.body.querySelector('ion-checkbox');

expect(checkbox.checked).toBe(false);

checkbox.click();

await page.waitForChanges();

expect(checkbox.checked).toBe(false);
});
});
2 changes: 1 addition & 1 deletion core/src/components/radio-group/radio-group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class RadioGroup implements ComponentInterface {
* using the `name` attribute.
*/
const selectedRadio = ev.target && (ev.target as HTMLElement).closest('ion-radio');
if (selectedRadio) {
if (selectedRadio && selectedRadio.disabled === false) {
const currentValue = this.value;
const newValue = selectedRadio.value;
if (newValue !== currentValue) {
Expand Down
6 changes: 5 additions & 1 deletion core/src/components/radio/radio.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,11 @@ export class Radio implements ComponentInterface {
};

private onClick = () => {
const { radioGroup, checked } = this;
const { radioGroup, checked, disabled } = this;

if (disabled) {
return;
}

/**
* The legacy control uses a native input inside
Expand Down
24 changes: 24 additions & 0 deletions core/src/components/radio/test/radio.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,27 @@ describe('ion-radio', () => {
expect(radio.classList.contains('radio-checked')).toBe(true);
});
});

describe('ion-radio: disabled', () => {
it('clicking disabled radio should not set checked state', async () => {
const page = await newSpecPage({
components: [Radio, RadioGroup],
html: `
<ion-radio-group>
<ion-radio disabled="true" value="a">Radio</ion-radio>
</ion-radio-group>
`,
});

const radio = page.body.querySelector('ion-radio');
const radioGroup = page.body.querySelector('ion-radio-group');

expect(radioGroup.value).toBe(undefined);

radio.click();

await page.waitForChanges();

expect(radioGroup.value).toBe(undefined);
});
});
21 changes: 21 additions & 0 deletions core/src/components/toggle/test/toggle.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,24 @@ describe('toggle', () => {
});
});
});

describe('ion-toggle: disabled', () => {
it('clicking disabled toggle should not toggle checked state', async () => {
const page = await newSpecPage({
components: [Toggle],
html: `
<ion-toggle disabled="true">Toggle</ion-toggle>
`,
});

const toggle = page.body.querySelector('ion-toggle');

expect(toggle.checked).toBe(false);

toggle.click();

await page.waitForChanges();

expect(toggle.checked).toBe(false);
});
});
4 changes: 4 additions & 0 deletions core/src/components/toggle/toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@ export class Toggle implements ComponentInterface {
}

private onClick = (ev: MouseEvent) => {
if (this.disabled) {
return;
}

ev.preventDefault();

if (this.lastDrag + 300 < Date.now()) {
Expand Down