basecoat-cli 0.2.0-beta.1 → 0.2.1

package/dist/assets/js/popover.js

@@ -0,0 +1,69 @@
+(() => {
+  const initPopover = (popoverComponent) => {
+    const trigger = popoverComponent.querySelector(':scope > button');
+    const content = popoverComponent.querySelector(':scope > [data-popover]');
+
+    if (!trigger || !content) {
+      console.error('Popover component is missing a trigger button or a content element.', popoverComponent);
+      return;
+    }
+
+    const closePopover = () => {
+      if (trigger.getAttribute('aria-expanded') === 'false') return;
+      trigger.setAttribute('aria-expanded', 'false');
+      content.setAttribute('aria-hidden', 'true');
+      trigger.focus();
+    };
+
+    const openPopover = () => {
+      const elementToFocus = content.querySelector('[autofocus]');
+      if (elementToFocus) {
+        content.addEventListener('transitionend', () => {
+          elementToFocus.focus();
+        }, { once: true });
+      }
+
+      trigger.setAttribute('aria-expanded', 'true');
+      content.setAttribute('aria-hidden', 'false');
+    };
+
+    trigger.addEventListener('click', () => {
+      const isExpanded = trigger.getAttribute('aria-expanded') === 'true';
+      if (isExpanded) {
+        closePopover();
+      } else {
+        openPopover();
+      }
+    });
+
+    popoverComponent.addEventListener('keydown', (e) => {
+      if (e.key === 'Escape') {
+        closePopover();
+      }
+    });
+
+    document.addEventListener('click', (e) => {
+      if (!popoverComponent.contains(e.target)) {
+        closePopover();
+      }
+    });
+
+    popoverComponent.dataset.popoverInitialized = true;
+  };
+
+  document.querySelectorAll('.popover:not([data-popover-initialized])').forEach(initPopover);
+
+  const observer = new MutationObserver((mutations) => {
+    mutations.forEach((mutation) => {
+      mutation.addedNodes.forEach((node) => {
+        if (node.nodeType !== Node.ELEMENT_NODE) return;
+        if (node.matches('.popover:not([data-popover-initialized])')) {
+          initPopover(node);
+        }
+        node.querySelectorAll('.popover:not([data-popover-initialized])').forEach(initPopover);
+      });
+    });
+  });
+  
+  observer.observe(document.body, { childList: true, subtree: true });
+})();

package/dist/assets/js/popover.min.js

@@ -0,0 +1 @@
+(()=>{const e=e=>{const t=e.querySelector(":scope > button"),o=e.querySelector(":scope > [data-popover]");if(!t||!o)return void console.error("Popover component is missing a trigger button or a content element.",e);const r=()=>{"false"!==t.getAttribute("aria-expanded")&&(t.setAttribute("aria-expanded","false"),o.setAttribute("aria-hidden","true"),t.focus())};t.addEventListener("click",(()=>{"true"===t.getAttribute("aria-expanded")?r():(()=>{const e=o.querySelector("[autofocus]");e&&o.addEventListener("transitionend",(()=>{e.focus()}),{once:!0}),t.setAttribute("aria-expanded","true"),o.setAttribute("aria-hidden","false")})()})),e.addEventListener("keydown",(e=>{"Escape"===e.key&&r()})),document.addEventListener("click",(t=>{e.contains(t.target)||r()})),e.dataset.popoverInitialized=!0};document.querySelectorAll(".popover:not([data-popover-initialized])").forEach(e);new MutationObserver((t=>{t.forEach((t=>{t.addedNodes.forEach((t=>{t.nodeType===Node.ELEMENT_NODE&&(t.matches(".popover:not([data-popover-initialized])")&&e(t),t.querySelectorAll(".popover:not([data-popover-initialized])").forEach(e))}))}))})).observe(document.body,{childList:!0,subtree:!0})})();

package/dist/assets/js/select.js

@@ -1,8 +1,8 @@
 (() => {
   const initSelect = (selectComponent) => {
-    const trigger = selectComponent.querySelector(':scope > [popovertarget]');
+    const trigger = selectComponent.querySelector(':scope > button');
     const selectedValue = trigger.querySelector(':scope > span');
-    const popover = selectComponent.querySelector(':scope > [popover]');
+    const popover = selectComponent.querySelector(':scope > [data-popover]');
     const listbox = popover.querySelector('[role="listbox"]');
     const input = selectComponent.querySelector(':scope > input[type="hidden"]');
     const filter = selectComponent.querySelector('header input[type="text"]');
@@ -21,15 +21,26 @@
       }
     };
 
+    const closePopover = () => {
+      popover.setAttribute('aria-hidden', 'true');
+      trigger.setAttribute('aria-expanded', 'false');
+      if (filter) {
+        filter.value = '';
+        visibleOptions = [...options];
+        options.forEach(opt => opt.setAttribute('aria-hidden', 'false'));
+      }
+      trigger.removeAttribute('aria-activedescendant');
+      if (activeIndex > -1) options[activeIndex]?.classList.remove('active');
+      activeIndex = -1;
+    }
+
     const selectOption = (option) => {
       if (!option) return;
       
-      updateValue(option);
-      
-      trigger.removeAttribute('aria-activedescendant');
-      options.forEach(opt => opt.classList.remove('active'));
-      activeIndex = -1;
-      popover.hidePopover();
+      if (option.dataset.value) {
+        updateValue(option);
+      }
+      closePopover();
     };
 
     if (filter) {
@@ -62,12 +73,14 @@
     updateValue(initialOption);
 
     const handleKeyNavigation = (e) => {
-      if (!['ArrowDown', 'ArrowUp', 'Enter', 'Home', 'End'].includes(e.key)) {
+      const isPopoverOpen = popover.getAttribute('aria-hidden') === 'false';
+
+      if (!['ArrowDown', 'ArrowUp', 'Enter', 'Home', 'End', 'Escape'].includes(e.key)) {
         return;
       }
 
-      if (!popover.matches(':popover-open')) {
-        if (e.currentTarget === trigger && e.key !== 'Enter') {
+      if (!isPopoverOpen) {
+        if (e.key !== 'Enter' && e.key !== 'Escape') {
           e.preventDefault();
           trigger.click();
         }
@@ -76,9 +89,14 @@
       
       e.preventDefault();
 
+      if (e.key === 'Escape') {
+        closePopover();
+        return;
+      }
+      
       if (e.key === 'Enter') {
         if (activeIndex > -1) {
-          selectOption(options[activeIndex]);
+          selectOption(visibleOptions[activeIndex]);
         }
         return;
       }
@@ -130,6 +148,31 @@
       filter.addEventListener('keydown', handleKeyNavigation);
     }
 
+    trigger.addEventListener('click', () => {
+      const isExpanded = trigger.getAttribute('aria-expanded') === 'true';
+      
+      if (isExpanded) {
+        closePopover();
+      } else {
+        popover.setAttribute('aria-hidden', 'false');
+        trigger.setAttribute('aria-expanded', 'true');
+        if (filter) filter.focus();
+        
+        const selectedOption = listbox.querySelector('[role="option"][aria-selected="true"]');
+        if (selectedOption) {
+          if (activeIndex > -1) {
+            options[activeIndex]?.classList.remove('active');
+          }
+          activeIndex = options.indexOf(selectedOption);
+          selectedOption.classList.add('active');
+          if (selectedOption.id) {
+            trigger.setAttribute('aria-activedescendant', selectedOption.id);
+          }
+          selectedOption.scrollIntoView({ block: 'nearest' });
+        }
+      }
+    });
+
     listbox.addEventListener('click', (e) => {
       const clickedOption = e.target.closest('[role="option"]');
       if (clickedOption) {
@@ -137,46 +180,13 @@
       }
     });
 
-    popover.addEventListener('toggle', (e) => {
-      trigger.setAttribute('aria-expanded', e.newState === 'open');
-
-      if (e.newState === 'open') {
-        if (filter) filter.focus();
-        
-        const selectedOption = listbox.querySelector('[role="option"][aria-selected="true"]');
-        let startingOption = null;
-
-        if (selectedOption && visibleOptions.includes(selectedOption)) {
-          startingOption = selectedOption;
-        } else if (visibleOptions.length > 0) {
-          startingOption = visibleOptions[0];
-        }
-
-        if (activeIndex > -1) options[activeIndex]?.classList.remove('active');
-
-        if (startingOption) {
-          activeIndex = options.indexOf(startingOption);
-          startingOption.classList.add('active');
-          if (startingOption.id) {
-            trigger.setAttribute('aria-activedescendant', startingOption.id);
-          }
-          startingOption.scrollIntoView({ block: 'nearest' });
-        } else {
-          activeIndex = -1;
-        }
-      } else if (e.newState === 'closed') {
-        if (filter) {
-          filter.value = '';
-          visibleOptions = [...options];
-          options.forEach(opt => opt.setAttribute('aria-hidden', 'false'));
-        }
-
-        trigger.removeAttribute('aria-activedescendant');
-        if (activeIndex > -1) options[activeIndex]?.classList.remove('active');
-        activeIndex = -1;
+    document.addEventListener('click', (e) => {
+      if (!selectComponent.contains(e.target)) {
+        closePopover();
       }
     });
 
+    popover.setAttribute('aria-hidden', 'true');
     selectComponent.dataset.selectInitialized = true;
   };
 

package/dist/assets/js/select.min.js

@@ -1 +1 @@
-(()=>{const e=e=>{const t=e.querySelector(":scope > [popovertarget]"),r=t.querySelector(":scope > span"),a=e.querySelector(":scope > [popover]"),i=a.querySelector('[role="listbox"]'),o=e.querySelector(':scope > input[type="hidden"]'),n=e.querySelector('header input[type="text"]');if(!(t&&a&&i&&o))return;const s=Array.from(i.querySelectorAll('[role="option"]'));let c=[...s],l=-1;const d=e=>{e&&(r.innerHTML=e.dataset.label||e.innerHTML,o.value=e.dataset.value,i.querySelector('[role="option"][aria-selected="true"]')?.removeAttribute("aria-selected"),e.setAttribute("aria-selected","true"))},u=e=>{e&&(d(e),t.removeAttribute("aria-activedescendant"),s.forEach((e=>e.classList.remove("active"))),l=-1,a.hidePopover())};if(n){const e=()=>{const e=n.value.trim().toLowerCase();l>-1&&(s[l].classList.remove("active"),t.removeAttribute("aria-activedescendant"),l=-1),c=[],s.forEach((t=>{const r=(t.dataset.label||t.textContent).trim().toLowerCase().includes(e);t.setAttribute("aria-hidden",String(!r)),r&&c.push(t)}))};n.addEventListener("input",e)}let v=s.find((e=>o.value&&e.dataset.value===o.value));!v&&s.length>0&&(v=s[0]),d(v);const p=e=>{if(!["ArrowDown","ArrowUp","Enter","Home","End"].includes(e.key))return;if(!a.matches(":popover-open"))return void(e.currentTarget===t&&"Enter"!==e.key&&(e.preventDefault(),t.click()));if(e.preventDefault(),"Enter"===e.key)return void(l>-1&&u(s[l]));if(0===c.length)return;const r=l>-1?c.indexOf(s[l]):-1;let i=r;switch(e.key){case"ArrowDown":r<c.length-1&&(i=r+1);break;case"ArrowUp":r>0?i=r-1:-1===r&&(i=0);break;case"Home":i=0;break;case"End":i=c.length-1}if(i!==r){r>-1&&c[r].classList.remove("active");const e=c[i];e.classList.add("active"),l=s.indexOf(e),e.id&&t.setAttribute("aria-activedescendant",e.id),e.scrollIntoView({block:"nearest",behavior:"smooth"})}};t.addEventListener("keydown",p),n&&n.addEventListener("keydown",p),i.addEventListener("click",(e=>{const t=e.target.closest('[role="option"]');t&&u(t)})),a.addEventListener("toggle",(e=>{if(t.setAttribute("aria-expanded","open"===e.newState),"open"===e.newState){n&&n.focus();const e=i.querySelector('[role="option"][aria-selected="true"]');let r=null;e&&c.includes(e)?r=e:c.length>0&&(r=c[0]),l>-1&&s[l]?.classList.remove("active"),r?(l=s.indexOf(r),r.classList.add("active"),r.id&&t.setAttribute("aria-activedescendant",r.id),r.scrollIntoView({block:"nearest"})):l=-1}else"closed"===e.newState&&(n&&(n.value="",c=[...s],s.forEach((e=>e.setAttribute("aria-hidden","false")))),t.removeAttribute("aria-activedescendant"),l>-1&&s[l]?.classList.remove("active"),l=-1)})),e.dataset.selectInitialized=!0};document.querySelectorAll("div.select:not([data-select-initialized])").forEach(e);new MutationObserver((t=>{t.forEach((t=>{t.addedNodes.forEach((t=>{t.nodeType===Node.ELEMENT_NODE&&(t.matches("div.select:not([data-select-initialized])")&&e(t),t.querySelectorAll("div.select:not([data-select-initialized])").forEach(e))}))}))})).observe(document.body,{childList:!0,subtree:!0})})();
+(()=>{const e=e=>{const t=e.querySelector(":scope > button"),r=t.querySelector(":scope > span"),a=e.querySelector(":scope > [data-popover]"),i=a.querySelector('[role="listbox"]'),s=e.querySelector(':scope > input[type="hidden"]'),n=e.querySelector('header input[type="text"]');if(!(t&&a&&i&&s))return;const o=Array.from(i.querySelectorAll('[role="option"]'));let c=[...o],d=-1;const l=e=>{e&&(r.innerHTML=e.dataset.label||e.innerHTML,s.value=e.dataset.value,i.querySelector('[role="option"][aria-selected="true"]')?.removeAttribute("aria-selected"),e.setAttribute("aria-selected","true"))},u=()=>{a.setAttribute("aria-hidden","true"),t.setAttribute("aria-expanded","false"),n&&(n.value="",c=[...o],o.forEach((e=>e.setAttribute("aria-hidden","false")))),t.removeAttribute("aria-activedescendant"),d>-1&&o[d]?.classList.remove("active"),d=-1},v=e=>{e&&(e.dataset.value&&l(e),u())};if(n){const e=()=>{const e=n.value.trim().toLowerCase();d>-1&&(o[d].classList.remove("active"),t.removeAttribute("aria-activedescendant"),d=-1),c=[],o.forEach((t=>{const r=(t.dataset.label||t.textContent).trim().toLowerCase().includes(e);t.setAttribute("aria-hidden",String(!r)),r&&c.push(t)}))};n.addEventListener("input",e)}let b=o.find((e=>s.value&&e.dataset.value===s.value));!b&&o.length>0&&(b=o[0]),l(b);const p=e=>{const r="false"===a.getAttribute("aria-hidden");if(!["ArrowDown","ArrowUp","Enter","Home","End","Escape"].includes(e.key))return;if(!r)return void("Enter"!==e.key&&"Escape"!==e.key&&(e.preventDefault(),t.click()));if(e.preventDefault(),"Escape"===e.key)return void u();if("Enter"===e.key)return void(d>-1&&v(c[d]));if(0===c.length)return;const i=d>-1?c.indexOf(o[d]):-1;let s=i;switch(e.key){case"ArrowDown":i<c.length-1&&(s=i+1);break;case"ArrowUp":i>0?s=i-1:-1===i&&(s=0);break;case"Home":s=0;break;case"End":s=c.length-1}if(s!==i){i>-1&&c[i].classList.remove("active");const e=c[s];e.classList.add("active"),d=o.indexOf(e),e.id&&t.setAttribute("aria-activedescendant",e.id),e.scrollIntoView({block:"nearest",behavior:"smooth"})}};t.addEventListener("keydown",p),n&&n.addEventListener("keydown",p),t.addEventListener("click",(()=>{if("true"===t.getAttribute("aria-expanded"))u();else{a.setAttribute("aria-hidden","false"),t.setAttribute("aria-expanded","true"),n&&n.focus();const e=i.querySelector('[role="option"][aria-selected="true"]');e&&(d>-1&&o[d]?.classList.remove("active"),d=o.indexOf(e),e.classList.add("active"),e.id&&t.setAttribute("aria-activedescendant",e.id),e.scrollIntoView({block:"nearest"}))}})),i.addEventListener("click",(e=>{const t=e.target.closest('[role="option"]');t&&v(t)})),document.addEventListener("click",(t=>{e.contains(t.target)||u()})),a.setAttribute("aria-hidden","true"),e.dataset.selectInitialized=!0};document.querySelectorAll("div.select:not([data-select-initialized])").forEach(e);new MutationObserver((t=>{t.forEach((t=>{t.addedNodes.forEach((t=>{t.nodeType===Node.ELEMENT_NODE&&(t.matches("div.select:not([data-select-initialized])")&&e(t),t.querySelectorAll("div.select:not([data-select-initialized])").forEach(e))}))}))})).observe(document.body,{childList:!0,subtree:!0})})();

package/dist/assets/nunjucks/dialog.njk

@@ -8,10 +8,10 @@
   @param footer {string} [optional] - HTML content for the dialog footer.
   @param main_attrs {object} [optional] - Additional HTML attributes for the main container div.
   @param trigger_attrs {object} [optional] - Additional HTML attributes for the trigger button.
-  @param content_attrs {object} [optional] - Additional HTML attributes for the dialog content article.
-  @param content_header_attrs {object} [optional] - Additional HTML attributes for the dialog header.
-  @param content_body_attrs {object} [optional] - Additional HTML attributes for the dialog body section.
-  @param content_footer_attrs {object} [optional] - Additional HTML attributes for the dialog footer.
+  @param dialog_attrs {object} [optional] - Additional HTML attributes for the dialog content article.
+  @param header_attrs {object} [optional] - Additional HTML attributes for the dialog header.
+  @param body_attrs {object} [optional] - Additional HTML attributes for the dialog body section.
+  @param footer_attrs {object} [optional] - Additional HTML attributes for the dialog footer.
   @param open {boolean} [optional] [default=false] - Whether the dialog should be open initially.
   @param close_button {boolean} [optional] [default=true] - Whether to include a close button.
   @param close_on_overlay_click {boolean} [optional] [default=true] - Whether clicking the overlay closes the dialog.

package/dist/assets/nunjucks/dropdown-menu.njk

@@ -3,26 +3,31 @@
 
   @param id {string} [optional] - Unique identifier for the dropdown component.
   @param trigger {string} [optional] - HTML content for the button that triggers the dropdown.
-  @param menu {array} [optional] - Array of menu items for the dropdown.
+  @param items {array} [optional] - Array of menu items for the dropdown.
   @param main_attrs {object} [optional] - Additional HTML attributes for the main container div.
   @param trigger_attrs {object} [optional] - Additional HTML attributes for the trigger button.
-  @param content_attrs {object} [optional] - Additional HTML attributes for the dropdown content div.
+  @param popover_attrs {object} [optional] - Additional HTML attributes for the dropdown content div.
 #}
 {% macro dropdown_menu(
-  id=None,
   trigger,
+  id=None,
   items=None,
+  main_attrs={},
   trigger_attrs={},
   popover_attrs={},
   menu_attrs={}
 ) %}
 {% set id = id or ("dropdown-menu-" + (range(100000, 999999) | random | string)) %}
 
-<div class="dropdown-menu">
+<div
+  class="dropdown-menu {{ main_attrs.class }}"
+  {% for key, value in main_attrs %}
+    {% if key != 'class' %}{{ key }}="{{ value }}"{% endif %}
+  {% endfor %}
+>
   <button
     type="button"
     id="{{ id }}-trigger"
-    popovertarget="{{ id }}"
     aria-haspopup="menu"
     aria-controls="{{ id }}-menu"
     aria-expanded="false"
@@ -33,14 +38,14 @@
     {{ trigger | safe }}
   </button>
   <div
-    popover
-    class="popover p-1 {% if popover_attrs.class %} {{ popover_attrs.class }}{% endif %}"
     id="{{ id }}"
+    data-popover
+    aria-hidden="true"
     {% for key, value in popover_attrs %}
-      {% if key != "class" %}{{ key }}="{{ value }}"{% endif %}
+      {{ key }}="{{ value }}"
     {% endfor %}
   >
-    <nav
+    <div
       role="menu"
       id="{{ id }}-menu"
       aria-labelledby="{{ id }}-trigger"
@@ -53,7 +58,7 @@
       {% else %}
         {{ caller() if caller }}
       {% endif %}
-    </nav>
+    </div>
   </div>
 </div>
 {% endmacro %}
@@ -73,11 +78,13 @@
       <div
         role="group"
         aria-labelledby="{{ group_label_id }}"
-        {% for key, value in item.attrs %}
-          {{ key }}="{{ value }}"
-        {% endfor %}
+        {% if item.attrs %}
+          {% for key, value in item.attrs %}
+            {{ key }}="{{ value }}"
+          {% endfor %}
+        {% endif %}
       >
-        <div role="heading" id="{{ group_label_id }}">{{ item.label }}</div>
+        <div role="presentation" id="{{ group_label_id }}">{{ item.label }}</div>
         {{ render_dropdown_items(item.items, item_id) if item.items }}
       </div>
     {% elif item.type == "separator" %}
@@ -85,24 +92,29 @@
     {% elif item.type == "item" or not item.type %}
       {% if item.url %}
         <a
+          id="{{ item_id }}"
           role="menuitem"
           href="{{ item.url }}"
-          {% for key, value in item.attrs %}
-            {% if key != "url" %} {{ key }}="{{ value }}" {% endif %}
-          {% endfor %}
+          {% if item.attrs %}
+            {% for key, value in item.attrs %}
+              {% if key != "url" %} {{ key }}="{{ value }}" {% endif %}
+            {% endfor %}
+          {% endif %}
         >
           {{ item.label | safe }}
         </a>
       {% else %}
-        <button
+        <div
+          id="{{ item_id }}"
           role="menuitem"
-          type="button"
-          {% for key, value in item.attrs %}
-             {{ key }}="{{ value }}"
-          {% endfor %}
+          {% if item.attrs %}
+            {% for key, value in item.attrs %}
+              {{ key }}="{{ value }}"
+            {% endfor %}
+          {% endif %}
         >
           {{ item.label | safe }}
-        </button>
+        </div>
       {% endif %}
     {% endif %}
   {% endfor %}

package/dist/assets/nunjucks/popover.njk

@@ -5,35 +5,43 @@
   @param trigger {string} [optional] - HTML content for the element that triggers the popover.
   @param main_attrs {object} [optional] - Additional HTML attributes for the main container div.
   @param trigger_attrs {object} [optional] - Additional HTML attributes for the trigger element.
-  @param content_attrs {object} [optional] - Additional HTML attributes for the popover content div.
+  @param popover_attrs {object} [optional] - Additional HTML attributes for the popover content div.
 #}
 {% macro popover(
-  id=None,
   trigger,
+  id=None,
+  main_attrs={},
   trigger_attrs={},
   popover_attrs={}
 ) %}
 {% set id = id or ("popover-" + (range(100000, 999999) | random | string)) %}
-<button
-  type="button"
-  popovertarget="{{ id }}"
-  id="{{ id }}-trigger"
-  onclick="this.setAttribute('aria-expanded', this.getAttribute('aria-expanded') === 'false' ? 'true' : 'false')"
-  aria-expanded="false"
-  {% for key, value in trigger_attrs %}
-    {{ key }}="{{ value }}"
-  {% endfor %}
->
-  {{ trigger | safe }}
-</button>
+
 <div
-  popover
-  id="{{ id }}"
-  class="popover {{ popover_attrs.class }}"
-  {% for key, value in popover_attrs %}
+  class="popover {{ main_attrs.class }}"
+  {% for key, value in main_attrs %}
     {% if key != 'class' %}{{ key }}="{{ value }}"{% endif %}
   {% endfor %}
-> 
-  {{ caller() if caller }}
+>
+  <button
+    id="{{ id }}-trigger"
+    type="button"
+    aria-expanded="false"
+    aria-controls="{{ id }}"
+    {% for key, value in trigger_attrs %}
+      {{ key }}="{{ value }}"
+    {% endfor %}
+  >
+    {{ trigger | safe }}
+  </button>
+  <div
+    id="{{ id }}"
+    data-popover
+    aria-hidden="true"
+    {% for key, value in popover_attrs %}
+      {{ key }}="{{ value }}"
+    {% endfor %}
+  > 
+    {{ caller() if caller }}
+  </div>
 </div>
 {% endmacro %}

package/dist/assets/nunjucks/select.njk

@@ -6,7 +6,7 @@
   @param name {string} [optional] - The name attribute for the hidden input storing the selected value.
   @param main_attrs {object} [optional] - Additional HTML attributes for the main container div.
   @param trigger_attrs {object} [optional] - Additional HTML attributes for the trigger button.
-  @param content_attrs {object} [optional] - Additional HTML attributes for the popover content div.
+  @param popover_attrs {object} [optional] - Additional HTML attributes for the popover content div.
   @param listbox_attrs {object} [optional] - Additional HTML attributes for the listbox div.
   @param input_attrs {object} [optional] - Additional HTML attributes for the hidden input.
   @param search_placeholder {string} [optional] [default="Search entries..."] - Placeholder text for the search input (combobox only).
@@ -17,9 +17,11 @@
   selected=None,
   name=None,
   items=None,
+  main_attrs={},
   trigger_attrs={},
   popover_attrs={},
   listbox_attrs={},
+  input_attrs={},
   search_placeholder="Search entries...",
   is_combobox=false
 ) %}
@@ -28,34 +30,40 @@
 {% set first_option = [] %}
 {% set selected_option = [] %}
 
-{% for item in items %}
-  {% if item.type == "group" %}
-    {% for sub_item in item.items %}
+{% if items %}
+  {% for item in items %}
+    {% if item.type == "group" %}
+      {% for sub_item in item.items %}
+        {% if not first_option[0] %}
+          {% set first_option = (first_option.push(sub_item), first_option) %}
+        {% endif %}
+        {% if selected and sub_item.value == selected and not selected_option[0] %}
+          {% set selected_option = (selected_option.push(sub_item), selected_option) %}
+        {% endif %}
+      {% endfor %}
+    {% else %}
       {% if not first_option[0] %}
-        {% set first_option = (first_option.push(sub_item), first_option) %}
+        {% set first_option = (first_option.push(item), first_option) %}
       {% endif %}
-      {% if selected and sub_item.value == selected and not selected_option[0] %}
-        {% set selected_option = (selected_option.push(sub_item), selected_option) %}
+      {% if selected and item.value == selected and not selected_option[0] %}
+        {% set selected_option = (selected_option.push(item), selected_option) %}
       {% endif %}
-    {% endfor %}
-  {% else %}
-    {% if not first_option[0] %}
-      {% set first_option = (first_option.push(item), first_option) %}
     {% endif %}
-    {% if selected and item.value == selected and not selected_option[0] %}
-      {% set selected_option = (selected_option.push(item), selected_option) %}
-    {% endif %}
-  {% endif %}
-{% endfor %}
+  {% endfor %}
+{% endif %}
 
 {% set default_option = selected_option[0] or first_option[0] or None %}
 
-<div class="select">
+<div
+  class="select {{ main_attrs.class }}"
+  {% for key, value in main_attrs %}
+    {% if key != 'class' %}{{ key }}="{{ value }}"{% endif %}
+  {% endfor %}
+>
   <button
     type="button"
     class="btn-outline justify-between font-normal {{ trigger_attrs.class }}"
     id="{{ id }}-trigger"
-    popovertarget="{{ id }}"
     aria-haspopup="listbox"
     aria-expanded="false"
     aria-controls="{{ id }}-listbox"
@@ -71,11 +79,11 @@
     {% endif %}
   </button>
   <div
-    popover
     id="{{ id }}"
-    class="popover {{ popover_attrs.class }}"
+    data-popover
+    aria-hidden="true"
     {% for key, value in popover_attrs %}
-      {% if key != 'class' %}{{ key }}="{{ value }}"{% endif %}
+      {{ key }}="{{ value }}"
     {% endfor %}
   >
     {% if is_combobox %}
@@ -90,8 +98,8 @@
         spellcheck="false"
         aria-autocomplete="list"
         role="combobox"
-        aria-expanded="true"
-        aria-controls="{{ id }}-content"
+        aria-expanded="false"
+        aria-controls="{{ id }}-listbox"
         aria-labelledby="{{ id }}-trigger"
       >
     </header>
@@ -105,7 +113,7 @@
         {{ key }}="{{ value }}"
       {% endfor %}
     >
-      {% if items.length > 0 %}
+      {% if items and items.length > 0 %}
         {{ render_select_items(items, default_option.value, id ~ "-items" if id else "items") }}
       {% else %}
         {{ caller() if caller }}
@@ -115,7 +123,7 @@
   <input
     type="hidden"
     name="{{ name or id ~ '-value' }}"
-    value="{{ selected or '' }}"
+    value="{{ (default_option.value if default_option) or '' }}"
     {% for key, value in input_attrs %}
       {% if key != 'name' and key != 'value' %}{{ key }}="{{ value }}"{% endif %}
     {% endfor %}
@@ -137,11 +145,13 @@
       <div
         role="group"
         aria-labelledby="{{ group_label_id }}"
-        {% for key, value in item.attrs %}
-          {{ key }}="{{ value }}"
-        {% endfor %}
+        {% if item.attrs %}
+          {% for key, value in item.attrs %}
+            {{ key }}="{{ value }}"
+          {% endfor %}
+        {% endif %}
       >
-        <div role="heading" id="{{ group_label_id }}">{{ item.label }}</div>
+        <div role="presentation" id="{{ group_label_id }}">{{ item.label }}</div>
         {{ render_select_items(item.items, selected, item_id) if item.items }}
       </div>
     {% elif item.type == "separator" %}
@@ -152,9 +162,11 @@
         role="option"
         data-value="{{ item.value }}"
         {% if selected == item.value %}aria-selected="true"{% endif %}
-        {% for key, value in item.attrs %}
-           {{ key }}="{{ value }}"
-        {% endfor %}
+        {% if item.attrs %}
+          {% for key, value in item.attrs %}
+            {{ key }}="{{ value }}"
+          {% endfor %}
+        {% endif %}
       >
         {{ item.label | safe }}
       </div>