Merge branch 'develop'

Author: george

dist/undernet.bundle.esm.js

@@ -1,6 +1,6 @@
 /*!
   * @license MIT (https://github.com/geotrev/undernet/blob/master/LICENSE)
-  * Undernet v4.3.0 (https://undernet.io)
+  * Undernet v4.4.0 (https://undernet.io)
   * Copyright 2017-2019 George Treviranus
   */
 const KeyCodes = {
@@ -21,6 +21,9 @@ const Events = {
   CLICK: "click",
 };
 
+/**
+ * Simple DOM manipulator methods. NOTE: These aren't chainable.
+ */
 const dom = {
   attr: (element, attr, newValue) => {
     if (newValue === false) {
@@ -57,6 +60,9 @@ const dom = {
   },
 };
 
+/**
+ * Return an array literal of elements matching focusable elements within a given container.
+ */
 const getFocusableElements = container => {
   const focusables = Selectors.FOCUSABLE_TAGS.map(
     element => `${container} ${element}${Selectors.NOT_VISUALLY_HIDDEN_CLASS}`
@@ -65,8 +71,15 @@ const getFocusableElements = container => {
   return dom.findAll(focusables)
 };
 
+/**
+ * Check if the current browser session is within an Apple device.
+ */
 const iOSMobile = /(iphone|ipod|ipad)/i.test(navigator.userAgent);
 
+/**
+ * Utility class to help with focus trapping and keyboard outline management.
+ * Components extend from this method.
+ */
 class Utils {
   constructor() {
     // events
@@ -284,41 +297,40 @@ class Accordion extends Utils {
   // private
 
   _setup(instance) {
-    const buttonId = dom.attr(instance, Selectors$1.DATA_TARGET);
+    const buttonTargetId = dom.attr(instance, Selectors$1.DATA_TARGET);
     const accordionId = dom.attr(instance, Selectors$1.DATA_PARENT);
-    const buttonContent = dom.find(`#${buttonId}`);
+    const buttonContent = dom.find(`#${buttonTargetId}`);
 
     if (!accordionId) {
-      throw new Error(Messages.NO_ACCORDION_ID_ERROR(buttonId))
+      throw new Error(Messages.NO_ACCORDION_ID_ERROR(buttonTargetId))
     }
 
     if (!buttonContent) {
-      throw new Error(Messages.NO_CONTENT_ERROR(buttonId))
+      throw new Error(Messages.NO_CONTENT_ERROR(buttonTargetId))
     }
 
-    const accordionRowAttr = this._getAccordionRowAttr(buttonId);
+    const accordionRowAttr = this._getAccordionRowAttr(buttonTargetId);
     const accordionRow = dom.find(accordionRowAttr);
 
     if (!accordionRow) {
-      throw new Error(Messages.NO_ROW_ERROR(buttonId))
+      throw new Error(Messages.NO_ROW_ERROR(buttonTargetId))
     }
 
-    const buttonHeaderSelector = this._headers.join(", ");
-    const buttonHeader = dom.find(buttonHeaderSelector, accordionRow);
+    const buttonId = instance.id;
 
-    if (!buttonHeader.id) {
+    if (!buttonId) {
       throw new Error(Messages.NO_HEADER_ID_ERROR(accordionRowAttr))
     }
 
     const buttonContentChildren = getFocusableElements(`#${buttonContent.id}`);
 
-    dom.attr(instance, Selectors$1.ARIA_CONTROLS, buttonId);
-    dom.attr(buttonContent, Selectors$1.ARIA_LABELLEDBY, buttonHeader.id);
+    dom.attr(instance, Selectors$1.ARIA_CONTROLS, buttonTargetId);
+    dom.attr(buttonContent, Selectors$1.ARIA_LABELLEDBY, buttonId);
 
     const contentShouldExpand = dom.attr(accordionRow, Selectors$1.DATA_VISIBLE);
 
     if (!contentShouldExpand) {
-      throw new Error(Messages.NO_VISIBLE_ERROR(buttonId))
+      throw new Error(Messages.NO_VISIBLE_ERROR(buttonTargetId))
     }
 
     if (contentShouldExpand === "true") {