From dd50ced5e1dd5e588fb981c3b5d3464cc3977afa Mon Sep 17 00:00:00 2001
From: jspurlin <jspurlin@microsoft.com>
Date: Thu, 13 Jul 2023 09:47:15 -0700
Subject: [PATCH 1/2] Keytip: Make keytip data align with which instance is
 visible (for duplicate registrations)

---
 .../src/components/KeytipLayer/KeytipLayer.base.tsx      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx b/packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx
index 0dec0dbf36e45..a94c99632957e 100644
--- a/packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx
+++ b/packages/react/src/components/KeytipLayer/KeytipLayer.base.tsx
@@ -12,6 +12,7 @@ import {
   Async,
   initializeComponentRef,
   KeyCodes,
+  isElementVisibleAndNotHidden,
 } from '../../Utilities';
 import { KeytipManager } from '../../utilities/keytips/KeytipManager';
 import { KeytipTree } from './KeytipTree';
@@ -375,7 +376,15 @@ 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 1dcaf74857abd5600b07a396c3a7675b6bf77f25 Mon Sep 17 00:00:00 2001
From: jspurlin <jspurlin@microsoft.com>
Date: Thu, 13 Jul 2023 09:49:39 -0700
Subject: [PATCH 2/2] changefile

---
 ...luentui-react-f5d92ca7-54dc-4233-b320-97e9faf3f3b1.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 change/@fluentui-react-f5d92ca7-54dc-4233-b320-97e9faf3f3b1.json

diff --git a/change/@fluentui-react-f5d92ca7-54dc-4233-b320-97e9faf3f3b1.json b/change/@fluentui-react-f5d92ca7-54dc-4233-b320-97e9faf3f3b1.json
new file mode 100644
index 0000000000000..6d6c60570229f
--- /dev/null
+++ b/change/@fluentui-react-f5d92ca7-54dc-4233-b320-97e9faf3f3b1.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Keytip: Make keytip data align with which instance is visible (for duplicate registrations)",
+  "packageName": "@fluentui/react",
+  "email": "jspurlin@microsoft.com",
+  "dependentChangeType": "patch"
+}