desy-html 16.0.4 → 17.0.1

package/src/js/aria/treeitem.js

@@ -149,7 +149,7 @@ export function Treeitem(aria) {
       return;
     }
 
-    if (event.shift) {
+    if (event.shiftKey) {
       if (isPrintableCharacter(char)) {
         printableCharacter(this);
       }
@@ -158,14 +158,18 @@ export function Treeitem(aria) {
       switch (event.keyCode) {
         case this.keyCode.SPACE:
         case this.keyCode.RETURN:
-          const typeOfInput = getCurrentCheckbox.type
-          if (typeOfInput === 'radio') {
-            for (let item of getAllChildrenOfTree) {
-              item.checked = false
+          // Navigation trees have no checkbox/radio: skip the toggle but still
+          // swallow the key so it doesn't propagate.
+          if (getCurrentCheckbox) {
+            const typeOfInput = getCurrentCheckbox.type
+            if (typeOfInput === 'radio') {
+              for (let item of getAllChildrenOfTree) {
+                item.checked = false
+              }
             }
+            getCurrentCheckbox.checked = getCurrentCheckbox.checked === true ? false : true
+            targetElement.setAttribute('aria-checked', getCurrentCheckbox.checked ? 'true' : 'false');
           }
-          getCurrentCheckbox.checked = getCurrentCheckbox.checked === true ? false : true
-          targetElement.setAttribute('aria-checked', getCurrentCheckbox.checked ? 'true' : 'false');
           flag = true;
           break;
 
@@ -279,11 +283,16 @@ export function Treeitem(aria) {
   };
 
   function arrayOrSingleElement(elementId, itemsIds, open) {
+    // Resolve the navigation flag once so every branch (array and single) treats
+    // tree-navigation items consistently.
+    const getElement = document.getElementById(elementId);
+    const isTreeNavigation = getElement ? getElement.hasAttribute('data-tree-navigation') : false;
+
     if (typeof itemsIds === 'object' && open !== null) {
       itemsIds.forEach((item) => {
         const selectItem = document.querySelector(`#${elementId} #${item}`)
         if (selectItem) {
-          activateElement(selectItem, open)
+          activateElement(selectItem, open, isTreeNavigation)
         } else {
           returnMessage()
         }
@@ -291,8 +300,6 @@ export function Treeitem(aria) {
     }
 
     if (typeof itemsIds !== 'object' && open !== null) {
-      const getElement = document.querySelector(`#${elementId}`);
-      const isTreeNavigation = getElement.hasAttribute('data-tree-navigation');
       const selectItem = document.querySelector(`#${elementId} #${itemsIds}`)
       if (selectItem) {
         activateElement(selectItem, open, isTreeNavigation)
@@ -305,7 +312,7 @@ export function Treeitem(aria) {
       itemsIds.forEach((item) => {
         const selectItem = document.querySelector(`#${elementId} #${item[0]}`)
         if (selectItem) {
-          activateElement(selectItem, item[1])
+          activateElement(selectItem, item[1], isTreeNavigation)
         } else {
           console.log('There is no item with this id in the document.');
           return null;
@@ -319,8 +326,10 @@ export function Treeitem(aria) {
       item.setAttribute('aria-expanded', 'true');
       if (treeNav) {
         const getLink = item.querySelector('a')
-        getLink.setAttribute("aria-current", "page");
-        getLink.innerHTML = `<strong class="font-bold">${getLink.textContent}</strong>`;
+        if (getLink) {
+          getLink.setAttribute("aria-current", "page");
+          getLink.innerHTML = `<strong class="font-bold">${getLink.textContent}</strong>`;
+        }
       }
       recursiveParent(item)
     } else {

package/src/js/aria/utils.js

@@ -1,219 +1,240 @@
-export function utils(aria) {
-  /**
-   * @namespace aria
-   */
-
-  aria.Utils = aria.Utils || {};
-
-  /**
-   * @desc
-   *  Key code constants
-   */
-  aria.KeyCode = {
-    BACKSPACE: 8,
-    TAB: 9,
-    RETURN: 13,
-    ESC: 27,
-    SPACE: 32,
-    PAGE_UP: 33,
-    PAGE_DOWN: 34,
-    END: 35,
-    HOME: 36,
-    LEFT: 37,
-    UP: 38,
-    RIGHT: 39,
-    DOWN: 40,
-    DELETE: 46
-  };
-
-
-  // Polyfill src https://developer.mozilla.org/en-US/docs/Web/API/Element/matches
-  aria.Utils.matches = function(element, selector) {
-    if (!Element.prototype.matches) {
-      Element.prototype.matches =
-        Element.prototype.matchesSelector ||
-        Element.prototype.mozMatchesSelector ||
-        Element.prototype.msMatchesSelector ||
-        Element.prototype.oMatchesSelector ||
-        Element.prototype.webkitMatchesSelector ||
-        function(s) {
-          var matches = element.parentNode.querySelectorAll(s);
-          var i = matches.length;
-          while (--i >= 0 && matches.item(i) !== this) {}
-          return i > -1;
-        };
-    }
-
-    return element.matches(selector);
-  };
-
-  aria.Utils.remove = function(item) {
-    if (item.remove && typeof item.remove === 'function') {
-      return item.remove();
-    }
-    if (item.parentNode &&
-      item.parentNode.removeChild &&
-      typeof item.parentNode.removeChild === 'function') {
-      return item.parentNode.removeChild(item);
-    }
-    return false;
-  };
-
-  aria.Utils.isFocusable = function(element) {
-    if (element.tabIndex > 0 || (element.tabIndex === 0 && element.getAttribute('tabIndex') !== null)) {
-      return true;
-    }
-
-    if (element.disabled) {
-      return false;
-    }
-
-    switch (element.nodeName) {
-      case 'A':
-        return !!element.href && element.rel != 'ignore';
-      case 'INPUT':
-        return element.type != 'hidden' && element.type != 'file';
-      case 'BUTTON':
-      case 'SELECT':
-      case 'TEXTAREA':
-        return true;
-      default:
-        return false;
-    }
-  };
-
-  aria.Utils.getAncestorBySelector = function(element, selector) {
-    if (!aria.Utils.matches(element, selector + ' ' + element.tagName)) {
-      // Element is not inside an element that matches selector
-      return null;
-    }
-
-    // Move up the DOM tree until a parent matching the selector is found
-    var currentNode = element;
-    var ancestor = null;
-    while (ancestor === null) {
-      if (aria.Utils.matches(currentNode.parentNode, selector)) {
-        ancestor = currentNode.parentNode;
-      } else {
-        currentNode = currentNode.parentNode;
-      }
-    }
-
-    return ancestor;
-  };
-
-  aria.Utils.hasClass = function(element, className) {
-    return (new RegExp('(\\s|^)' + className + '(\\s|$)')).test(element.className);
-  };
-
-  aria.Utils.addClass = function(element, className) {
-    if (!aria.Utils.hasClass(element, className)) {
-      element.className += ' ' + className;
-    }
-  };
-
-  aria.Utils.removeClass = function(element, className) {
-    var classRegex = new RegExp('(\\s|^)' + className + '(\\s|$)');
-    element.className = element.className.replace(classRegex, ' ').trim();
-  };
-
-  aria.Utils.bindMethods = function(object /* , ...methodNames */ ) {
-    var methodNames = Array.prototype.slice.call(arguments, 1);
-    methodNames.forEach(function(method) {
-      object[method] = object[method].bind(object);
-    });
-  };
-}
-
-// Function to convert ISO date(s) to DD-MM-YYYY format
-export function formatDateToDDMMYYYY(isoDate) {
-  if (!isoDate) return '';
-  try {
-    // Case 1: Multiple dates separated by space
-    if (isoDate.includes(' ')) {
-      return isoDate
-        .split(' ')
-        .map(date => formatSingleDate(date))
-        .join(' ');
-    }
-    // Case 2: Date range separated by /
-    if (isoDate.includes('/')) {
-      const [startDate, endDate] = isoDate.split('/');
-      return `${formatSingleDate(startDate)}/${formatSingleDate(endDate)}`;
-    }
-    // Case 3: Single date
-    return formatSingleDate(isoDate);
-  } catch (error) {
-    console.error('Error formatting date:', error);
-    return '';
-  }
-}
-
-// Helper function to format a single date
-export function formatSingleDate(isoDate) {
-  const date = new Date(isoDate);
-  if (isNaN(date.getTime())) {
-    return '';
-  }
-  const day = String(date.getDate()).padStart(2, '0');
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const year = date.getFullYear();
-  return `${day}-${month}-${year}`;
-}
-
-// Function to convert DD-MM-YYYY format to ISO
-export function convertToISOFormat(ddmmyyyyDate) {
-  if (!ddmmyyyyDate) return '';
-  try {
-    // For multiple dates
-    if (ddmmyyyyDate.includes(' ')) {
-      return ddmmyyyyDate
-        .split(' ')
-        .map(date => convertSingleDateToISO(date))
-        .join(' ');
-    }
-    // For date ranges
-    if (ddmmyyyyDate.includes('/')) {
-      const [startDate, endDate] = ddmmyyyyDate.split('/');
-      return `${convertSingleDateToISO(startDate)}/${convertSingleDateToISO(endDate)}`;
-    }
-    // For single date
-    return convertSingleDateToISO(ddmmyyyyDate);
-  } catch (error) {
-    console.error('Error converting to ISO format:', error);
-    return '';
-  }
-}
-
-// Helper function to convert a single date to ISO
-export function convertSingleDateToISO(ddmmyyyyDate) {
-  if (!ddmmyyyyDate) return '';
-  const [day, month, year] = ddmmyyyyDate.split('-');
-  return `${year}-${month}-${day}`;
-}
-
-// Advanced format detection for different date patterns
-export function detectDateFormat(dateString) {
-  if (!dateString) return 'invalid';
-
-  const isISO = (date) => /^\d{4}-\d{2}-\d{2}$/.test(date);
-  const isDDMMYYYY = (date) => /^\d{2}-\d{2}-\d{4}$/.test(date);
-
-  // Date range separated by /
-  if (dateString.includes('/')) {
-    const [start, end] = dateString.split('/');
-    return isISO(start) && isISO(end) ? 'iso' :
-           isDDMMYYYY(start) && isDDMMYYYY(end) ? 'dd-mm-yyyy' : 'invalid';
-  }
-
-  // Multiple dates separated by space
-  if (dateString.includes(' ')) {
-    const dates = dateString.split(' ');
-    return dates.every(isISO) ? 'iso' :
-           dates.every(isDDMMYYYY) ? 'dd-mm-yyyy' : 'invalid';
-  }
-
-  // Single date
-  return isISO(dateString) ? 'iso' :
-         isDDMMYYYY(dateString) ? 'dd-mm-yyyy' : 'invalid';
-}
+export function utils(aria) {
+  /**
+   * @namespace aria
+   */
+
+  aria.Utils = aria.Utils || {};
+
+  /**
+   * @desc
+   *  Key code constants
+   */
+  aria.KeyCode = {
+    BACKSPACE: 8,
+    TAB: 9,
+    RETURN: 13,
+    ESC: 27,
+    SPACE: 32,
+    PAGE_UP: 33,
+    PAGE_DOWN: 34,
+    END: 35,
+    HOME: 36,
+    LEFT: 37,
+    UP: 38,
+    RIGHT: 39,
+    DOWN: 40,
+    DELETE: 46
+  };
+
+
+  // Polyfill src https://developer.mozilla.org/en-US/docs/Web/API/Element/matches
+  aria.Utils.matches = function(element, selector) {
+    if (!Element.prototype.matches) {
+      Element.prototype.matches =
+        Element.prototype.matchesSelector ||
+        Element.prototype.mozMatchesSelector ||
+        Element.prototype.msMatchesSelector ||
+        Element.prototype.oMatchesSelector ||
+        Element.prototype.webkitMatchesSelector ||
+        function(s) {
+          var matches = element.parentNode.querySelectorAll(s);
+          var i = matches.length;
+          while (--i >= 0 && matches.item(i) !== this) {}
+          return i > -1;
+        };
+    }
+
+    return element.matches(selector);
+  };
+
+  aria.Utils.remove = function(item) {
+    if (item.remove && typeof item.remove === 'function') {
+      return item.remove();
+    }
+    if (item.parentNode &&
+      item.parentNode.removeChild &&
+      typeof item.parentNode.removeChild === 'function') {
+      return item.parentNode.removeChild(item);
+    }
+    return false;
+  };
+
+  aria.Utils.isFocusable = function(element) {
+    if (element.tabIndex > 0 || (element.tabIndex === 0 && element.getAttribute('tabIndex') !== null)) {
+      return true;
+    }
+
+    if (element.disabled) {
+      return false;
+    }
+
+    switch (element.nodeName) {
+      case 'A':
+        return !!element.href && element.rel != 'ignore';
+      case 'INPUT':
+        return element.type != 'hidden' && element.type != 'file';
+      case 'BUTTON':
+      case 'SELECT':
+      case 'TEXTAREA':
+        return true;
+      default:
+        return false;
+    }
+  };
+
+  aria.Utils.getAncestorBySelector = function(element, selector) {
+    if (!aria.Utils.matches(element, selector + ' ' + element.tagName)) {
+      // Element is not inside an element that matches selector
+      return null;
+    }
+
+    // Move up the DOM tree until a parent matching the selector is found
+    var currentNode = element;
+    var ancestor = null;
+    while (ancestor === null) {
+      if (aria.Utils.matches(currentNode.parentNode, selector)) {
+        ancestor = currentNode.parentNode;
+      } else {
+        currentNode = currentNode.parentNode;
+      }
+    }
+
+    return ancestor;
+  };
+
+  aria.Utils.hasClass = function(element, className) {
+    return (new RegExp('(\\s|^)' + className + '(\\s|$)')).test(element.className);
+  };
+
+  aria.Utils.addClass = function(element, className) {
+    if (!aria.Utils.hasClass(element, className)) {
+      element.className += ' ' + className;
+    }
+  };
+
+  aria.Utils.removeClass = function(element, className) {
+    var classRegex = new RegExp('(\\s|^)' + className + '(\\s|$)');
+    element.className = element.className.replace(classRegex, ' ').trim();
+  };
+
+  aria.Utils.bindMethods = function(object /* , ...methodNames */ ) {
+    var methodNames = Array.prototype.slice.call(arguments, 1);
+    methodNames.forEach(function(method) {
+      object[method] = object[method].bind(object);
+    });
+  };
+}
+
+var HTML_ESCAPES = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' };
+
+// Escapes & " ' < > for safe use in HTML content and attributes. null/undefined -> ''.
+export function escapeHtml(value) {
+  if (value === null || value === undefined) return '';
+  return String(value).replace(/[&<>"']/g, function (c) { return HTML_ESCAPES[c]; });
+}
+
+// Neutralizes dangerous schemes in href via an allow-list: relative URLs or http/https/mailto/tel.
+// Strips C0 control chars (tab/LF/CR included) before probing, since the browser's URL parser would
+// remove them and reconstruct schemes like "java\tscript:". Any other scheme returns '#'.
+export function safeHref(value) {
+  if (value === null || value === undefined) return '';
+  var v = String(value);
+  var probe = v.replace(/[\u0000-\u001F]/g, '').trim().toLowerCase();
+  var scheme = probe.match(/^([a-z][a-z0-9+.-]*):/);
+  if (!scheme) return v;
+  var allowed = { http: true, https: true, mailto: true, tel: true };
+  return allowed[scheme[1]] === true ? v : '#';
+}
+
+// Function to convert ISO date(s) to DD-MM-YYYY format
+export function formatDateToDDMMYYYY(isoDate) {
+  if (!isoDate) return '';
+  try {
+    // Case 1: Multiple dates separated by space
+    if (isoDate.includes(' ')) {
+      return isoDate
+        .split(' ')
+        .map(date => formatSingleDate(date))
+        .join(' ');
+    }
+    // Case 2: Date range separated by /
+    if (isoDate.includes('/')) {
+      const [startDate, endDate] = isoDate.split('/');
+      return `${formatSingleDate(startDate)}/${formatSingleDate(endDate)}`;
+    }
+    // Case 3: Single date
+    return formatSingleDate(isoDate);
+  } catch (error) {
+    console.error('Error formatting date:', error);
+    return '';
+  }
+}
+
+// Helper function to format a single date
+export function formatSingleDate(isoDate) {
+  const date = new Date(isoDate);
+  if (isNaN(date.getTime())) {
+    return '';
+  }
+  const day = String(date.getDate()).padStart(2, '0');
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const year = date.getFullYear();
+  return `${day}-${month}-${year}`;
+}
+
+// Function to convert DD-MM-YYYY format to ISO
+export function convertToISOFormat(ddmmyyyyDate) {
+  if (!ddmmyyyyDate) return '';
+  try {
+    // For multiple dates
+    if (ddmmyyyyDate.includes(' ')) {
+      return ddmmyyyyDate
+        .split(' ')
+        .map(date => convertSingleDateToISO(date))
+        .join(' ');
+    }
+    // For date ranges
+    if (ddmmyyyyDate.includes('/')) {
+      const [startDate, endDate] = ddmmyyyyDate.split('/');
+      return `${convertSingleDateToISO(startDate)}/${convertSingleDateToISO(endDate)}`;
+    }
+    // For single date
+    return convertSingleDateToISO(ddmmyyyyDate);
+  } catch (error) {
+    console.error('Error converting to ISO format:', error);
+    return '';
+  }
+}
+
+// Helper function to convert a single date to ISO
+export function convertSingleDateToISO(ddmmyyyyDate) {
+  if (!ddmmyyyyDate) return '';
+  const [day, month, year] = ddmmyyyyDate.split('-');
+  return `${year}-${month}-${day}`;
+}
+
+// Advanced format detection for different date patterns
+export function detectDateFormat(dateString) {
+  if (!dateString) return 'invalid';
+
+  const isISO = (date) => /^\d{4}-\d{2}-\d{2}$/.test(date);
+  const isDDMMYYYY = (date) => /^\d{2}-\d{2}-\d{4}$/.test(date);
+
+  // Date range separated by /
+  if (dateString.includes('/')) {
+    const [start, end] = dateString.split('/');
+    return isISO(start) && isISO(end) ? 'iso' :
+           isDDMMYYYY(start) && isDDMMYYYY(end) ? 'dd-mm-yyyy' : 'invalid';
+  }
+
+  // Multiple dates separated by space
+  if (dateString.includes(' ')) {
+    const dates = dateString.split(' ');
+    return dates.every(isISO) ? 'iso' :
+           dates.every(isDDMMYYYY) ? 'dd-mm-yyyy' : 'invalid';
+  }
+
+  // Single date
+  return isISO(dateString) ? 'iso' :
+         isDDMMYYYY(dateString) ? 'dd-mm-yyyy' : 'invalid';
+}