django-unfold 0.45.0__py3-none-any.whl → 0.46.0__py3-none-any.whl

unfold/styles.css

@@ -637,7 +637,7 @@ trix-toolbar[id^="trix-toolbar-"] {
 }
 
 .ui-tabs.ui-widget .ui-tabs-nav {
-  @apply bg-base-100 border-0 flex gap-2 m-0 mb-4 mr-auto p-1 rounded text-sm dark:bg-white/[.04] after:hidden;
+  @apply bg-base-100 border-0 flex gap-2 m-0 ml-3 mb-0 mt-3 mr-auto p-1 rounded text-sm dark:bg-white/[.04] after:hidden;
 }
 
 .ui-tabs.ui-widget .ui-tabs-nav li {

unfold/templates/admin/login.html

@@ -34,20 +34,22 @@
 
                 {% include "unfold/helpers/messages.html" %}
 
-                <div class="flex flex-col gap-4 mb-8 *:mb-0">
-                    {% include "unfold/helpers/messages/errornote.html" with errors=form.errors %}
+                {% if form.errors or form.non_field_errors %}
+                    <div class="flex flex-col gap-4 mb-8 *:mb-0">
+                        {% include "unfold/helpers/messages/errornote.html" with errors=form.errors %}
 
-                    {% include "unfold/helpers/messages/error.html" with errors=form.non_field_errors %}
+                        {% include "unfold/helpers/messages/error.html" with errors=form.non_field_errors %}
 
-                    {% if user.is_authenticated %}
-                        {% blocktranslate trimmed asvar message %}
-                            You are authenticated as {{ username }}, but are not authorized to
-                            access this page. Would you like to login to a different account?
-                        {% endblocktranslate %}
+                        {% if user.is_authenticated %}
+                            {% blocktranslate trimmed asvar message %}
+                                You are authenticated as {{ username }}, but are not authorized to
+                                access this page. Would you like to login to a different account?
+                            {% endblocktranslate %}
 
-                        {% include "unfold/helpers/messages/error.html" with error=message %}
-                    {% endif %}
-                </div>
+                            {% include "unfold/helpers/messages/error.html" with error=message %}
+                        {% endif %}
+                    </div>
+                {% endif %}
 
                 {% block login_before %}{% endblock %}
 

unfold/templates/admin/submit_line.html

@@ -1,7 +1,7 @@
 {% load i18n admin_urls %}
 
-<div {% if not is_popup %}id="submit-row"{% endif %} class="relative lg:mt-16 z-20">
-    <div class="{% if not is_popup %}max-w-full lg:bottom-0 lg:fixed lg:left-0 lg:right-0{% endif %}" {% if not is_popup %}x-bind:class="{'xl:left-0': !sidebarDesktopOpen, 'xl:left-72': sidebarDesktopOpen}"{% endif %} x-bind:style="'width: ' + mainWidth + 'px'">
+<div {% if not is_popup %}id="submit-row"{% endif %} class="relative {% if not is_popup %}lg:mt-16{% endif %} z-20">
+    <div class="{% if not is_popup %}max-w-full lg:bottom-0 lg:fixed lg:left-0 lg:right-0{% endif %}" {% if not is_popup %}x-bind:class="{'xl:left-0': !sidebarDesktopOpen, 'xl:left-72': sidebarDesktopOpen}" x-bind:style="'width: ' + mainWidth + 'px'"{% endif %}>
         <div class="backdrop-blur-sm bg-white/80 pb-4 dark:bg-base-900/80 {% if not is_popup %}lg:border-t lg:border-base-200 lg:py-4 relative lg:scrollable-top lg:px-8 dark:border-base-800{% endif %}">
             <div class="flex flex-col-reverse gap-3 items-center mx-auto lg:flex-row-reverse">
                 {% block submit-row %}
@@ -27,14 +27,6 @@
                         </button>
                     {% endif %}
 
-                    {% if show_close %}
-                        {% url opts|admin_urlname:'changelist' as changelist_url %}
-
-                        <a href="{% add_preserved_filters changelist_url %}" class="border border-base-200 font-medium px-3 py-2 rounded transition-all w-full hover:bg-base-50 lg:block lg:w-auto dark:border-base-700  dark:hover:text-base-200 dark:hover:bg-base-900">
-                            {% translate 'Close' %}
-                        </a>
-                    {% endif %}
-
                     {% if show_save_and_add_another %}
                         <button type="submit" name="_addanother" class="border border-base-200 font-medium px-3 py-2 rounded transition-all w-full hover:bg-base-50 lg:block lg:w-auto dark:border-base-700  dark:hover:text-base-200 dark:hover:bg-base-900">
                             {% translate 'Save and add another' %}
@@ -47,15 +39,24 @@
                         </button>
                     {% endif %}
 
-                    {% if show_delete_link and original %}
-                        {% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
+                    <div class="flex flex-col gap-3 mr-auto w-full lg:flex-row lg:w-auto">
+                        {% if show_close or adminform.model_admin.change_form_show_cancel_button %}
+                            {% url opts|admin_urlname:'changelist' as changelist_url %}
+
+                            <a href="{% add_preserved_filters changelist_url %}" class="border border-base-200 font-medium px-3 py-2 rounded text-center transition-all w-full hover:bg-base-50 lg:block lg:w-auto dark:border-base-700  dark:hover:text-base-200 dark:hover:bg-base-900">
+                                {% translate 'Close' %}
+                            </a>
+                        {% endif %}
+
+                        {% if show_delete_link and original %}
+                            {% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
 
-                        <p class="deletelink-box mr-auto w-full lg:w-auto">
-                            <a href="{% add_preserved_filters delete_url %}" class="bg-red-600 flex items-center justify-center font-medium h-9.5 ml-auto px-3 py-2 rounded text-white dark:bg-red-500/20 dark:text-red-500">
+
+                            <a href="{% add_preserved_filters delete_url %}" class="bg-red-600 flex items-center justify-center font-medium h-9.5 ml-auto px-3 py-2 rounded text-center text-white w-full lg:w-auto dark:bg-red-500/20 dark:text-red-500">
                                 {% translate "Delete" %} {{ opts.verbose_name }}
                             </a>
-                        </p>
-                    {% endif %}
+                        {% endif %}
+                    </div>
                 {% endblock %}
             </div>
         </div>

unfold/templates/unfold/helpers/change_list_filter.html

@@ -1,31 +1,25 @@
 {% load i18n admin_list unfold %}
 
 <div id="changelist-filter" class="backdrop-blur-sm bg-opacity-80 bg-base-900 flex inset-0 z-50 fixed {% if not cl.model_admin.list_filter_sheet %}2xl:pb-24 2xl:bg-transparent 2xl:relative 2xl:!block 2xl:z-10{% endif %}" hx-preserve x-show="filterOpen">
-    <label for="show-filters" id="changelist-filter-close" class="flex-grow {% if not cl.model_admin.list_filter_sheet %}2xl:hidden{% endif %}" x-on:click="filterOpen = false"></label>
+    <div id="changelist-filter-close" class="flex-grow {% if not cl.model_admin.list_filter_sheet %}2xl:hidden{% endif %}" x-on:click="filterOpen = false"></div>
 
     <div class="bg-white flex m-4 overflow-hidden rounded shadow-sm w-80 dark:bg-base-800 {% if not cl.model_admin.list_filter_sheet %} 2xl:overflow-visible 2xl:border-0 2xl:shadow-none 2xl:sticky 2xl:top-4 2xl:dark:border-base-800 2xl:bg-transparent 2xl:dark:!bg-transparent 2xl:m-0{% endif %}">
         <div class="flex-grow h-full overflow-auto relative {% if not cl.model_admin.list_filter_sheet %} 2xl:overflow-visible{% endif %}">
-            <div class="px-3 py-2.5 {% if not cl.model_admin.list_filter_sheet %}2xl:px-0{% endif %}">
-                {% if cl.model_admin.list_filter_submit %}
-                    <form id="filter-form" method="get">
-                        {% preserve_filters %}
-                {% endif %}
+            <{% if cl.model_admin.list_filter_submit %}form id="filter-form" method="get"{% else %}div{% endif %} class="flex flex-col h-full {% if not cl.model_admin.list_filter_sheet %}2xl:px-0{% endif %}">
+            {% if cl.model_admin.list_filter_submit %}
+                {% preserve_filters %}
+            {% endif %}
 
-                <div class="flex flex-col gap-4 *:mb-0">
+            <div class="flex flex-col grow gap-4 overflow-auto *:mb-0" {% if cl.model_admin.list_filter_sheet %}data-simplebar data-simplebar-direction='rtl'{% endif %}>
+                <div class="flex flex-col gap-4 {% if cl.model_admin.list_filter_sheet %}px-3 py-2.5{% endif %} *:mb-0">
                     {% for spec in cl.filter_specs %}
                         {% admin_list_filter cl spec %}
                     {% endfor %}
                 </div>
-
-                {% if cl.model_admin.list_filter_submit %}
-                    <button type="submit" class="bg-primary-600 block border border-transparent font-medium mt-6 px-3 py-2 rounded text-white w-full">
-                        {% trans "Apply Filters" %}
-                    </button>
-                    </form>
-                {% endif %}
-
-                {% include "unfold/helpers/change_list_filter_actions.html" %}
             </div>
-        </div>
+
+            {% include "unfold/helpers/change_list_filter_actions.html" %}
+        </{% if cl.model_admin.list_filter_submit %}form{% else %}div{% endif %}>
     </div>
 </div>
+</div>

unfold/templates/unfold/helpers/change_list_filter_actions.html

@@ -1,23 +1,31 @@
 {% load i18n %}
 
-{% if cl.is_facets_optional or cl.has_active_filters %}
-    <span id="changelist-filter-extra-actions" class="flex flex-row gap-2 items-center mt-2">
-        {% if cl.is_facets_optional %}
-            {% if cl.add_facets %}
-                <a href="{{ cl.remove_facet_link }}" class="hidelink border flex-grow font-medium px-3 py-2 rounded text-center transition-all w-full hover:bg-base-50 lg:w-auto dark:border-base-700 dark:hover:text-base-200">
-                    {% trans "Hide counts" %}
-                </a>
-            {% else %}
-                <a href="{{ cl.add_facet_link }}" class="viewlink border flex-grow font-medium px-3 py-2 rounded text-center transition-all w-full lg:w-auto dark:border-base-700 dark:hover:text-base-200">
-                    {% trans "Show counts" %}
-                </a>
+<div class="{% if cl.model_admin.list_filter_sheet %}bg-white border-t border-base-200 p-3 py-2.5 dark:bg-base-800 dark:border-base-700{% else %}mt-6{% endif %}">
+    {% if cl.model_admin.list_filter_submit %}
+        <button type="submit" class="bg-primary-600 block border border-transparent font-medium px-3 py-2 rounded text-white w-full">
+            {% trans "Apply Filters" %}
+        </button>
+    {% endif %}
+
+    {% if cl.is_facets_optional or cl.has_active_filters %}
+        <span id="changelist-filter-extra-actions" class="flex flex-row gap-2 items-center mt-2">
+            {% if cl.is_facets_optional %}
+                {% if cl.add_facets %}
+                    <a href="{{ cl.remove_facet_link }}" class="hidelink border flex-grow font-medium px-3 py-2 rounded text-center transition-all w-full hover:bg-base-50 lg:w-auto dark:border-base-700 dark:hover:text-base-200">
+                        {% trans "Hide counts" %}
+                    </a>
+                {% else %}
+                    <a href="{{ cl.add_facet_link }}" class="viewlink border flex-grow font-medium px-3 py-2 rounded text-center transition-all w-full lg:w-auto dark:border-base-700 dark:hover:text-base-200">
+                        {% trans "Show counts" %}
+                    </a>
+                {% endif %}
             {% endif %}
-        {% endif %}
 
-        {% if cl.has_active_filters %}
-            <a href="{{ cl.clear_all_filters_qs }}" class="border flex-grow font-medium px-3 py-2 rounded text-center transition-all w-full hover:bg-base-50 lg:w-auto dark:border-base-700 dark:hover:text-base-200">
-                {% trans "Clear all filters" %}
-            </a>
-        {% endif %}
-    </span>
-{% endif %}
+            {% if cl.has_active_filters %}
+                <a href="{{ cl.clear_all_filters_qs }}" class="border flex-grow font-medium px-3 py-2 rounded text-center transition-all w-full hover:bg-base-50 lg:w-auto dark:border-base-700 dark:hover:text-base-200">
+                    {% trans "Clear all filters" %}
+                </a>
+            {% endif %}
+        </span>
+    {% endif %}
+</div>

unfold/templates/unfold/helpers/field_readonly_value.html

@@ -1 +1 @@
-<div class="readonly break-all {% if field.is_json %}max-w-4xl{% else %}max-w-2xl{% endif %} py-2 text-sm *:rounded {% if not adminform.model_admin.compressed_fields and not field.is_image %}bg-base-50 border font-medium px-3 rounded shadow-sm dark:border-base-700 dark:bg-base-800{% endif %} {% if field.is_image %}inline-block [&_img]:rounded !py-0{% endif %}">{% if value %}{{ value }}{% elif field.contents %}{{ field.contents }}{% else %}-{% endif %}</div>
+<div class="readonly break-words {% if field.is_json %}max-w-4xl{% else %}max-w-2xl{% endif %} py-2 text-sm *:rounded {% if not adminform.model_admin.compressed_fields and not field.is_image %}bg-base-50 border font-medium px-3 rounded shadow-sm dark:border-base-700 dark:bg-base-800{% endif %} {% if field.is_image %}inline-block [&_img]:rounded !py-0{% endif %}">{% if value %}{{ value }}{% elif field.contents %}{{ field.contents }}{% else %}-{% endif %}</div>

unfold/templates/unfold/helpers/header_back_button.html

@@ -0,0 +1,13 @@
+{% load admin_urls i18n %}
+
+{% if show_back_button %}
+    {% if opts and adminform %}
+        {% url opts|admin_urlname:'changelist' as link %}
+
+        <a href="{{ link }}" class="block h-4.5 mr-3" title="{% trans "Go back" %}">
+            <span class="material-symbols-outlined">
+                arrow_back
+            </span>
+        </a>
+    {% endif %}
+{% endif %}

unfold/templates/unfold/helpers/site_icon.html

@@ -16,6 +16,6 @@
     </a>
 {% endif %}
 
-<span class="text-font-important-light tracking-tight dark:text-font-important-dark xl:text-base">
+<div class="text-font-important-light tracking-tight dark:text-font-important-dark xl:text-base">
     {{ branding }}
-</span>
+</div>

unfold/templates/unfold/helpers/welcomemsg.html

@@ -13,6 +13,8 @@
 
     <span class="block bg-base-200 h-5 mx-3 w-px dark:bg-base-700"></span>
 
+    {% include "unfold/helpers/header_back_button.html" %}
+
     <h1 class="overflow-hidden text-ellipsis text-sm whitespace-nowrap xl:text-base text-font-important-light dark:text-font-important-dark">
         {% if content_title %}
             <span class="tracking-tight">

unfold/templatetags/unfold.py

@@ -296,6 +296,7 @@ def fieldset_rows_classes(context: Context) -> str:
 @register.simple_tag(takes_context=True)
 def fieldset_row_classes(context: Context) -> str:
     classes = [
+        "form-row",
         "field-row",
         "group/row",
     ]
@@ -315,7 +316,11 @@ def fieldset_row_classes(context: Context) -> str:
             classes.append("hidden")
 
     # Compressed fields special styling
-    if adminform and adminform.model_admin.compressed_fields:
+    if (
+        adminform
+        and hasattr(adminform.model_admin, "compressed_fields")
+        and adminform.model_admin.compressed_fields
+    ):
         classes.extend(
             [
                 "lg:border-b",
@@ -359,7 +364,11 @@ def fieldset_line_classes(context: Context) -> str:
     if hasattr(field, "errors") and field.errors():
         classes.append("errors")
 
-    if adminform.model_admin.compressed_fields:
+    if (
+        adminform
+        and hasattr(adminform.model_admin, "compressed_fields")
+        and adminform.model_admin.compressed_fields
+    ):
         classes.extend(
             [
                 "border-b",

unfold/widgets.py

@@ -256,26 +256,53 @@ SWITCH_CLASSES = [
 
 class UnfoldAdminTextInputWidget(AdminTextInputWidget):
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
-        super().__init__(attrs={"class": " ".join(INPUT_CLASSES), **(attrs or {})})
+        super().__init__(
+            attrs={
+                **(attrs or {}),
+                "class": " ".join(
+                    [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            }
+        )
 
 
 class UnfoldAdminURLInputWidget(AdminURLFieldWidget):
     template_name = "unfold/widgets/url.html"
 
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
-        super().__init__(attrs={"class": " ".join(INPUT_CLASSES), **(attrs or {})})
+        super().__init__(
+            attrs={
+                **(attrs or {}),
+                "class": " ".join(
+                    [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            }
+        )
 
 
 class UnfoldAdminColorInputWidget(AdminTextInputWidget):
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
         super().__init__(
-            attrs={"type": "color", "class": " ".join(COLOR_CLASSES), **(attrs or {})}
+            attrs={
+                **(attrs or {}),
+                "type": "color",
+                "class": " ".join(
+                    [*COLOR_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            }
         )
 
 
 class UnfoldAdminUUIDInputWidget(AdminUUIDInputWidget):
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
-        super().__init__(attrs={"class": " ".join(INPUT_CLASSES), **(attrs or {})})
+        super().__init__(
+            attrs={
+                **(attrs or {}),
+                "class": " ".join(
+                    [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            }
+        )
 
 
 class UnfoldAdminIntegerRangeWidget(MultiWidget):
@@ -285,7 +312,9 @@ class UnfoldAdminIntegerRangeWidget(MultiWidget):
         if attrs is None:
             attrs = {}
 
-        attrs["class"] = " ".join(INPUT_CLASSES)
+        attrs["class"] = " ".join(
+            [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+        )
 
         _widgets = (NumberInput(attrs=attrs), NumberInput(attrs=attrs))
 
@@ -299,7 +328,14 @@ class UnfoldAdminIntegerRangeWidget(MultiWidget):
 
 class UnfoldAdminEmailInputWidget(AdminEmailInputWidget):
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
-        super().__init__(attrs={"class": " ".join(INPUT_CLASSES), **(attrs or {})})
+        super().__init__(
+            attrs={
+                **(attrs or {}),
+                "class": " ".join(
+                    [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            }
+        )
 
 
 class FileFieldMixin:
@@ -341,9 +377,15 @@ class UnfoldAdminDateWidget(AdminDateWidget):
         self, attrs: Optional[Dict[str, Any]] = None, format: Optional[str] = None
     ) -> None:
         attrs = {
-            "class": "vDateField " + " ".join(DATETIME_CLASSES),
-            "size": "10",
             **(attrs or {}),
+            "class": " ".join(
+                [
+                    "vDateField",
+                    *DATETIME_CLASSES,
+                    attrs.get("class", "") if attrs else "",
+                ]
+            ),
+            "size": "10",
         }
         super().__init__(attrs=attrs, format=format)
 
@@ -355,9 +397,15 @@ class UnfoldAdminSingleDateWidget(AdminDateWidget):
         self, attrs: Optional[Dict[str, Any]] = None, format: Optional[str] = None
     ) -> None:
         attrs = {
-            "class": "vDateField " + " ".join(DATETIME_CLASSES),
-            "size": "10",
             **(attrs or {}),
+            "class": " ".join(
+                [
+                    "vDateField",
+                    *DATETIME_CLASSES,
+                    attrs.get("class", "") if attrs else "",
+                ]
+            ),
+            "size": "10",
         }
         super().__init__(attrs=attrs, format=format)
 
@@ -369,9 +417,15 @@ class UnfoldAdminTimeWidget(AdminTimeWidget):
         self, attrs: Optional[Dict[str, Any]] = None, format: Optional[str] = None
     ) -> None:
         attrs = {
-            "class": "vTimeField " + " ".join(DATETIME_CLASSES),
-            "size": "8",
             **(attrs or {}),
+            "class": " ".join(
+                [
+                    "vTimeField",
+                    *DATETIME_CLASSES,
+                    attrs.get("class", "") if attrs else "",
+                ]
+            ),
+            "size": "8",
         }
         super().__init__(attrs=attrs, format=format)
 
@@ -383,9 +437,15 @@ class UnfoldAdminSingleTimeWidget(AdminTimeWidget):
         self, attrs: Optional[Dict[str, Any]] = None, format: Optional[str] = None
     ) -> None:
         attrs = {
-            "class": "vTimeField " + " ".join(DATETIME_CLASSES),
-            "size": "8",
             **(attrs or {}),
+            "class": " ".join(
+                [
+                    "vTimeField",
+                    *DATETIME_CLASSES,
+                    attrs.get("class", "") if attrs else "",
+                ]
+            ),
+            "size": "8",
         }
         super().__init__(attrs=attrs, format=format)
 
@@ -398,8 +458,14 @@ class UnfoldAdminTextareaWidget(AdminTextareaWidget):
 
         super().__init__(
             attrs={
-                "class": "vLargeTextField " + " ".join(TEXTAREA_CLASSES),
                 **(attrs or {}),
+                "class": " ".join(
+                    [
+                        "vLargeTextField",
+                        *TEXTAREA_CLASSES,
+                        attrs.get("class", "") if attrs else "",
+                    ]
+                ),
             }
         )
 
@@ -414,11 +480,15 @@ class UnfoldAdminExpandableTextareaWidget(AdminTextareaWidget):
 
         super().__init__(
             attrs={
-                "class": "vLargeTextField "
-                + " ".join(TEXTAREA_CLASSES)
-                + " "
-                + " ".join(TEXTAREA_EXPANDABLE_CLASSES),
                 **(attrs or {}),
+                "class": " ".join(
+                    [
+                        "vLargeTextField",
+                        *TEXTAREA_CLASSES,
+                        *TEXTAREA_EXPANDABLE_CLASSES,
+                        attrs.get("class", "") if attrs else "",
+                    ]
+                ),
             }
         )
 
@@ -471,17 +541,38 @@ class UnfoldAdminSplitDateTimeVerticalWidget(AdminSplitDateTime):
 
 class UnfoldAdminIntegerFieldWidget(AdminIntegerFieldWidget):
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
-        super().__init__(attrs={"class": " ".join(INPUT_CLASSES), **(attrs or {})})
+        super().__init__(
+            attrs={
+                **(attrs or {}),
+                "class": " ".join(
+                    [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            }
+        )
 
 
 class UnfoldAdminDecimalFieldWidget(AdminIntegerFieldWidget):
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
-        super().__init__(attrs={"class": " ".join(INPUT_CLASSES), **(attrs or {})})
+        super().__init__(
+            attrs={
+                **(attrs or {}),
+                "class": " ".join(
+                    [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            }
+        )
 
 
 class UnfoldAdminBigIntegerFieldWidget(AdminBigIntegerFieldWidget):
     def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
-        super().__init__(attrs={"class": " ".join(INPUT_CLASSES), **(attrs or {})})
+        super().__init__(
+            attrs={
+                **(attrs or {}),
+                "class": " ".join(
+                    [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            }
+        )
 
 
 class UnfoldAdminNullBooleanSelectWidget(NullBooleanSelect):
@@ -489,7 +580,9 @@ class UnfoldAdminNullBooleanSelectWidget(NullBooleanSelect):
         if attrs is None:
             attrs = {}
 
-        attrs["class"] = " ".join(SELECT_CLASSES)
+        attrs["class"] = " ".join(
+            [*SELECT_CLASSES, attrs.get("class", "") if attrs else ""]
+        )
         super().__init__(attrs)
 
 
@@ -498,7 +591,9 @@ class UnfoldAdminSelectWidget(Select):
         if attrs is None:
             attrs = {}
 
-        attrs["class"] = " ".join([*SELECT_CLASSES, attrs.get("class", "")])
+        attrs["class"] = " ".join(
+            [*SELECT_CLASSES, attrs.get("class", "") if attrs else ""]
+        )
         super().__init__(attrs, choices)
 
 
@@ -507,7 +602,9 @@ class UnfoldAdminSelectMultipleWidget(SelectMultiple):
         if attrs is None:
             attrs = {}
 
-        attrs["class"] = " ".join([*SELECT_CLASSES, attrs.get("class", "")])
+        attrs["class"] = " ".join(
+            [*SELECT_CLASSES, attrs.get("class", "") if attrs else ""]
+        )
         super().__init__(attrs, choices)
 
 
@@ -537,7 +634,9 @@ class UnfoldAdminCheckboxSelectMultiple(CheckboxSelectMultiple):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.attrs = {"class": " ".join(CHECKBOX_CLASSES)}
+        self.attrs = {
+            "class": " ".join([*CHECKBOX_CLASSES, self.attrs.get("class", "")])
+        }
 
 
 try:
@@ -575,7 +674,9 @@ class UnfoldBooleanWidget(CheckboxInput):
         super().__init__(
             {
                 **(attrs or {}),
-                "class": " ".join(CHECKBOX_CLASSES + [attrs.get("class", "")]),
+                "class": " ".join(
+                    [*CHECKBOX_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
             },
             check_test,
         )
@@ -586,7 +687,13 @@ class UnfoldBooleanSwitchWidget(CheckboxInput):
         self, attrs: Optional[Dict[str, Any]] = None, check_test: Callable = None
     ) -> None:
         super().__init__(
-            attrs={"class": " ".join(SWITCH_CLASSES), **(attrs or {})}, check_test=None
+            attrs={
+                **(attrs or {}),
+                "class": " ".join(
+                    [*SWITCH_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            },
+            check_test=None,
         )
 
 
@@ -605,8 +712,14 @@ class UnfoldForeignKeyRawIdWidget(ForeignKeyRawIdWidget):
         using: Optional[Any] = None,
     ) -> None:
         attrs = {
-            "class": " ".join(["vForeignKeyRawIdAdminField"] + INPUT_CLASSES),
             **(attrs or {}),
+            "class": " ".join(
+                [
+                    "vForeignKeyRawIdAdminField",
+                    *INPUT_CLASSES,
+                    attrs.get("class", "") if attrs else "",
+                ]
+            ),
         }
         super().__init__(rel, admin_site, attrs, using)
 
@@ -614,5 +727,11 @@ class UnfoldForeignKeyRawIdWidget(ForeignKeyRawIdWidget):
 class UnfoldAdminPasswordInput(PasswordInput):
     def __init__(self, attrs=None, render_value=False):
         super().__init__(
-            {"class": " ".join(INPUT_CLASSES), **(attrs or {})}, render_value
+            {
+                **(attrs or {}),
+                "class": " ".join(
+                    [*INPUT_CLASSES, attrs.get("class", "") if attrs else ""]
+                ),
+            },
+            render_value,
         )