basecoat-cli 0.2.0-beta.1 → 0.2.0

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 %}
@@ -141,7 +149,7 @@
           {{ key }}="{{ value }}"
         {% endfor %}
       >
-        <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" %}

package/dist/assets/nunjucks/toast.njk

@@ -14,9 +14,9 @@
 ) %}
 <div
   id="{{ id }}"
-  class="toaster"
+  class="toaster {{ attrs.class }}"
   {% for key, value in attrs %}
-    {{ key }}="{{ value }}"
+    {% if key != 'class' %}{{ key }}="{{ value }}"{% endif %}
   {% endfor %}
 >
 {% for item in toasts %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basecoat-cli",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0",
   "description": "Add Basecoat components to your project",
   "author": "hunvreus",
   "license": "MIT",