minor #2711 [Toolkit] Remove redundant code in Shadcn kit components (Kocal)

This PR was merged into the 2.x branch.

Discussion
----------

[Toolkit] Remove redundant code in Shadcn kit components

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Docs?         | yes/no <!-- required for new features -->
| Issues        | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
| License       | MIT

Small PR on the plane ✈️ , by removing redundant and not so much useful code from Toolkit's Shadcn components.

Commits
-------

f204999 [Toolkit] Remove redundant code in Shadcn kit components

Author: Kocal

src/Toolkit/kits/shadcn/templates/components/Alert.html.twig

@@ -12,7 +12,7 @@
 <div
     class="{{ style.apply({variant}, attributes.render('class'))|tailwind_merge }}"
     role="alert"
-    {{ attributes.defaults({role: 'alert'}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Alert/Description.html.twig

@@ -1,6 +1,6 @@
 <p
     class="{{ 'text-sm [&_p]:leading-relaxed ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </p>

src/Toolkit/kits/shadcn/templates/components/Alert/Title.html.twig

@@ -1,6 +1,6 @@
 <h5
     class="{{ 'mb-1 font-medium leading-none tracking-tight ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </h5>

src/Toolkit/kits/shadcn/templates/components/AspectRatio.html.twig

@@ -1,7 +1,7 @@
 {%- props ratio, style = '' -%}
 <div
     style="aspect-ratio: {{ ratio }}; {{ style }}"
-    {{ attributes.defaults({}).without('style') }}
+    {{ attributes.without('style') }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Avatar.html.twig

@@ -1,6 +1,6 @@
 <span
     class="{{ 'relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </span>

src/Toolkit/kits/shadcn/templates/components/Avatar/Image.html.twig

@@ -1,4 +1,4 @@
 <img
     class="{{ 'aspect-square h-full w-full ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({alt: ''}).without('class') }}
+    {{ attributes.defaults({alt: ''}) }}
 />

src/Toolkit/kits/shadcn/templates/components/Avatar/Text.html.twig

@@ -1,6 +1,6 @@
 <span
     class="{{ 'flex h-full w-full items-center justify-center rounded-full bg-muted ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </span>

src/Toolkit/kits/shadcn/templates/components/Badge.html.twig

@@ -12,7 +12,7 @@
 ) -%}
 <div
     class="{{ style.apply({variant, outline}, attributes.render('class'))|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Ellipsis.html.twig

@@ -1,6 +1,6 @@
 <span
     class="{{ 'flex h-9 w-9 items-center justify-center ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
     role="presentation"
     aria-hidden="true"
 >

src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Item.html.twig

@@ -1,6 +1,6 @@
 <li
     class="{{ 'inline-flex items-center gap-1.5 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </li>

src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Link.html.twig

@@ -1,6 +1,6 @@
 <a
     class="{{ 'transition-colors hover:text-foreground ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </a>

src/Toolkit/kits/shadcn/templates/components/Breadcrumb/List.html.twig

@@ -1,6 +1,6 @@
 <ol
     class="{{ 'flex flex-wrap items-center gap-1.5 break-words text-sm text-muted-foreground sm:gap-2.5 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </ol>

src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Page.html.twig

@@ -1,6 +1,6 @@
 <span
     class="{{ 'font-normal text-foreground ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
     role="link"
     aria-disabled="true"
     aria-current="page"

src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Separator.html.twig

@@ -1,6 +1,6 @@
 <li
     class="{{ '[&>svg]:w-3.5 [&>svg]:h-3.5 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
     role="presentation"
     aria-hidden="true"
 >

src/Toolkit/kits/shadcn/templates/components/Button.html.twig

@@ -21,7 +21,7 @@
 
 <{{ as }}
     class="{{ style.apply({variant, outline, size}, attributes.render('class'))|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </{{ as }}>

src/Toolkit/kits/shadcn/templates/components/Card.html.twig

@@ -1,6 +1,6 @@
 <div
     class="{{ 'rounded-lg border bg-card text-card-foreground shadow-sm ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Card/Content.html.twig

@@ -1,6 +1,6 @@
 <div
     class="{{ 'p-6 pt-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Card/Description.html.twig

@@ -1,6 +1,6 @@
 <div
     class="{{ 'text-sm text-muted-foreground ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Card/Footer.html.twig

@@ -1,6 +1,6 @@
 <div
     class="{{ 'flex items-center p-6 pt-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Card/Header.html.twig

@@ -1,6 +1,6 @@
 <div
     class="{{ 'flex flex-col space-y-1.5 p-6 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Card/Title.html.twig

@@ -1,6 +1,6 @@
 <div
     class="{{ 'text-2xl font-semibold leading-none tracking-tight ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>

src/Toolkit/kits/shadcn/templates/components/Checkbox.html.twig

@@ -1,5 +1,5 @@
 <input
     type="checkbox"
     class="{{ 'peer size-4 inline-block align-middle accent-primary ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >

src/Toolkit/kits/shadcn/templates/components/Input.html.twig

@@ -2,5 +2,5 @@
 <input
     type="{{ type }}"
     class="{{ 'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >

src/Toolkit/kits/shadcn/templates/components/Label.html.twig

@@ -1,6 +1,6 @@
 <label
     class="{{ ('text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 ' ~ attributes.render('class'))|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </label>

src/Toolkit/kits/shadcn/templates/components/Pagination.html.twig

@@ -1,7 +1,7 @@
 <nav
     class="{{ 'mx-auto flex w-full justify-center ' ~ attributes.render('class')|tailwind_merge }}"
     role="navigation"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </nav>

src/Toolkit/kits/shadcn/templates/components/Progress.html.twig

@@ -6,7 +6,7 @@
     aria-valuemin="0"
     aria-valuemax="100"
     aria-valuenow="{{ value }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     <div class="h-full w-full flex-1 bg-primary transition-all" style="transform: translateX(-{{ 100 - value }}%)"></div>
 </div>

src/Toolkit/kits/shadcn/templates/components/Select.html.twig

@@ -1,6 +1,6 @@
 <select
     class="{{ 'flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background data-[placeholder]:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </select>

src/Toolkit/kits/shadcn/templates/components/Separator.html.twig

@@ -13,6 +13,6 @@
     {{ attributes.defaults({
         role: decorative ? 'none' : 'separator',
         'aria-orientation': decorative ? false : orientation,
-    }).without('class') }}
+    }) }}
 >
 </div>

src/Toolkit/kits/shadcn/templates/components/Skeleton.html.twig

@@ -1,4 +1,4 @@
 <div
     class="{{ 'animate-pulse rounded-full bg-muted ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 ></div>

src/Toolkit/kits/shadcn/templates/components/Switch.html.twig

@@ -1,4 +1,4 @@
 <label class="{{ 'relative inline-flex items-center cursor-pointer ' ~ attributes.render('class')|tailwind_merge }}">
-    <input type="checkbox" class="sr-only peer absolute inset-0 w-full h-full cursor-pointer" {{ attributes.defaults({}).without('class') }}>
+    <input type="checkbox" class="sr-only peer absolute inset-0 w-full h-full cursor-pointer" {{ attributes }}>
     <div class="pointer-events-none w-11 h-6 bg-input rounded-full peer peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-primary peer-disabled:opacity-50 peer-disabled:cursor-not-allowed"></div>
 </label>

src/Toolkit/kits/shadcn/templates/components/Table.html.twig

@@ -1,7 +1,7 @@
 <div class="relative w-full overflow-auto">
     <table
         class="{{ 'w-full caption-bottom text-sm ' ~ attributes.render('class')|tailwind_merge }}"
-        {{ attributes.defaults({}).without('class') }}
+        {{ attributes }}
     >
         {%- block content %}{% endblock -%}
     </table>

src/Toolkit/kits/shadcn/templates/components/Table/Body.html.twig

@@ -1,6 +1,6 @@
 <tbody
     class="{{ '[&_tr:last-child]:border-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </tbody>

src/Toolkit/kits/shadcn/templates/components/Table/Caption.html.twig

@@ -1,6 +1,6 @@
 <caption
     class="{{ 'mt-4 text-sm text-muted-foreground ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </caption>

src/Toolkit/kits/shadcn/templates/components/Table/Cell.html.twig

@@ -1,6 +1,6 @@
 <td
     class="{{ 'p-4 align-middle [&:has([role=checkbox])]:pr-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </td>

src/Toolkit/kits/shadcn/templates/components/Table/Footer.html.twig

@@ -1,6 +1,6 @@
 <tfoot
     class="{{ 'border-t bg-muted/50 font-medium [&>tr]:last:border-b-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </tfoot>

src/Toolkit/kits/shadcn/templates/components/Table/Head.html.twig

@@ -1,6 +1,6 @@
 <th
     class="{{ 'h-12 px-4 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </th>

src/Toolkit/kits/shadcn/templates/components/Table/Header.html.twig

@@ -1,6 +1,6 @@
 <thead
     class="{{ '[&_tr]:border-b ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </thead>

src/Toolkit/kits/shadcn/templates/components/Table/Row.html.twig

@@ -1,6 +1,6 @@
 <tr
     class="{{ 'border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </tr>

src/Toolkit/kits/shadcn/templates/components/Textarea.html.twig

@@ -1,4 +1,4 @@
 <textarea
     class="{{ 'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 ></textarea>