From 7b78fc957541dda58c4e8cd6eaa4b5516e984bb9 Mon Sep 17 00:00:00 2001
From: Matt <makopch-ms@users.noreply.github.com>
Date: Thu, 24 Aug 2023 11:57:27 -0700
Subject: [PATCH 1/2] Revert "Keytips: Align keytipData with visible instance
 for dupes (#28522)"

This reverts commit bbba7284a99cf7a63cbd7676a5a85e8770163357.
---
 .../src/components/KeytipLayer/KeytipLayer.base.tsx      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx b/packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx
index c1013e14aded0f..d9de9b12f361db 100644
--- a/packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx
+++ b/packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx
@@ -12,7 +12,6 @@ import {
   Async,
   initializeComponentRef,
   KeyCodes,
-  isElementVisibleAndNotHidden,
 } from '../../Utilities';
 import { KeytipManager } from '../../utilities/keytips/KeytipManager';
 import { KeytipTree } from './KeytipTree';
@@ -376,15 +375,7 @@ export class KeytipLayerBase extends React.Component<IKeytipLayerProps, IKeytipL
         // Account for overflow set sequences when checking for duplicates
         keytipId = sequencesToID(mergeOverflows(keytip.keySequences, keytip.overflowSetSequence));
       }
-      const targetSelector = ktpTargetFromSequences(keytip.keySequences);
-      const matchingElements = document.querySelectorAll(targetSelector);
       seenIds[keytipId] = seenIds[keytipId] ? seenIds[keytipId] + 1 : 1;
-
-      // If there are multiple elements for the keytip sequence, return true if the element instance
-      // that corresponds to the keytip instance is visible
-      if (matchingElements.length > 1 && seenIds[keytipId] <= matchingElements.length) {
-        return keytip.visible && isElementVisibleAndNotHidden(matchingElements[seenIds[keytipId] - 1] as HTMLElement);
-      }
       return keytip.visible && seenIds[keytipId] === 1;
     });
   }

From 218b1530666e1f84a2d16ed652d51a85ad4fcec3 Mon Sep 17 00:00:00 2001
From: Matt Kopchick <makopch@microsoft.com>
Date: Thu, 24 Aug 2023 14:10:13 -0700
Subject: [PATCH 2/2] change files

---
 ...luentui-react-0078b842-450a-442c-b9da-1c591f0299fb.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 change/@fluentui-react-0078b842-450a-442c-b9da-1c591f0299fb.json

diff --git a/change/@fluentui-react-0078b842-450a-442c-b9da-1c591f0299fb.json b/change/@fluentui-react-0078b842-450a-442c-b9da-1c591f0299fb.json
new file mode 100644
index 00000000000000..f981517f7db684
--- /dev/null
+++ b/change/@fluentui-react-0078b842-450a-442c-b9da-1c591f0299fb.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Revert \"Keytips: Align keytipData with visible instance for dupes (#28522)\"",
+  "packageName": "@fluentui/react",
+  "email": "makopch@microsoft.com",
+  "dependentChangeType": "patch"
+}