vrembem 3.0.3 → 3.0.6

package/dev/scripts.modern.js

@@ -308,12 +308,14 @@ function localStore(key, enable = true) {
 
   return new Proxy(getStore(), {
     set: (target, property, value) => {
-      target[property] = value;
-      if (enable) setStore(target);
-      return true;
-    },
-    deleteProperty: (target, property) => {
-      delete target[property];
+      console.log('localStore() => set');
+
+      if (value === undefined) {
+        delete target[property];
+      } else {
+        target[property] = value;
+      }
+
       if (enable) setStore(target);
       return true;
     }
@@ -631,7 +633,7 @@ async function deregister$2(obj, close = true) {
     } // Remove entry from local store.
 
 
-    delete this.store[entry.id]; // Unmount the MatchMedia functionality.
+    this.store[entry.id] = undefined; // Unmount the MatchMedia functionality.
 
     entry.unmountBreakpoint(); // Delete properties from collection entry.
 
@@ -646,12 +648,12 @@ async function deregister$2(obj, close = true) {
   return this.collection;
 }
 
-function L() {
+function g() {
   return getComputedStyle(document.body).getPropertyValue("--vrembem-variable-prefix").trim();
 }
 
 function getBreakpoint(drawer) {
-  const prefix = L();
+  const prefix = g();
   const bp = drawer.getAttribute(`data-${this.settings.dataBreakpoint}`);
 
   if (this.settings.breakpoints && this.settings.breakpoints[bp]) {
@@ -1697,7 +1699,7 @@ function getConfig(el, settings) {
 
   for (const prop in config) {
     // Get the CSS variable property values.
-    const prefix = L();
+    const prefix = g();
     const value = styles.getPropertyValue(`--${prefix}popover-${prop}`).trim(); // If a value was found, replace the default in config obj.
 
     if (value) {
@@ -1899,7 +1901,7 @@ function closeCheck(popover) {
     // 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 element are not currently hovered or focused.
+    const isFocused = document.activeElement.closest(`#${popover.id}, [aria-controls="${popover.id}"], [aria-describedby="${popover.id}"]`); // Close if the trigger and element are not currently hovered or focused.
 
     if (!isHovered && !isFocused) {
       popover.close();
@@ -1942,21 +1944,21 @@ function handleKeydown(event) {
 function handleDocumentClick(popover) {
   const root = this;
   document.addEventListener('click', function _f(event) {
-    // Check if a popover was clicked.
-    const result = event.target.closest(`#${popover.id}, [aria-controls="${popover.id}"]`);
+    // Check if a popover or its trigger was clicked.
+    const wasClicked = event.target.closest(`#${popover.id}, [aria-controls="${popover.id}"], [aria-describedby="${popover.id}"]`); // If popover or popover trigger was clicked...
 
-    if (!result) {
-      // If it doesn't match and popover is open, close it and remove event listener.
+    if (wasClicked) {
+      // If popover element exists and is not active...
+      if (popover.el && !popover.el.classList.contains(root.settings.stateActive)) {
+        this.removeEventListener('click', _f);
+      }
+    } else {
+      // If popover element exists and is active...
       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.el && !popover.el.classList.contains(root.settings.stateActive)) {
-        this.removeEventListener('click', _f);
-      }
     }
   });
 }