Skip to content

fix(DataToolbar): fix filter context from updating unnecessarily #4056

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
dlabaj merged 2 commits into from
Apr 14, 2020
Merged

fix(DataToolbar): fix filter context from updating unnecessarily #4056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ce9b51
fix(DataTooblar): fix filter context from updating unnecessarily, whe…
kmcfaul Apr 9, 2020
4f50d84
feat(DataToolbar): update snapshots
kmcfaul Apr 13, 2020
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
10 changes: 7 additions & 3 deletions packages/react-core/src/components/DataToolbar/DataToolbarFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,19 @@ export class DataToolbarFilter extends React.Component<DataToolbarFilterProps, D
this.setState({ isMounted: true });
}

componentDidUpdate() {
componentDidUpdate(prevProps: DataToolbarFilterProps) {
const { categoryName, chips } = this.props;
this.context.updateNumberFilters(typeof categoryName === 'string' ? categoryName : categoryName.name, chips.length);
if (prevProps.chips.length !== chips.length) {
this.context.updateNumberFilters(
typeof categoryName === 'string' ? categoryName : categoryName.name,
chips.length
);
}
}

render() {
const { children, chips, deleteChip, categoryName, showToolbarItem, ...props } = this.props;
const { isExpanded, chipGroupContentRef } = this.context;

const chipGroup = chips.length ? (
<DataToolbarItem variant="chip-group">
<ChipGroup withToolbar>
Expand Down
16 changes: 8 additions & 8 deletions ...s/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
className="pf-c-data-toolbar__toggle"
>
<Component
aria-controls="data-toolbar-expandable-content-7"
aria-controls="data-toolbar-expandable-content-6"
aria-haspopup={false}
aria-label="Show Filters"
onClick={[Function]}
Expand All @@ -54,7 +54,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
component={[Function]}
componentProps={
Object {
"aria-controls": "data-toolbar-expandable-content-7",
"aria-controls": "data-toolbar-expandable-content-6",
"aria-haspopup": false,
"aria-label": "Show Filters",
"children": <FilterIcon
Expand All @@ -70,7 +70,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
consumerContext={null}
>
<Button
aria-controls="data-toolbar-expandable-content-7"
aria-controls="data-toolbar-expandable-content-6"
aria-haspopup={false}
aria-label="Show Filters"
onClick={[Function]}
Expand All @@ -83,7 +83,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
variant="plain"
>
<button
aria-controls="data-toolbar-expandable-content-7"
aria-controls="data-toolbar-expandable-content-6"
aria-disabled={null}
aria-haspopup={false}
aria-label="Show Filters"
Expand Down Expand Up @@ -1455,7 +1455,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
Object {
"current": <div
class="pf-c-data-toolbar__expandable-content"
id="data-toolbar-expandable-content-7"
id="data-toolbar-expandable-content-6"
>
<div
class="pf-c-data-toolbar__group"
Expand Down Expand Up @@ -1484,13 +1484,13 @@ exports[`data toolbar DataToolbarFilter 1`] = `
</div>,
}
}
id="data-toolbar-expandable-content-7"
id="data-toolbar-expandable-content-6"
isExpanded={false}
showClearFiltersButton={true}
>
<div
className="pf-c-data-toolbar__expandable-content"
id="data-toolbar-expandable-content-7"
id="data-toolbar-expandable-content-6"
>
<ForwardRef>
<DataToolbarGroupWithRef
Expand Down Expand Up @@ -1757,7 +1757,7 @@ exports[`data toolbar DataToolbarFilter 1`] = `
clearFiltersButtonText="Clear all filters"
collapseListedFiltersBreakpoint="lg"
isExpanded={false}
numberOfFilters={3}
numberOfFilters={1}
showClearFiltersButton={true}
>
<div
Expand Down