Skip to content

fix (datatoolbar): Added support for key with categoryName. #3880

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
evwilkin merged 2 commits into from
Mar 9, 2020
Merged

fix (datatoolbar): Added support for key with categoryName. #3880

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eae579c
Issue3552 - added support for key with categoryName.
dlabaj Mar 5, 2020
9f37d87
Update to fix memory leak with datatoolbar filter.
dlabaj Mar 9, 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
24 changes: 18 additions & 6 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 @@ -5,6 +5,13 @@ import { ChipGroup, Chip, ChipGroupToolbarItem } from '../../components/ChipGrou
import { DataToolbarContentContext, DataToolbarContext } from './DataToolbarUtils';
import { PickOptional } from '../../helpers/typeUtils';

export interface DataToolbarChipGroup {
/** A unique key to identify this chip group category */
key: string;
/** The category name to display for the chip group */
name: string;
}

export interface DataToolbarChip {
/** A unique key to identify this chip */
key: string;
Expand All @@ -16,11 +23,11 @@ export interface DataToolbarFilterProps extends DataToolbarItemProps {
/** An array of strings to be displayed as chips in the expandable content */
chips?: (string | DataToolbarChip)[];
/** Callback passed by consumer used to delete a chip from the chips[] */
deleteChip?: (category: string, chip: DataToolbarChip | string) => void;
deleteChip?: (category: string | DataToolbarChipGroup, chip: DataToolbarChip | string) => void;
/** Content to be rendered inside the data toolbar item associated with the chip group */
children: React.ReactNode;
/** Unique category name to be used as a label for the chip group */
categoryName: string;
categoryName: string | DataToolbarChipGroup;
/** Flag to show the toolbar item */
showToolbarItem?: boolean;
}
Expand All @@ -32,7 +39,7 @@ interface DataToolbarFilterState {
export class DataToolbarFilter extends React.Component<DataToolbarFilterProps, DataToolbarFilterState> {
static contextType: any = DataToolbarContext;
static defaultProps: PickOptional<DataToolbarFilterProps> = {
chips: [] as string[],
chips: [] as (string | DataToolbarChip)[],
showToolbarItem: true
};

Expand All @@ -44,12 +51,14 @@ export class DataToolbarFilter extends React.Component<DataToolbarFilterProps, D
}

componentDidMount() {
this.context.updateNumberFilters(this.props.categoryName, this.props.chips.length);
const { categoryName, chips } = this.props;
this.context.updateNumberFilters(typeof categoryName === 'string' ? categoryName : categoryName.name, chips.length);
this.setState({ isMounted: true });
}

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

render() {
Expand All @@ -59,7 +68,10 @@ export class DataToolbarFilter extends React.Component<DataToolbarFilterProps, D
const chipGroup = chips.length ? (
<DataToolbarItem variant="chip-group">
<ChipGroup withToolbar>
<ChipGroupToolbarItem key={categoryName} categoryName={categoryName}>
<ChipGroupToolbarItem
key={typeof categoryName === 'string' ? categoryName : categoryName.key}
categoryName={typeof categoryName === 'string' ? categoryName : categoryName.name}
>
{chips.map(chip =>
typeof chip === 'string' ? (
<Chip key={chip} onClick={() => deleteChip(categoryName, chip)}>
Expand Down