From dedbade25071049d418622e3477619d78fb87996 Mon Sep 17 00:00:00 2001
From: Zhihao Cui <5257855+origami-z@users.noreply.github.com>
Date: Thu, 12 Dec 2024 14:41:15 +0000
Subject: [PATCH] Scope floating ui portal (#4385)

---
 .changeset/modern-chefs-knock.md                        | 5 +++++
 packages/core/src/utils/useFloatingUI/useFloatingUI.tsx | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/modern-chefs-knock.md

diff --git a/.changeset/modern-chefs-knock.md b/.changeset/modern-chefs-knock.md
new file mode 100644
index 00000000000..a2b12a69f91
--- /dev/null
+++ b/.changeset/modern-chefs-knock.md
@@ -0,0 +1,5 @@
+---
+"@salt-ds/core": patch
+---
+
+Fixed Salt Provider in floating ui adding extra attributes to root when mixing styling options.
diff --git a/packages/core/src/utils/useFloatingUI/useFloatingUI.tsx b/packages/core/src/utils/useFloatingUI/useFloatingUI.tsx
index 1f6a45e358d..cd7c77a4837 100644
--- a/packages/core/src/utils/useFloatingUI/useFloatingUI.tsx
+++ b/packages/core/src/utils/useFloatingUI/useFloatingUI.tsx
@@ -74,7 +74,7 @@ const DefaultFloatingComponent = forwardRef<
   if (focusManagerProps && open) {
     return (
       <FloatingPortal>
-        <ChosenSaltProvider>
+        <ChosenSaltProvider applyClassesTo="scope">
           <FloatingFocusManager {...focusManagerProps}>
             <div style={style} {...rest} ref={ref} />
           </FloatingFocusManager>
@@ -85,7 +85,7 @@ const DefaultFloatingComponent = forwardRef<
 
   return open ? (
     <FloatingPortal>
-      <ChosenSaltProvider>
+      <ChosenSaltProvider applyClassesTo="scope">
         <div style={style} {...rest} ref={ref} />
       </ChosenSaltProvider>
     </FloatingPortal>