From d38059f39e5293826ce63ca3903de7a3fbe0249d Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <66456876+tomi-msft@users.noreply.github.com>
Date: Tue, 16 Apr 2024 13:10:39 -0700
Subject: [PATCH] chore: move tabindex to the root slot of Spinner (#31056)

---
 ...react-spinner-99434a32-a61d-4fe2-aa49-f82c5f5dc211.json | 7 +++++++
 .../react-spinner/src/components/Spinner/useSpinner.tsx    | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 change/@fluentui-react-spinner-99434a32-a61d-4fe2-aa49-f82c5f5dc211.json

diff --git a/change/@fluentui-react-spinner-99434a32-a61d-4fe2-aa49-f82c5f5dc211.json b/change/@fluentui-react-spinner-99434a32-a61d-4fe2-aa49-f82c5f5dc211.json
new file mode 100644
index 0000000000000..daa37b6015f6b
--- /dev/null
+++ b/change/@fluentui-react-spinner-99434a32-a61d-4fe2-aa49-f82c5f5dc211.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: move tabindex to the root slot of Spinner.",
+  "packageName": "@fluentui/react-spinner",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react-components/react-spinner/src/components/Spinner/useSpinner.tsx b/packages/react-components/react-spinner/src/components/Spinner/useSpinner.tsx
index ea74c63efec13..f8beb792d177f 100644
--- a/packages/react-components/react-spinner/src/components/Spinner/useSpinner.tsx
+++ b/packages/react-components/react-spinner/src/components/Spinner/useSpinner.tsx
@@ -19,7 +19,7 @@ export const useSpinner_unstable = (props: SpinnerProps, ref: React.Ref<HTMLElem
   const { appearance = 'primary', labelPosition = 'after', size = contextSize ?? 'medium', delay = 0 } = props;
   const baseId = useId('spinner');
 
-  const { role = 'progressbar', tabIndex, ...rest } = props;
+  const { role = 'progressbar', ...rest } = props;
   const nativeRoot = slot.always(
     getIntrinsicElementProps(
       'div',
@@ -57,7 +57,6 @@ export const useSpinner_unstable = (props: SpinnerProps, ref: React.Ref<HTMLElem
   });
   const spinnerShortHand = slot.optional(props.spinner, {
     renderByDefault: true,
-    defaultProps: { tabIndex },
     elementType: 'span',
   });
   if (labelShorthand && nativeRoot && !nativeRoot['aria-labelledby']) {