diff --git a/.changeset/wild-bears-pay.md b/.changeset/wild-bears-pay.md
deleted file mode 100644
index a447186e0da..00000000000
--- a/.changeset/wild-bears-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': patch
----
-
-ButtonGroup: Fix button and icon button styling when tooltips are used on them
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-colorblind-linux.png
deleted file mode 100644
index fd92130673e..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-dimmed-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-dimmed-linux.png
deleted file mode 100644
index 0905298720d..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-dimmed-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-high-contrast-linux.png
deleted file mode 100644
index a3814a5ba78..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-linux.png
deleted file mode 100644
index efc628c9d63..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-tritanopia-linux.png
deleted file mode 100644
index fd92130673e..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-dark-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-colorblind-linux.png
deleted file mode 100644
index eceb226b3e2..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-high-contrast-linux.png
deleted file mode 100644
index d82b4849422..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-linux.png
deleted file mode 100644
index 80890b51f9f..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-tritanopia-linux.png
deleted file mode 100644
index eceb226b3e2..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-2-light-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-colorblind-linux.png
deleted file mode 100644
index 9ec92f9ef19..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-dimmed-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-dimmed-linux.png
deleted file mode 100644
index b44baedae2c..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-dimmed-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-high-contrast-linux.png
deleted file mode 100644
index a885a664061..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-linux.png
deleted file mode 100644
index f3d8ba4af1d..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-tritanopia-linux.png
deleted file mode 100644
index 3b8be6612d9..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-dark-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-colorblind-linux.png
deleted file mode 100644
index a3222b8ce86..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-high-contrast-linux.png
deleted file mode 100644
index 581e6f1be53..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-linux.png
deleted file mode 100644
index 205a90f5c95..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-tritanopia-linux.png
deleted file mode 100644
index a3222b8ce86..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Button-Group-With-Tooltip-light-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-colorblind-linux.png
deleted file mode 100644
index 6a3fa732d68..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-dimmed-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-dimmed-linux.png
deleted file mode 100644
index bb946fbf4ea..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-dimmed-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-high-contrast-linux.png
deleted file mode 100644
index 83b9103319e..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-linux.png
deleted file mode 100644
index f305a27ce12..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-tritanopia-linux.png
deleted file mode 100644
index 6a3fa732d68..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-dark-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-colorblind-linux.png
deleted file mode 100644
index 5f28810981b..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-high-contrast-linux.png
deleted file mode 100644
index ce4ceec15d1..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-linux.png
deleted file mode 100644
index dcf32e8bff4..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-tritanopia-linux.png
deleted file mode 100644
index 5f28810981b..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-2-light-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-colorblind-linux.png
deleted file mode 100644
index c104d009f53..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-dimmed-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-dimmed-linux.png
deleted file mode 100644
index 3295847b3d2..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-dimmed-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-high-contrast-linux.png
deleted file mode 100644
index ae9eed0c9d4..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-linux.png
deleted file mode 100644
index 9305b0f0ab4..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-tritanopia-linux.png
deleted file mode 100644
index c104d009f53..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-dark-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-colorblind-linux.png
deleted file mode 100644
index d2f5518b9c9..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-high-contrast-linux.png
deleted file mode 100644
index 337212f7902..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-linux.png
deleted file mode 100644
index a0cacd209e6..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-tritanopia-linux.png
deleted file mode 100644
index d2f5518b9c9..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Icon-Buttons-With-Tooltip-light-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-colorblind-linux.png
deleted file mode 100644
index 6a3fa732d68..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-dimmed-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-dimmed-linux.png
deleted file mode 100644
index bb946fbf4ea..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-dimmed-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-high-contrast-linux.png
deleted file mode 100644
index 83b9103319e..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-linux.png
deleted file mode 100644
index f305a27ce12..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-tritanopia-linux.png
deleted file mode 100644
index 6a3fa732d68..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-dark-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-colorblind-linux.png
deleted file mode 100644
index 5f28810981b..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-high-contrast-linux.png
deleted file mode 100644
index ce4ceec15d1..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-linux.png
deleted file mode 100644
index dcf32e8bff4..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-tritanopia-linux.png
deleted file mode 100644
index 5f28810981b..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-2-light-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-colorblind-linux.png
deleted file mode 100644
index 3b8be6612d9..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-dimmed-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-dimmed-linux.png
deleted file mode 100644
index b44baedae2c..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-dimmed-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-high-contrast-linux.png
deleted file mode 100644
index 517859b3f6f..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-linux.png
deleted file mode 100644
index f3d8ba4af1d..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-tritanopia-linux.png
deleted file mode 100644
index 3b8be6612d9..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-dark-tritanopia-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-colorblind-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-colorblind-linux.png
deleted file mode 100644
index bb0b0944c6a..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-colorblind-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-high-contrast-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-high-contrast-linux.png
deleted file mode 100644
index 24b282237d7..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-high-contrast-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-linux.png
deleted file mode 100644
index 205a90f5c95..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-linux.png and /dev/null differ
diff --git a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-tritanopia-linux.png b/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-tritanopia-linux.png
deleted file mode 100644
index bb0b0944c6a..00000000000
Binary files a/.playwright/snapshots/components/ButtonGroup.test.ts-snapshots/ButtonGroup-Links-With-Tooltip-light-tritanopia-linux.png and /dev/null differ
diff --git a/e2e/components/ButtonGroup.test.ts b/e2e/components/ButtonGroup.test.ts
index 56ecc4d3e31..c3ca9822ff7 100644
--- a/e2e/components/ButtonGroup.test.ts
+++ b/e2e/components/ButtonGroup.test.ts
@@ -86,207 +86,4 @@ test.describe('ButtonGroup', () => {
})
}
})
- test.describe('Button Group With Tooltip', () => {
- for (const theme of themes) {
- test.describe(theme, () => {
- test('default @vrt', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--button-group-with-tooltip',
- globals: {
- colorScheme: theme,
- },
- })
-
- // Default state
- await page.keyboard.press('Tab')
- expect(await page.screenshot({animations: 'disabled'})).toMatchSnapshot(
- `ButtonGroup.Button Group With Tooltip.${theme}.png`,
- {
- threshold: 0.1,
- },
- )
- })
-
- test('axe @aat', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--button-group-with-tooltip',
- globals: {
- colorScheme: theme,
- },
- })
- await expect(page).toHaveNoViolations()
- })
- })
- }
- })
-
- test.describe('Button Group With Tooltip 2', () => {
- for (const theme of themes) {
- test.describe(theme, () => {
- test('default @vrt', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--button-group-with-tooltip-2',
- globals: {
- colorScheme: theme,
- },
- })
-
- // Default state
- await page.keyboard.press('Tab')
- expect(await page.screenshot({animations: 'disabled'})).toMatchSnapshot(
- `ButtonGroup.Button Group With Tooltip 2.${theme}.png`,
- {
- threshold: 0.1,
- },
- )
- })
-
- test('axe @aat', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--button-group-with-tooltip-2',
- globals: {
- colorScheme: theme,
- },
- })
- await expect(page).toHaveNoViolations()
- })
- })
- }
- })
-
- test.describe('Icon Buttons With Tooltip', () => {
- for (const theme of themes) {
- test.describe(theme, () => {
- test('default @vrt', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--icon-buttons-with-tooltip',
- globals: {
- colorScheme: theme,
- },
- })
-
- // Default state
- await page.keyboard.press('Tab')
- expect(await page.screenshot({animations: 'disabled'})).toMatchSnapshot(
- `ButtonGroup.Icon Buttons With Tooltip.${theme}.png`,
- {
- threshold: 0.1,
- },
- )
- })
-
- test('axe @aat', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--icon-buttons-with-tooltip',
- globals: {
- colorScheme: theme,
- },
- })
- await expect(page).toHaveNoViolations()
- })
- })
- }
- })
-
- test.describe('Icon Buttons With Tooltip 2', () => {
- for (const theme of themes) {
- test.describe(theme, () => {
- test('default @vrt', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--icon-buttons-with-tooltip-2',
- globals: {
- colorScheme: theme,
- },
- })
-
- // Default state
- await page.keyboard.press('Tab')
- expect(await page.screenshot({animations: 'disabled'})).toMatchSnapshot(
- `ButtonGroup.Icon Buttons With Tooltip 2.${theme}.png`,
- {
- threshold: 0.1,
- },
- )
- })
-
- test('axe @aat', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--icon-buttons-with-tooltip-2',
- globals: {
- colorScheme: theme,
- },
- })
- await expect(page).toHaveNoViolations()
- })
- })
- }
- })
-
- test.describe('Links With Tooltip', () => {
- for (const theme of themes) {
- test.describe(theme, () => {
- test('default @vrt', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--links-with-tooltip',
- globals: {
- colorScheme: theme,
- },
- })
-
- // Default state
- await page.keyboard.press('Tab')
- expect(await page.screenshot({animations: 'disabled'})).toMatchSnapshot(
- `ButtonGroup.Links With Tooltip.${theme}.png`,
- {
- threshold: 0.1,
- },
- )
- })
-
- test('axe @aat', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--links-with-tooltip',
- globals: {
- colorScheme: theme,
- },
- })
- await expect(page).toHaveNoViolations()
- })
- })
- }
- })
-
- test.describe('Links With Tooltip 2', () => {
- for (const theme of themes) {
- test.describe(theme, () => {
- test('default @vrt', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--links-with-tooltip-2',
- globals: {
- colorScheme: theme,
- },
- })
-
- // Default state
- await page.keyboard.press('Tab')
- expect(await page.screenshot({animations: 'disabled'})).toMatchSnapshot(
- `ButtonGroup.Links With Tooltip 2.${theme}.png`,
- {
- threshold: 0.1,
- },
- )
- })
-
- test('axe @aat', async ({page}) => {
- await visit(page, {
- id: 'components-buttongroup-features--links-with-tooltip-2',
- globals: {
- colorScheme: theme,
- },
- })
- await expect(page).toHaveNoViolations()
- })
- })
- }
- })
})
diff --git a/packages/react/src/ButtonGroup/ButtonGroup.features.stories.tsx b/packages/react/src/ButtonGroup/ButtonGroup.features.stories.tsx
index 1b2554fa851..43e57953da7 100644
--- a/packages/react/src/ButtonGroup/ButtonGroup.features.stories.tsx
+++ b/packages/react/src/ButtonGroup/ButtonGroup.features.stories.tsx
@@ -1,10 +1,9 @@
import React from 'react'
import {ComponentMeta} from '@storybook/react'
import ButtonGroup from './ButtonGroup'
-import {Button, IconButton} from '../Button'
+import {IconButton} from '../Button'
import {PlusIcon, DashIcon} from '@primer/octicons-react'
-import {Tooltip as TooltipV2} from '../drafts'
-import {Tooltip} from '..'
+
export default {
title: 'Components/ButtonGroup/Features',
component: ButtonGroup,
@@ -16,73 +15,3 @@ export const IconButtons = () => (
)
-
-export const IconButtonsWithTooltip = () => (
-
-
-
-
-
-
-
-
-)
-
-export const ButtonGroupWithTooltip = () => (
-
-
-
-
-
-
-
-
-)
-
-export const LinksWithTooltip = () => (
-
-
-
-
-
-
-
-
-)
-
-export const IconButtonsWithTooltip2 = () => (
-
-
-
-
-
-
-
-
-)
-
-export const LinksWithTooltip2 = () => (
-
-
-
-
-
-
-
-
-)
-
-export const ButtonGroupWithTooltip2 = () => (
-
-
-
-
-
-
-
-
-)
diff --git a/packages/react/src/ButtonGroup/ButtonGroup.tsx b/packages/react/src/ButtonGroup/ButtonGroup.tsx
index 6493f3c5afe..9e49b669aca 100644
--- a/packages/react/src/ButtonGroup/ButtonGroup.tsx
+++ b/packages/react/src/ButtonGroup/ButtonGroup.tsx
@@ -8,13 +8,21 @@ const ButtonGroup = styled.div`
vertical-align: middle;
isolation: isolate;
- && > [type='button'],
- /* this specific selection is required to cover for tooltip. Because the buttons are wrapped with the tooltip span */
- && > span[role='tooltip'] > [type='button'] {
+ && > * {
margin-inline-end: -1px;
position: relative;
border-radius: 0;
+ :first-child {
+ border-top-left-radius: ${get('radii.2')};
+ border-bottom-left-radius: ${get('radii.2')};
+ }
+
+ :last-child {
+ border-top-right-radius: ${get('radii.2')};
+ border-bottom-right-radius: ${get('radii.2')};
+ }
+
:focus,
:active,
:hover {
@@ -22,18 +30,6 @@ const ButtonGroup = styled.div`
}
}
- && > [type='button']:first-child,
- && > span[role='tooltip']:first-of-type > [type='button'] {
- border-top-left-radius: ${get('radii.2')};
- border-bottom-left-radius: ${get('radii.2')};
- }
-
- && > [type='button']:last-of-type,
- && > span[role='tooltip']:last-of-type > [type='button'] {
- border-top-right-radius: ${get('radii.2')};
- border-bottom-right-radius: ${get('radii.2')};
- }
-
${sx};
`
diff --git a/script/generate-e2e-tests.js b/script/generate-e2e-tests.js
index 4f7ee9f35ea..484e0f90814 100644
--- a/script/generate-e2e-tests.js
+++ b/script/generate-e2e-tests.js
@@ -273,31 +273,6 @@ const components = new Map([
id: 'components-buttongroup-features--icon-buttons',
name: 'Icon Buttons',
},
- {
- id: 'components-buttongroup-features--button-group-with-tooltip',
- name: 'Button Group With Tooltip',
- },
-
- {
- id: 'components-buttongroup-features--button-group-with-tooltip-2',
- name: 'Button Group With Tooltip 2',
- },
- {
- id: 'components-buttongroup-features--icon-buttons-with-tooltip',
- name: 'Icon Buttons With Tooltip',
- },
- {
- id: 'components-buttongroup-features--icon-buttons-with-tooltip-2',
- name: 'Icon Buttons With Tooltip 2',
- },
- {
- id: 'components-buttongroup-features--links-with-tooltip',
- name: 'Links With Tooltip',
- },
- {
- id: 'components-buttongroup-features--links-with-tooltip-2',
- name: 'Links With Tooltip 2',
- },
],
},
],