From 7b613f4048f03194185054dba2b1949b00aafa9d Mon Sep 17 00:00:00 2001
From: Robert Snow <snowystinger@gmail.com>
Date: Wed, 22 Oct 2025 15:02:58 +1100
Subject: [PATCH 1/2] [wip]: tree disabled hide selection checkbox

---
 packages/@react-spectrum/s2/src/TreeView.tsx             | 8 +++++---
 packages/@react-spectrum/s2/stories/TreeView.stories.tsx | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx
index 5d1f0c26e5d..b4b806337e2 100644
--- a/packages/@react-spectrum/s2/src/TreeView.tsx
+++ b/packages/@react-spectrum/s2/src/TreeView.tsx
@@ -351,9 +351,11 @@ export const TreeViewItemContent = (props: TreeViewItemContentProps): ReactNode
             {selectionMode !== 'none' && selectionBehavior === 'toggle' && (
               // TODO: add transition?
               <div className={treeCheckbox}>
-                <Checkbox
-                  isEmphasized={isEmphasized}
-                  slot="selection" />
+                <div className={style({display: {isDisabled: 'none'}})({isDisabled})}>
+                  <Checkbox
+                    isEmphasized={isEmphasized}
+                    slot="selection" />
+                </div>
               </div>
             )}
             <div
diff --git a/packages/@react-spectrum/s2/stories/TreeView.stories.tsx b/packages/@react-spectrum/s2/stories/TreeView.stories.tsx
index 8059d6cf7af..694512440ae 100644
--- a/packages/@react-spectrum/s2/stories/TreeView.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/TreeView.stories.tsx
@@ -75,7 +75,7 @@ const TreeExampleStatic = (args: TreeViewProps<any>): ReactElement => (
   <div style={{width: '300px', resize: 'both', height: '320px', overflow: 'auto'}}>
     <TreeView
       {...args}
-      disabledKeys={['projects-1']}
+      disabledKeys={['projects-1', 'projects-2']}
       aria-label="test static tree"
       onExpandedChange={action('onExpandedChange')}
       onSelectionChange={action('onSelectionChange')}>

From 0935a46b2b84460a5570117127f8ace23a25ecb4 Mon Sep 17 00:00:00 2001
From: Robert Snow <snowystinger@gmail.com>
Date: Thu, 23 Oct 2025 08:58:42 +1100
Subject: [PATCH 2/2] hide checkbox for behaviour all

---
 packages/@react-spectrum/s2/src/TreeView.tsx | 29 ++++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx
index b4b806337e2..2855356f4e8 100644
--- a/packages/@react-spectrum/s2/src/TreeView.tsx
+++ b/packages/@react-spectrum/s2/src/TreeView.tsx
@@ -15,6 +15,7 @@ import {ActionMenuContext} from './ActionMenu';
 import {
   Button,
   ButtonContext,
+  CheckboxContext,
   ListLayout,
   Provider,
   TreeItemProps as RACTreeItemProps,
@@ -26,6 +27,7 @@ import {
   TreeLoadMoreItem,
   TreeLoadMoreItemProps,
   useContextProps,
+  useSlottedContext,
   Virtualizer
 } from 'react-aria-components';
 import {centerBaseline} from './CenterBaseline';
@@ -333,7 +335,7 @@ export const TreeViewItemContent = (props: TreeViewItemContentProps): ReactNode
   let {
     children
   } = props;
-  let {isDetached, isEmphasized} = useContext(InternalTreeContext);
+  let {isDetached} = useContext(InternalTreeContext);
   let scale = useScale();
 
   return (
@@ -349,14 +351,7 @@ export const TreeViewItemContent = (props: TreeViewItemContentProps): ReactNode
         return (
           <div className={treeCellGrid({isDisabled, isNextSelected, isSelected, isFirst, isNextFocused, isDetached})}>
             {selectionMode !== 'none' && selectionBehavior === 'toggle' && (
-              // TODO: add transition?
-              <div className={treeCheckbox}>
-                <div className={style({display: {isDisabled: 'none'}})({isDisabled})}>
-                  <Checkbox
-                    isEmphasized={isEmphasized}
-                    slot="selection" />
-                </div>
-              </div>
+              <TreeCheckbox />
             )}
             <div
               className={style({
@@ -384,6 +379,22 @@ export const TreeViewItemContent = (props: TreeViewItemContentProps): ReactNode
   );
 };
 
+function TreeCheckbox() {
+  let {isEmphasized} = useContext(InternalTreeContext);
+  let checkboxProps = useSlottedContext(CheckboxContext, 'selection');
+  let isDisabled = checkboxProps?.isDisabled ?? false;
+  return (
+    // TODO: add transition?
+    <div className={treeCheckbox}>
+      <div className={style({visibility: {isDisabled: 'hidden'}})({isDisabled})}>
+        <Checkbox
+          isEmphasized={isEmphasized}
+          slot="selection" />
+      </div>
+    </div>
+  );
+}
+
 const centeredWrapper = style({
   display: 'flex',
   alignItems: 'center',