From e5fcc00ed19e8022eecca413def65e26a204fb40 Mon Sep 17 00:00:00 2001
From: Charles <chassunc@microsoft.com>
Date: Wed, 14 Sep 2022 17:35:49 -0300
Subject: [PATCH 1/3] fix: use trigger prop for ariaa-haspopup

---
 .../accessibility/src/behaviors/Popup/popupBehavior.ts        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/fluentui/accessibility/src/behaviors/Popup/popupBehavior.ts b/packages/fluentui/accessibility/src/behaviors/Popup/popupBehavior.ts
index b2a51ea697af9..451993bae6c3e 100644
--- a/packages/fluentui/accessibility/src/behaviors/Popup/popupBehavior.ts
+++ b/packages/fluentui/accessibility/src/behaviors/Popup/popupBehavior.ts
@@ -10,7 +10,9 @@ export const popupBehavior: Accessibility<PopupBehaviorProps> = props => {
     : undefined;
 
   if (tabbableTriggerProps) {
-    tabbableTriggerProps['aria-haspopup'] = 'dialog';
+    tabbableTriggerProps['aria-haspopup'] = props.trigger?.props.hasOwnProperty('aria-haspopup')
+      ? props.trigger?.props['aria-haspopup']
+      : 'dialog';
 
     if (process.env.NODE_ENV !== 'production') {
       // Override the default trigger's accessibility schema class.

From a080b4e8d74cb0d5be189e9ef555b46722ef7df5 Mon Sep 17 00:00:00 2001
From: Charles <chassunc@microsoft.com>
Date: Fri, 16 Sep 2022 11:11:13 -0300
Subject: [PATCH 2/3] chore: add changelog

---
 packages/fluentui/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/fluentui/CHANGELOG.md b/packages/fluentui/CHANGELOG.md
index 2e1f47aa26a5f..747e5dcc1c09f 100644
--- a/packages/fluentui/CHANGELOG.md
+++ b/packages/fluentui/CHANGELOG.md
@@ -28,6 +28,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Remove `rotate(360deg)` from `PopupContent` content styles @yuanboxue-amber ([#24432](https://github.com/microsoft/fluentui/pull/24432))
 - Fix `FocusZone` to reset tabindex when focus is outside the zone with prop `shouldResetActiveElementWhenTabFromZone` @yuanboxue-amber ([#24463](https://github.com/microsoft/fluentui/pull/24463))
 - Change `useLayoutEffect` in `Dropdown` to `useIsomorphicLayoutEffect` @marwan38 ([#24559](https://github.com/microsoft/fluentui/pull/24559))
+- Fix `Popup` trigger attribute being override @chpalac ([#24794](https://github.com/microsoft/fluentui/pull/24794))
+
 
 ### Performance
 - Avoid memory trashing in `felaExpandCssShorthandsPlugin` @layershifter ([#24663](https://github.com/microsoft/fluentui/pull/24663))

From c16474542a37479b24ecdf58c052daef51dc705a Mon Sep 17 00:00:00 2001
From: Charles <chassunc@microsoft.com>
Date: Mon, 19 Sep 2022 09:19:23 -0300
Subject: [PATCH 3/3] chore: add tests

---
 .../accessibility/test/behaviors/popupBehavior-test.tsx   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/fluentui/accessibility/test/behaviors/popupBehavior-test.tsx b/packages/fluentui/accessibility/test/behaviors/popupBehavior-test.tsx
index 3beb60db43717..147f6d43eff20 100644
--- a/packages/fluentui/accessibility/test/behaviors/popupBehavior-test.tsx
+++ b/packages/fluentui/accessibility/test/behaviors/popupBehavior-test.tsx
@@ -20,6 +20,14 @@ describe('PopupBehavior.ts', () => {
     expect(expectedResult.attributes.trigger.tabIndex).toEqual(-1);
   });
 
+  test('Do not override trigger aria-haspopup attribute', () => {
+    const expectedResult = popupBehavior({
+      trigger: <button aria-haspopup={null} />,
+      tabbableTrigger: true,
+    });
+    expect(expectedResult.attributes.trigger['aria-haspopup']).toBeNull();
+  });
+
   // TODO: Fix me
   // test('does not add tabIndex if element is already tabbable', () => {
   //   const expectedResult = popupBehavior({ trigger: <Button />, tabbableTrigger: true })