@rijkshuisstijl-community/components-twig 1.0.0 → 1.1.0

package/dist/Heading.twig

@@ -1,11 +1,7 @@
-{% from "attributes.twig" import parse_attributes %}
-{%- set attributes = attributes|default({'class': []})|merge({
-  'class': attributes.class|default([]),
-}) -%}
 {%- if appearance is not empty -%}
   {% set attributes = attributes|merge({'appearance': appearance}) %}
 {%- endif -%}
 {%- if level is empty -%}
   {% set level = 1 %}
 {%- endif -%}
-<h{{ level }}{{ parse_attributes(attributes) }}>{{ children }}</h{{ level }}>
+<h{{ level }}{{ attributes }}>{{ children }}</h{{ level }}>

package/dist/Icon.twig

@@ -1,4 +1,3 @@
-{% from "attributes.twig" import parse_attributes %}
 {%- set attributes = attributes|default({'class': []})|merge({
   'class': attributes.class|default(['utrecht-icon']),
   'role': 'presentation',
@@ -17,8 +16,8 @@
   'stroke-linejoin': 'round'
 })
 -%}
-<span{{ parse_attributes(attributes) }}>
-  <svg{{ parse_attributes(svg_attributes) }}>
+<span{{ attributes }}>
+  <svg{{ svg_attributes }}>
     <use xlink:href="node_modules/@tabler/icons-sprite/dist/tabler-sprite.svg#tabler-{{ icon }}" />
   </svg>
 </span>

package/dist/OrderedList.twig

@@ -1,7 +1,7 @@
 <!-- TODO: This is a dummy component created to setup support for nested Twig templates. It needs to be replaced with an official template -->
 <ol>
   {% for item in items %}
-    {% include 'OrderedListItem.twig' with {
+    {% include '@rhc/OrderedListItem.twig' with {
       content: item
     } %}
   {% endfor %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rijkshuisstijl-community/components-twig",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": "Community for NL Design System",
   "description": "Twig component library for the Rijkshuisstijl Community repository, based on the NL Design System architecture",
   "license": "EUPL-1.2",
@@ -23,13 +23,16 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@rijkshuisstijl-community/components-css": "1.0.0"
+    "@rijkshuisstijl-community/components-css": "1.0.1"
   },
   "devDependencies": {
     "@nl-design-system/tsconfig": "1.0.1",
     "cpx": "1.5.0",
+    "drupal-attribute": "1.1.0",
+    "drupal-twig-extensions": "1.0.0-beta.5",
     "npm-run-all": "4.1.5",
     "rimraf": "6.0.1",
+    "twig": "1.17.1",
     "typescript": "5.7.3"
   },
   "scripts": {

package/dist/utils/attributes.twig

@@ -1,69 +0,0 @@
-{#
-A custom attributes function.
-
-By default it will return an empty string, but if any attributes are available
-they will be used to create the string with attributes.
-
-Why do we need this function? Because we want the Twig templates in our
-components to be as clean and Twig-native as possible without dependencies on
-methods like those provided by drupal on the Attributes object. See:
-https://www.drupal.org/docs/8/theming-drupal-8/using-attributes-in-templates#s-attributesmethods
-
-Parameters:
-- attributes
-  An arrray with attributes as provided by Drupal.
-
-Returns:
-- A string with attributes and their values.
-#}
-{%- macro parse_attributes(attributes) -%}
-  {%- set str = '' -%}
-  {%- set boolean_attributes = [
-    'allowfullscreen',
-    'allowpaymentrequest',
-    'async',
-    'autofocus',
-    'autoplay',
-    'checked',
-    'controls',
-    'default',
-    'disabled',
-    'formnovalidate',
-    'hidden',
-    'ismap',
-    'itemscope',
-    'loop',
-    'multiple',
-    'muted',
-    'nomodule',
-    'novalidate',
-    'open',
-    'playsinline',
-    'readonly',
-    'required',
-    'reversed',
-    'selected',
-    'truespeed'
-  ] -%}
-  {# Attributes is optional, so check if it exists. #}
-  {%- for key, value in attributes -%}
-    {%- if value is iterable -%}
-      {%- set unique = [] -%}
-      {%- for item in value -%}
-        {%- if item not in unique -%}
-          {%- set unique = unique|merge([item|trim]) -%}
-        {%- endif -%}
-      {%- endfor -%}
-      {%- set joined = unique|join(' ') -%}
-      {%- if joined != '' -%}
-        {%- set str = str ~ ' ' ~ key ~ '="' ~ (joined|trim) ~ '"' -%}
-      {%- endif -%}
-    {%- elseif key in boolean_attributes -%}
-      {%- set str = str ~ ' ' ~ key -%}
-    {% else %}
-      {%- set str = str ~ ' ' ~ key ~ '="' ~ value ~ '"' -%}
-    {%- endif -%}
-  {%- endfor -%}
-  {#- Render the string raw (otherwise quotes will be escaped. -#}
-  {{- str|raw -}}
-{%- endmacro -%}