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
29 changes: 15 additions & 14 deletions packages/components/src/FilterChips/FilterChips.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import React from 'react';
import { Badge } from '@patternfly/react-core/dist/dynamic/components/Badge';
import { Button } from '@patternfly/react-core/dist/dynamic/components/Button';
import { Chip } from '@patternfly/react-core/dist/dynamic/deprecated/components/Chip';
import { ChipGroup } from '@patternfly/react-core/dist/dynamic/deprecated/components/Chip';
import { Badge, Button, Label, LabelGroup } from '@patternfly/react-core';
import classNames from 'classnames';
import './filter-chips.scss';

Expand Down Expand Up @@ -47,7 +44,7 @@ const FilterChips: React.FunctionComponent<FilterChipsProps> = ({
}) => {
const groups: FilterChipGroup[] = filters.filter(isFilterChipGroup);
const groupedFilters = groups.map((group, groupKey) => (
<ChipGroup
<LabelGroup
key={`group_${group.category}`}
categoryName={String(group.category) || ' '}
{...(group.chips.length > 1 && onDeleteGroup && {
Expand All @@ -63,9 +60,10 @@ const FilterChips: React.FunctionComponent<FilterChipsProps> = ({
})}
>
{group.chips.map((chip) => (
<Chip
<Label
key={chip.name}
onClick={(event) => {
variant="outline"
onClose={(event) => {
event.stopPropagation();
onDelete(event, [{ ...group, chips: [chip] }]);
}}
Expand All @@ -76,9 +74,9 @@ const FilterChips: React.FunctionComponent<FilterChipsProps> = ({
{chip.count}
</Badge>
)}
</Chip>
</Label>
))}
</ChipGroup>
</LabelGroup>
));

const plainFilters = filters.filter(isPlainFilterChip);
Expand All @@ -88,9 +86,12 @@ const FilterChips: React.FunctionComponent<FilterChipsProps> = ({
{groupedFilters}
{plainFilters &&
plainFilters.map((chip) => (
<ChipGroup key={`group_plain_chip_${chip.name}`}>
<Chip
onClick={(event) => {
<LabelGroup
key={`group_plain_chip_${chip.name}`}
>
<Label
variant="outline"
onClose={(event) => {
event.stopPropagation();
onDelete(event, [chip]);
}}
Expand All @@ -101,8 +102,8 @@ const FilterChips: React.FunctionComponent<FilterChipsProps> = ({
{chip.count}
</Badge>
)}
</Chip>
</ChipGroup>
</Label>
</LabelGroup>
))}
{(showDeleteButton === true || (showDeleteButton === undefined && filters.length > 0)) && (
<Button variant="link" ouiaId="ClearFilters" onClick={(event) => onDelete(event, filters, true)}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,19 @@ exports[`FilterChips component should render 1`] = `
<ul
aria-labelledby="pf-random-id-0"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-1"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 1
</span>
Expand Down Expand Up @@ -89,16 +83,12 @@ exports[`FilterChips component should render 1`] = `
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-2"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 2
<span
Expand Down Expand Up @@ -150,27 +140,21 @@ exports[`FilterChips component should render 1`] = `
class="pf-v6-c-label-group__main"
>
<ul
aria-label="Chip group category"
aria-label="Label group category"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-3"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 3
</span>
Expand Down Expand Up @@ -217,27 +201,21 @@ exports[`FilterChips component should render 1`] = `
class="pf-v6-c-label-group__main"
>
<ul
aria-label="Chip group category"
aria-label="Label group category"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-4"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 4
</span>
Expand Down Expand Up @@ -315,25 +293,19 @@ exports[`FilterChips component should render group delete 1`] = `
<ul
aria-labelledby="pf-random-id-6"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-9"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 1
</span>
Expand Down Expand Up @@ -375,16 +347,12 @@ exports[`FilterChips component should render group delete 1`] = `
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-10"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 2
<span
Expand Down Expand Up @@ -432,7 +400,7 @@ exports[`FilterChips component should render group delete 1`] = `
class="pf-v6-c-label-group__close"
>
<button
aria-label="Close chip group"
aria-label="Close label group"
aria-labelledby="remove_group_pf-random-id-6 pf-random-id-6"
class="pf-v6-c-button pf-m-plain pf-m-small"
data-ouia-component-id="OUIA-Generated-Button-plain-11"
Expand Down Expand Up @@ -468,27 +436,21 @@ exports[`FilterChips component should render group delete 1`] = `
class="pf-v6-c-label-group__main"
>
<ul
aria-label="Chip group category"
aria-label="Label group category"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-11"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 3
</span>
Expand Down Expand Up @@ -535,27 +497,21 @@ exports[`FilterChips component should render group delete 1`] = `
class="pf-v6-c-label-group__main"
>
<ul
aria-label="Chip group category"
aria-label="Label group category"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-12"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 4
</span>
Expand Down Expand Up @@ -633,25 +589,19 @@ exports[`FilterChips component should render with custom delete message 1`] = `
<ul
aria-labelledby="pf-random-id-3"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-5"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 1
</span>
Expand Down Expand Up @@ -693,16 +643,12 @@ exports[`FilterChips component should render with custom delete message 1`] = `
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-6"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 2
<span
Expand Down Expand Up @@ -754,27 +700,21 @@ exports[`FilterChips component should render with custom delete message 1`] = `
class="pf-v6-c-label-group__main"
>
<ul
aria-label="Chip group category"
aria-label="Label group category"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-7"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 3
</span>
Expand Down Expand Up @@ -821,27 +761,21 @@ exports[`FilterChips component should render with custom delete message 1`] = `
class="pf-v6-c-label-group__main"
>
<ul
aria-label="Chip group category"
aria-label="Label group category"
class="pf-v6-c-label-group__list"
data-ouia-component-type="PF6/ChipGroup"
data-ouia-safe="true"
role="list"
>
<li
class="pf-v6-c-label-group__list-item"
>
<span
class="pf-v6-c-label pf-m-outline"
data-ouia-component-id="OUIA-Generated-Chip-8"
data-ouia-component-type="PF6/Chip"
data-ouia-safe="true"
>
<span
class="pf-v6-c-label__content"
>
<span
class="pf-v6-c-label__text"
style="--pf-v6-c-label__text--MaxWidth: 16ch;"
>
Chip 4
</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/FilterChips/filter-chips.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
}
}

.ins-c-chip-filters .pf-v6-c-chip .pf-v6-c-badge {
.ins-c-chip-filters .pf-v6-c-label .pf-v6-c-badge {
margin-left: var(--pf-t--global--spacer--xs);
}
Loading
Loading