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(chip-group): Add existence checks #7586

Merged
merged 1 commit into from
Aug 23, 2023
Merged

fix(chip-group): Add existence checks #7586

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
14 changes: 7 additions & 7 deletions packages/calcite-components/src/components/chip-group/chip-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export class ChipGroup implements InteractiveComponent {
@Listen("calciteInternalChipKeyEvent")
calciteInternalChipKeyEventListener(event: CustomEvent): void {
if (event.composedPath().includes(this.el)) {
const interactiveItems = this.items.filter((el) => !el.disabled);
const interactiveItems = this.items?.filter((el) => !el.disabled);
switch (event.detail.key) {
case "ArrowRight":
focusElementInGroup(interactiveItems, event.detail.target, "next");
Expand All @@ -146,16 +146,16 @@ export class ChipGroup implements InteractiveComponent {
@Listen("calciteChipClose")
calciteChipCloseListener(event: CustomEvent): void {
const item = event.target as HTMLCalciteChipElement;
if (this.items.includes(item)) {
if (this.items.indexOf(item) > 0) {
if (this.items?.includes(item)) {
if (this.items?.indexOf(item) > 0) {
focusElementInGroup(this.items, item as HTMLCalciteChipElement, "previous");
} else if (this.items.indexOf(item) === 0) {
} else if (this.items?.indexOf(item) === 0) {
focusElementInGroup(this.items, item as HTMLCalciteChipElement, "next");
} else {
focusElementInGroup(this.items, item as HTMLCalciteChipElement, "first");
}
}
this.items = this.items.filter((el) => el !== item);
this.items = this.items?.filter((el) => el !== item);
}

@Listen("calciteChipSelect")
Expand Down Expand Up @@ -205,7 +205,7 @@ export class ChipGroup implements InteractiveComponent {

private setSelectedItems = (emit: boolean, elToMatch?: HTMLCalciteChipElement): void => {
if (elToMatch) {
this.items.forEach((el) => {
this.items?.forEach((el) => {
const matchingEl = elToMatch === el;
switch (this.selectionMode) {
case "multiple":
Expand All @@ -225,7 +225,7 @@ export class ChipGroup implements InteractiveComponent {
});
}

this.selectedItems = this.items.filter((el) => el.selected);
this.selectedItems = this.items?.filter((el) => el.selected);

if (emit) {
this.calciteChipGroupSelect.emit();
Expand Down