Skip to content

[Patch] Fix error toggle group #828

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

Merged
merged 1 commit into from
Apr 25, 2022
Merged

[Patch] Fix error toggle group #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 24 additions & 12 deletions projects/dxc-ngx-cdk/src/lib/dxc-toggleGroup/dxc-toggleGroup.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ describe("DxcToggleGroup tests", () => {
expect(changeMock).toHaveBeenCalledTimes(0);
});

test("dxc-toggleGroup with default value", async () => {
test("dxc-toggleGroup uncontrolled with default value", async () => {
const changeMock = jest.fn();
const dxcToggleGroup = await render(
`<dxc-togglegroup defaultValue="3">,
`<dxc-togglegroup defaultValue="3" (onChange)="changeMock($event)">,
<dxc-toggle label="Facebook" value="1"></dxc-toggle>
<dxc-toggle label="Twitter" value="2"></dxc-toggle>
<dxc-toggle label="Linkedin" value="3"></dxc-toggle>
Expand All @@ -166,16 +166,17 @@ describe("DxcToggleGroup tests", () => {
excludeComponentDeclaration: true,
}
);
const radios = dxcToggleGroup.getAllByRole("radio");
expect(radios[0].getAttribute("aria-checked")).toBe("false");
expect(radios[1].getAttribute("aria-checked")).toBe("false");
expect(radios[2].getAttribute("aria-checked")).toBe("true");
dxcToggleGroup.detectChanges();
expect(dxcToggleGroup.getByText("Linkedin"));
fireEvent.click(dxcToggleGroup.getByText("Linkedin"));
dxcToggleGroup.detectChanges();
expect(changeMock).toHaveBeenCalledWith(null);
});

test("dxc-toggleGroup multiple with default value", async () => {
test("dxc-toggleGroup uncontrolled with multiple and default value", async () => {
const changeMock = jest.fn();
const dxcToggleGroup = await render(
`<dxc-togglegroup [multiple]="true" [defaultValue]="['2','3']">,
`<dxc-togglegroup [multiple]="true" [defaultValue]="['1','2','3']" (onChange)="changeMock($event)">
<dxc-toggle label="Facebook" value="1"></dxc-toggle>
<dxc-toggle label="Twitter" value="2"></dxc-toggle>
<dxc-toggle label="Linkedin" value="3"></dxc-toggle>
Expand All @@ -188,9 +189,20 @@ describe("DxcToggleGroup tests", () => {
excludeComponentDeclaration: true,
}
);
const radios = dxcToggleGroup.getAllByRole("switch");
expect(radios[0].getAttribute("aria-checked")).toBe("false");
expect(radios[1].getAttribute("aria-checked")).toBe("true");
expect(radios[2].getAttribute("aria-checked")).toBe("true");
dxcToggleGroup.detectChanges();
expect(dxcToggleGroup.getByText("Facebook"));
fireEvent.click(dxcToggleGroup.getByText("Facebook"));
dxcToggleGroup.detectChanges();
expect(changeMock).toHaveBeenCalledWith(["2", "3"]);
dxcToggleGroup.detectChanges();
expect(dxcToggleGroup.getByText("Twitter"));
fireEvent.click(dxcToggleGroup.getByText("Twitter"));
dxcToggleGroup.detectChanges();
expect(changeMock).toHaveBeenCalledWith(["3"]);
dxcToggleGroup.detectChanges();
expect(dxcToggleGroup.getByText("Linkedin"));
fireEvent.click(dxcToggleGroup.getByText("Linkedin"));
dxcToggleGroup.detectChanges();
expect(changeMock).toHaveBeenCalledWith([]);
});
});
8 changes: 5 additions & 3 deletions projects/dxc-ngx-cdk/src/lib/dxc-toggleGroup/dxc-toggleGroup.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@ export class DxcToggleGroupComponent implements OnInit {
}
});

item.tabIndexValue = this.disabled ? -1 : this.tabIndexValue;
item.setRole(this.multiple ? "switch" : "radio");
this.setToggleSelected(item);
setTimeout(() => {
item.tabIndexValue = this.disabled ? -1 : this.tabIndexValue;
item.role = this.multiple ? "switch" : "radio";
this.setToggleSelected(item);
});
});
}
}
Expand Down