desy-html 8.2.0 → 8.2.2

package/docs/index.html

@@ -37,6 +37,15 @@
 
   <h2>Changelog (English)</h2>
   <p>What's new in the latest version of desy-html</p>
+  <h3>v.8.2.2</h3>
+  <ul class="text-sm">
+    <li>Fixed duplicate ids in subitems in components with subitems.</li>
+    <li>Minor fixes.</li>
+  </ul>
+  <h3>v.8.2.1</h3>
+  <ul class="text-sm">
+    <li>Minor fixes.</li>
+  </ul>
   <h3>v.8.2.0</h3>
   <ul class="text-sm">
     <li>Added global function to select an item in Menu vertical.</li>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "desy-html",
-  "version": "8.2.0",
+  "version": "8.2.2",
   "description": "desy-html contains the code you need to start building a user interface for Gobierno de Aragón government webapps.",
   "author": {
     "name": "Desy (SDA Servicios Digitales de Aragón)",

package/src/js/aria/MenuVertical.js

@@ -34,7 +34,7 @@ export function MenuVertical(aria) {
 
     aria.MenuVertical.prototype.wrapActiveElement = function (elementActive) {
       const getText = elementActive.textContent;
-      const strongElement = `<strong class="font-bold">${getText}</strong>`;
+      const strongElement = `<strong>${getText}</strong>`;
       elementActive.innerHTML = strongElement;
     };
 
@@ -44,28 +44,40 @@ export function MenuVertical(aria) {
       elementDeactivated.innerHTML = strongElement;
     };
 
-    window.activateItemMenuVertical = function (menu, elementActive) {
-      menu.querySelectorAll('li').forEach((element, index) => {
-        const processElement = function (elem) {
-          let getId = elem.id
-          if(getId == elementActive){
-            const getText = elem.textContent;
-            const strongElement = `<strong class="font-bold">${getText}</strong>`;
-            elem.innerHTML = strongElement;
-          } else {
-            const getText = elem.textContent;
-            const strongElement = `${getText}`;
-            elem.innerHTML = strongElement;
-          }
+    window.activateItemMenuVertical = function (menuId, activeItemId) {
+      if (document.getElementById(menuId)) {
+        if (document.querySelector('#' + menuId + ' #' + activeItemId)) {
+          const menu = document.getElementById(menuId);
+          let selectedItem = null;
+          menu.querySelectorAll('li').forEach((element, index) => {
+            const processElement = function (elem) {
+              let getId = elem.id;
+              if(getId == activeItemId){
+                const getText = elem.textContent;
+                const strongElement = `<strong>${getText}</strong>`;
+                elem.innerHTML = strongElement;
+                selectedItem = elem;
+              } else {
+                const getText = elem.textContent;
+                const strongElement = `${getText}`;
+                elem.innerHTML = strongElement;
+              }
+            }
+            if (element.querySelector('a')) {
+              let getLink = element.querySelector('a');
+              processElement(getLink);
+            } else if (element.querySelector('span')) {
+              let getLink = element.querySelector('span');
+              processElement(getLink);
+            }
+          });
+          return([menu,selectedItem]);
+        } else {
+          console.log('There is no element with this id in the menu.');
         }
-        if (element.querySelector('a')) {
-          let getLink = element.querySelector('a');
-          processElement(getLink);
-        } else if (element.querySelector('span')) {
-          let getLink = element.querySelector('span');
-          processElement(getLink);
-        }
-      })
+      } else {
+        console.log('There is no menu with this id in the document.');
+      }
     };
   }());
 }

package/src/templates/components/accordion/_template.accordion.njk

@@ -5,12 +5,7 @@
     {%- if item.id -%}
       {%- set id = item.id -%}
     {%- else -%}
-      {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-      {%- if loop.first -%}
-        {%- set id = idPrefix %}
-      {%- else -%}
-        {%- set id = idPrefix + "-" + loop.index0 -%}
-      {%- endif -%}
+      {%- set id = idPrefix + "-" + loop.index -%}
     {%- endif -%}
     {%- if item.open -%}
       {%- set conditionalValue = id -%}
@@ -54,12 +49,7 @@
         {%- if item.id -%}
           {%- set id = item.id -%}
         {%- else -%}
-          {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-          {%- if loop.first -%}
-            {%- set id = idPrefix %}
-          {%- else -%}
-            {%- set id = idPrefix + "-" + loop.index0 -%}
-          {%- endif -%}
+          {%- set id = idPrefix + "-" + loop.index -%}
         {%- endif %}
 
     <div class="-my-px px-xs py-sm border-t border-b border-neutral-base">

package/src/templates/components/accordion-history/_template.accordion-history.njk

@@ -5,12 +5,7 @@
     {%- if item.id -%}
       {%- set id = item.id -%}
     {%- else -%}
-      {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-      {%- if loop.first -%}
-        {%- set id = idPrefix %}
-      {%- else -%}
-        {%- set id = idPrefix + "-" + loop.index0 -%}
-      {%- endif -%}
+      {%- set id = idPrefix + "-" + loop.index -%}
     {%- endif -%}
     {%- if item.open -%}
       {%- set conditionalValue = id -%}
@@ -55,12 +50,7 @@
       {%- if item.id -%}
         {%- set id = item.id -%}
       {%- else -%}
-        {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-        {%- if loop.first -%}
-          {%- set id = idPrefix %}
-        {%- else -%}
-          {%- set id = idPrefix + "-" + loop.index0 -%}
-        {%- endif -%}
+        {%- set id = idPrefix + "-" + loop.index -%}
       {%- endif %}
 
     <div class="relative -my-px px-xs py-sm border-t border-b border-neutral-base">

package/src/templates/components/header/_template.header.header__navigation.njk

@@ -5,19 +5,14 @@
 <nav class="{{ params.classes if params.classes else 'hidden lg:block' }}" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
   <ul class="ml-sm flex flex-wrap items-baseline">
   {% for item in params.items %}
-  	{% if item %}
+    {% if item %}
     <li>
-    	{#- If the user explicitly sets an id, use this instead of the regular idPrefix -#}
-    	{% if item.id %}
-    	{% set id = item.id %}
-    	{% else %}
-    	{#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-    	{% if loop.first %}
-    	{% set id = idPrefix %}
-    	{% else %}
-    	{% set id = idPrefix + "-" + loop.index %}
-    	{% endif %}
-    	{% endif %}
+      {#- If the user explicitly sets an id, use this instead of the regular idPrefix -#}
+      {% if item.id %}
+      {% set id = item.id %}
+      {% else %}
+      {% set id = idPrefix + "-" + loop.index %}
+      {% endif %}
       {% if item.active %}
 
       <a {%- if id %} id="{{ id }}"{% endif %} href="{{ item.href }}" class="max-w-40 lg:max-w-xs px-3 py-4 font-bold text-sm text-black hover:underline truncate focus:outline-none focus:ring-4 focus:ring-inset focus:ring-black focus:bg-warning-base" aria-current="page" {%- if item.target %} target="{{ item.target }}"{% endif %}><strong class="font-bold">{{ item.html | safe if item.html else item.text }}</strong></a>

package/src/templates/components/links-list/_template.links-list.njk

@@ -15,12 +15,7 @@
         {%- if item.id -%}
           {%- set id = item.id -%}
         {%- else -%}
-          {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-          {%- if loop.first -%}
-            {%- set id = idPrefix %}
-          {% else %}
-            {%- set id = idPrefix + "-" + loop.index -%}
-          {%- endif -%}
+          {%- set id = idPrefix + "-" + loop.index -%}
         {%- endif -%}
         {% set subId = "sub-" + id %}
     <li class="{% if item.containerClasses %}{{ item.containerClasses }}{% else %}px-base border-y border-neutral-base -my-px{% endif %}">

package/src/templates/components/menu-horizontal/_template.menu-horizontal.njk

@@ -12,13 +12,8 @@
     {% if item.id %}
     {% set id = item.id %}
     {% else %}
-    {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-    {% if loop.first %}
-    {% set id = idPrefix %}
-    {% else %}
     {% set id = idPrefix + "-" + loop.index %}
     {% endif %}
-    {% endif %}
     <li>
     {% if item.active %}
       <span {%- if id %} id="{{ id }}"{% endif %} class="c-menu-horizontal__active flex items-center relative py-sm lg:px-lg lg:py-base border border-transparent truncate font-semibold {%- if item.classes %} {{ item.classes }}{% endif -%}" {%- if item.title %} title="{{ item.title }}"{% endif %} aria-current="page" {%- for attribute, value in item.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}>

package/src/templates/components/menu-navigation/_template.menu-navigation.njk

@@ -21,12 +21,7 @@
         {%- if item.id -%}
           {%- set id = item.id -%}
         {%- else -%}
-          {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-          {%- if loop.first -%}
-            {%- set id = idPrefix %}
-          {% else %}
-            {%- set id = idPrefix + "-" + loop.index -%}
-          {%- endif -%}
+          {%- set id = idPrefix + "-" + loop.index -%}
         {%- endif -%}
         {% set subId = "sub-" + id %}
     <li class="relative">
@@ -50,12 +45,7 @@
             {%- if subitem.id -%}
               {%- set subId = subitem.id -%}
             {%- else -%}
-              {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-              {%- if loop.first -%}
-                {%- set subId = "sub-" + id %}
-              {% else %}
-                {%- set subId = "sub-" + id + "-" + loop.index -%}
-              {%- endif -%}
+              {%- set subId = "sub-" + id + "-" + loop.index -%}
             {%- endif %}
             {% set commonSubItemAttributes %}{% if subId %} id="{{ subId }}"{% endif %} {%- if subitem.title %} title="{{ subitem.title }}"{% endif %} {%- for attribute, value in subitem.attributes %} {{ attribute }}="{{ value }}"{% endfor %}{% endset %}
           <li>

package/src/templates/components/menu-vertical/_examples.menu-vertical.njk

@@ -48,6 +48,7 @@
   },
   {
     "name": "con item activo",
+    "description": 'Añade <code>active: true</code> a un item para mostrarlo activo inicialmente. También puedes usar con javascript la función global <code>activateItemMenuVertical(elementMenu, idItemSeleccionado)</code> para seleccionar un item de un menú, usando sus ids. Ej: Abre la consola del navegador y escribe <code>activateItemMenuVertical("mi-menu", "active-item-3")</code> para desactivar el item actual y activar el tercer item de este ejemplo.',
     "data": {
       "idPrefix": "active-item",
       "items": [
@@ -66,6 +67,7 @@
         }
       ],
       "attributes": {
+        "id": "mi-menu",
         "aria-label": "Menu vertical"
       }
     }

package/src/templates/components/menu-vertical/_template.menu-vertical.njk

@@ -10,12 +10,7 @@
         {%- if item.id -%}
           {%- set id = item.id -%}
         {%- else -%}
-          {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-          {%- if loop.first -%}
-            {%- set id = idPrefix %}
-          {% else %}
-            {%- set id = idPrefix + "-" + loop.index -%}
-          {%- endif -%}
+          {%- set id = idPrefix + "-" + loop.index -%}
         {%- endif -%}
         {% set subId = "sub-" + id %}
     <li class="m-base">
@@ -44,12 +39,7 @@
           {%- if subitem.id -%}
             {%- set subId = subitem.id -%}
           {%- else -%}
-            {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-            {%- if loop.first -%}
-              {%- set subId = "sub-" + id %}
-            {% else %}
-              {%- set subId = "sub-" + id + "-" + loop.index -%}
-            {%- endif -%}
+            {%- set subId = "sub-" + id + "-" + loop.index -%}
           {%- endif %}
         <li class="m-base origin-top-left text-sm">
             {% if subitem.href %}

package/src/templates/components/menubar/_template.menubar.njk

@@ -18,12 +18,7 @@
       {%- if item.id -%}
         {%- set id = item.id -%}
       {%- else -%}
-        {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-        {%- if loop.first -%}
-          {%- set id = idPrefix %}
-        {% else %}
-          {%- set id = idPrefix + "-" + loop.index -%}
-        {%- endif -%}
+        {%- set id = idPrefix + "-" + loop.index -%}
       {%- endif -%}
       {% set subId = "sub-" + id %}
     <li class="relative" role="none">
@@ -49,12 +44,7 @@
             {%- if subitem.id -%}
               {%- set subId = subitem.id -%}
               {%- else -%}
-                {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-                {%- if loop.first -%}
-                  {%- set subId = "sub-" + id %}
-                {% else %}
-                  {%- set subId = "sub-" + id + "-" + loop.index -%}
-                {%- endif -%}
+                {%- set subId = "sub-" + id + "-" + loop.index -%}
               {%- endif %}
         {% if subitem.role == 'none' %}
         <li role="none" id="{{ subId }}" data-option="{{ subId }}">
@@ -69,12 +59,7 @@
                 {%- if subsubitem.id -%}
                   {%- set subsubId = subsubitem.id -%}
                   {%- else -%}
-                    {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-                    {%- if loop.first -%}
-                      {%- set subsubId = "sub-" + subId %}
-                      {% else %}
-                        {%- set subsubId = "sub-" + subId + "-" + loop.index -%}
-                    {%- endif -%}
+                    {%- set subsubId = "sub-" + subId + "-" + loop.index -%}
                 {%- endif %}
             <li {%- if subsubitem.role %} role="{{ subsubitem.role}}"{% endif %}{% if subsubitem.role == 'menuitemcheckbox' or subsubitem.role == 'menuitemradio' %} aria-checked="{% if subsubitem.checked %}{{ subsubitem.checked }}{% else %}false{% endif %}"{% endif %} class="flex items-center pr-base pl-lg py-sm cursor-pointer hover:bg-primary-base hover:text-white" id="{{ subsubId }}" data-option="{{ subsubId }}">
               {{ subsubitem.html | safe if subsubitem.html else subsubitem.text }}

package/src/templates/components/nav/_template.nav.njk

@@ -15,13 +15,8 @@
   {% if item.id %}
   {% set id = item.id %}
   {% else %}
-  {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-  {% if loop.first %}
-  {% set id = idPrefix %}
-  {% else %}
   {% set id = idPrefix + "-" + loop.index %}
   {% endif %}
-  {% endif %}
   {% set commonItemAttributes %}{% if id %} id="{{ id }}"{% endif %} {%- if item.title %} title="{{ item.title }}"{% endif %} {%- for attribute, value in item.attributes %} {{ attribute }}="{{ value }}"{% endfor %}{% endset %}
 <li>
   {% if item.active %}

package/src/templates/components/pagination/_template.pagination.njk

@@ -27,12 +27,7 @@
 {% set innerHtml %}
   {% for item in params.items %}
   {% if item %}
-  {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-  {% if loop.first %}
-  {% set id = idPrefix %}
-  {% else %}
   {% set id = idPrefix + "-" + loop.index %}
-  {% endif %}
   <li>
     {% set prefix %}<span class="sr-only">Página&nbsp;</span>{% endset %}
     {% set suffix %}<span class="sr-only">&nbsp;(resultados del {{ loop.index | int * params.itemsPerPage | int }} al {% if ((loop.index | int + 1)  * params.itemsPerPage | int) > ( params.totalItems | int ) %}{{ params.totalItems }}{% else %}{{ (loop.index | int + 1)  * params.itemsPerPage | int }}{% endif %})</span>{% endset %}