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
4 changes: 4 additions & 0 deletions packages/react-core/src/components/TreeView/TreeView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ export interface TreeViewProps {
className?: string;
/** Toolbar to display above the tree view */
toolbar?: React.ReactNode;
/** Flag indicating the TreeView should utilize memoization to help render large data sets. Setting this property requires that `activeItems` pass in an array containing every node in the selected item's path. */
useMemo?: boolean;
}

export const TreeView: React.FunctionComponent<TreeViewProps> = ({
Expand All @@ -89,6 +91,7 @@ export const TreeView: React.FunctionComponent<TreeViewProps> = ({
activeItems,
compareItems = (item, itemToCheck) => item.id === itemToCheck.id,
className,
useMemo,
...props
}: TreeViewProps) => {
const treeViewList = (
Expand Down Expand Up @@ -116,6 +119,7 @@ export const TreeView: React.FunctionComponent<TreeViewProps> = ({
action={item.action}
compareItems={compareItems}
isCompact={variant === 'compact' || variant === 'compactNoBackground'}
useMemo={useMemo}
{...(item.children && {
children: (
<TreeView
Expand Down
58 changes: 55 additions & 3 deletions packages/react-core/src/components/TreeView/TreeViewListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ export interface TreeViewListItemProps {
action?: React.ReactNode;
/** Callback for item comparison function */
compareItems?: (item: TreeViewDataItem, itemToCheck: TreeViewDataItem) => boolean;
/** Flag indicating the TreeView should utilize memoization to help render large data sets. Setting this property requires that `activeItems` pass in an array containing every node in the selected item's path. */
useMemo?: boolean;
}

export const TreeViewListItem: React.FunctionComponent<TreeViewListItemProps> = ({
const TreeViewListItemBase: React.FunctionComponent<TreeViewListItemProps> = ({
name,
title,
id,
Expand All @@ -78,10 +80,11 @@ export const TreeViewListItem: React.FunctionComponent<TreeViewListItemProps> =
icon,
expandedIcon,
action,
compareItems
compareItems,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
useMemo
}: TreeViewListItemProps) => {
const [internalIsExpanded, setIsExpanded] = useState(defaultExpanded);

useEffect(() => {
if (isExpanded !== undefined && isExpanded !== null) {
setIsExpanded(isExpanded);
Expand Down Expand Up @@ -207,4 +210,53 @@ export const TreeViewListItem: React.FunctionComponent<TreeViewListItemProps> =
</li>
);
};

export const TreeViewListItem = React.memo(TreeViewListItemBase, (prevProps, nextProps) => {
if (!nextProps.useMemo) {
return false;
}

const prevIncludes =
prevProps.activeItems &&
prevProps.activeItems.length > 0 &&
prevProps.activeItems.some(
item => prevProps.compareItems && item && prevProps.compareItems(item, prevProps.itemData)
);
const nextIncludes =
nextProps.activeItems &&
nextProps.activeItems.length > 0 &&
nextProps.activeItems.some(
item => nextProps.compareItems && item && nextProps.compareItems(item, nextProps.itemData)
);

if (prevIncludes || nextIncludes) {
return false;
}

if (
prevProps.name !== nextProps.name ||
prevProps.title !== nextProps.title ||
prevProps.id !== nextProps.id ||
prevProps.isExpanded !== nextProps.isExpanded ||
prevProps.defaultExpanded !== nextProps.defaultExpanded ||
prevProps.onSelect !== nextProps.onSelect ||
prevProps.onCheck !== nextProps.onCheck ||
prevProps.hasCheck !== nextProps.hasCheck ||
prevProps.checkProps !== nextProps.checkProps ||
prevProps.hasBadge !== nextProps.hasBadge ||
prevProps.customBadgeContent !== nextProps.customBadgeContent ||
prevProps.badgeProps !== nextProps.badgeProps ||
prevProps.isCompact !== nextProps.isCompact ||
prevProps.icon !== nextProps.icon ||
prevProps.expandedIcon !== nextProps.expandedIcon ||
prevProps.action !== nextProps.action ||
prevProps.parentItem !== nextProps.parentItem ||
prevProps.itemData !== nextProps.itemData
) {
return false;
}

return true;
});

TreeViewListItem.displayName = 'TreeViewListItem';
Loading