Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Fix tree level to render root without collapse icon (#1295)

Bogdan Chadkin53ba9abc696a
diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsx
index 65d6247f9b..d18a680ea5 100644
--- a/packages/design-system/src/components/tree/tree-node.tsx
+++ b/packages/design-system/src/components/tree/tree-node.tsx
@@ -445,10 +445,8 @@ export const TreeNode = <Data extends { id: string }>({
const itemSelector = [itemData.id, ...(parentSelector ?? [])];
const itemIsHidden = isItemHidden(itemData.id);
- const isAlwaysExpanded = itemIsHidden;
- if (itemIsHidden === false) {
- level += 1;
- }
+ // hidden items and root are always expanded
+ const isAlwaysExpanded = itemIsHidden || level === 0;
const isExpandable = itemChildren.length > 0;
const isExpanded = getIsExpanded(itemSelector) || isAlwaysExpanded;
@@ -514,7 +512,7 @@ export const TreeNode = <Data extends { id: string }>({
itemData={child}
parentSelector={itemSelector}
parentIsSelected={isSelected || parentIsSelected}
- level={level}
+ level={itemIsHidden ? level : level + 1}
{...commonProps}
/>
))
diff --git a/packages/design-system/src/components/tree/tree.stories.tsx b/packages/design-system/src/components/tree/tree.stories.tsx
index 24899b9020..29283eaf7f 100644
--- a/packages/design-system/src/components/tree/tree.stories.tsx
+++ b/packages/design-system/src/components/tree/tree.stories.tsx
@@ -109,7 +109,11 @@ export const StressTest = ({ animate }: { animate: boolean }) => {
<TreeItemLabel>{props.itemData.id}</TreeItemLabel>
</TreeItemBody>
)}
- onDragEnd={(payload) => setRoot((root) => reparent(root, payload))}
+ onDragEnd={(payload) => {
+ setRoot((root) => reparent(root, payload));
+ setDragItemSelector(undefined);
+ setDropTarget(undefined);
+ }}
onCancel={() => {
setDragItemSelector(undefined);
setDropTarget(undefined);