vrembem 1.40.3 → 1.42.1

package/dev/scripts.modern.js

@@ -891,6 +891,7 @@ var defaults$1 = {
   dataClose: 'modal-close',
   dataFocus: 'modal-focus',
   dataRequired: 'modal-required',
+  dataConfig: 'modal-config',
   // State classes
   stateOpened: 'is-opened',
   stateOpening: 'is-opening',
@@ -910,17 +911,40 @@ var defaults$1 = {
   transition: true
 };
 
+function getModalConfig(modal) {
+  const json = modal.getAttribute(`data-${this.settings.dataConfig}`);
+
+  if (json) {
+    const config = JSON.parse(json);
+    return _extends({}, this.settings, config);
+  } else {
+    return this.settings;
+  }
+}
+function getModal(modalKey) {
+  if (typeof modalKey !== 'string') return modalKey;
+  return document.querySelector(`[data-${this.settings.dataModal}="${modalKey}"]`);
+}
+function modalNotFound(key) {
+  return Promise.reject(new Error(`Did not find modal with key: "${key}"`));
+}
+function moveModals(type = this.settings.moveModals.type, ref = this.settings.moveModals.ref) {
+  const modals = document.querySelectorAll(`[data-${this.settings.dataModal}]`);
+  if (modals.length) moveElement(modals, type, ref);
+}
+
 async function close$1(returnFocus = true) {
   const modal = document.querySelector(`[data-${this.settings.dataModal}].${this.settings.stateOpened}`);
 
   if (modal) {
     this.working = true;
-    setInert(false, this.settings.selectorInert);
-    setOverflowHidden(false, this.settings.selectorOverflow);
-    await closeTransition(modal, this.settings);
+    const config = getModalConfig.call(this, modal);
+    setInert(false, config.selectorInert);
+    setOverflowHidden(false, config.selectorOverflow);
+    await closeTransition(modal, config);
     if (returnFocus) focusTrigger(this);
     this.focusTrap.destroy();
-    modal.dispatchEvent(new CustomEvent(this.settings.customEventPrefix + 'closed', {
+    modal.dispatchEvent(new CustomEvent(config.customEventPrefix + 'closed', {
       detail: this,
       bubbles: true
     }));
@@ -973,18 +997,6 @@ function handlerKeydown$1(event) {
   }
 }
 
-function getModal(modalKey) {
-  if (typeof modalKey !== 'string') return modalKey;
-  return document.querySelector(`[data-${this.settings.dataModal}="${modalKey}"]`);
-}
-function modalNotFound(key) {
-  return Promise.reject(new Error(`Did not find modal with key: "${key}"`));
-}
-function moveModals(type = this.settings.moveModals.type, ref = this.settings.moveModals.ref) {
-  const modals = document.querySelectorAll(`[data-${this.settings.dataModal}]`);
-  if (modals.length) moveElement(modals, type, ref);
-}
-
 function setInitialState() {
   const modals = document.querySelectorAll(`[data-${this.settings.dataModal}]`);
   modals.forEach(el => {
@@ -1005,15 +1017,16 @@ function setInitialState() {
 async function open$1(modalKey) {
   const modal = getModal.call(this, modalKey);
   if (!modal) return modalNotFound(modalKey);
+  const config = getModalConfig.call(this, modal);
 
-  if (hasClass(modal, this.settings.stateClosed)) {
+  if (hasClass(modal, config.stateClosed)) {
     this.working = true;
-    setOverflowHidden(true, this.settings.selectorOverflow);
-    await openTransition(modal, this.settings);
+    setOverflowHidden(true, config.selectorOverflow);
+    await openTransition(modal, config);
     this.focusTrap.init(modal);
-    focusTarget(modal, this.settings);
-    setInert(true, this.settings.selectorInert);
-    modal.dispatchEvent(new CustomEvent(this.settings.customEventPrefix + 'opened', {
+    focusTarget(modal, config);
+    setInert(true, config.selectorInert);
+    modal.dispatchEvent(new CustomEvent(config.customEventPrefix + 'opened', {
       detail: this,
       bubbles: true
     }));
@@ -1111,39 +1124,87 @@ class Modal {
 
 }
 
+class Collection {
+  constructor() {
+    this.collection = [];
+  }
+
+  register(item) {
+    this.deregister(item);
+    this.collection.push(item);
+    return this.collection;
+  }
+
+  deregister(ref) {
+    const index = this.collection.findIndex(entry => {
+      return entry === ref;
+    });
+
+    if (index >= 0) {
+      const entry = this.collection[index];
+      Object.getOwnPropertyNames(entry).forEach(prop => {
+        delete entry[prop];
+      });
+      this.collection.splice(index, 1);
+    }
+
+    return this.collection;
+  }
+
+  registerCollection(items) {
+    items.forEach(item => {
+      this.register(item);
+    });
+    return this.collection;
+  }
+
+  deregisterCollection() {
+    while (this.collection.length > 0) {
+      this.deregister(this.collection[0]);
+    }
+
+    return this.collection;
+  }
+
+  get(query, key = 'id') {
+    const result = this.collection.find(item => {
+      return item[key] === query;
+    });
+    return result || null;
+  }
+
+}
+
 var defaults = {
   autoInit: false,
-  // Data attributes
-  dataPopover: 'popover',
-  dataTrigger: 'popover-trigger',
-  dataArrow: 'popover-arrow',
-  dataEventType: 'popover-event',
-  dataPlacement: 'popover-placement',
+  // Selectors
+  selectorPopover: '.popover',
+  selectorArrow: '.popover__arrow',
   // State classes
   stateActive: 'is-active',
   // Feature toggles
-  eventType: 'click',
   eventListeners: true,
-  placement: 'bottom-start'
+  eventType: 'click',
+  placement: 'bottom'
 };
 
 function close(popover) {
   // Update state class
   popover.target.classList.remove(this.settings.stateActive); // Update a11y attributes
 
-  popover.trigger.setAttribute('aria-expanded', 'false'); // Disable popper event listeners
+  if (popover.trigger.hasAttribute('aria-controls')) {
+    popover.trigger.setAttribute('aria-expanded', 'false');
+  } // Disable popper event listeners
+
 
   popover.popper.setOptions({
     modifiers: [{
       name: 'eventListeners',
       enabled: false
     }]
-  }); // Update collection status with new state
+  }); // Update popover state
 
-  const index = this.collection.findIndex(item => {
-    return item.target === popover.target;
-  });
-  this.collection[index].state = 'closed'; // Clear the memory if popover trigger matches the ones saved in memory
+  popover.state = 'closed'; // Clear memory if popover trigger matches the one saved in memory
 
   if (popover.trigger === this.memory.trigger) {
     this.memory.trigger = null;
@@ -1155,7 +1216,7 @@ function close(popover) {
 function closeAll() {
   this.collection.forEach(popover => {
     if (popover.state === 'opened') {
-      this.close(popover);
+      popover.close();
     }
   }); // Return the collection
 
@@ -1169,10 +1230,10 @@ function closeCheck(popover) {
     // 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
 
-    const isFocused = document.activeElement.closest(`[data-${this.settings.dataPopover}]`) === popover.target || document.activeElement.closest(`[data-${this.settings.dataTrigger}]`) === popover.trigger; // 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 target are not currently hovered or focused
 
     if (!isHovered && !isFocused) {
-      this.close(popover);
+      popover.close();
     } // Return the popover
 
 
@@ -1182,10 +1243,10 @@ function closeCheck(popover) {
 
 function handlerClick(popover) {
   if (popover.target.classList.contains(this.settings.stateActive)) {
-    this.close(popover);
+    popover.close();
   } else {
     this.memory.trigger = popover.trigger;
-    this.open(popover);
+    popover.open();
     documentClick.call(this, popover);
   }
 }
@@ -1196,7 +1257,7 @@ function handlerKeydown(event) {
         this.memory.trigger.focus();
       }
 
-      this.closeAll();
+      closeAll.call(this);
       return;
 
     case 'Tab':
@@ -1210,19 +1271,21 @@ function handlerKeydown(event) {
   }
 }
 function documentClick(popover) {
-  const obj = this;
+  const root = this;
   document.addEventListener('click', function _f(event) {
-    const result = event.target.closest(`[data-${obj.settings.dataPopover}], [data-${obj.settings.dataTrigger}]`);
-    const match = result === popover.target || result === popover.trigger;
+    // Check if a popover was clicked
+    const result = event.target.closest(`#${popover.id}, [aria-controls="${popover.id}"]`);
 
-    if (!match) {
-      if (popover.target.classList.contains(obj.settings.stateActive)) {
-        obj.close(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)) {
+        popover.close();
       }
 
       this.removeEventListener('click', _f);
     } else {
-      if (!popover.target.classList.contains(obj.settings.stateActive)) {
+      // If it does match and popover isn't currently active, remove event listener
+      if (popover.target && !popover.target.classList.contains(root.settings.stateActive)) {
         this.removeEventListener('click', _f);
       }
     }
@@ -1239,26 +1302,23 @@ function getConfig(el, settings) {
     'offset': 0,
     'overflow-padding': 0,
     'flip-padding': 0,
-    'arrow-element': `[data-${settings.dataArrow}]`,
+    'arrow-element': settings.selectorArrow,
     'arrow-padding': 0
   }; // Loop through config obj
 
   for (const prop in config) {
     // Get the CSS variable property values
     const prefix = getComputedStyle(document.body).getPropertyValue('--vrembem-variable-prefix');
-    const val = styles.getPropertyValue(`--${prefix}popover-${prop}`).trim(); // If a value was found, replace the default in config obj
+    const value = styles.getPropertyValue(`--${prefix}popover-${prop}`).trim(); // If a value was found, replace the default in config obj
 
-    if (val) {
-      config[prop] = val;
+    if (value) {
+      config[prop] = value;
     }
   } // Return the config obj
 
 
   return config;
 }
-function getData(el, attr, fallback = false) {
-  return el.hasAttribute(`data-${attr}`) ? el.getAttribute(`data-${attr}`) : fallback;
-}
 function getPadding(value) {
   let padding; // Split the value by spaces if it's a string
 
@@ -1332,49 +1392,58 @@ function getModifiers(options) {
     }
   }];
 }
-function getPopover(trigger, settings) {
-  // Get the value of the popover trigger attribute
-  const id = trigger.getAttribute(`data-${settings.dataTrigger}`).trim();
+function getPopoverID(obj) {
+  // If it's a string
+  if (typeof obj === 'string') {
+    return obj;
+  } // If it's an HTML element
+  else if (typeof obj.hasAttribute === 'function') {
+    // If it's a popover trigger
+    if (obj.hasAttribute('aria-controls')) {
+      return obj.getAttribute('aria-controls');
+    } // If it's a popover tooltip trigger
+    else if (obj.hasAttribute('aria-describedby')) {
+      return obj.getAttribute('aria-describedby');
+    } // If it's a popover target
+    else if (obj.closest(this.settings.selectorPopover)) {
+      return obj.id;
+    } // Return false if no id was found
+    else return false;
+  } // If it has an ID property
+  else if (obj.id) {
+    return obj.id;
+  } // Return false if no id was found
+  else return false;
+}
+function getPopoverElements(query) {
+  const id = getPopoverID.call(this, query);
 
   if (id) {
-    // If trigger attribute value exists, return the querySelector element using
-    // the provided popover trigger attribute's value
-    return document.querySelector(`[data-${settings.dataPopover}="${id}"]`);
+    const trigger = document.querySelector(`[aria-controls="${id}"]`) || document.querySelector(`[aria-describedby="${id}"]`);
+    const target = document.querySelector(`#${id}`);
+
+    if (!trigger && !target) {
+      console.error('No popover elements found using the provided ID:', id);
+    } else if (!trigger) {
+      console.error('No popover trigger associated with the provided popover:', target);
+    } else if (!target) {
+      console.error('No popover associated with the provided popover trigger:', trigger);
+    }
+
+    if (!trigger || !target) {
+      return false;
+    } else {
+      return {
+        trigger,
+        target
+      };
+    }
   } else {
-    // If trigger attribute value doesn't exist, check if 
-    // - There is a nextElementSibling relative to the trigger
-    // - And it has the popover data attribute.
-    return trigger.nextElementSibling && trigger.nextElementSibling.hasAttribute(`data-${settings.dataPopover}`) ? // Return the element or false if the two checks fail
-    trigger.nextElementSibling : false;
+    console.error('Could not resolve the popover ID:', query);
+    return false;
   }
 }
 
-function open(popover) {
-  // Update state class
-  popover.target.classList.add(this.settings.stateActive); // Update a11y attributes
-
-  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.popper.setOptions({
-    placement: getData(popover.target, this.settings.dataPlacement, popover.config['placement']),
-    modifiers: [{
-      name: 'eventListeners',
-      enabled: true
-    }, ...getModifiers(popover.config)]
-  }); // Update popover's position
-
-  popover.popper.update(); // Update collection status with new state
-
-  const index = this.collection.findIndex(item => {
-    return item.target === popover.target;
-  });
-  this.collection[index].state = 'opened'; // Return the popover
-
-  return popover;
-}
-
 var top = 'top';
 var bottom = 'bottom';
 var right = 'right';
@@ -3158,72 +3227,100 @@ var createPopper = /*#__PURE__*/popperGenerator({
   defaultModifiers: defaultModifiers
 }); // eslint-disable-next-line import/no-unused-modules
 
-function register(trigger, target) {
-  // If no target is passed
-  if (!target) {
-    // Try and get the target
-    target = getPopover(trigger, this.settings); // If still no target is returned, log an error and return false
+function open(popover) {
+  // Update state class
+  popover.target.classList.add(this.settings.stateActive); // Update a11y attribute
 
-    if (!target) {
-      console.error('No popover associated with the provided trigger:', trigger);
-      return false;
-    }
-  } // Check if this item has already been registered in the collection
+  if (popover.trigger.hasAttribute('aria-controls')) {
+    popover.trigger.setAttribute('aria-expanded', 'true');
+  } // Update popover config
 
 
-  const index = this.collection.findIndex(item => {
-    return item.trigger === trigger && item.target === target;
-  }); // Initiate popover variable
+  popover.config = getConfig(popover.target, this.settings); // Enable popper event listeners and set placement/modifiers
 
-  let popover; // Check if it already exists in collection
+  popover.popper.setOptions({
+    placement: popover.config['placement'],
+    modifiers: [{
+      name: 'eventListeners',
+      enabled: true
+    }, ...getModifiers(popover.config)]
+  }); // Update popover position
 
-  if (index >= 0) {
-    // Set popover as item from collection
-    popover = this.collection[index];
-  } else {
-    // Create popper instance
-    const popperInstance = createPopper(trigger, target); // Build popover object and push to collection array
+  popover.popper.update(); // Update popover state
+
+  popover.state = 'opened'; // Return the popover
+
+  return popover;
+}
 
-    popover = {
-      state: 'closed',
-      trigger: trigger,
-      target: target,
-      popper: popperInstance,
-      config: getConfig(target, this.settings)
-    }; // Add item to collection
+function register(trigger, target) {
+  // Deregister popover if it already exists in the collection
+  this.deregister(target.id); // Create popper instance
+
+  const popperInstance = createPopper(trigger, target); // Save root this for use inside object & create methods API
+
+  const root = this;
+  const methods = {
+    open() {
+      open.call(root, this);
+    },
+
+    close() {
+      close.call(root, this);
+    },
+
+    deregister() {
+      deregister.call(root, this);
+    }
+
+  }; // Build popover object and push to collection array
 
-    this.collection.push(popover);
-  } // Setup event listeners
+  const popover = _extends({
+    id: target.id,
+    state: 'closed',
+    trigger: trigger,
+    target: target,
+    popper: popperInstance,
+    config: getConfig(target, this.settings)
+  }, methods); // Setup event listeners
 
 
   registerEventListeners.call(this, popover); // Set initial state of popover
 
   if (popover.target.classList.contains(this.settings.stateActive)) {
-    this.open(popover);
+    popover.open();
     documentClick.call(this, popover);
   } else {
-    this.close(popover);
-  } // Return the popover object
+    popover.close();
+  } // Add item to collection
+
 
+  this.collection.push(popover); // Return the popover object
 
   return popover;
 }
 function deregister(popover) {
   // Check if this item has been registered in the collection
-  const index = this.collection.findIndex(item => {
-    return item.trigger === popover.trigger && item.target === popover.target;
-  }); // If the item exists in the collection
+  const index = this.collection.findIndex(entry => {
+    return entry.id === popover.id;
+  }); // If the entry exists in the collection
 
   if (index >= 0) {
-    // Close the popover
-    if (popover.state === 'opened') {
-      this.close(popover);
+    // Get the collection entry
+    const entry = this.collection[index]; // Close the collection entry if it's open
+
+    if (entry.state === 'opened') {
+      entry.close();
     } // Clean up the popper instance
 
 
-    popover.popper.destroy(); // Remove event listeners
+    entry.popper.destroy(); // Remove event listeners
 
-    deregisterEventListeners(popover); // Remove item from collection
+    deregisterEventListeners(entry); // Delete properties from collection entry
+
+    Object.getOwnPropertyNames(entry).forEach(prop => {
+      delete entry[prop];
+    }); // Remove entry from collection
 
     this.collection.splice(index, 1);
   } // Return the new collection
@@ -3235,7 +3332,7 @@ function registerEventListeners(popover) {
   // If event listeners aren't already setup
   if (!popover.__eventListeners) {
     // Add event listeners based on event type
-    const eventType = getData(popover.target, this.settings.dataEventType, popover.config['event']);
+    const eventType = popover.config['event'];
 
     if (eventType === 'hover') {
       // Setup event listeners object for hover
@@ -3296,31 +3393,13 @@ function deregisterEventListeners(popover) {
 
   return popover;
 }
-function registerCollection() {
-  // Get all the triggers
-  const triggers = document.querySelectorAll(`[data-${this.settings.dataTrigger}]`);
-  triggers.forEach(trigger => {
-    // Register the popover and save to collection array
-    this.register(trigger, false);
-  }); // Return the popover collection
-
-  return this.collection;
-}
-function deregisterCollection() {
-  // Loop through all items within the collection and pass them to deregister()
-  while (this.collection.length > 0) {
-    this.deregister(this.collection[0]);
-  } // Return the popover collection
 
-
-  return this.collection;
-}
-
-class Popover {
+class Popover extends Collection {
   constructor(options) {
+    super();
     this.defaults = defaults;
-    this.settings = _extends({}, this.defaults, options);
-    this.collection = [];
+    this.settings = _extends({}, this.defaults, options); // this.collection = [];
+
     this.memory = {
       trigger: null
     };
@@ -3330,9 +3409,11 @@ class Popover {
 
   init(options = null) {
     // Update settings with passed options
-    if (options) this.settings = _extends({}, this.settings, options); // Build the collections array with popover instances
+    if (options) this.settings = _extends({}, this.settings, options); // Get all the popovers
 
-    this.registerCollection(); // If eventListeners is enabled
+    const popovers = document.querySelectorAll(this.settings.selectorPopover); // Build the collections array with popover instances
+
+    this.registerCollection(popovers); // If eventListeners is enabled
 
     if (this.settings.eventListeners) {
       // Pass false to initEventListeners() since registerCollection()
@@ -3384,36 +3465,36 @@ class Popover {
    */
 
 
-  register(trigger, target = false) {
-    return register.call(this, trigger, target);
+  register(query) {
+    const els = getPopoverElements.call(this, query);
+    if (!els) return false;
+    return register.call(this, els.trigger, els.target);
   }
 
-  deregister(popover) {
+  deregister(query) {
+    const popover = this.get(getPopoverID(query));
+    if (!popover) return false;
     return deregister.call(this, popover);
   }
-
-  registerCollection() {
-    return registerCollection.call(this);
-  }
-
-  deregisterCollection() {
-    return deregisterCollection.call(this);
-  }
   /**
    * Change state functionality
    */
 
 
-  open(popover) {
-    return open.call(this, popover);
+  open(id) {
+    const popover = this.get(id);
+    if (!popover) return false;
+    return popover.open();
   }
 
-  close(popover) {
-    return close.call(this, popover);
-  }
-
-  closeAll() {
-    return closeAll.call(this);
+  close(id) {
+    if (id) {
+      const popover = this.get(id);
+      if (!popover) return false;
+      return popover.close();
+    } else {
+      return closeAll.call(this);
+    }
   }
 
 }