vrembem 2.0.0 → 3.0.0

package/dev/scripts.modern.js

@@ -1,60 +1,105 @@
-const setInert = (state, selector) => {
-  if (selector) {
-    const els = document.querySelectorAll(selector);
-    els.forEach(el => {
-      if (state) {
-        el.inert = true;
-        el.setAttribute('aria-hidden', true);
-      } else {
-        el.inert = null;
-        el.removeAttribute('aria-hidden');
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
       }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
+var id = 0;
+
+function _classPrivateFieldLooseKey(name) {
+  return "__private_" + id++ + "_" + name;
+}
+
+function _classPrivateFieldLooseBase(receiver, privateKey) {
+  if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
+    throw new TypeError("attempted to use private field on non-instance");
+  }
+
+  return receiver;
+}
+
+var _handler = /*#__PURE__*/_classPrivateFieldLooseKey("handler");
+
+class Breakpoint {
+  constructor(value, handler) {
+    Object.defineProperty(this, _handler, {
+      writable: true,
+      value: void 0
     });
+    this.value = value;
+    _classPrivateFieldLooseBase(this, _handler)[_handler] = handler;
+    this.mql = null;
   }
-};
-const setOverflowHidden = (state, selector) => {
-  if (selector) {
-    const els = document.querySelectorAll(selector);
-    els.forEach(el => {
-      if (state) {
-        el.style.overflow = 'hidden';
+
+  get handler() {
+    return _classPrivateFieldLooseBase(this, _handler)[_handler];
+  } // Unmount existing handler before setting a new one.
+
+
+  set handler(func) {
+    if (this.mql) {
+      // Conditionally use removeListener() for IE11 support.
+      if (typeof this.mql.removeEventListener === 'function') {
+        this.mql.removeEventListener('change', _classPrivateFieldLooseBase(this, _handler)[_handler]);
       } else {
-        el.style.removeProperty('overflow');
+        this.mql.removeListener(_classPrivateFieldLooseBase(this, _handler)[_handler]);
       }
-    });
+    }
+
+    _classPrivateFieldLooseBase(this, _handler)[_handler] = func;
   }
-};
-const setTabindex = selector => {
-  if (selector) {
-    const els = document.querySelectorAll(selector);
-    els.forEach(el => {
-      el.setAttribute('tabindex', '-1');
-    });
+
+  mount(value, handler) {
+    // Update passed params.
+    if (value) this.value = value;
+    if (handler) _classPrivateFieldLooseBase(this, _handler)[_handler] = handler; // Guard if no breakpoint was set.
+
+    if (!this.value) return this; // Setup and store the MediaQueryList instance.
+
+    this.mql = window.matchMedia(`(min-width: ${this.value})`); // Conditionally use addListener() for IE11 support.
+
+    if (typeof this.mql.addEventListener === 'function') {
+      this.mql.addEventListener('change', _classPrivateFieldLooseBase(this, _handler)[_handler]);
+    } else {
+      this.mql.addListener(_classPrivateFieldLooseBase(this, _handler)[_handler]);
+    } // Run the handler.
+
+
+    _classPrivateFieldLooseBase(this, _handler)[_handler](this.mql);
+
+    return this;
   }
-};
 
-/**
- * Adds a class or classes to a Node or NodeList.
- * @param {Node || NodeList} el - Element(s) to add class(es) to.
- * @param  {String || Array} cl - Class(es) to add.
- */
-const addClass = (el, ...cl) => {
-  el = el.forEach ? el : [el];
-  el.forEach(el => {
-    el.classList.add(...cl);
-  });
-};
+  unmount() {
+    // Guard if no MediaQueryList instance exists.
+    if (!this.mql) return this; // Conditionally use removeListener() for IE11 support.
 
-/**
- * Takes a hyphen cased string and converts it to camel case.
- * @param {String } str - the string to convert to camel case.
- * @returns {Boolean} - returns a camel cased string.
- */
-const camelCase = str => {
-  return str.replace(/-([a-z])/g, function (g) {
-    return g[1].toUpperCase();
-  });
-};
+    if (typeof this.mql.removeEventListener === 'function') {
+      this.mql.removeEventListener('change', _classPrivateFieldLooseBase(this, _handler)[_handler]);
+    } else {
+      this.mql.removeListener(_classPrivateFieldLooseBase(this, _handler)[_handler]);
+    } // Set value, handler and MediaQueryList to null.
+
+
+    this.value = null;
+    _classPrivateFieldLooseBase(this, _handler)[_handler] = null;
+    this.mql = null;
+    return this;
+  }
+
+}
 
 class Collection {
   constructor() {
@@ -108,154 +153,168 @@ class Collection {
 
 var focusableSelectors = ['a[href]:not([tabindex^="-"])', 'area[href]:not([tabindex^="-"])', 'input:not([type="hidden"]):not([type="radio"]):not([disabled]):not([tabindex^="-"])', 'input[type="radio"]:not([disabled]):not([tabindex^="-"])', 'select:not([disabled]):not([tabindex^="-"])', 'textarea:not([disabled]):not([tabindex^="-"])', 'button:not([disabled]):not([tabindex^="-"])', 'iframe:not([tabindex^="-"])', 'audio[controls]:not([tabindex^="-"])', 'video[controls]:not([tabindex^="-"])', '[contenteditable]:not([tabindex^="-"])', '[tabindex]:not([tabindex^="-"])'];
 
-const focusTarget = (target, settings) => {
-  const innerFocus = target.querySelector(settings.selectorFocus);
+var _focusable = /*#__PURE__*/_classPrivateFieldLooseKey("focusable");
+
+var _handleFocusTrap = /*#__PURE__*/_classPrivateFieldLooseKey("handleFocusTrap");
+
+var _handleFocusLock = /*#__PURE__*/_classPrivateFieldLooseKey("handleFocusLock");
 
-  if (innerFocus) {
-    innerFocus.focus();
-  } else {
-    const innerElement = target.querySelector('[tabindex="-1"]');
-    if (innerElement) innerElement.focus();
-  }
-};
-const focusTrigger = obj => {
-  if (!obj || !obj.memory || !obj.memory.trigger) return;
-  obj.memory.trigger.focus();
-  obj.memory.trigger = null;
-};
 class FocusTrap {
-  constructor() {
-    this.target = null;
-    this.__handlerFocusTrap = this.handlerFocusTrap.bind(this);
+  constructor(el = null, selectorFocus = '[data-focus]') {
+    Object.defineProperty(this, _focusable, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _handleFocusTrap, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _handleFocusLock, {
+      writable: true,
+      value: void 0
+    });
+    this.el = el;
+    this.selectorFocus = selectorFocus;
+    _classPrivateFieldLooseBase(this, _handleFocusTrap)[_handleFocusTrap] = handleFocusTrap.bind(this);
+    _classPrivateFieldLooseBase(this, _handleFocusLock)[_handleFocusLock] = handleFocusLock.bind(this);
   }
 
-  init(target) {
-    this.destroy();
-    this.target = target;
-    this.inner = this.target.querySelector('[tabindex="-1"]');
-    this.focusable = this.getFocusable();
+  get focusable() {
+    return _classPrivateFieldLooseBase(this, _focusable)[_focusable];
+  }
 
-    if (this.focusable.length) {
-      this.focusableFirst = this.focusable[0];
-      this.focusableLast = this.focusable[this.focusable.length - 1];
-      this.target.addEventListener('keydown', this.__handlerFocusTrap);
+  set focusable(value) {
+    // Update the focusable value.
+    _classPrivateFieldLooseBase(this, _focusable)[_focusable] = value; // Apply event listeners based on new focusable array length.
+
+    if (_classPrivateFieldLooseBase(this, _focusable)[_focusable].length) {
+      document.removeEventListener('keydown', _classPrivateFieldLooseBase(this, _handleFocusLock)[_handleFocusLock]);
+      document.addEventListener('keydown', _classPrivateFieldLooseBase(this, _handleFocusTrap)[_handleFocusTrap]);
     } else {
-      this.target.addEventListener('keydown', this.handlerFocusLock);
+      document.removeEventListener('keydown', _classPrivateFieldLooseBase(this, _handleFocusTrap)[_handleFocusTrap]);
+      document.addEventListener('keydown', _classPrivateFieldLooseBase(this, _handleFocusLock)[_handleFocusLock]);
     }
   }
 
-  destroy() {
-    if (!this.target) return;
-    this.inner = null;
-    this.focusable = null;
-    this.focusableFirst = null;
-    this.focusableLast = null;
-    this.target.removeEventListener('keydown', this.__handlerFocusTrap);
-    this.target.removeEventListener('keydown', this.handlerFocusLock);
-    this.target = null;
-  }
-
-  refresh() {
-    // Check if a target has been set
-    if (!this.target) return; // Remove existing  events
-
-    this.target.removeEventListener('keydown', this.__handlerFocusTrap);
-    this.target.removeEventListener('keydown', this.handlerFocusLock); // Get the focusable elements
-
-    this.focusable = this.getFocusable(); // Setup the focus handlers based on focusable length
-
-    if (this.focusable.length) {
-      // If there are focusable elements, setup focus trap
-      this.focusableFirst = this.focusable[0];
-      this.focusableLast = this.focusable[this.focusable.length - 1];
-      this.target.addEventListener('keydown', this.__handlerFocusTrap);
-    } else {
-      // If there are no focusable elements, setup focus lock
-      this.focusableFirst = null;
-      this.focusableLast = null;
-      this.target.addEventListener('keydown', this.handlerFocusLock);
-    }
+  get focusableFirst() {
+    return this.focusable[0];
   }
 
-  handlerFocusTrap(event) {
-    const isTab = event.key === 'Tab' || event.keyCode === 9;
-    if (!isTab) return;
+  get focusableLast() {
+    return this.focusable[this.focusable.length - 1];
+  }
 
-    if (event.shiftKey) {
-      if (document.activeElement === this.focusableFirst || document.activeElement === this.inner) {
-        this.focusableLast.focus();
-        event.preventDefault();
-      }
-    } else {
-      if (document.activeElement === this.focusableLast || document.activeElement === this.inner) {
-        this.focusableFirst.focus();
-        event.preventDefault();
-      }
-    }
+  mount(el, selectorFocus) {
+    // Update passed params.
+    if (el) this.el = el;
+    if (selectorFocus) this.selectorFocus = selectorFocus; // Get the focusable elements.
+
+    this.focusable = this.getFocusable(); // Set the focus on the element.
+
+    this.focus();
+  }
+
+  unmount() {
+    // Set element to null.
+    this.el = null; // Apply empty array to focusable.
+
+    this.focusable = []; // Remove event listeners
+
+    document.removeEventListener('keydown', _classPrivateFieldLooseBase(this, _handleFocusTrap)[_handleFocusTrap]);
+    document.removeEventListener('keydown', _classPrivateFieldLooseBase(this, _handleFocusLock)[_handleFocusLock]);
   }
 
-  handlerFocusLock(event) {
-    const isTab = event.key === 'Tab' || event.keyCode === 9;
-    if (isTab) event.preventDefault();
+  focus(el = this.el, selectorFocus = this.selectorFocus) {
+    // Query for the focus selector, otherwise return this element.
+    const result = el.querySelector(selectorFocus) || el; // Give the returned element focus.
+
+    result.focus();
   }
 
-  getFocusable() {
-    const focusable = [];
+  getFocusable(el = this.el) {
+    // Initialize the focusable array.
+    const focusable = []; // Store the initial focus and scroll position.
+
     const initFocus = document.activeElement;
-    const initScrollTop = this.inner ? this.inner.scrollTop : 0;
-    this.target.querySelectorAll(focusableSelectors.join(',')).forEach(el => {
-      el.focus();
+    const initScrollTop = el.scrollTop; // Query for all the focusable elements.
 
-      if (el === document.activeElement) {
+    const els = el.querySelectorAll(focusableSelectors.join(',')); // Loop through all focusable elements.
+
+    els.forEach(el => {
+      // Set them to focus and check 
+      el.focus(); // Test that the element took focus.
+
+      if (document.activeElement === el) {
+        // Add element to the focusable array.
         focusable.push(el);
       }
-    });
-    if (this.inner) this.inner.scrollTop = initScrollTop;
-    initFocus.focus();
+    }); // Restore the initial scroll position and focus.
+
+    el.scrollTop = initScrollTop;
+    initFocus.focus(); // Return the focusable array.
+
     return focusable;
   }
 
 }
 
-/**
- * Checks an element or NodeList whether they contain a class or classes.
- * Ref: https://davidwalsh.name/nodelist-array
- * @param {Node} el - Element(s) to check class(es) on.
- * @param {String || Array} c - Class(es) to check.
- * @returns {Boolean} - Returns true if class exists, otherwise false.
- */
-const hasClass = (el, ...cl) => {
-  el = el.forEach ? el : [el];
-  el = [].slice.call(el);
-  return cl.some(cl => {
-    return el.some(el => {
-      if (el.classList.contains(cl)) return true;
-    });
-  });
-};
+function handleFocusTrap(event) {
+  // Check if the click was a tab and return if not.
+  const isTab = event.key === 'Tab' || event.keyCode === 9;
+  if (!isTab) return; // If the shift key is pressed.
 
-/**
- * Takes a camel cased string and converts it to hyphen case.
- * @param {String } str - the string to convert to hyphen case.
- * @returns {Boolean} - returns a hyphen cased string.
- */
-const hyphenCase = str => {
-  return str.replace(/([a-z][A-Z])/g, function (g) {
-    return g[0] + '-' + g[1].toLowerCase();
-  });
-};
+  if (event.shiftKey) {
+    // If the active element is either the root el or first focusable.
+    if (document.activeElement === this.focusableFirst || document.activeElement === this.el) {
+      // Prevent default and focus the last focusable element instead.
+      event.preventDefault();
+      this.focusableLast.focus();
+    }
+  } else {
+    // If the active element is either the root el or last focusable.
+    if (document.activeElement === this.focusableLast || document.activeElement === this.el) {
+      // Prevent default and focus the first focusable element instead.
+      event.preventDefault();
+      this.focusableFirst.focus();
+    }
+  }
+}
 
-/**
- * Remove a class or classes from an element or NodeList.
- * @param {Node || NodeList} el - Element(s) to remove class(es) from.
- * @param {String || Array} cl - Class(es) to remove.
- */
-const removeClass = (el, ...cl) => {
-  el = el.forEach ? el : [el];
-  el.forEach(el => {
-    el.classList.remove(...cl);
+function handleFocusLock(event) {
+  // Ignore the tab key by preventing default.
+  const isTab = event.key === 'Tab' || event.keyCode === 9;
+  if (isTab) event.preventDefault();
+}
+
+function getConfig$1(el, dataConfig) {
+  const string = el.getAttribute(`data-${dataConfig}`) || '';
+  const json = string.replace(/'/g, '"');
+  return json ? JSON.parse(json) : {};
+}
+
+function localStore(key, enable = true) {
+  function getStore() {
+    const value = localStorage.getItem(key);
+    return value ? JSON.parse(value) : {};
+  }
+
+  function setStore(obj) {
+    localStorage.setItem(key, JSON.stringify(obj));
+  }
+
+  return new Proxy(getStore(), {
+    set: (target, property, value) => {
+      target[property] = value;
+      if (enable) setStore(target);
+      return true;
+    },
+    deleteProperty: (target, property) => {
+      delete target[property];
+      if (enable) setStore(target);
+      return true;
+    }
   });
-};
+}
 
 /**
  * Teleports an element in the DOM based on a reference and teleport method.
@@ -299,20 +358,6 @@ function teleport(what, where, how) {
   return returnRef;
 }
 
-/**
- * Toggle a class or classes on an element or NodeList.
- * @param {Node || NodeList} el - Element(s) to toggle class(es) on.
- * @param {String || Array} cl - Class(es) to toggle.
- */
-const toggleClass = (el, ...cl) => {
-  el = el.forEach ? el : [el];
-  el.forEach(el => {
-    cl.forEach(cl => {
-      el.classList.toggle(cl);
-    });
-  });
-};
-
 const openTransition = (el, settings) => {
   return new Promise(resolve => {
     if (settings.transition) {
@@ -350,44 +395,54 @@ const closeTransition = (el, settings) => {
   });
 };
 
+function setOverflowHidden(state, selector) {
+  if (selector) {
+    const els = document.querySelectorAll(selector);
+    els.forEach(el => {
+      if (state) {
+        el.style.overflow = 'hidden';
+      } else {
+        el.style.removeProperty('overflow');
+      }
+    });
+  }
+}
+
+function setInert(state, selector) {
+  if (selector) {
+    const els = document.querySelectorAll(selector);
+    els.forEach(el => {
+      if (state) {
+        el.inert = true;
+        el.setAttribute('aria-hidden', true);
+      } else {
+        el.inert = null;
+        el.removeAttribute('aria-hidden');
+      }
+    });
+  }
+}
+
+function updateGlobalState(param, config) {
+  // Set inert state based on if a modal is active.
+  setInert(!!param, config.selectorInert); // Set overflow state based on if a modal is active.
+
+  setOverflowHidden(!!param, config.selectorOverflow);
+}
+
 var index = {
   __proto__: null,
-  setInert: setInert,
-  setOverflowHidden: setOverflowHidden,
-  setTabindex: setTabindex,
-  addClass: addClass,
-  camelCase: camelCase,
+  Breakpoint: Breakpoint,
   Collection: Collection,
-  focusTarget: focusTarget,
-  focusTrigger: focusTrigger,
   FocusTrap: FocusTrap,
-  hasClass: hasClass,
-  hyphenCase: hyphenCase,
-  removeClass: removeClass,
+  getConfig: getConfig$1,
+  localStore: localStore,
   teleport: teleport,
-  toggleClass: toggleClass,
   openTransition: openTransition,
-  closeTransition: closeTransition
+  closeTransition: closeTransition,
+  updateGlobalState: updateGlobalState
 };
 
-function _extends() {
-  _extends = Object.assign || function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-
-  return _extends.apply(this, arguments);
-}
-
 var defaults$3 = {
   autoInit: false,
   stateAttr: 'aria-checked',
@@ -452,16 +507,17 @@ class Checkbox {
 var defaults$2 = {
   autoInit: false,
   // Data attributes
-  dataDrawer: 'drawer',
-  dataDialog: 'drawer-dialog',
-  dataToggle: 'drawer-toggle',
   dataOpen: 'drawer-open',
   dataClose: 'drawer-close',
+  dataToggle: 'drawer-toggle',
   dataBreakpoint: 'drawer-breakpoint',
+  dataConfig: 'drawer-config',
   // Selectors
+  selectorDrawer: '.drawer',
+  selectorDialog: '.drawer__dialog',
   selectorFocus: '[data-focus]',
   selectorInert: null,
-  selectorOverflow: null,
+  selectorOverflow: 'body',
   // State classes
   stateOpened: 'is-opened',
   stateOpening: 'is-opening',
@@ -473,440 +529,593 @@ var defaults$2 = {
   breakpoints: null,
   customEventPrefix: 'drawer:',
   eventListeners: true,
-  stateSave: true,
-  stateKey: 'DrawerState',
+  store: true,
+  storeKey: 'VB:DrawerState',
   setTabindex: true,
   transition: true
 };
 
-class Breakpoint {
-  constructor(parent) {
-    this.mediaQueryLists = [];
-    this.parent = parent;
-    this.prefix = this.getVariablePrefix();
-    this.__check = this.check.bind(this);
-  }
-
-  init() {
-    const drawers = document.querySelectorAll(`[data-${this.parent.settings.dataBreakpoint}]`);
-    drawers.forEach(drawer => {
-      // Setup mediaQueryList object
-      const id = drawer.getAttribute(`data-${this.parent.settings.dataDrawer}`);
-      const key = drawer.getAttribute(`data-${this.parent.settings.dataBreakpoint}`);
-      const bp = this.getBreakpoint(key);
-      const mql = window.matchMedia('(min-width:' + bp + ')'); // Run match check
-
-      this.match(mql, drawer); // Conditionally use addListner() for IE11 support
-
-      if (typeof mql.addEventListener === 'function') {
-        mql.addEventListener('change', this.__check);
-      } else {
-        mql.addListener(this.__check);
-      } // Push to mediaQueryLists array along with drawer ID
+function handleClick$2(event) {
+  // If an open, close or toggle button was clicked, handle the click event.
+  const trigger = event.target.closest(`
+    [data-${this.settings.dataOpen}],
+    [data-${this.settings.dataToggle}],
+    [data-${this.settings.dataClose}]
+  `);
+
+  if (trigger) {
+    // Prevent the default behavior of the trigger.
+    event.preventDefault(); // If it's a toggle trigger...
+
+    if (trigger.matches(`[data-${this.settings.dataToggle}]`)) {
+      const selectors = trigger.getAttribute(`data-${this.settings.dataToggle}`).trim().split(' ');
+      selectors.forEach(selector => {
+        // Get the entry from collection using the attribute value.
+        const entry = this.get(selector); // Store the trigger on the entry.
+
+        entry.trigger = trigger; // Toggle the drawer
+
+        entry.toggle();
+      });
+    } // If it's a open trigger...
+
+
+    if (trigger.matches(`[data-${this.settings.dataOpen}]`)) {
+      const selectors = trigger.getAttribute(`data-${this.settings.dataOpen}`).trim().split(' ');
+      selectors.forEach(selector => {
+        // Get the entry from collection using the attribute value.
+        const entry = this.get(selector); // Store the trigger on the entry.
+
+        entry.trigger = trigger; // Open the drawer.
+
+        entry.open();
+      });
+    } // If it's a close trigger...
+
+
+    if (trigger.matches(`[data-${this.settings.dataClose}]`)) {
+      const selectors = trigger.getAttribute(`data-${this.settings.dataClose}`).trim().split(' ');
+      selectors.forEach(selector => {
+        if (selector) {
+          // Get the entry from collection using the attribute value.
+          const entry = this.get(selector); // Store the trigger on the entry.
+
+          entry.trigger = trigger; // Close the drawer.
+
+          entry.close();
+        } else {
+          // If no value is set on close trigger, get the parent drawer.
+          const parent = event.target.closest(this.settings.selectorDrawer); // If a parent drawer was found, close it.
+
+          if (parent) this.close(parent);
+        }
+      });
+    }
+
+    return;
+  } // If the modal drawer screen was clicked...
+
+
+  if (event.target.matches(this.settings.selectorDrawer)) {
+    // Close the modal drawer.
+    this.close(event.target.id);
+  }
+}
+function handleKeydown$2(event) {
+  if (event.key === 'Escape') {
+    const modal = this.activeModal;
+    if (modal) this.close(modal);
+  }
+}
+
+async function deregister$2(obj, close = true) {
+  // Return collection if nothing was passed.
+  if (!obj) return this.collection; // Check if entry has been registered in the collection.
+
+  const index = this.collection.findIndex(entry => {
+    return entry.id === obj.id;
+  });
+
+  if (index >= 0) {
+    // Get the collection entry.
+    const entry = this.collection[index]; // If entry is in the opened state.
+
+    if (close && entry.state === 'opened') {
+      // Close the drawer.
+      await entry.close(false);
+    } // Remove entry from local store.
+
+
+    delete this.store[entry.id]; // Unmount the MatchMedia functionality.
+
+    entry.unmountBreakpoint(); // Delete properties from collection entry.
+
+    Object.getOwnPropertyNames(entry).forEach(prop => {
+      delete entry[prop];
+    }); // Remove entry from collection.
+
+    this.collection.splice(index, 1);
+  } // Return the modified collection.
+
+
+  return this.collection;
+}
+
+function getBreakpoint(drawer) {
+  const prefix = getVariablePrefix();
+  const bp = drawer.getAttribute(`data-${this.settings.dataBreakpoint}`);
+
+  if (this.settings.breakpoints && this.settings.breakpoints[bp]) {
+    return this.settings.breakpoints[bp];
+  } else if (getComputedStyle(document.body).getPropertyValue(prefix + bp)) {
+    return getComputedStyle(document.body).getPropertyValue(prefix + bp);
+  } else {
+    return bp;
+  }
+}
+
+function getVariablePrefix() {
+  let prefix = '--';
+  prefix += getComputedStyle(document.body).getPropertyValue('--vrembem-variable-prefix');
+  prefix += 'breakpoint-';
+  return prefix;
+}
+
+function getDrawer(query) {
+  // Get the entry from collection.
+  const entry = typeof query === 'string' ? this.get(query) : this.get(query.id); // Return entry if it was resolved, otherwise throw error.
+
+  if (entry) {
+    return entry;
+  } else {
+    throw new Error(`Drawer not found in collection with id of "${query.id || query}".`);
+  }
+}
+
+function getDrawerID(obj) {
+  // If it's a string, return the string.
+  if (typeof obj === 'string') {
+    return obj;
+  } // If it's an HTML element.
+  else if (typeof obj.hasAttribute === 'function') {
+    // If it's a drawer open trigger, return data value.
+    if (obj.hasAttribute(`data-${this.settings.dataOpen}`)) {
+      return obj.getAttribute(`data-${this.settings.dataOpen}`);
+    } // If it's a drawer close trigger, return data value or false.
+    else if (obj.hasAttribute(`data-${this.settings.dataClose}`)) {
+      return obj.getAttribute(`data-${this.settings.dataClose}`) || false;
+    } // If it's a drawer toggle trigger, return data value.
+    else if (obj.hasAttribute(`data-${this.settings.dataToggle}`)) {
+      return obj.getAttribute(`data-${this.settings.dataToggle}`);
+    } // If it's a drawer element, return the id.
+    else if (obj.closest(this.settings.selectorDrawer)) {
+      obj = obj.closest(this.settings.selectorDrawer);
+      return obj.id || false;
+    } // Return false if no id was found.
+    else return false;
+  } // If it has an id property, return its value.
+  else if (obj.id) {
+    return obj.id;
+  } // Return false if no id was found.
+  else return false;
+}
 
+function getDrawerElements(query) {
+  const id = getDrawerID.call(this, query);
 
-      this.mediaQueryLists.push({
-        'mql': mql,
-        'drawer': id
-      });
-    });
-  }
+  if (id) {
+    const drawer = document.querySelector(`#${id}`);
+    const dialog = drawer ? drawer.querySelector(this.settings.selectorDialog) : null;
 
-  destroy() {
-    if (this.mediaQueryLists && this.mediaQueryLists.length) {
-      this.mediaQueryLists.forEach(item => {
-        item.mql.removeListener(this.__check);
-      });
+    if (!drawer && !dialog) {
+      return {
+        error: new Error(`No drawer elements found using the ID: "${id}".`)
+      };
+    } else if (!dialog) {
+      return {
+        error: new Error('Drawer is missing dialog element.')
+      };
+    } else {
+      return {
+        drawer,
+        dialog
+      };
     }
-
-    this.mediaQueryLists = null;
+  } else {
+    return {
+      error: new Error('Could not resolve the drawer ID.')
+    };
   }
+}
 
-  check(event = null) {
-    if (this.mediaQueryLists && this.mediaQueryLists.length) {
-      this.mediaQueryLists.forEach(item => {
-        // If an event is passed, filter out drawers that don't match the query
-        // If event is null, run all drawers through match
-        let filter = event ? event.media == item.mql.media : true;
-        if (!filter) return;
-        const drawer = document.querySelector(`[data-${this.parent.settings.dataDrawer}="${item.drawer}"]`);
-        if (drawer) this.match(item.mql, drawer);
-      });
-      document.dispatchEvent(new CustomEvent(this.parent.settings.customEventPrefix + 'breakpoint', {
-        bubbles: true
-      }));
+async function initialState(entry) {
+  // Setup initial state using the following priority:
+  //  1. If a store state is available, restore from local store.
+  //  2. If opened state class is set, set state to opened.
+  //  3. Else, initialize default state.
+  if (this.store[entry.id]) {
+    // Restore drawers to saved inline state.
+    if (this.store[entry.id] === 'opened') {
+      await entry.open(false, false);
+    } else {
+      await entry.close(false, false);
     }
+  } else if (entry.el.classList.contains(this.settings.stateOpened)) {
+    // Update drawer state.
+    entry.state = 'opened';
+  } else {
+    // Remove transition state classes.
+    entry.el.classList.remove(this.settings.stateOpening);
+    entry.el.classList.remove(this.settings.stateClosing); // Add closed state class.
+
+    entry.el.classList.add(this.settings.stateClosed);
   }
+}
 
-  match(mql, drawer) {
-    if (mql.matches) {
-      this.parent.switchToDefault(drawer);
+function updateFocusState$1(entry) {
+  // Check if there's an active modal
+  if (entry.state === 'opened') {
+    // Mount the focus trap on the opened drawer.
+    if (entry.mode === 'modal') {
+      this.focusTrap.mount(entry.dialog, this.settings.selectorFocus);
     } else {
-      this.parent.switchToModal(drawer);
+      this.focusTrap.focus(entry.dialog, this.settings.selectorFocus);
+    }
+  } else {
+    // Set focus to root trigger and unmount the focus trap.
+    if (entry.trigger) {
+      entry.trigger.focus();
+      entry.trigger = null;
     }
+
+    this.focusTrap.unmount();
   }
+}
 
-  getBreakpoint(key) {
-    let breakpoint = key;
+async function open$2(query, transition, focus = true) {
+  // Get the drawer from collection.
+  const drawer = getDrawer.call(this, query); // Get the modal configuration.
 
-    if (this.parent.settings.breakpoints && this.parent.settings.breakpoints[key]) {
-      breakpoint = this.parent.settings.breakpoints[key];
-    } else if (getComputedStyle(document.body).getPropertyValue(this.prefix + key)) {
-      breakpoint = getComputedStyle(document.body).getPropertyValue(this.prefix + key);
-    }
+  const config = _extends({}, this.settings, drawer.settings); // Add transition parameter to configuration.
 
-    return breakpoint;
-  }
 
-  getVariablePrefix() {
-    let prefix = '--';
-    prefix += getComputedStyle(document.body).getPropertyValue('--vrembem-variable-prefix');
-    prefix += 'breakpoint-';
-    return prefix;
-  }
+  if (transition !== undefined) config.transition = transition; // If drawer is closed.
 
-}
+  if (drawer.state === 'closed') {
+    // Update drawer state.
+    drawer.state = 'opening'; // Run the open transition.
 
-function getDrawer(drawerKey) {
-  if (typeof drawerKey !== 'string') return drawerKey;
-  return document.querySelector(`[data-${this.settings.dataDrawer}="${drawerKey}"]`);
-}
-function drawerNotFound(key) {
-  return Promise.reject(new Error(`Did not find drawer with key: "${key}"`));
+    await openTransition(drawer.el, config); // Update the global state if mode is modal.
+
+    if (drawer.mode === 'modal') updateGlobalState(true, config); // Update drawer state.
+
+    drawer.state = 'opened';
+  } // Set focus to the drawer element if the focus param is true.
+
+
+  if (focus) {
+    updateFocusState$1.call(this, drawer);
+  } // Dispatch custom opened event.
+
+
+  drawer.el.dispatchEvent(new CustomEvent(config.customEventPrefix + 'opened', {
+    detail: this,
+    bubbles: true
+  })); // Return the drawer.
+
+  return drawer;
 }
 
-async function close$2(drawerKey) {
-  const drawer = this.getDrawer(drawerKey);
-  if (!drawer) return drawerNotFound(drawerKey);
+async function close$2(query, transition, focus = true) {
+  // Get the drawer from collection.
+  const drawer = getDrawer.call(this, query); // Get the modal configuration.
 
-  if (hasClass(drawer, this.settings.stateOpened)) {
-    this.working = true;
+  const config = _extends({}, this.settings, drawer.settings); // Add transition parameter to configuration.
 
-    if (hasClass(drawer, this.settings.classModal)) {
-      setInert(false, this.settings.selectorInert);
-      setOverflowHidden(false, this.settings.selectorOverflow);
-    }
 
-    await closeTransition(drawer, this.settings);
-    this.stateSave(drawer);
-    focusTrigger(this);
-    this.focusTrap.destroy();
-    drawer.dispatchEvent(new CustomEvent(this.settings.customEventPrefix + 'closed', {
+  if (transition !== undefined) config.transition = transition; // If drawer is opened.
+
+  if (drawer.state === 'opened') {
+    // Update drawer state.
+    drawer.state = 'closing'; // Remove focus from active element.
+
+    document.activeElement.blur(); // Run the close transition.
+
+    await closeTransition(drawer.el, config); // Update the global state if mode is modal.
+
+    if (drawer.mode === 'modal') updateGlobalState(false, config); // Set focus to the trigger element if the focus param is true.
+
+    if (focus) {
+      updateFocusState$1.call(this, drawer);
+    } // Update drawer state.
+
+
+    drawer.state = 'closed'; // Dispatch custom closed event.
+
+    drawer.el.dispatchEvent(new CustomEvent(config.customEventPrefix + 'closed', {
       detail: this,
       bubbles: true
     }));
-    this.working = false;
-    return drawer;
+  } // Return the drawer.
+
+
+  return drawer;
+}
+
+async function toggle(query, transition, focus) {
+  // Get the drawer from collection.
+  const drawer = getDrawer.call(this, query); // Open or close the drawer based on its current state.
+
+  if (drawer.state === 'closed') {
+    return open$2.call(this, drawer, transition, focus);
   } else {
-    return drawer;
+    return close$2.call(this, drawer, transition, focus);
   }
 }
 
-function handlerClick$1(event) {
-  // Working catch
-  if (this.working) return; // Toggle data trigger
+function switchMode(entry) {
+  switch (entry.mode) {
+    case 'inline':
+      return toInline.call(this, entry);
 
-  let trigger = event.target.closest(`[data-${this.settings.dataToggle}]`);
+    case 'modal':
+      return toModal.call(this, entry);
 
-  if (trigger) {
-    const selector = trigger.getAttribute(`data-${this.settings.dataToggle}`);
-    this.memory.trigger = trigger;
-    this.toggle(selector);
-    event.preventDefault();
-    return;
-  } // Open data trigger
+    default:
+      throw new Error(`"${entry.mode}" is not a valid drawer mode.`);
+  }
+}
 
+async function toInline(entry) {
+  // Remove the modal class.
+  entry.el.classList.remove(entry.getSetting('classModal')); // Remove the aria-modal attribute.
 
-  trigger = event.target.closest(`[data-${this.settings.dataOpen}]`);
+  entry.dialog.removeAttribute('aria-modal'); // Update the global state.
 
-  if (trigger) {
-    const selector = trigger.getAttribute(`data-${this.settings.dataOpen}`);
-    this.memory.trigger = trigger;
-    this.open(selector);
-    event.preventDefault();
-    return;
-  } // Close data trigger
+  updateGlobalState(false, _extends({}, this.settings, entry.settings)); // Remove any focus traps.
 
+  this.focusTrap.unmount(); // Setup initial state.
 
-  trigger = event.target.closest(`[data-${this.settings.dataClose}]`);
+  await initialState.call(this, entry); // Dispatch custom switch event.
 
-  if (trigger) {
-    const selector = trigger.getAttribute(`data-${this.settings.dataClose}`);
+  entry.el.dispatchEvent(new CustomEvent(entry.getSetting('customEventPrefix') + 'switchMode', {
+    detail: this,
+    bubbles: true
+  })); // Return the entry.
 
-    if (selector) {
-      this.memory.trigger = trigger;
-      this.close(selector);
-    } else {
-      const target = event.target.closest(`[data-${this.settings.dataDrawer}]`);
-      if (target) this.close(target);
-    }
+  return entry;
+}
 
-    event.preventDefault();
-    return;
-  } // Screen modal trigger
+async function toModal(entry) {
+  // Get the drawer configuration.
+  // Add the modal class.
+  entry.el.classList.add(entry.getSetting('classModal')); // Set aria-modal attribute to true.
 
+  entry.dialog.setAttribute('aria-modal', 'true'); // If there isn't a stored state but also has the opened state class...
 
-  if (event.target.hasAttribute(`data-${this.settings.dataDrawer}`)) {
-    this.close(event.target);
-    return;
-  }
-}
-function handlerKeydown$1(event) {
-  // Working catch
-  if (this.working) return;
+  if (!this.store[entry.id] && entry.el.classList.contains(entry.getSetting('stateOpened'))) {
+    // Save the opened state in local store.
+    this.store[entry.id] = 'opened';
+  } // Modal drawer defaults to closed state.
 
-  if (event.key === 'Escape') {
-    const target = document.querySelector(`.${this.settings.classModal}.${this.settings.stateOpened}`);
 
-    if (target) {
-      this.close(target);
-    }
-  }
+  await close$2.call(this, entry, false, false); // Dispatch custom switch event.
+
+  entry.el.dispatchEvent(new CustomEvent(entry.getSetting('customEventPrefix') + 'switchMode', {
+    detail: this,
+    bubbles: true
+  })); // Return the entry.
+
+  return entry;
 }
 
-async function open$2(drawerKey) {
-  const drawer = this.getDrawer(drawerKey);
-  if (!drawer) return drawerNotFound(drawerKey);
+async function register$2(el, dialog) {
+  // Deregister entry incase it has already been registered.
+  await deregister$2.call(this, el, false); // Save root this for use inside methods API.
 
-  if (!hasClass(drawer, this.settings.stateOpened)) {
-    this.working = true;
-    const isModal = hasClass(drawer, this.settings.classModal);
+  const root = this; // Create an instance of the Breakpoint class.
 
-    if (isModal) {
-      setOverflowHidden(true, this.settings.selectorOverflow);
-    }
+  const breakpoint = new Breakpoint(); // Setup methods API.
 
-    await openTransition(drawer, this.settings);
-    this.stateSave(drawer);
+  const methods = {
+    open(transition, focus) {
+      return open$2.call(root, this, transition, focus);
+    },
 
-    if (isModal) {
-      this.focusTrap.init(drawer);
-      setInert(true, this.settings.selectorInert);
-    }
+    close(transition, focus) {
+      return close$2.call(root, this, transition, focus);
+    },
 
-    focusTarget(drawer, this.settings);
-    drawer.dispatchEvent(new CustomEvent(this.settings.customEventPrefix + 'opened', {
-      detail: this,
-      bubbles: true
-    }));
-    this.working = false;
-    return drawer;
-  } else {
-    focusTarget(drawer, this.settings);
-    return drawer;
-  }
-}
+    toggle(transition, focus) {
+      return toggle.call(root, this, transition, focus);
+    },
+
+    deregister() {
+      return deregister$2.call(root, this);
+    },
 
-function stateSet(settings) {
-  // If save state is disabled
-  if (!settings.stateSave) return stateClear(settings); // If there isn't an existing state to set
+    mountBreakpoint() {
+      const value = this.breakpoint;
+      const handler = this.handleBreakpoint.bind(this);
+      breakpoint.mount(value, handler);
+      return this;
+    },
 
-  const storageCheck = localStorage.getItem(settings.stateKey);
+    unmountBreakpoint() {
+      breakpoint.unmount();
+      return this;
+    },
 
-  if (!storageCheck || storageCheck && Object.keys(JSON.parse(storageCheck)).length === 0) {
-    return stateSave(null, settings);
-  } // Set the existing state
+    handleBreakpoint(event) {
+      this.mode = event.matches ? 'inline' : 'modal';
+      return this;
+    },
 
+    getSetting(key) {
+      return key in this.settings ? this.settings[key] : root.settings[key];
+    }
 
-  const state = JSON.parse(localStorage.getItem(settings.stateKey));
-  Object.keys(state).forEach(key => {
-    const item = document.querySelector(`[data-${settings.dataDrawer}="${key}"]`);
-    if (!item) return;
-    state[key] == settings.stateOpened ? addClass(item, settings.stateOpened) : removeClass(item, settings.stateOpened);
-  });
-  return state;
-}
-function stateSave(target, settings) {
-  // If save state is disabled
-  if (!settings.stateSave) return stateClear(settings); // Get the currently saved object if it exists
+  }; // Setup the drawer object.
 
-  const state = localStorage.getItem(settings.stateKey) ? JSON.parse(localStorage.getItem(settings.stateKey)) : {}; // Are we saving a single target or the entire suite?
+  const entry = _extends({
+    id: el.id,
+    el: el,
+    dialog: dialog,
+    trigger: null,
+    settings: getConfig$1(el, this.settings.dataConfig),
 
-  const drawers = target ? [target] : document.querySelectorAll(`[data-${settings.dataDrawer}]`); // Loop through drawers and save their states
+    get breakpoint() {
+      return getBreakpoint.call(root, el);
+    },
 
-  drawers.forEach(el => {
-    if (hasClass(el, settings.classModal)) return;
-    const drawerKey = el.getAttribute(`data-${settings.dataDrawer}`);
-    state[drawerKey] = hasClass(el, settings.stateOpened) ? settings.stateOpened : settings.stateClosed;
-  }); // Save to localStorage and return the state
+    get state() {
+      return __state;
+    },
 
-  localStorage.setItem(settings.stateKey, JSON.stringify(state));
-  return state;
-}
-function stateClear(settings) {
-  if (localStorage.getItem(settings.stateKey)) {
-    localStorage.removeItem(settings.stateKey);
-  }
+    set state(value) {
+      __state = value; // Save 'opened' and 'closed' states to store if mode is inline.
 
-  return {};
-}
+      if (value === 'opened' || value === 'closed') {
+        if (this.mode === 'inline') root.store[this.id] = this.state;
+      }
+    },
 
-async function switchToModal(drawerKey) {
-  // Initial guards
-  const drawer = this.getDrawer(drawerKey);
-  if (!drawer) return drawerNotFound(drawerKey);
-  if (hasClass(drawer, this.settings.classModal)) return; // Enable modal state
+    get mode() {
+      return __mode;
+    },
 
-  addClass(drawer, this.settings.classModal);
-  addClass(drawer, this.settings.stateClosed);
-  removeClass(drawer, this.settings.stateOpened); // Dispatch custom event
+    set mode(value) {
+      __mode = value;
+      switchMode.call(root, this);
+    }
 
-  drawer.dispatchEvent(new CustomEvent(this.settings.customEventPrefix + 'toModal', {
-    bubbles: true
-  }));
-  return drawer;
-}
-async function switchToDefault(drawerKey) {
-  // Initial guards
-  const drawer = this.getDrawer(drawerKey);
-  if (!drawer) return drawerNotFound(drawerKey);
-  if (!hasClass(drawer, this.settings.classModal)) return; // Tear down modal state
+  }, methods); // Create the state var with the initial state.
 
-  setInert(false, this.settings.selectorInert);
-  setOverflowHidden(false, this.settings.selectorOverflow);
-  removeClass(drawer, this.settings.classModal);
-  this.focusTrap.destroy(); // Restore drawers saved state
 
-  drawerKey = drawer.getAttribute(`data-${this.settings.dataDrawer}`);
-  const drawerState = this.state[drawerKey];
+  let __state = el.classList.contains(entry.getSetting('stateOpened')) ? 'opened' : 'closed'; // Create the mode var with the initial mode.
 
-  if (drawerState == this.settings.stateOpened) {
-    addClass(drawer, this.settings.stateOpened);
-    removeClass(drawer, this.settings.stateClosed);
-  } // Dispatch custom event
 
+  let __mode = el.classList.contains(entry.getSetting('classModal')) ? 'modal' : 'inline'; // Setup mode specific attributes.
+
+
+  if (entry.mode === 'modal') {
+    // Set aria-modal attribute to true.
+    entry.dialog.setAttribute('aria-modal', 'true');
+  } else {
+    // Remove the aria-modal attribute.
+    entry.dialog.removeAttribute('aria-modal');
+  } // Set tabindex="-1" so dialog is focusable via JS or click.
+
+
+  if (entry.getSetting('setTabindex')) {
+    entry.dialog.setAttribute('tabindex', '-1');
+  } // Add entry to collection.
 
-  drawer.dispatchEvent(new CustomEvent(this.settings.customEventPrefix + 'toDefault', {
-    bubbles: true
-  }));
-  return drawer;
-}
 
-async function toggle(drawerKey) {
-  const drawer = this.getDrawer(drawerKey);
-  if (!drawer) return drawerNotFound(drawerKey);
-  const isClosed = !hasClass(drawer, this.settings.stateOpened);
+  this.collection.push(entry); // If the entry has a breakpoint...
 
-  if (isClosed) {
-    return this.open(drawer);
+  if (entry.breakpoint) {
+    // Mount media query breakpoint functionality.
+    entry.mountBreakpoint();
   } else {
-    return this.close(drawer);
-  }
+    // Else, Setup initial state.
+    await initialState.call(this, entry);
+  } // Return the registered entry.
+
+
+  return entry;
 }
 
-class Drawer {
+var _handleClick$1 = /*#__PURE__*/_classPrivateFieldLooseKey("handleClick");
+
+var _handleKeydown$2 = /*#__PURE__*/_classPrivateFieldLooseKey("handleKeydown");
+
+class Drawer extends Collection {
   constructor(options) {
+    super();
+    Object.defineProperty(this, _handleClick$1, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _handleKeydown$2, {
+      writable: true,
+      value: void 0
+    });
     this.defaults = defaults$2;
     this.settings = _extends({}, this.defaults, options);
-    this.working = false;
-    this.memory = {};
-    this.state = {};
-    this.focusTrap = new FocusTrap();
-    this.breakpoint = new Breakpoint(this);
-    this.__handlerClick = handlerClick$1.bind(this);
-    this.__handlerKeydown = handlerKeydown$1.bind(this);
+    this.focusTrap = new FocusTrap(); // Setup local store for inline drawer state management.
+
+    this.store = localStore(this.settings.storeKey, this.settings.store);
+    _classPrivateFieldLooseBase(this, _handleClick$1)[_handleClick$1] = handleClick$2.bind(this);
+    _classPrivateFieldLooseBase(this, _handleKeydown$2)[_handleKeydown$2] = handleKeydown$2.bind(this);
     if (this.settings.autoInit) this.init();
   }
 
-  init(options = null) {
-    if (options) this.settings = _extends({}, this.settings, options);
-    this.stateSet();
+  get activeModal() {
+    return this.collection.find(entry => {
+      return entry.state === 'opened' && entry.mode === 'modal';
+    });
+  }
 
-    if (this.settings.setTabindex) {
-      this.setTabindex();
-    }
+  async init(options = null) {
+    // Update settings with passed options.
+    if (options) this.settings = _extends({}, this.settings, options); // Get all the modals.
 
-    this.breakpoint.init();
+    const drawers = document.querySelectorAll(this.settings.selectorDrawer); // Register the collections array with modal instances.
+
+    await this.registerCollection(drawers); // If eventListeners are enabled, init event listeners.
 
     if (this.settings.eventListeners) {
       this.initEventListeners();
     }
+
+    return this;
   }
 
-  destroy() {
-    this.breakpoint.destroy();
-    this.memory = {};
-    this.state = {};
-    localStorage.removeItem(this.settings.stateKey);
+  async destroy() {
+    // Remove all entries from the collection.
+    await this.deregisterCollection(); // If eventListeners are enabled, init event listeners.
 
     if (this.settings.eventListeners) {
       this.destroyEventListeners();
     }
-  }
-  /**
-   * Event listeners
-   */
 
+    return this;
+  }
 
   initEventListeners() {
-    document.addEventListener('click', this.__handlerClick, false);
-    document.addEventListener('touchend', this.__handlerClick, false);
-    document.addEventListener('keydown', this.__handlerKeydown, false);
+    document.addEventListener('click', _classPrivateFieldLooseBase(this, _handleClick$1)[_handleClick$1], false);
+    document.addEventListener('touchend', _classPrivateFieldLooseBase(this, _handleClick$1)[_handleClick$1], false);
+    document.addEventListener('keydown', _classPrivateFieldLooseBase(this, _handleKeydown$2)[_handleKeydown$2], false);
   }
 
   destroyEventListeners() {
-    document.removeEventListener('click', this.__handlerClick, false);
-    document.removeEventListener('touchend', this.__handlerClick, false);
-    document.removeEventListener('keydown', this.__handlerKeydown, false);
-  }
-  /**
-   * Helpers
-   */
-
-
-  getDrawer(drawerKey) {
-    return getDrawer.call(this, drawerKey);
-  }
-
-  setTabindex() {
-    return setTabindex(`
-      [data-${this.settings.dataDrawer}]
-      [data-${this.settings.dataDialog}]
-    `);
-  }
-  /**
-   * Save state functionality
-   */
-
-
-  stateSet() {
-    this.state = stateSet(this.settings);
-  }
-
-  stateSave(target = null) {
-    this.state = stateSave(target, this.settings);
+    document.removeEventListener('click', _classPrivateFieldLooseBase(this, _handleClick$1)[_handleClick$1], false);
+    document.removeEventListener('touchend', _classPrivateFieldLooseBase(this, _handleClick$1)[_handleClick$1], false);
+    document.removeEventListener('keydown', _classPrivateFieldLooseBase(this, _handleKeydown$2)[_handleKeydown$2], false);
   }
 
-  stateClear() {
-    this.state = stateClear(this.settings);
-  }
-  /**
-   * SwitchTo functionality
-   */
-
-
-  switchToDefault(drawerKey) {
-    return switchToDefault.call(this, drawerKey);
+  register(query) {
+    const els = getDrawerElements.call(this, query);
+    if (els.error) return Promise.reject(els.error);
+    return register$2.call(this, els.drawer, els.dialog);
   }
 
-  switchToModal(drawerKey) {
-    return switchToModal.call(this, drawerKey);
+  deregister(query) {
+    const entry = this.get(getDrawerID.call(this, query));
+    return deregister$2.call(this, entry);
   }
-  /**
-   * Change state functionality
-   */
 
-
-  toggle(drawerKey) {
-    return toggle.call(this, drawerKey);
+  open(id, transition, focus) {
+    return open$2.call(this, id, transition, focus);
   }
 
-  open(drawerKey) {
-    return open$2.call(this, drawerKey);
+  close(id, transition, focus) {
+    return close$2.call(this, id, transition, focus);
   }
 
-  close(drawerKey) {
-    return close$2.call(this, drawerKey);
+  toggle(id, transition, focus) {
+    return toggle.call(this, id, transition, focus);
   }
 
 }
@@ -939,38 +1148,6 @@ var defaults$1 = {
   transition: true
 };
 
-function updateGlobalState() {
-  // Set inert state based on if a modal is active.
-  setInert(!!this.active, this.settings.selectorInert); // Set overflow state based on if a modal is active.
-
-  setOverflowHidden(!!this.active, this.settings.selectorOverflow); // Update the z-index of the stack.
-
-  updateStackIndex(this.stack);
-}
-function updateFocusState() {
-  // Check if there's an active modal
-  if (this.active) {
-    // Set focus and init focus trap on active modal.
-    focusTarget(this.active.target, this.settings);
-    this.focusTrap.init(this.active.target);
-  } else {
-    // Set focus to root trigger and destroy focus trap.
-    focusTrigger(this);
-    this.focusTrap.destroy();
-  }
-}
-function updateStackIndex(stack) {
-  stack.forEach((entry, index) => {
-    entry.target.style.zIndex = null;
-    const value = getComputedStyle(entry.target)['z-index'];
-    entry.target.style.zIndex = parseInt(value) + index + 1;
-  });
-}
-function getConfig$1(el) {
-  const string = el.getAttribute(`data-${this.settings.dataConfig}`) || '';
-  const json = string.replace(/'/g, '"');
-  return json ? JSON.parse(json) : {};
-}
 function getModal(query) {
   // Get the entry from collection.
   const entry = typeof query === 'string' ? this.get(query) : this.get(query.id); // Return entry if it was resolved, otherwise throw error.
@@ -978,9 +1155,10 @@ function getModal(query) {
   if (entry) {
     return entry;
   } else {
-    throw new Error(`Modal not found in collection with id of "${query}".`);
+    throw new Error(`Modal not found in collection with id of "${query.id || query}".`);
   }
 }
+
 function getModalID(obj) {
   // If it's a string, return the string.
   if (typeof obj === 'string') {
@@ -996,7 +1174,7 @@ function getModalID(obj) {
     } // If it's a modal replace trigger, return data value.
     else if (obj.hasAttribute(`data-${this.settings.dataReplace}`)) {
       return obj.getAttribute(`data-${this.settings.dataReplace}`);
-    } // If it's a modal target, return the id.
+    } // If it's a modal element, return the id.
     else if (obj.closest(this.settings.selectorModal)) {
       obj = obj.closest(this.settings.selectorModal);
       return obj.id || false;
@@ -1008,14 +1186,15 @@ function getModalID(obj) {
   } // Return false if no id was found.
   else return false;
 }
+
 function getModalElements(query) {
   const id = getModalID.call(this, query);
 
   if (id) {
-    const target = document.querySelector(`#${id}`);
-    const dialog = target ? target.querySelector(this.settings.selectorDialog) : null;
+    const modal = document.querySelector(`#${id}`);
+    const dialog = modal ? modal.querySelector(this.settings.selectorDialog) : null;
 
-    if (!target && !dialog) {
+    if (!modal && !dialog) {
       return {
         error: new Error(`No modal elements found using the ID: "${id}".`)
       };
@@ -1025,7 +1204,7 @@ function getModalElements(query) {
       };
     } else {
       return {
-        target,
+        modal,
         dialog
       };
     }
@@ -1036,7 +1215,31 @@ function getModalElements(query) {
   }
 }
 
-async function handleClick(event) {
+function updateFocusState() {
+  // Check if there's an active modal
+  if (this.active) {
+    // Mount the focus trap on the active modal.
+    this.focusTrap.mount(this.active.dialog, this.settings.selectorFocus);
+  } else {
+    // Set focus to root trigger and unmount the focus trap.
+    if (this.trigger) {
+      this.trigger.focus();
+      this.trigger = null;
+    }
+
+    this.focusTrap.unmount();
+  }
+}
+
+function updateStackIndex(stack) {
+  stack.forEach((entry, index) => {
+    entry.el.style.zIndex = null;
+    const value = getComputedStyle(entry.el)['z-index'];
+    entry.el.style.zIndex = parseInt(value) + index + 1;
+  });
+}
+
+async function handleClick$1(event) {
   // If an open or replace button was clicked, open or replace the modal.
   let trigger = event.target.closest(`[data-${this.settings.dataOpen}], [data-${this.settings.dataReplace}]`);
 
@@ -1044,7 +1247,7 @@ async function handleClick(event) {
     event.preventDefault(); // Save the trigger if it's not coming from inside a modal.
 
     const fromModal = event.target.closest(this.settings.selectorModal);
-    if (!fromModal) this.memory.trigger = trigger; // Get the modal.
+    if (!fromModal) this.trigger = trigger; // Get the modal.
 
     const modal = this.get(getModalID.call(this, trigger)); // Depending on the button type, either open or replace the modal.
 
@@ -1067,7 +1270,7 @@ async function handleClick(event) {
     return this.close(getModalID.call(this, event.target));
   }
 }
-function handleKeydown(event) {
+function handleKeydown$1(event) {
   // If escape key was pressed.
   if (event.key === 'Escape') {
     // If a modal is opened and not required, close the modal.
@@ -1119,7 +1322,7 @@ async function deregister$1(obj, close = true) {
   return this.collection;
 }
 
-async function open$1(query, transition, bulk = false) {
+async function open$1(query, transition, focus = true) {
   // Get the modal from collection.
   const modal = getModal.call(this, query); // Get the modal configuration.
 
@@ -1144,24 +1347,24 @@ async function open$1(query, transition, bulk = false) {
     // Update modal state.
     modal.state = 'opening'; // Apply z-index styles based on stack length.
 
-    modal.target.style.zIndex = null;
-    const value = getComputedStyle(modal.target)['z-index'];
-    modal.target.style.zIndex = parseInt(value) + this.stack.length + 1; // Store modal in stack array.
+    modal.el.style.zIndex = null;
+    const value = getComputedStyle(modal.el)['z-index'];
+    modal.el.style.zIndex = parseInt(value) + this.stack.length + 1; // Store modal in stack array.
 
     this.stack.push(modal); // Run the open transition.
 
-    await openTransition(modal.target, config); // Update modal state.
+    await openTransition(modal.el, config); // Update modal state.
 
     modal.state = 'opened';
-  } // Update the focus state if this is not a bulk action.
+  } // Update focus if the focus param is true.
 
 
-  if (!bulk) {
+  if (focus) {
     updateFocusState.call(this);
   } // Dispatch custom opened event.
 
 
-  modal.target.dispatchEvent(new CustomEvent(config.customEventPrefix + 'opened', {
+  modal.el.dispatchEvent(new CustomEvent(config.customEventPrefix + 'opened', {
     detail: this,
     bubbles: true
   })); // Return the modal.
@@ -1169,7 +1372,7 @@ async function open$1(query, transition, bulk = false) {
   return modal;
 }
 
-async function close$1(query, transition, bulk = false) {
+async function close$1(query, transition, focus = true) {
   // Get the modal from collection, or top modal in stack if no query is provided.
   const modal = query ? getModal.call(this, query) : this.active; // If a modal exists and its state is opened.
 
@@ -1184,24 +1387,24 @@ async function close$1(query, transition, bulk = false) {
 
     document.activeElement.blur(); // Run the close transition.
 
-    await closeTransition(modal.target, config); // Remove z-index styles.
+    await closeTransition(modal.el, config); // Remove z-index styles.
 
-    modal.target.style.zIndex = null; // Get index of modal in stack array.
+    modal.el.style.zIndex = null; // Get index of modal in stack array.
 
     const index = this.stack.findIndex(entry => {
       return entry.id === modal.id;
     }); // Remove modal from stack array.
 
-    this.stack.splice(index, 1); // Update the focus state if this is not a bulk action.
+    this.stack.splice(index, 1); // Update focus if the focus param is true.
 
-    if (!bulk) {
+    if (focus) {
       updateFocusState.call(this);
     } // Update modal state.
 
 
     modal.state = 'closed'; // Dispatch custom closed event.
 
-    modal.target.dispatchEvent(new CustomEvent(config.customEventPrefix + 'closed', {
+    modal.el.dispatchEvent(new CustomEvent(config.customEventPrefix + 'closed', {
       detail: this,
       bubbles: true
     }));
@@ -1217,7 +1420,7 @@ async function closeAll$1(exclude, transition) {
     if (exclude && exclude === modal.id) {
       Promise.resolve();
     } else {
-      result.push(await close$1.call(this, modal, transition, true));
+      result.push(await close$1.call(this, modal, transition, false));
     }
 
     modal.trigger = null;
@@ -1225,7 +1428,7 @@ async function closeAll$1(exclude, transition) {
   return result;
 }
 
-async function replace(query, transition) {
+async function replace(query, transition, focus = true) {
   // Get the modal from collection.
   const modal = getModal.call(this, query); // Setup results for return.
 
@@ -1237,13 +1440,16 @@ async function replace(query, transition) {
     resultClosed = await closeAll$1.call(this, modal.id, transition);
   } else {
     // If modal is closed, close all and open replacement at the same time.
-    resultOpened = open$1.call(this, modal, transition, true);
+    resultOpened = open$1.call(this, modal, transition, false);
     resultClosed = closeAll$1.call(this, false, transition);
     await Promise.all([resultOpened, resultClosed]);
-  } // Update the focus state.
+  } // Update focus if the focus param is true.
+
 
+  if (focus) {
+    updateFocusState.call(this);
+  } // Return the modals there were opened and closed.
 
-  updateFocusState.call(this); // Return the modals there were opened and closed.
 
   return {
     opened: resultOpened,
@@ -1251,23 +1457,23 @@ async function replace(query, transition) {
   };
 }
 
-async function register$1(target, dialog) {
+async function register$1(el, dialog) {
   // Deregister entry incase it has already been registered.
-  await deregister$1.call(this, target, false); // Save root this for use inside methods API.
+  await deregister$1.call(this, el, false); // Save root this for use inside methods API.
 
   const root = this; // Setup methods API.
 
   const methods = {
-    open(transition) {
-      return open$1.call(root, this, transition);
+    open(transition, focus) {
+      return open$1.call(root, this, transition, focus);
     },
 
-    close(transition) {
-      return close$1.call(root, this, transition);
+    close(transition, focus) {
+      return close$1.call(root, this, transition, focus);
     },
 
-    replace(transition) {
-      return replace.call(root, this, transition);
+    replace(transition, focus) {
+      return replace.call(root, this, transition, focus);
     },
 
     deregister() {
@@ -1276,20 +1482,20 @@ async function register$1(target, dialog) {
 
     teleport(ref = this.getSetting('teleport'), method = this.getSetting('teleportMethod')) {
       if (!this.returnRef) {
-        this.returnRef = teleport(this.target, ref, method);
-        return this.target;
+        this.returnRef = teleport(this.el, ref, method);
+        return this.el;
       } else {
-        console.error('Element has already been teleported:', this.target);
+        console.error('Element has already been teleported:', this.el);
         return false;
       }
     },
 
     teleportReturn() {
       if (this.returnRef) {
-        this.returnRef = teleport(this.target, this.returnRef);
-        return this.target;
+        this.returnRef = teleport(this.el, this.returnRef);
+        return this.el;
       } else {
-        console.error('No return reference found:', this.target);
+        console.error('No return reference found:', this.el);
         return false;
       }
     },
@@ -1301,12 +1507,12 @@ async function register$1(target, dialog) {
   }; // Setup the modal object.
 
   const entry = _extends({
-    id: target.id,
+    id: el.id,
     state: 'closed',
-    settings: getConfig$1.call(this, target),
-    target: target,
+    el: el,
     dialog: dialog,
-    returnRef: null
+    returnRef: null,
+    settings: getConfig$1(el, this.settings.dataConfig)
   }, methods); // Set aria-modal attribute to true.
 
 
@@ -1329,42 +1535,55 @@ async function register$1(target, dialog) {
 
   this.collection.push(entry); // Setup initial state.
 
-  if (entry.target.classList.contains(this.settings.stateOpened)) {
-    // Open modal with transitions disabled.
-    entry.open(false);
+  if (entry.el.classList.contains(this.settings.stateOpened)) {
+    // Open entry with transitions disabled.
+    await entry.open(false);
   } else {
     // Remove transition state classes.
-    entry.target.classList.remove(this.settings.stateOpening);
-    entry.target.classList.remove(this.settings.stateClosing); // Add closed state class.
+    entry.el.classList.remove(this.settings.stateOpening);
+    entry.el.classList.remove(this.settings.stateClosing); // Add closed state class.
 
-    entry.target.classList.add(this.settings.stateClosed);
+    entry.el.classList.add(this.settings.stateClosed);
   } // Return the registered entry.
 
 
   return entry;
 }
 
+var _handleClick = /*#__PURE__*/_classPrivateFieldLooseKey("handleClick");
+
+var _handleKeydown$1 = /*#__PURE__*/_classPrivateFieldLooseKey("handleKeydown");
+
 class Modal extends Collection {
   constructor(options) {
     super();
+    Object.defineProperty(this, _handleClick, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _handleKeydown$1, {
+      writable: true,
+      value: void 0
+    });
     this.defaults = defaults$1;
     this.settings = _extends({}, this.defaults, options);
-    this.memory = {};
+    this.trigger = null;
     this.focusTrap = new FocusTrap(); // Setup a proxy for stack array.
 
     this.stack = new Proxy([], {
       set: (target, property, value) => {
-        target[property] = value; // Update global state whenever the length property of stack changes.
+        target[property] = value; // Update global state if stack length changed.
 
         if (property === 'length') {
-          updateGlobalState.call(this);
+          updateGlobalState(this.active, this.settings);
+          updateStackIndex(this.stack);
         }
 
         return true;
       }
     });
-    this.__handleClick = handleClick.bind(this);
-    this.__handleKeydown = handleKeydown.bind(this);
+    _classPrivateFieldLooseBase(this, _handleClick)[_handleClick] = handleClick$1.bind(this);
+    _classPrivateFieldLooseBase(this, _handleKeydown$1)[_handleKeydown$1] = handleKeydown$1.bind(this);
     if (this.settings.autoInit) this.init();
   }
 
@@ -1383,35 +1602,39 @@ class Modal extends Collection {
     if (this.settings.eventListeners) {
       this.initEventListeners();
     }
+
+    return this;
   }
 
   async destroy() {
-    // Clear any stored memory.
-    this.memory = {}; // Remove all entries from the collection.
+    // Clear stored trigger.
+    this.trigger = null; // Remove all entries from the collection.
 
     await this.deregisterCollection(); // If eventListeners are enabled, destroy event listeners.
 
     if (this.settings.eventListeners) {
       this.destroyEventListeners();
     }
+
+    return this;
   }
 
   initEventListeners() {
-    document.addEventListener('click', this.__handleClick, false);
-    document.addEventListener('touchend', this.__handleClick, false);
-    document.addEventListener('keydown', this.__handleKeydown, false);
+    document.addEventListener('click', _classPrivateFieldLooseBase(this, _handleClick)[_handleClick], false);
+    document.addEventListener('touchend', _classPrivateFieldLooseBase(this, _handleClick)[_handleClick], false);
+    document.addEventListener('keydown', _classPrivateFieldLooseBase(this, _handleKeydown$1)[_handleKeydown$1], false);
   }
 
   destroyEventListeners() {
-    document.removeEventListener('click', this.__handleClick, false);
-    document.removeEventListener('touchend', this.__handleClick, false);
-    document.removeEventListener('keydown', this.__handleKeydown, false);
+    document.removeEventListener('click', _classPrivateFieldLooseBase(this, _handleClick)[_handleClick], false);
+    document.removeEventListener('touchend', _classPrivateFieldLooseBase(this, _handleClick)[_handleClick], false);
+    document.removeEventListener('keydown', _classPrivateFieldLooseBase(this, _handleKeydown$1)[_handleKeydown$1], false);
   }
 
   register(query) {
     const els = getModalElements.call(this, query);
     if (els.error) return Promise.reject(els.error);
-    return register$1.call(this, els.target, els.dialog);
+    return register$1.call(this, els.modal, els.dialog);
   }
 
   deregister(query) {
@@ -1419,21 +1642,25 @@ class Modal extends Collection {
     return deregister$1.call(this, modal);
   }
 
-  open(id, transition) {
-    return open$1.call(this, id, transition);
+  open(id, transition, focus) {
+    return open$1.call(this, id, transition, focus);
   }
 
-  close(id, transition) {
-    return close$1.call(this, id, transition);
+  close(id, transition, focus) {
+    return close$1.call(this, id, transition, focus);
   }
 
-  replace(id, transition) {
-    return replace.call(this, id, transition);
+  replace(id, transition, focus) {
+    return replace.call(this, id, transition, focus);
   }
 
-  async closeAll(exclude = false, transition) {
-    const result = await closeAll$1.call(this, exclude, transition);
-    updateFocusState.call(this);
+  async closeAll(exclude = false, transition, focus = true) {
+    const result = await closeAll$1.call(this, exclude, transition); // Update focus if the focus param is true.
+
+    if (focus) {
+      updateFocusState.call(this);
+    }
+
     return result;
   }
 
@@ -1479,6 +1706,7 @@ function getConfig(el, settings) {
 
   return config;
 }
+
 function getPadding(value) {
   let padding; // Split the value by spaces if it's a string.
 
@@ -1528,6 +1756,7 @@ function getPadding(value) {
 
   return padding;
 }
+
 function getModifiers(options) {
   return [{
     name: 'offset',
@@ -1552,6 +1781,7 @@ function getModifiers(options) {
     }
   }];
 }
+
 function getPopover(query) {
   // Get the entry from collection.
   const entry = typeof query === 'string' ? this.get(query) : this.get(query.id); // Return entry if it was resolved, otherwise throw error.
@@ -1562,13 +1792,14 @@ function getPopover(query) {
     throw new Error(`Popover not found in collection with id of "${query}".`);
   }
 }
+
 function getPopoverID(obj) {
   // If it's a string, return the string.
   if (typeof obj === 'string') {
     return obj;
   } // If it's an HTML element.
   else if (typeof obj.hasAttribute === 'function') {
-    // If it's a popover target, return the id.
+    // If it's a popover element, return the id.
     if (obj.closest(this.settings.selectorPopover)) {
       obj = obj.closest(this.settings.selectorPopover);
       return obj.id;
@@ -1586,14 +1817,15 @@ function getPopoverID(obj) {
   } // Return false if no id was found.
   else return false;
 }
+
 function getPopoverElements(query) {
   const id = getPopoverID.call(this, query);
 
   if (id) {
+    const popover = document.querySelector(`#${id}`);
     const trigger = document.querySelector(`[aria-controls="${id}"]`) || document.querySelector(`[aria-describedby="${id}"]`);
-    const target = document.querySelector(`#${id}`);
 
-    if (!trigger && !target) {
+    if (!trigger && !popover) {
       return {
         error: new Error(`No popover elements found using the ID: "${id}".`)
       };
@@ -1601,14 +1833,14 @@ function getPopoverElements(query) {
       return {
         error: new Error('No popover trigger associated with the provided popover.')
       };
-    } else if (!target) {
+    } else if (!popover) {
       return {
         error: new Error('No popover associated with the provided popover trigger.')
       };
     } else {
       return {
-        trigger,
-        target
+        popover,
+        trigger
       };
     }
   } else {
@@ -1624,7 +1856,7 @@ async function close(query) {
 
   if (popover && popover.state === 'opened') {
     // Update state class.
-    popover.target.classList.remove(this.settings.stateActive); // Update accessibility attribute(s).
+    popover.el.classList.remove(this.settings.stateActive); // Update accessibility attribute(s).
 
     if (popover.trigger.hasAttribute('aria-controls')) {
       popover.trigger.setAttribute('aria-expanded', 'false');
@@ -1638,10 +1870,10 @@ async function close(query) {
       }]
     }); // Update popover state.
 
-    popover.state = 'closed'; // Clear memory if popover trigger matches the one saved in memory.
+    popover.state = 'closed'; // Clear root trigger if popover trigger matches.
 
-    if (popover.trigger === this.memory.trigger) {
-      this.memory.trigger = null;
+    if (popover.trigger === this.trigger) {
+      this.trigger = null;
     }
   } // Return the popover.
 
@@ -1662,10 +1894,10 @@ function closeCheck(popover) {
   if (popover.state != 'opened') return; // Needed to correctly check which element is currently being focused.
 
   setTimeout(() => {
-    // Check if trigger or target are being hovered.
-    const isHovered = popover.target.closest(':hover') === popover.target || popover.trigger.closest(':hover') === popover.trigger; // Check if trigger or target are being focused.
+    // Check if trigger or element are being hovered.
+    const isHovered = popover.el.closest(':hover') === popover.el || popover.trigger.closest(':hover') === popover.trigger; // Check if trigger or element are being focused.
 
-    const isFocused = document.activeElement.closest(`#${popover.id}, [aria-controls="${popover.id}"]`); // Close if the trigger and target are not currently hovered or focused.
+    const isFocused = document.activeElement.closest(`#${popover.id}, [aria-controls="${popover.id}"]`); // Close if the trigger and element are not currently hovered or focused.
 
     if (!isHovered && !isFocused) {
       popover.close();
@@ -1676,20 +1908,20 @@ function closeCheck(popover) {
   }, 1);
 }
 
-function handlerClick(popover) {
+function handleClick(popover) {
   if (popover.state === 'opened') {
     popover.close();
   } else {
-    this.memory.trigger = popover.trigger;
+    this.trigger = popover.trigger;
     popover.open();
-    documentClick.call(this, popover);
+    handleDocumentClick.call(this, popover);
   }
 }
-function handlerKeydown(event) {
+function handleKeydown(event) {
   switch (event.key) {
     case 'Escape':
-      if (this.memory.trigger) {
-        this.memory.trigger.focus();
+      if (this.trigger) {
+        this.trigger.focus();
       }
 
       closeAll.call(this);
@@ -1705,7 +1937,7 @@ function handlerKeydown(event) {
       return;
   }
 }
-function documentClick(popover) {
+function handleDocumentClick(popover) {
   const root = this;
   document.addEventListener('click', function _f(event) {
     // Check if a popover was clicked.
@@ -1713,14 +1945,14 @@ function documentClick(popover) {
 
     if (!result) {
       // If it doesn't match and popover is open, close it and remove event listener.
-      if (popover.target && popover.target.classList.contains(root.settings.stateActive)) {
+      if (popover.el && popover.el.classList.contains(root.settings.stateActive)) {
         popover.close();
       }
 
       this.removeEventListener('click', _f);
     } else {
       // If it does match and popover isn't currently active, remove event listener.
-      if (popover.target && !popover.target.classList.contains(root.settings.stateActive)) {
+      if (popover.el && !popover.el.classList.contains(root.settings.stateActive)) {
         this.removeEventListener('click', _f);
       }
     }
@@ -3569,14 +3801,14 @@ async function open(query) {
   // Get the popover from collection.
   const popover = getPopover.call(this, query); // Update state class.
 
-  popover.target.classList.add(this.settings.stateActive); // Update accessibility attribute(s).
+  popover.el.classList.add(this.settings.stateActive); // Update accessibility attribute(s).
 
   if (popover.trigger.hasAttribute('aria-controls')) {
     popover.trigger.setAttribute('aria-expanded', 'true');
   } // Update popover config.
 
 
-  popover.config = getConfig(popover.target, this.settings); // Enable popper event listeners and set placement/modifiers.
+  popover.config = getConfig(popover.el, this.settings); // Enable popper event listeners and set placement/modifiers.
 
   popover.popper.setOptions({
     placement: popover.config['placement'],
@@ -3593,9 +3825,9 @@ async function open(query) {
   return popover;
 }
 
-async function register(trigger, target) {
+async function register(el, trigger) {
   // Deregister entry incase it has already been registered.
-  deregister.call(this, target); // Save root this for use inside methods API.
+  deregister.call(this, el); // Save root this for use inside methods API.
 
   const root = this; // Setup methods API.
 
@@ -3615,12 +3847,12 @@ async function register(trigger, target) {
   }; // Setup the popover object.
 
   const entry = _extends({
-    id: target.id,
+    id: el.id,
     state: 'closed',
+    el: el,
     trigger: trigger,
-    target: target,
-    popper: createPopper(trigger, target),
-    config: getConfig(target, this.settings)
+    popper: createPopper(trigger, el),
+    config: getConfig(el, this.settings)
   }, methods); // Set aria-expanded to false if trigger has aria-controls attribute.
 
 
@@ -3633,9 +3865,9 @@ async function register(trigger, target) {
 
   this.collection.push(entry); // Set initial state.
 
-  if (entry.target.classList.contains(this.settings.stateActive)) {
+  if (entry.el.classList.contains(this.settings.stateActive)) {
     await entry.open();
-    documentClick.call(this, entry);
+    handleDocumentClick.call(this, entry);
   } // Return the registered entry.
 
 
@@ -3654,7 +3886,7 @@ function registerEventListeners(entry) {
         type: ['mouseenter', 'focus'],
         listener: open.bind(this, entry)
       }, {
-        el: ['trigger', 'target'],
+        el: ['el', 'trigger'],
         type: ['mouseleave', 'focusout'],
         listener: closeCheck.bind(this, entry)
       }]; // Loop through listeners and apply to the appropriate elements.
@@ -3672,7 +3904,7 @@ function registerEventListeners(entry) {
       entry.__eventListeners = [{
         el: ['trigger'],
         type: ['click'],
-        listener: handlerClick.bind(this, entry)
+        listener: handleClick.bind(this, entry)
       }]; // Loop through listeners and apply to the appropriate elements.
 
       entry.__eventListeners.forEach(evObj => {
@@ -3689,13 +3921,19 @@ function registerEventListeners(entry) {
   return entry;
 }
 
+var _handleKeydown = /*#__PURE__*/_classPrivateFieldLooseKey("handleKeydown");
+
 class Popover extends Collection {
   constructor(options) {
     super();
+    Object.defineProperty(this, _handleKeydown, {
+      writable: true,
+      value: void 0
+    });
     this.defaults = defaults;
     this.settings = _extends({}, this.defaults, options);
-    this.memory = {};
-    this.__handlerKeydown = handlerKeydown.bind(this);
+    this.trigger = null;
+    _classPrivateFieldLooseBase(this, _handleKeydown)[_handleKeydown] = handleKeydown.bind(this);
     if (this.settings.autoInit) this.init();
   }
 
@@ -3712,11 +3950,13 @@ class Popover extends Collection {
       // already adds event listeners to popovers.
       this.initEventListeners(false);
     }
+
+    return this;
   }
 
   async destroy() {
-    // Clear any stored memory.
-    this.memory = {}; // Remove all entries from the collection.
+    // Clear stored trigger.
+    this.trigger = null; // Remove all entries from the collection.
 
     await this.deregisterCollection(); // If eventListeners are enabled, destroy event listeners.
 
@@ -3725,6 +3965,8 @@ class Popover extends Collection {
       // already removes event listeners from popovers.
       this.destroyEventListeners(false);
     }
+
+    return this;
   }
 
   initEventListeners(processCollection = true) {
@@ -3736,7 +3978,7 @@ class Popover extends Collection {
     } // Add keydown global event listener.
 
 
-    document.addEventListener('keydown', this.__handlerKeydown, false);
+    document.addEventListener('keydown', _classPrivateFieldLooseBase(this, _handleKeydown)[_handleKeydown], false);
   }
 
   destroyEventListeners(processCollection = true) {
@@ -3748,13 +3990,13 @@ class Popover extends Collection {
     } // Remove keydown global event listener.
 
 
-    document.removeEventListener('keydown', this.__handlerKeydown, false);
+    document.removeEventListener('keydown', _classPrivateFieldLooseBase(this, _handleKeydown)[_handleKeydown], false);
   }
 
   register(query) {
     const els = getPopoverElements.call(this, query);
     if (els.error) return Promise.reject(els.error);
-    return register.call(this, els.trigger, els.target);
+    return register.call(this, els.popover, els.trigger);
   }
 
   deregister(query) {