From ab66e7f391d66e4a6dc3700f3ca291c4f1b22b73 Mon Sep 17 00:00:00 2001
From: Blake Vandercar <blake.vandercar@validatek.com>
Date: Wed, 10 Jan 2024 14:52:22 -0700
Subject: [PATCH] style: PopupKind default to "menu"

---
 packages/core/src/components/popover/popover.tsx | 13 ++++++-------
 packages/core/test/popover/popoverTests.tsx      |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/components/popover/popover.tsx b/packages/core/src/components/popover/popover.tsx
index c4e1f8b8ed..87f89f38b6 100644
--- a/packages/core/src/components/popover/popover.tsx
+++ b/packages/core/src/components/popover/popover.tsx
@@ -87,11 +87,9 @@ export interface PopoverProps<TProps extends DefaultPopoverTargetHTMLProps = Def
     interactionKind?: PopoverInteractionKind;
 
     /**
-     * The kind of popup displayed by the popover. This property is ignored if
-     * `interactionKind` is {@link PopoverInteractionKind.HOVER_TARGET_ONLY}.
-     * This controls the `aria-haspopup` attribute of the target element. The
-     * default is "menu" (technically, `aria-haspopup` will be set to "true",
-     * which is the same as "menu", for backwards compatibility).
+     * The kind of popup displayed by the popover. Gets directly applied to the
+     * `aria-haspopup` attribute of the target element. This property is
+     * ignored if `interactionKind` is {@link PopoverInteractionKind.HOVER_TARGET_ONLY}.
      *
      * @default "menu" or undefined
      */
@@ -388,8 +386,9 @@ export class Popover<
         const childTargetProps = {
             "aria-expanded": isOpen,
             "aria-haspopup":
-                this.props.popupKind ??
-                (this.props.interactionKind === PopoverInteractionKind.HOVER_TARGET_ONLY ? undefined : true),
+                this.props.interactionKind === PopoverInteractionKind.HOVER_TARGET_ONLY
+                    ? undefined
+                    : this.props.popupKind ?? "menu",
         } satisfies React.HTMLProps<HTMLElement>;
 
         const targetModifierClasses = {
diff --git a/packages/core/test/popover/popoverTests.tsx b/packages/core/test/popover/popoverTests.tsx
index 7917cfcb3d..9fe6e291d4 100644
--- a/packages/core/test/popover/popoverTests.tsx
+++ b/packages/core/test/popover/popoverTests.tsx
@@ -201,7 +201,7 @@ describe("<Popover>", () => {
 
         it("renders with aria-haspopup attr", () => {
             wrapper = renderPopover({ isOpen: true });
-            assert.isTrue(wrapper.find("[aria-haspopup=true]").exists());
+            assert.isTrue(wrapper.find("[aria-haspopup='menu']").exists());
         });
 
         it("sets aria-haspopup attr base on popupKind", () => {