From 53be4cbcfaa3b8d0d4d7db35159200577f77ebe1 Mon Sep 17 00:00:00 2001
From: Jan Hassel <hello@janhassel.de>
Date: Wed, 3 Apr 2024 18:18:11 +0200
Subject: [PATCH] fix(treeview): don't overwrite disabled=true state for
 children (#16079)

---
 packages/react/src/components/TreeView/TreeNode.js       | 2 +-
 .../react/src/components/TreeView/Treeview.stories.js    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/components/TreeView/TreeNode.js b/packages/react/src/components/TreeView/TreeNode.js
index df9f36258793..284440a9e5b6 100644
--- a/packages/react/src/components/TreeView/TreeNode.js
+++ b/packages/react/src/components/TreeView/TreeNode.js
@@ -62,7 +62,7 @@ const TreeNode = React.forwardRef(
         return React.cloneElement(node, {
           active,
           depth: depth + 1,
-          disabled,
+          disabled: disabled || node.props.disabled,
           onTreeSelect,
           selected,
           tabIndex: (!node.props.disabled && -1) || null,
diff --git a/packages/react/src/components/TreeView/Treeview.stories.js b/packages/react/src/components/TreeView/Treeview.stories.js
index 27908696a1d3..2a96d8f443ad 100644
--- a/packages/react/src/components/TreeView/Treeview.stories.js
+++ b/packages/react/src/components/TreeView/Treeview.stories.js
@@ -262,3 +262,12 @@ Playground.argTypes = {
     control: { type: 'select' },
   },
 };
+
+export const Temp = () => (
+  <TreeView label="Tree View">
+    <TreeNode label="Enabled">
+      <TreeNode label="Disabled" disabled />
+    </TreeNode>
+    <TreeNode label="Disabled" disabled></TreeNode>
+  </TreeView>
+);