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.

Sign up for GitHub

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(segmented-control): Make check state update correctly #9733

Merged
merged 4 commits into from
Jul 5, 2024
Merged

fix(segmented-control): Make check state update correctly #9733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
938b2db
fix(segmented-control): Make check state update correctly
josercarcamo Jul 3, 2024
5b90a27
Added test case
josercarcamo Jul 3, 2024
79c500d
Moved and improved test
josercarcamo Jul 3, 2024
0af1f67
Added newlines and moved function
josercarcamo Jul 5, 2024
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
37 changes: 30 additions & 7 deletions packages/calcite-components/src/components/segmented-control/segmented-control.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,14 @@ describe("calcite-segmented-control", () => {
expect(selectedValue).toBe("3");
});

it("allows items to be selected", async () => {
async function getSelectedItemValue(page: E2EPage): Promise<string> {
return page.$eval(
"calcite-segmented-control",
(segmentedControl: HTMLCalciteSegmentedControlElement) => segmentedControl.selectedItem.value,
);
}
async function getSelectedItemValue(page: E2EPage): Promise<string> {
return page.$eval(
"calcite-segmented-control",
(segmentedControl: HTMLCalciteSegmentedControlElement) => segmentedControl.selectedItem.value,
);
}

it("allows items to be selected", async () => {
const page = await newE2EPage();
await page.setContent(
`<calcite-segmented-control>
Expand Down Expand Up @@ -193,6 +193,29 @@ describe("calcite-segmented-control", () => {
expect(await getSelectedItemValue(page)).toBe("2");
});

it("updates selection when cleared with undefined", async () => {
const page = await newE2EPage();
await page.setContent(
`<calcite-segmented-control>
<calcite-segmented-control-item value="1" checked>one</calcite-segmented-control-item>
<calcite-segmented-control-item value="2">two</calcite-segmented-control-item>
</calcite-segmented-control>`,
);
await page.waitForChanges();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: for readability, can you add newlines between the test setup, and each update/assert chunk?

expect(await getSelectedItemValue(page)).toBe("1");

const [first, second] = await page.findAll("calcite-segmented-control-item");
first.setProperty("checked", undefined);
second.setProperty("checked", true);
await page.waitForChanges();
expect(await getSelectedItemValue(page)).toBe("2");

first.setProperty("checked", true);
second.setProperty("checked", undefined);
await page.waitForChanges();
expect(await getSelectedItemValue(page)).toBe("1");
});

it("does not emit extraneous events (edge case from #3210)", async () => {
const page = await newE2EPage();
await page.setContent(
Expand Down
5 changes: 4 additions & 1 deletion packages/calcite-components/src/components/segmented-control/segmented-control.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,10 @@ export class SegmentedControl
@Listen("calciteInternalSegmentedControlItemChange")
protected handleSelected(event: Event): void {
event.preventDefault();
this.selectItem(event.target as HTMLCalciteSegmentedControlItemElement);
const el = event.target as HTMLCalciteSegmentedControlItemElement;
if (el.checked) {
this.selectItem(el);
}
event.stopPropagation();
}

Expand Down
Loading