chore: theme selector updates

Author: mcoker

packages/documentation-framework/components/themeSelector/themeSelector.js

@@ -50,15 +50,24 @@ const DesktopIcon = (
   </svg>
 );
 
-const HCGroupLabel = () => {
+const ColorSchemeGroupLabel = () => {
+  return (
+    <div className="pf-v6-c-menu__group-title" id="theme-selector-color-scheme-title">
+      Color scheme
+    </div>
+  );
+};
+
+const HighContrastGroupLabel = () => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 
   return (
-    <h2 className="pf-v6-c-menu__group-title">
+    <div className="pf-v6-c-menu__group-title">
       High contrast{' '}
       <Popover
+        onClick={(e) => e.stopPropagation()}
         headerContent={"Under development"}
-        headerComponent="h3"
+        headerComponent="h1"
         bodyContent={
           "We are still working to add high contrast support across all PatternFly components and extensions. This beta allows you to preview our progress."
         }
@@ -81,7 +90,7 @@ const HCGroupLabel = () => {
         />
       </Popover>{' '}&nbsp;
       <Label color="blue" isCompact>Beta</Label>
-    </h2>
+    </div>
   )
 };
 
@@ -144,8 +153,8 @@ export const ThemeSelector = ({ id }) => {
       shouldFocusToggleOnSelect
       onOpenChangeKeys={['Escape']}
     >
-      <SelectGroup label={'Color scheme'} labelHeadingLevel="h2">
-        <SelectList aria-label="Light/Dark theme switcher">
+      <SelectGroup label={ColorSchemeGroupLabel}>
+        <SelectList aria-labelledby="theme-selector-color-scheme-title">
           <SelectOption value={colorModes.SYSTEM} icon={DesktopIcon} description="Follow system preference">
             System
           </SelectOption>
@@ -159,7 +168,7 @@ export const ThemeSelector = ({ id }) => {
       </SelectGroup>
       {process.env.hasHighContrastSwitcher && (<>
       <Divider />
-      <SelectGroup label={HCGroupLabel}>
+      <SelectGroup label={HighContrastGroupLabel}>
         <MenuSearch>
           <MenuSearchInput>
             <ToggleGroup aria-label="High contrast theme switcher">