From b6e64b07f37d41dd75bb50c6704c06335c424acb Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Fri, 12 Dec 2025 14:59:20 -0800
Subject: [PATCH 1/6] docs: add shouldCloseOnPress to RAC Tooltip docs

---
 packages/dev/s2-docs/pages/react-aria/Tooltip.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx b/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
index 875908f67d1..f1b10c4d765 100644
--- a/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
@@ -16,7 +16,7 @@ export const description = 'Displays a description of an element on hover or foc
 <PageDescription>{docs.exports.Tooltip.description}</PageDescription>
 
 <ExampleSwitcher>
-  ```tsx render docs={vanillaDocs.exports.Tooltip} links={vanillaDocs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip']}  type="vanilla" files={["starters/docs/src/Tooltip.tsx", "starters/docs/src/Tooltip.css"]}
+  ```tsx render docs={vanillaDocs.exports.Tooltip} links={vanillaDocs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip', 'shouldCloseOnPress']}  type="vanilla" files={["starters/docs/src/Tooltip.tsx", "starters/docs/src/Tooltip.css"]}
   "use client";
   import {TooltipTrigger} from 'react-aria-components';
   import {Tooltip} from 'vanilla-starter/Tooltip';

From ea6cd01a9d0dbe95a61201fa4bc366272041c67a Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Fri, 12 Dec 2025 15:12:16 -0800
Subject: [PATCH 2/6] move prop to the actual correct example

---
 packages/dev/s2-docs/pages/react-aria/Tooltip.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx b/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
index f1b10c4d765..91e50fa18dd 100644
--- a/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
@@ -16,7 +16,7 @@ export const description = 'Displays a description of an element on hover or foc
 <PageDescription>{docs.exports.Tooltip.description}</PageDescription>
 
 <ExampleSwitcher>
-  ```tsx render docs={vanillaDocs.exports.Tooltip} links={vanillaDocs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip', 'shouldCloseOnPress']}  type="vanilla" files={["starters/docs/src/Tooltip.tsx", "starters/docs/src/Tooltip.css"]}
+  ```tsx render docs={vanillaDocs.exports.Tooltip} links={vanillaDocs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip']}  type="vanilla" files={["starters/docs/src/Tooltip.tsx", "starters/docs/src/Tooltip.css"]}
   "use client";
   import {TooltipTrigger} from 'react-aria-components';
   import {Tooltip} from 'vanilla-starter/Tooltip';
@@ -67,7 +67,7 @@ export const description = 'Displays a description of an element on hover or foc
 
 Tooltips appear after a "warmup" delay when hovering, or instantly on focus. Once a tooltip is displayed, other tooltips display immediately. If the user waits for the "cooldown period" before hovering another element, the warmup timer restarts.
 
-```tsx render docs={docs.exports.TooltipTrigger} links={docs.links} props={['trigger', 'delay', 'closeDelay', 'isDisabled']} type="vanilla"
+```tsx render docs={docs.exports.TooltipTrigger} links={docs.links} props={['trigger', 'delay', 'closeDelay', 'isDisabled', 'shouldCloseOnPress']} type="vanilla"
 "use client";
 import {TooltipTrigger} from 'react-aria-components';
 import {Tooltip} from 'vanilla-starter/Tooltip';

From a603ba9f546a0af240da0054c3422e2c3df43811 Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Fri, 12 Dec 2025 15:20:22 -0800
Subject: [PATCH 3/6] fix link i think?

---
 packages/dev/s2-docs/pages/s2/migrating.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dev/s2-docs/pages/s2/migrating.mdx b/packages/dev/s2-docs/pages/s2/migrating.mdx
index 44b3db59074..3ef7c3748b8 100644
--- a/packages/dev/s2-docs/pages/s2/migrating.mdx
+++ b/packages/dev/s2-docs/pages/s2/migrating.mdx
@@ -35,7 +35,7 @@ Note that <PendingBadge /> indicates that future changes are expected, and the c
 ### All components
 
 - Update imports to use the `@react-spectrum/s2` package instead of `@adobe/react-spectrum` or individual packages like `@react-spectrum/button`
-- Update [style props](v3/styling#style-props) to use the style macro instead. See the 'Style props' section below
+- Update [style props](../v3/styling#style-props) to use the style macro instead. See the 'Style props' section below
 
 ### Accordion
 

From de239ca756b86e7143ffde60a4795a6deafba450 Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Fri, 12 Dec 2025 16:17:46 -0800
Subject: [PATCH 4/6] fix link pretty please

---
 packages/dev/s2-docs/pages/s2/migrating.mdx | 2 +-
 packages/dev/s2-docs/src/Link.tsx           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/dev/s2-docs/pages/s2/migrating.mdx b/packages/dev/s2-docs/pages/s2/migrating.mdx
index 3ef7c3748b8..16df9671565 100644
--- a/packages/dev/s2-docs/pages/s2/migrating.mdx
+++ b/packages/dev/s2-docs/pages/s2/migrating.mdx
@@ -35,7 +35,7 @@ Note that <PendingBadge /> indicates that future changes are expected, and the c
 ### All components
 
 - Update imports to use the `@react-spectrum/s2` package instead of `@adobe/react-spectrum` or individual packages like `@react-spectrum/button`
-- Update [style props](../v3/styling#style-props) to use the style macro instead. See the 'Style props' section below
+- Update [style props](s2:v3/styling#style-props) to use the style macro instead. See the 'Style props' section below
 
 ### Accordion
 
diff --git a/packages/dev/s2-docs/src/Link.tsx b/packages/dev/s2-docs/src/Link.tsx
index e54e58194f7..5701a3e4c71 100644
--- a/packages/dev/s2-docs/src/Link.tsx
+++ b/packages/dev/s2-docs/src/Link.tsx
@@ -19,7 +19,7 @@ export function BaseLink({ref, ...props}: LinkProps & {ref?: Ref<HTMLAnchorEleme
 export function Link({href, ...props}: LinkProps) {
   if (href?.startsWith('s2:') || href?.startsWith('react-aria:')) {
     let url = new URL(href);
-    href = getBaseUrl(url.protocol.slice(0, -1) as any) + '/' + url.pathname;
+    href = getBaseUrl(url.protocol.slice(0, -1) as any) + '/' + url.pathname + url.hash;
   }
 
   return (

From b4914b8f8d3f9b861c068a7e36ad42d889df71cb Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Fri, 12 Dec 2025 17:03:33 -0800
Subject: [PATCH 5/6] Revert "fix link pretty please"

This reverts commit de239ca756b86e7143ffde60a4795a6deafba450.
---
 packages/dev/s2-docs/pages/s2/migrating.mdx | 2 +-
 packages/dev/s2-docs/src/Link.tsx           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/dev/s2-docs/pages/s2/migrating.mdx b/packages/dev/s2-docs/pages/s2/migrating.mdx
index 16df9671565..3ef7c3748b8 100644
--- a/packages/dev/s2-docs/pages/s2/migrating.mdx
+++ b/packages/dev/s2-docs/pages/s2/migrating.mdx
@@ -35,7 +35,7 @@ Note that <PendingBadge /> indicates that future changes are expected, and the c
 ### All components
 
 - Update imports to use the `@react-spectrum/s2` package instead of `@adobe/react-spectrum` or individual packages like `@react-spectrum/button`
-- Update [style props](s2:v3/styling#style-props) to use the style macro instead. See the 'Style props' section below
+- Update [style props](../v3/styling#style-props) to use the style macro instead. See the 'Style props' section below
 
 ### Accordion
 
diff --git a/packages/dev/s2-docs/src/Link.tsx b/packages/dev/s2-docs/src/Link.tsx
index 5701a3e4c71..e54e58194f7 100644
--- a/packages/dev/s2-docs/src/Link.tsx
+++ b/packages/dev/s2-docs/src/Link.tsx
@@ -19,7 +19,7 @@ export function BaseLink({ref, ...props}: LinkProps & {ref?: Ref<HTMLAnchorEleme
 export function Link({href, ...props}: LinkProps) {
   if (href?.startsWith('s2:') || href?.startsWith('react-aria:')) {
     let url = new URL(href);
-    href = getBaseUrl(url.protocol.slice(0, -1) as any) + '/' + url.pathname + url.hash;
+    href = getBaseUrl(url.protocol.slice(0, -1) as any) + '/' + url.pathname;
   }
 
   return (

From d8275f7e81f1b085b0997c863de0c33bd7185333 Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Fri, 12 Dec 2025 17:03:43 -0800
Subject: [PATCH 6/6] Revert "fix link i think?"

This reverts commit a603ba9f546a0af240da0054c3422e2c3df43811.
---
 packages/dev/s2-docs/pages/s2/migrating.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dev/s2-docs/pages/s2/migrating.mdx b/packages/dev/s2-docs/pages/s2/migrating.mdx
index 3ef7c3748b8..44b3db59074 100644
--- a/packages/dev/s2-docs/pages/s2/migrating.mdx
+++ b/packages/dev/s2-docs/pages/s2/migrating.mdx
@@ -35,7 +35,7 @@ Note that <PendingBadge /> indicates that future changes are expected, and the c
 ### All components
 
 - Update imports to use the `@react-spectrum/s2` package instead of `@adobe/react-spectrum` or individual packages like `@react-spectrum/button`
-- Update [style props](../v3/styling#style-props) to use the style macro instead. See the 'Style props' section below
+- Update [style props](v3/styling#style-props) to use the style macro instead. See the 'Style props' section below
 
 ### Accordion