The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix Collection Tree Collapsing (#65620)
Ryan Lauried52732d113c3
diff --git a/frontend/src/metabase/common/components/tree/Tree.tsx b/frontend/src/metabase/common/components/tree/Tree.tsxindex 661cf7d920c..220fa70490d 100644--- a/frontend/src/metabase/common/components/tree/Tree.tsx+++ b/frontend/src/metabase/common/components/tree/Tree.tsx@@ -1,18 +1,18 @@import { useCallback, useEffect, useState } from "react";import * as React from "react";import { usePrevious } from "react-use";+import _ from "underscore";import { TreeNode as DefaultTreeNode } from "./TreeNode";import { TreeNodeList } from "./TreeNodeList";import type { ITreeNodeItem } from "./types";-import { getAllExpandableIds, getInitialExpandedIds } from "./utils";+import { getInitialExpandedIds } from "./utils";interface TreeProps {data: ITreeNodeItem[];selectedId?: ITreeNodeItem["id"];role?: string;emptyState?: React.ReactNode;- initiallyExpanded?: boolean;onSelect?: (item: ITreeNodeItem) => void;rightSection?: (item: ITreeNodeItem) => React.ReactNode;TreeNode?: any; // This was previously set to TreeNodeComponent, but after upgrading to react 18, the type no longer played nice with forward ref compontents, including styled components@@ -23,15 +23,11 @@ function BaseTree({selectedId,role = "menu",emptyState = null,- initiallyExpanded = false,onSelect,TreeNode = DefaultTreeNode,rightSection,}: TreeProps) {const [expandedIds, setExpandedIds] = useState(() => {- if (initiallyExpanded) {- return new Set(getAllExpandableIds(data));- }return new Set(selectedId != null ? getInitialExpandedIds(selectedId, data) : [],);@@ -40,30 +36,20 @@ function BaseTree({const prevData = usePrevious(data);useEffect(() => {- if (initiallyExpanded && data !== prevData) {- setExpandedIds(new Set(getAllExpandableIds(data)));- return;- }-if (!selectedId) {return;}+ const dataHasChanged = !_.isEqual(data, prevData);const selectedItemChanged =previousSelectedId !== selectedId && !expandedIds.has(selectedId);- if (selectedItemChanged || data !== prevData) {++ if (selectedItemChanged || dataHasChanged) {setExpandedIds((prev) =>new Set([...prev, ...getInitialExpandedIds(selectedId, data)]),);}- }, [- prevData,- data,- selectedId,- previousSelectedId,- expandedIds,- initiallyExpanded,- ]);+ }, [prevData, data, selectedId, previousSelectedId, expandedIds]);const handleToggleExpand = useCallback((itemId: string | number) => {diff --git a/frontend/src/metabase/common/components/tree/utils.tsx b/frontend/src/metabase/common/components/tree/utils.tsxindex 9e368409642..e12b6fba33e 100644--- a/frontend/src/metabase/common/components/tree/utils.tsx+++ b/frontend/src/metabase/common/components/tree/utils.tsx@@ -18,21 +18,3 @@ export const getInitialExpandedIds = (return [];}).flat();--export const getAllExpandableIds = (- nodes: ITreeNodeItem[],-): ITreeNodeItem["id"][] => {- const ids: ITreeNodeItem["id"][] = [];-- const traverse = (items: ITreeNodeItem[]) => {- for (const item of items) {- if (item.children && item.children.length > 0) {- ids.push(item.id);- traverse(item.children);- }- }- };-- traverse(nodes);- return ids;-};