From 2bebd5d74d75ba34cbbe1340f1eb698583c3fcf6 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Mon, 3 Aug 2026 15:42:01 +1000
Subject: [PATCH] fix: tooltip prop spread in s2 docs examples

---
 packages/dev/s2-docs/pages/s2/Tooltip.mdx        | 4 ++--
 packages/dev/s2-docs/src/VisualExampleClient.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/dev/s2-docs/pages/s2/Tooltip.mdx b/packages/dev/s2-docs/pages/s2/Tooltip.mdx
index 8929caecfaf..93529ce115c 100644
--- a/packages/dev/s2-docs/pages/s2/Tooltip.mdx
+++ b/packages/dev/s2-docs/pages/s2/Tooltip.mdx
@@ -17,9 +17,9 @@ import {Tooltip, TooltipTrigger} from '@react-spectrum/s2/Tooltip';
 import {ActionButton} from '@react-spectrum/s2/ActionButton';
 import Edit from '@react-spectrum/s2/icons/Edit';
 
-<TooltipTrigger>
+<TooltipTrigger/* PROPS */>
   <ActionButton aria-label="Edit name"><Edit /></ActionButton>
-  <Tooltip/* PROPS */>Edit name</Tooltip>
+  <Tooltip>Edit name</Tooltip>
 </TooltipTrigger>
 ```
 
diff --git a/packages/dev/s2-docs/src/VisualExampleClient.tsx b/packages/dev/s2-docs/src/VisualExampleClient.tsx
index 2c9e957e1c2..245d869517a 100644
--- a/packages/dev/s2-docs/src/VisualExampleClient.tsx
+++ b/packages/dev/s2-docs/src/VisualExampleClient.tsx
@@ -447,7 +447,7 @@ function renderProp(name: string, value: any, control?: PropControl, indent = ''
       </>
     );
   } else if (typeof value === 'boolean') {
-    if (value === false && control?.optional) {
+    if (value === false && control?.optional && !control?.default) {
       return null;
     }
     if (name === 'contextualHelp') {