update aria-haspopup to use the correct role (#2101)

`aria-haspopup` should now contain the corresponding role instead of
just true or false. The `aria-haspopup="true"` is considered a `menu`
now.

Context: https://w3c.github.io/aria/#aria-haspopup

Fixes: #2099

Author: RobinMalfait

packages/@headlessui-react/src/components/combobox/combobox.tsx

@@ -1027,7 +1027,7 @@ let Button = forwardRefWithAs(function Button<TTag extends ElementType = typeof
     id,
     type: useResolveButtonType(props, data.buttonRef),
     tabIndex: -1,
-    'aria-haspopup': true,
+    'aria-haspopup': 'listbox',
     'aria-controls': data.optionsRef.current?.id,
     'aria-expanded': data.disabled ? undefined : data.comboboxState === ComboboxState.Open,
     'aria-labelledby': labelledby,

packages/@headlessui-react/src/components/listbox/listbox.tsx

@@ -664,7 +664,7 @@ let Button = forwardRefWithAs(function Button<TTag extends ElementType = typeof
     ref: buttonRef,
     id,
     type: useResolveButtonType(props, data.buttonRef),
-    'aria-haspopup': true,
+    'aria-haspopup': 'listbox',
     'aria-controls': data.optionsRef.current?.id,
     'aria-expanded': data.disabled ? undefined : data.listboxState === ListboxStates.Open,
     'aria-labelledby': labelledby,

packages/@headlessui-react/src/components/menu/menu.tsx

@@ -371,7 +371,7 @@ let Button = forwardRefWithAs(function Button<TTag extends ElementType = typeof
     ref: buttonRef,
     id,
     type: useResolveButtonType(props, state.buttonRef),
-    'aria-haspopup': true,
+    'aria-haspopup': 'menu',
     'aria-controls': state.itemsRef.current?.id,
     'aria-expanded': props.disabled ? undefined : state.menuState === MenuStates.Open,
     onKeyDown: handleKeyDown,

packages/@headlessui-vue/src/components/combobox/combobox.ts

@@ -616,7 +616,7 @@ export let ComboboxButton = defineComponent({
         id,
         type: type.value,
         tabindex: '-1',
-        'aria-haspopup': true,
+        'aria-haspopup': 'listbox',
         'aria-controls': dom(api.optionsRef)?.id,
         'aria-expanded': api.disabled.value
           ? undefined

packages/@headlessui-vue/src/components/listbox/listbox.ts

@@ -527,7 +527,7 @@ export let ListboxButton = defineComponent({
         ref: api.buttonRef,
         id,
         type: type.value,
-        'aria-haspopup': true,
+        'aria-haspopup': 'listbox',
         'aria-controls': dom(api.optionsRef)?.id,
         'aria-expanded': api.disabled.value
           ? undefined

packages/@headlessui-vue/src/components/menu/menu.ts

@@ -317,7 +317,7 @@ export let MenuButton = defineComponent({
         ref: api.buttonRef,
         id,
         type: type.value,
-        'aria-haspopup': true,
+        'aria-haspopup': 'menu',
         'aria-controls': dom(api.itemsRef)?.id,
         'aria-expanded': props.disabled ? undefined : api.menuState.value === MenuStates.Open,
         onKeydown: handleKeyDown,