From 1795e8b718ed2c822ea756d3e602c2dbb2034d36 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:18:28 +0100
Subject: [PATCH 001/105] IBX-11506: Add DS toggle form theme

---
 .../ui/form_fields/toggle_widget_ds.html.twig | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/bundle/Resources/views/themes/admin/ui/form_fields/toggle_widget_ds.html.twig

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields/toggle_widget_ds.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields/toggle_widget_ds.html.twig
new file mode 100644
index 0000000000..5ba0505aa0
--- /dev/null
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields/toggle_widget_ds.html.twig
@@ -0,0 +1,40 @@
+{%- block toggle_widget -%}
+    {% set default_label_on = 'toggle_widget.label.on'|trans|desc('On') %}
+    {% set default_label_off = 'toggle_widget.label.off'|trans|desc('Off') %}
+    {% set field_type = block_prefixes[1]|default('choice') %}
+    {% set attr = attr|default({}) %}
+    {% set is_disabled = disabled|default(false) or attr.readonly|default(false) %}
+
+    {% if checked|default(false) %}
+        {% set attr = attr|merge({ 'checked': 'checked' }) %}
+    {% endif %}
+    {% if value is defined %}
+        {% set attr = attr|merge({ 'value': value }) %}
+    {% endif %}
+
+    {% set input_content %}
+        {% if custom_inputs is defined %}
+            {{ custom_inputs }}
+        {% elseif field_type == 'choice' %}
+            {{ block('choice_widget') }}
+        {% else %}
+            <input type="checkbox" {% with attr %}{{ block('widget_attributes') }}{% endwith %} />
+        {% endif %}
+    {% endset %}
+
+    <twig:ibexa:toggle_button:input
+        :id="id"
+        name="{{ full_name }}"
+        :checked="checked|default(false)"
+        :disabled="is_disabled"
+        :required="required|default(false)"
+        :value="value is defined ? value : null"
+        size="{{ small|default(false) ? 'small' : 'medium' }}"
+        onLabel="{{ label_on|default(default_label_on) }}"
+        offLabel="{{ label_off|default(default_label_off) }}"
+    >
+        <twig:block name="input">
+            {{ input_content|raw }}
+        </twig:block>
+    </twig:ibexa:toggle_button:input>
+{%- endblock -%}

From 95e143bb50d271a3a3a6cc3ed8056ec1a5c6d0bd Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:18:39 +0100
Subject: [PATCH 002/105] IBX-11506: Use DS toggle form theme in admin UI

---
 .../Resources/views/themes/admin/ui/form_fields.html.twig     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index 91a7092d11..70715d1a84 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -1,6 +1,6 @@
 {% extends 'bootstrap_5_layout.html.twig' %}
 
-{% use '@ibexadesign/ui/form_fields/toggle_widget.html.twig' %}
+{% use '@ibexadesign/ui/form_fields/toggle_widget_ds.html.twig' %}
 {% use '@ibexadesign/ui/form_fields/dropdown_widget.html.twig' %}
 
 {%- block button_widget -%}
@@ -504,7 +504,7 @@
 {%- endblock %}
 
 {% block content_type_meta_field_definition_enabled_row -%}
-    {% use '@ibexadesign/ui/form_fields/toggle_widget.html.twig' %}
+    {% use '@ibexadesign/ui/form_fields/toggle_widget_ds.html.twig' %}
 
     <div class="ibexa-content-type-edit__form-field ibexa-form-field form-group">
         {{ block('form_label') }}

From 4fd68b24c7a9b77f72f49ffb53c93f69590c107f Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:18:39 +0100
Subject: [PATCH 003/105] IBX-11506: Use DS toggle in custom URL checkbox

---
 .../views/themes/admin/content/tab/url/checkbox.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
index 6a0a768ed0..e005f17794 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
@@ -1,4 +1,4 @@
-{% use '@ibexadesign/ui/form_fields/toggle_widget.html.twig' %}
+{% use '@ibexadesign/ui/form_fields/toggle_widget_ds.html.twig' %}
 
 {%- block checkbox_widget -%}
     {% if value is defined %}

From 26067efb0c4c31f8fe5947cd9f28519f11d0b642 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:18:57 +0100
Subject: [PATCH 004/105] IBX-11506: Use DS toggle in boolean field

---
 .../themes/admin/ui/field_type/edit/ibexa_boolean.html.twig     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_boolean.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_boolean.html.twig
index c6a286b4f7..930734b00f 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_boolean.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_boolean.html.twig
@@ -1,4 +1,4 @@
-{% use '@ibexadesign/ui/form_fields/toggle_widget.html.twig' %}
+{% use '@ibexadesign/ui/form_fields/toggle_widget_ds.html.twig' %}
 
 {% block ezplatform_fieldtype_ibexa_boolean_label %}
     {{ block('form_label') }}

From a9254c974ea63fa4b90fd08954eedbab3b2a32f7 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:18:57 +0100
Subject: [PATCH 005/105] IBX-11506: Use DS toggle in locations tab

---
 .../admin/content/tab/locations/tab.html.twig | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
index 0fa5775eeb..b5ffabc308 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
@@ -48,25 +48,25 @@
 
                 {% set col_raw %}
                     <div class="ibexa-content-locations__visibility-toggler">
-                        <div class="ibexa-toggle ibexa-toggle--checkbox {{ not can_hide[location.id] ? 'ibexa-toggle--is-disabled' }} {{ not location.explicitlyHidden ? 'ibexa-toggle--is-checked' }}">
-                            <label class="ibexa-toggle__switcher">
-                                <span class="ibexa-toggle__indicator"></span>
-                                <input
-                                    type="checkbox"
-                                    class="ibexa-toggle__input ibexa-content-locations__visibility-checkbox"
-                                    {{ not location.explicitlyHidden ? 'checked' }}
+                        <twig:ibexa:toggle_button:input
+                            name="updateVisibility"
+                            :checked="not location.explicitlyHidden"
+                            :disabled="not can_hide[location.id]"
+                            :value="location.id"
+                            onLabel="{{ 'toggle_widget.label.on'|trans|desc('On') }}"
+                            offLabel="{{ 'toggle_widget.label.off'|trans|desc('Off') }}"
+                        >
+                            <twig:block name="input">
+                                <twig:ibexa:checkbox:input
                                     name="updateVisibility"
-                                    {{ not can_hide[location.id] ? 'disabled' }}
-                                    value="{{ location.id }}"
+                                    class="ibexa-content-locations__visibility-checkbox"
+                                    :checked="not location.explicitlyHidden"
+                                    :disabled="not can_hide[location.id]"
+                                    :value="location.id"
+                                    data-ids-custom-init="1"
                                 />
-                            </label>
-                            <span class="ibexa-toggle__label ibexa-toggle__label--on">
-                                {{ 'toggle_widget.label.on'|trans|desc('On') }}
-                            </span>
-                            <span class="ibexa-toggle__label ibexa-toggle__label--off mr-2">
-                                {{ 'toggle_widget.label.off'|trans|desc('Off') }}
-                            </span>
-                        </div>
+                            </twig:block>
+                        </twig:ibexa:toggle_button:input>
                         <label class="ibexa-content-locations__visibility-toggler-label {{ not location.invisible ? 'ibexa-content-locations__visibility-toggler-label--hidden' }}">
                             <svg class="ibexa-icon ibexa-icon--small-medium">
                                 <use xlink:href="{{ ibexa_icon_path('system-information') }}"></use>

From 8a1401be4ae502ae170c483554bd9553e8ae9331 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:18:58 +0100
Subject: [PATCH 006/105] IBX-11506: Support DS toggles in legacy toggle helper

---
 .../public/js/scripts/core/toggle.button.js   | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/bundle/Resources/public/js/scripts/core/toggle.button.js b/src/bundle/Resources/public/js/scripts/core/toggle.button.js
index 19bf315f33..1a7a6580fe 100644
--- a/src/bundle/Resources/public/js/scripts/core/toggle.button.js
+++ b/src/bundle/Resources/public/js/scripts/core/toggle.button.js
@@ -4,7 +4,10 @@
     class ToggleButton {
         constructor(config) {
             this.toggleNode = config.toggleNode;
-            this.inputsSelector = config?.inputsSelector || 'input';
+            this.inputsSelector = config?.inputsSelector || (this.toggleNode.classList.contains('ids-toggle') ? '.ids-toggle__source input' : 'input');
+            this.checkedClass = this.toggleNode.classList.contains('ids-toggle') ? 'ids-toggle--checked' : 'ibexa-toggle--is-checked';
+            this.disabledClass = this.toggleNode.classList.contains('ids-toggle') ? 'ids-toggle--disabled' : 'ibexa-toggle--is-disabled';
+            this.focusedClass = this.toggleNode.classList.contains('ids-toggle') ? 'ids-toggle--focused' : 'ibexa-toggle--is-focused';
 
             this.toggleState = this.toggleState.bind(this);
             this.addFocus = this.addFocus.bind(this);
@@ -18,18 +21,18 @@
 
             const toggler = event.currentTarget;
 
-            if (toggler.classList.contains('ibexa-toggle--is-disabled')) {
+            if (toggler.classList.contains(this.disabledClass)) {
                 return;
             }
 
-            const isChecked = toggler.classList.toggle('ibexa-toggle--is-checked');
+            const isChecked = toggler.classList.toggle(this.checkedClass);
 
             if (toggler.classList.contains('ibexa-toggle--radio')) {
                 const valueToSet = isChecked ? 1 : 0;
 
                 toggler.querySelector(`.form-check input[value="${valueToSet}"]`).checked = true;
             } else {
-                const toggleInput = toggler.querySelector('.ibexa-toggle__input');
+                const toggleInput = toggler.querySelector(this.inputsSelector);
 
                 toggleInput.checked = isChecked;
                 toggleInput.dispatchEvent(new Event('change'));
@@ -39,25 +42,25 @@
         addFocus(event) {
             event.preventDefault();
 
-            const toggler = event.currentTarget.closest('.ibexa-toggle');
+            const toggler = event.currentTarget.closest('.ibexa-toggle, .ids-toggle');
 
-            if (toggler.classList.contains('ibexa-toggle--is-disabled')) {
+            if (toggler.classList.contains(this.disabledClass)) {
                 return;
             }
 
-            toggler.classList.add('ibexa-toggle--is-focused');
+            toggler.classList.add(this.focusedClass);
         }
 
         removeFocus(event) {
             event.preventDefault();
 
-            const toggler = event.currentTarget.closest('.ibexa-toggle');
+            const toggler = event.currentTarget.closest('.ibexa-toggle, .ids-toggle');
 
-            if (toggler.classList.contains('ibexa-toggle--is-disabled')) {
+            if (toggler.classList.contains(this.disabledClass)) {
                 return;
             }
 
-            toggler.classList.remove('ibexa-toggle--is-focused');
+            toggler.classList.remove(this.focusedClass);
         }
 
         toggleStateOnSpacePressed(event) {

From b21383115af3ef5bc8d8858306ee37214e4de227 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:18:58 +0100
Subject: [PATCH 007/105] IBX-11506: Update custom URL toggle selectors

---
 src/bundle/Resources/public/scss/_custom-url-form.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/public/scss/_custom-url-form.scss b/src/bundle/Resources/public/scss/_custom-url-form.scss
index 7626b45f09..e9fa793638 100644
--- a/src/bundle/Resources/public/scss/_custom-url-form.scss
+++ b/src/bundle/Resources/public/scss/_custom-url-form.scss
@@ -25,13 +25,13 @@
         &--checked {
             display: none;
 
-            .ibexa-toggle--is-checked + & {
+            .ids-toggle--checked + & {
                 display: block;
             }
         }
 
         &--unchecked {
-            .ibexa-toggle--is-checked + .ibexa-custom-url-from__info-text--checked + & {
+            .ids-toggle--checked + .ibexa-custom-url-from__info-text--checked + & {
                 display: none;
             }
         }

From 6f36880e63e53e13211dd0e78bc3181726f16cff Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:18:58 +0100
Subject: [PATCH 008/105] IBX-11506: Initialize DS components in admin UI

---
 src/bundle/Resources/encore/ibexa.js.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bundle/Resources/encore/ibexa.js.config.js b/src/bundle/Resources/encore/ibexa.js.config.js
index 30b8296fd9..89e6e1fedb 100644
--- a/src/bundle/Resources/encore/ibexa.js.config.js
+++ b/src/bundle/Resources/encore/ibexa.js.config.js
@@ -49,6 +49,7 @@ const layout = [
     path.resolve(__dirname, '../public/js/scripts/admin.focus.mode.js'),
     path.resolve(__dirname, '../public/js/scripts/sidebar/main.menu.js'),
     path.resolve(__dirname, '../public/js/scripts/admin.input.text.js'),
+    path.resolve('./vendor/ibexa/design-system-twig/src/bundle/Resources/public/ts/init_components.ts'),
     path.resolve(__dirname, '../public/js/scripts/admin.table.js'),
     path.resolve(__dirname, '../public/js/scripts/core/collapse.js'),
     path.resolve(__dirname, '../public/js/scripts/admin.dropdown.js'),

From 373bb43466db5d0b164766a1194a85284c9de66b Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:24:17 +0100
Subject: [PATCH 009/105] IBX-11506: Update focus mode toggle selectors

---
 src/lib/Behat/Component/UpperMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/Behat/Component/UpperMenu.php b/src/lib/Behat/Component/UpperMenu.php
index e4363c903e..afa6258a23 100644
--- a/src/lib/Behat/Component/UpperMenu.php
+++ b/src/lib/Behat/Component/UpperMenu.php
@@ -99,8 +99,8 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('userSettingsPopup', '.ibexa-header-user-menu .ibexa-header-user-menu__popup-menu'),
             new VisibleCSSLocator('searchInput', '.ibexa-main-header #search_query'),
             new VisibleCSSLocator('searchButton', '.ibexa-main-header .ibexa-input-text-wrapper__action-btn--search'),
-            new VisibleCSSLocator('userFocusEnabled', '[name="focus_mode_change"] .ibexa-toggle__label--on'),
-            new VisibleCSSLocator('userFocusMode', '[name="focus_mode_change"] .ibexa-toggle__switcher'),
+            new VisibleCSSLocator('userFocusEnabled', '[name="focus_mode_change"] .ids-toggle__label'),
+            new VisibleCSSLocator('userFocusMode', '[name="focus_mode_change"] .ids-toggle__widget'),
             new VisibleCSSLocator('focusModeBadge', '.ibexa-user-mode-badge'),
             new VisibleCSSLocator('siteDropdown', '.ibexa-preview-context-switch-form .ibexa-dropdown'),
             new VisibleCSSLocator('siteDropdownSelectedItem', '.ibexa-preview-context-switch-form .ibexa-dropdown li.ibexa-dropdown__selected-item:nth-of-type(1)'),

From 3813a9e8a2009ad822cdb7605fc2db13f0471d64 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:24:17 +0100
Subject: [PATCH 010/105] IBX-11506: Update user toggle field selectors

---
 src/lib/Behat/Component/Fields/User.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/Behat/Component/Fields/User.php b/src/lib/Behat/Component/Fields/User.php
index bcc85c7782..f39334bf41 100644
--- a/src/lib/Behat/Component/Fields/User.php
+++ b/src/lib/Behat/Component/Fields/User.php
@@ -89,8 +89,8 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('password', '#ezplatform_content_forms_user_create_fieldsData_user_account_value_password_first,#ezplatform_content_forms_user_update_fieldsData_user_account_value_password_first'),
             new VisibleCSSLocator('confirmPassword', '#ezplatform_content_forms_user_create_fieldsData_user_account_value_password_second,#ezplatform_content_forms_user_update_fieldsData_user_account_value_password_second'),
             new VisibleCSSLocator('email', '#ezplatform_content_forms_user_create_fieldsData_user_account_value_email,#ezplatform_content_forms_user_update_fieldsData_user_account_value_email'),
-            new VisibleCSSLocator('buttonEnabled', '.ibexa-toggle--checkbox'),
-            new VisibleCSSLocator('buttonEnabledToggleConfirmation', '.ibexa-toggle--is-checked'),
+            new VisibleCSSLocator('buttonEnabled', '.ids-toggle'),
+            new VisibleCSSLocator('buttonEnabledToggleConfirmation', '.ids-toggle--checked'),
         ];
     }
 

From b953e4605ffbd00c827290d140d5df4ad0a4acc5 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:24:17 +0100
Subject: [PATCH 011/105] IBX-11506: Update checkbox field toggle selectors

---
 src/lib/Behat/Component/Fields/Checkbox.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/Behat/Component/Fields/Checkbox.php b/src/lib/Behat/Component/Fields/Checkbox.php
index 476fdf80fb..d58614de8c 100644
--- a/src/lib/Behat/Component/Fields/Checkbox.php
+++ b/src/lib/Behat/Component/Fields/Checkbox.php
@@ -68,9 +68,9 @@ public function getFieldTypeIdentifier(): string
     public function specifyLocators(): array
     {
         return [
-            new VisibleCSSLocator('fieldInput', '.ibexa-toggle__indicator'),
-            new VisibleCSSLocator('checkbox', '.ibexa-toggle__switcher'),
-            new VisibleCSSLocator('checked', 'ibexa-toggle--is-checked'),
+            new VisibleCSSLocator('fieldInput', '.ids-toggle__indicator'),
+            new VisibleCSSLocator('checkbox', '.ids-toggle__widget'),
+            new VisibleCSSLocator('checked', 'ids-toggle--checked'),
         ];
     }
 }

From b2a6744819bc253d5e0cb02eed2dde4f02f72eaa Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:24:17 +0100
Subject: [PATCH 012/105] IBX-11506: Update URL alias toggle selector

---
 src/lib/Behat/Component/CreateUrlAliasModal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/CreateUrlAliasModal.php b/src/lib/Behat/Component/CreateUrlAliasModal.php
index d971af4e56..dabaa05191 100644
--- a/src/lib/Behat/Component/CreateUrlAliasModal.php
+++ b/src/lib/Behat/Component/CreateUrlAliasModal.php
@@ -46,7 +46,7 @@ public function createNewUrlAlias(string $path, string $languageName, bool $redi
     private function setRedirectToggle(bool $shouldBeChecked): void
     {
         $toggle = $this->getHTMLPage()->find($this->getLocator('redirectToggle'));
-        $isChecked = $toggle->hasClass('ibexa-toggle--is-checked');
+        $isChecked = $toggle->hasClass('ids-toggle--checked');
         if ($shouldBeChecked !== $isChecked) {
             $this->getHTMLPage()->find($this->getLocator('redirectToggle'))->click();
         }

From be60b50a14f51619c4ee2370526a950fecabecdf Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 13:58:48 +0100
Subject: [PATCH 013/105] IBX-11506: Cast location toggle values to string

---
 .../views/themes/admin/content/tab/locations/tab.html.twig    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
index b5ffabc308..fdd20a82e8 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
@@ -52,7 +52,7 @@
                             name="updateVisibility"
                             :checked="not location.explicitlyHidden"
                             :disabled="not can_hide[location.id]"
-                            :value="location.id"
+                            :value="location.id ~ ''"
                             onLabel="{{ 'toggle_widget.label.on'|trans|desc('On') }}"
                             offLabel="{{ 'toggle_widget.label.off'|trans|desc('Off') }}"
                         >
@@ -62,7 +62,7 @@
                                     class="ibexa-content-locations__visibility-checkbox"
                                     :checked="not location.explicitlyHidden"
                                     :disabled="not can_hide[location.id]"
-                                    :value="location.id"
+                                    :value="location.id ~ ''"
                                     data-ids-custom-init="1"
                                 />
                             </twig:block>

From 7f8719b5d134dd795a08278448233a8d0382bd17 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 14:02:49 +0100
Subject: [PATCH 014/105] IBX-11506: Update checkbox input styles

---
 src/bundle/Resources/public/scss/_inputs.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/bundle/Resources/public/scss/_inputs.scss b/src/bundle/Resources/public/scss/_inputs.scss
index 7ed963dee7..05b9140b8b 100644
--- a/src/bundle/Resources/public/scss/_inputs.scss
+++ b/src/bundle/Resources/public/scss/_inputs.scss
@@ -528,3 +528,11 @@
         }
     }
 }
+
+.form-check-input:checked[type=checkbox] {
+  --bs-form-check-bg-image: none;
+}
+
+.form-check-input[type=checkbox] {
+    border-radius: calculateRem(2px);
+}

From a3237f4f88a1456721e6fcaf66e2f707e3925aae Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:29 +0100
Subject: [PATCH 015/105] IBX-11507-use-ds-radio-button: use DS radio in admin
 form theme

---
 .../themes/admin/ui/form_fields.html.twig     | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index 70715d1a84..14ed940c2b 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -153,8 +153,35 @@
 {%- endblock -%}
 
 {%- block radio_widget -%}
-    {%- set attr = attr|merge({class: 'ibexa-input ibexa-input--radio ' ~ attr.class|default('') }) -%}
-    {{ parent() }}
+    {%- set attr_class = attr.class|default('') -%}
+    {%- set row_class = '' -%}
+    {%- if 'btn-check' not in attr_class -%}
+        {%- set row_class = 'form-check' -%}
+    {%- endif -%}
+    {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
+    {%- if 'radio-inline' in parent_label_class -%}
+        {%- set row_class = row_class ~ ' form-check-inline' -%}
+    {%- endif -%}
+    {%- set component_attr = attr|merge({ class: attr_class|trim }) -%}
+    {%- if row_class is not empty -%}
+        <div class="{{ row_class }}">
+    {%- endif -%}
+    {{- form_label(form, null, { widget: block('radio_widget_input_ds') }) -}}
+    {%- if row_class is not empty -%}
+        </div>
+    {%- endif -%}
+{%- endblock -%}
+
+{%- block radio_widget_input_ds -%}
+    <twig:ibexa:radio_button:input
+        id="{{ id }}"
+        name="{{ full_name }}"
+        :checked="checked"
+        :disabled="disabled"
+        :required="required"
+        value="{{ (value is defined ? value : '') ~ '' }}"
+        {{ ...component_attr }}
+    />
 {%- endblock -%}
 
 {%- block trash_item_checkbox_widget -%}

From a38e142fbf62d10135fe379d6c2250ff9ed86961 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:29 +0100
Subject: [PATCH 016/105] IBX-11507-use-ds-radio-button: use DS radio in
 translation add form

---
 .../content/translation_add_form_fields.html.twig    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/translation_add_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/content/translation_add_form_fields.html.twig
index 0df1e5ab12..78d44c294d 100644
--- a/src/bundle/Resources/views/themes/admin/content/translation_add_form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/translation_add_form_fields.html.twig
@@ -1,10 +1,18 @@
 {% extends '@ibexadesign/ui/form_fields.html.twig' %}
 
 {% block radio_widget %}
-    {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-translation__input')|trim}) %}
+    {% set component_attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-translation__input')|trim}) %}
     <div class="radio ibexa-translation__input-wrapper">
         <label class="ibexa-translation__label">
-            {{ parent() }}
+            <twig:ibexa:radio_button:input
+                id="{{ id }}"
+                name="{{ full_name }}"
+                :checked="checked"
+                :disabled="disabled"
+                :required="required"
+                value="{{ (value is defined ? value : '') ~ '' }}"
+                {{ ...component_attr }}
+            />
             <svg class="ibexa-icon">
                 <use xlink:href="{{ ibexa_icon_path('checkmark') }}"></use>
             </svg>

From 53639b7de0ebfaa7b761957770e96d22a01e2c5e Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:29 +0100
Subject: [PATCH 017/105] IBX-11507-use-ds-radio-button: use DS radio in
 locations tab

---
 .../themes/admin/content/tab/locations/tab.html.twig | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
index fdd20a82e8..c86327daf9 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig
@@ -32,14 +32,12 @@
                 ]) %}
 
                 {% set col_raw %}
-                    <input
-                        class="ibexa-input ibexa-input--radio"
-                        type="radio"
-                        {{ location.main ? 'checked' }}
-                        {{ not location.canEdit ? 'disabled' }}
+                    <twig:ibexa:radio_button:input
                         name="updateMainLocation"
-                        value="{{ location.id }}"
-                    >
+                        :checked="location.main"
+                        :disabled="not location.canEdit"
+                        :value="location.id ~ ''"
+                    />
                 {% endset %}
                 {% set body_row_cols = body_row_cols|merge([{
                     content: col_raw,

From 68b629b0ba5e5fae59350bd3d6cc120092a947f7 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:29 +0100
Subject: [PATCH 018/105] IBX-11507-use-ds-radio-button: use DS radio in
 translations tab

---
 .../admin/content/tab/translations/tab.html.twig       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig
index eb4281b529..6622f8168e 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig
@@ -40,14 +40,12 @@
 
         {% if main_translation_switch %}
             {% set col_raw %}
-                <input
-                    class="ibexa-input ibexa-input--radio"
-                    type="radio"
-                    {{ translation.main ? 'checked' }}
-                    {{ not translation.canEdit ? 'disabled' }}
+                <twig:ibexa:radio_button:input
                     name="main_translation_update"
+                    :checked="translation.main"
+                    :disabled="not translation.canEdit"
                     value="{{ translation.languageCode }}"
-                >
+                />
             {% endset %}
             {% set body_row_cols = body_row_cols|merge([{
                 content: col_raw,

From b58bd58af6890589ee3dda84ef3a1be902f384ce Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:29 +0100
Subject: [PATCH 019/105] IBX-11507-use-ds-radio-button: update user edit radio
 selector

---
 src/bundle/Resources/public/js/scripts/sidebar/btn/user.edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/js/scripts/sidebar/btn/user.edit.js b/src/bundle/Resources/public/js/scripts/sidebar/btn/user.edit.js
index d2a8204ced..f17d3df02b 100644
--- a/src/bundle/Resources/public/js/scripts/sidebar/btn/user.edit.js
+++ b/src/bundle/Resources/public/js/scripts/sidebar/btn/user.edit.js
@@ -1,6 +1,6 @@
 (function (global, doc) {
     const editButton = doc.querySelector('.ibexa-btn--edit-user');
-    const languageRadioOption = doc.querySelector('.ibexa-extra-actions--edit-user.ibexa-extra-actions--prevent-show .ibexa-input--radio');
+    const languageRadioOption = doc.querySelector('.ibexa-extra-actions--edit-user.ibexa-extra-actions--prevent-show .ids-input--radio');
     const editActions = doc.querySelector('.ibexa-extra-actions--edit-user');
 
     if (!editActions || !languageRadioOption) {

From 5f6cf39a5de4f14f92393c787cf5f4c337562420 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:30 +0100
Subject: [PATCH 020/105] IBX-11507-use-ds-radio-button: update content type
 radio selector

---
 .../Resources/public/js/scripts/sidebar/btn/contenttype.edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/js/scripts/sidebar/btn/contenttype.edit.js b/src/bundle/Resources/public/js/scripts/sidebar/btn/contenttype.edit.js
index 437a1b5f8c..bc59a4d9e6 100644
--- a/src/bundle/Resources/public/js/scripts/sidebar/btn/contenttype.edit.js
+++ b/src/bundle/Resources/public/js/scripts/sidebar/btn/contenttype.edit.js
@@ -1,6 +1,6 @@
 (function (global, doc) {
     const editButton = doc.querySelector('.ibexa-btn--edit');
-    const languageRadioOption = doc.querySelector('.ibexa-extra-actions--edit.ibexa-extra-actions--prevent-show .ibexa-input--radio');
+    const languageRadioOption = doc.querySelector('.ibexa-extra-actions--edit.ibexa-extra-actions--prevent-show .ids-input--radio');
     const editActions = doc.querySelector('.ibexa-extra-actions--edit');
     const btns = editActions.querySelectorAll('.form-check [type="radio"]');
     const changeHandler = () => {

From b181df07975310ff0fd887119d6524ece78a0bef Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:30 +0100
Subject: [PATCH 021/105] IBX-11507-use-ds-radio-button: update content edit
 radio selector

---
 .../Resources/public/js/scripts/sidebar/btn/content.edit.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/js/scripts/sidebar/btn/content.edit.js b/src/bundle/Resources/public/js/scripts/sidebar/btn/content.edit.js
index a2d8d1287e..1813e212f6 100644
--- a/src/bundle/Resources/public/js/scripts/sidebar/btn/content.edit.js
+++ b/src/bundle/Resources/public/js/scripts/sidebar/btn/content.edit.js
@@ -3,7 +3,7 @@
 
     editButtons.forEach((editButton) => {
         const languageRadioOption = doc.querySelector(
-            `.ibexa-extra-actions--edit.ibexa-extra-actions--prevent-show[data-actions="${editButton.dataset.actions}"] .ibexa-input--radio`,
+            `.ibexa-extra-actions--edit.ibexa-extra-actions--prevent-show[data-actions="${editButton.dataset.actions}"] .ids-input--radio`,
         );
 
         if (!languageRadioOption) {

From 94e4fa0248802e4acd1ea91cf96d9cd507b75f45 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:30 +0100
Subject: [PATCH 022/105] IBX-11507-use-ds-radio-button: update table radio
 styles

---
 src/bundle/Resources/public/scss/_tables.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/public/scss/_tables.scss b/src/bundle/Resources/public/scss/_tables.scss
index 6f97f9a339..2af7e8cd0d 100644
--- a/src/bundle/Resources/public/scss/_tables.scss
+++ b/src/bundle/Resources/public/scss/_tables.scss
@@ -41,7 +41,7 @@
                 }
 
                 .ibexa-input--checkbox,
-                .ibexa-input--radio {
+                .ids-input--radio {
                     border-color: $ibexa-color-primary;
                 }
             }
@@ -217,7 +217,7 @@
             }
         }
 
-        .ibexa-input--radio {
+        .ids-input--radio {
             vertical-align: middle;
         }
     }

From e5008f4d609302f74ec012c50e9694e1329c90c0 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:30 +0100
Subject: [PATCH 023/105] IBX-11507-use-ds-radio-button: update grid view radio
 styles

---
 src/bundle/Resources/public/scss/_grid-view-item.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/_grid-view-item.scss b/src/bundle/Resources/public/scss/_grid-view-item.scss
index 99362deb62..7772ecb066 100644
--- a/src/bundle/Resources/public/scss/_grid-view-item.scss
+++ b/src/bundle/Resources/public/scss/_grid-view-item.scss
@@ -29,7 +29,7 @@
         text-decoration: none;
 
         .ibexa-input--checkbox,
-        .ibexa-input--radio {
+        .ids-input--radio {
             border-color: $ibexa-color-primary;
         }
     }

From 48e157eb0879de2827e159edb5943a28db957843 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:30 +0100
Subject: [PATCH 024/105] IBX-11507-use-ds-radio-button: update content type
 radio locator

---
 src/lib/Behat/Page/ContentTypeUpdatePage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Page/ContentTypeUpdatePage.php b/src/lib/Behat/Page/ContentTypeUpdatePage.php
index ec5e54673d..8c2c385171 100644
--- a/src/lib/Behat/Page/ContentTypeUpdatePage.php
+++ b/src/lib/Behat/Page/ContentTypeUpdatePage.php
@@ -73,7 +73,7 @@ public function specifyLocators(): array
             new VisibleCSSLocator('availableFieldLabelList', '.ibexa-available-field-types__list > li:not(.ibexa-available-field-type--hidden)'),
             new VisibleCSSLocator('workspace', '.ibexa-collapse__body-content'),
             new VisibleCSSLocator('fieldDefinitionToggle', '.ibexa-collapse:nth-last-child(2) > div.ibexa-collapse__header > button:last-child:not([data-bs-target="#content_collapse"])'),
-            new VisibleCSSLocator('selectLaunchEditorMode', '.form-check .ibexa-input--radio'),
+            new VisibleCSSLocator('selectLaunchEditorMode', '.form-check .ids-input--radio'),
             new VisibleCSSLocator('fieldDefinitionOpenContainer', '[data-collapsed="false"] .ibexa-content-type-edit__field-definition-content'),
             new VisibleCSSLocator('selectBlocksDropdown', '.ibexa-page-select-items__toggler'),
             new VisibleCSSLocator('fieldDefinitionSearch', '.ibexa-available-field-types__sidebar-filter'),

From 842b872f427adfa3e64ea2c75c1c532fcc65247b Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Fri, 27 Mar 2026 18:06:30 +0100
Subject: [PATCH 025/105] IBX-11507-use-ds-radio-button: update content view
 radio locator

---
 src/lib/Behat/Page/ContentViewPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Page/ContentViewPage.php b/src/lib/Behat/Page/ContentViewPage.php
index 67e50a00ad..a8c6efe360 100644
--- a/src/lib/Behat/Page/ContentViewPage.php
+++ b/src/lib/Behat/Page/ContentViewPage.php
@@ -296,7 +296,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('addUrlAliasButton', '#ibexa-tab-location-view-urls [data-bs-target="#ibexa-modal--custom-url-alias"]'),
             new VisibleCSSLocator('customUrlAliasesTable', '#ibexa-tab-location-view-urls .ibexa-table'),
             new VisibleCSSLocator('alertTitle', '.ibexa-alert__title'),
-            new VisibleCSSLocator('selectHideMode', '.form-check .ibexa-input--radio'),
+            new VisibleCSSLocator('selectHideMode', '.form-check .ids-input--radio'),
             new VisibleCSSLocator('cancelScheduleButton', '.ibexa-btn--schedule-hide-cancel'),
         ];
     }

From 645472218757c0771a1541eedd35a5e3f899cc1f Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sat, 28 Mar 2026 10:36:56 +0100
Subject: [PATCH 026/105] IBX-11507-use-ds-radio-button: update UDW radio
 classes

---
 .../components/toggle-selection/toggle.item.selection.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
index 6c1f228683..1e665b1fbd 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
@@ -13,7 +13,7 @@ const ToggleItemSelection = ({ item, isDisabled = false, isPreselected = false,
     const className = createCssClassNames({
         'c-udw-toggle-selection ibexa-input': true,
         'ibexa-input--checkbox': multiple,
-        'ibexa-input--radio': !multiple,
+        'ids-input ids-input--radio': !multiple,
         'c-udw-toggle-selection--hidden': isHidden,
     });
     const inputType = multiple ? 'checkbox' : 'radio';

From 9f84e86953c9d2b6aa69b860e5087180ea2eb6f3 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sat, 28 Mar 2026 11:09:31 +0100
Subject: [PATCH 027/105] IBX-11507-use-ds-radio-button: update grid view radio
 visuals

---
 src/bundle/Resources/public/scss/_grid-view-item.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/_grid-view-item.scss b/src/bundle/Resources/public/scss/_grid-view-item.scss
index 7772ecb066..ca2fde6265 100644
--- a/src/bundle/Resources/public/scss/_grid-view-item.scss
+++ b/src/bundle/Resources/public/scss/_grid-view-item.scss
@@ -179,9 +179,16 @@
         top: calculateRem(10px);
         display: none;
 
-        .ibexa-input {
+        .ibexa-input,
+        .ids-input {
             background-color: $ibexa-color-white;
         }
+
+        &--hovered {
+            .ids-input {
+                border-color: $ibexa-color-primary;
+            }
+        }
     }
 
     &:hover {

From c9e52387cfc4b4af2e9f531ddb7b2640b69e7e87 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sat, 28 Mar 2026 11:37:38 +0100
Subject: [PATCH 028/105] IBX-11507-use-ds-radio-button: include DS base styles
 in admin UI

---
 src/bundle/Resources/encore/ibexa.css.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bundle/Resources/encore/ibexa.css.config.js b/src/bundle/Resources/encore/ibexa.css.config.js
index 62dfba962e..283f45eb1f 100644
--- a/src/bundle/Resources/encore/ibexa.css.config.js
+++ b/src/bundle/Resources/encore/ibexa.css.config.js
@@ -5,6 +5,7 @@ module.exports = (Encore) => {
         path.resolve(__dirname, '../public/scss/ibexa-bootstrap.scss'),
         path.resolve(__dirname, '../public/scss/ibexa.scss'),
         path.resolve(__dirname, '../public/scss/ui/ibexa-modules.scss'),
+        path.resolve('./vendor/ibexa/admin-ui-assets/src/bundle/Resources/public/vendors/ids-assets/dist/css/styles.css'),
         path.resolve('./vendor/ibexa/admin-ui-assets/src/bundle/Resources/public/vendors/flatpickr/dist/flatpickr.min.css'),
         path.resolve(
             './vendor/ibexa/admin-ui-assets/src/bundle/Resources/public/vendors/flatpickr/dist/plugins/confirmDate/confirmDate.css',

From 52ef451b8bd3c020ce70c07d078737fc4d938e78 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 12:02:47 +0100
Subject: [PATCH 029/105] IBX-11506: Use DS checkbox classes in form fields

---
 .../Resources/views/themes/admin/ui/form_fields.html.twig     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index 14ed940c2b..2cdfdb26c1 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -148,7 +148,7 @@
 {%- endblock -%}
 
 {%- block checkbox_widget -%}
-    {%- set attr = attr|merge({class: 'ibexa-input ibexa-input--checkbox ' ~ attr.class|default('') }) -%}
+    {%- set attr = attr|merge({class: 'ids-input ids-input--checkbox ' ~ attr.class|default('') }) -%}
     {{ parent() }}
 {%- endblock -%}
 
@@ -185,7 +185,7 @@
 {%- endblock -%}
 
 {%- block trash_item_checkbox_widget -%}
-    <input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
+    <input type="checkbox" class="ids-input ids-input--checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
 {%- endblock -%}
 
 {%- block _trash_item_restore_restore_widget -%}

From 646c90fdecabef4ba071baef6cba0f772f2e338a Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:46:50 +0100
Subject: [PATCH 030/105] IBX-11506: Use DS checkbox classes in trash list

---
 src/bundle/Resources/views/themes/admin/trash/list.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/trash/list.html.twig b/src/bundle/Resources/views/themes/admin/trash/list.html.twig
index 2aa53dbe29..51d7c8a4cd 100644
--- a/src/bundle/Resources/views/themes/admin/trash/list.html.twig
+++ b/src/bundle/Resources/views/themes/admin/trash/list.html.twig
@@ -129,7 +129,7 @@
                     <div class="form-check">
                         {{ form_widget(form, { attr: {
                             'data-is-parent-in-trash': is_parent_in_trash ? '1': '0',
-                            class: 'ibexa-input ibexa-input--checkbox  form-check-input'
+                            class: 'ids-input ids-input--checkbox'
                         }}) }}
                     </div>
                 {% endset %}

From 8850283dd2947311874e1865437fbed628cffcd9 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:35 +0100
Subject: [PATCH 031/105] IBX-11506: Update UDW collapsible checkbox styles

---
 .../scss/ui/modules/universal-discovery/_collapsible.scss       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_collapsible.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_collapsible.scss
index 40bf62707c..755a7256b9 100644
--- a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_collapsible.scss
+++ b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_collapsible.scss
@@ -78,7 +78,7 @@
             overflow: hidden;
         }
 
-        .ibexa-input--checkbox {
+        .ids-input--checkbox {
             margin-right: calculateRem(8px);
         }
     }

From 8b7578fddf4d7a5c99189b34600e32f73c682c13 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:35 +0100
Subject: [PATCH 032/105] IBX-11506: Update content type selector checkbox
 styles

---
 .../universal-discovery/_content-type-selector-list.scss        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content-type-selector-list.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content-type-selector-list.scss
index c559ad6a7b..d2afb2f7ae 100644
--- a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content-type-selector-list.scss
+++ b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content-type-selector-list.scss
@@ -20,7 +20,7 @@
             font-size: $ibexa-text-font-size-medium;
         }
 
-        .ibexa-input--checkbox {
+        .c-content-type-selector-list__checkbox {
             margin-right: calculateRem(8px);
         }
     }

From 865859448f475c5b70a8b7e1ec603e70d181af6b Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:35 +0100
Subject: [PATCH 033/105] IBX-11506: Update column toggler checkbox styles

---
 .../sub-items-list/_view-columns-toggler-list-element.scss      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_view-columns-toggler-list-element.scss b/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_view-columns-toggler-list-element.scss
index 7873b20f62..fdbfea30dc 100644
--- a/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_view-columns-toggler-list-element.scss
+++ b/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_view-columns-toggler-list-element.scss
@@ -9,7 +9,7 @@
         align-items: center;
     }
 
-    .ibexa-input--checkbox {
+    &__checkbox {
         margin-right: calculateRem(8px);
     }
 

From f1b314fedb4e27bf0dc6d836ee1a686552d0ea26 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:35 +0100
Subject: [PATCH 034/105] IBX-11506: Use DS checkbox classes in UDW selection

---
 .../components/toggle-selection/toggle.selection.js            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.selection.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.selection.js
index 740bc2798f..08002f54c1 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.selection.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.selection.js
@@ -8,8 +8,7 @@ const ToggleSelection = ({ multiple, location, isDisabled = false, isHidden = fa
     const [selectedLocations, dispatchSelectedLocationsAction] = useContext(SelectedLocationsContext);
     const isSelected = selectedLocations.some((selectedItem) => selectedItem.location.id === location.id);
     const className = createCssClassNames({
-        'c-udw-toggle-selection ibexa-input': true,
-        'ibexa-input--checkbox': multiple,
+        'c-udw-toggle-selection ids-input ids-input--checkbox': true,
         'c-udw-toggle-selection--hidden': isHidden,
     });
     const toggleSelection = () => {

From f2ab275dea45478381d77d02902b3e293b3052d4 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:35 +0100
Subject: [PATCH 035/105] IBX-11506: Use DS checkbox classes in content type
 selector

---
 .../components/content-type-selector/content.type.selector.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-type-selector/content.type.selector.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-type-selector/content.type.selector.js
index 1be5094598..6f1a23e2ef 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-type-selector/content.type.selector.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-type-selector/content.type.selector.js
@@ -47,7 +47,7 @@ const ContentTypeSelector = () => {
                                             <input
                                                 type="checkbox"
                                                 id={`ibexa-search-content-type-${contentType.identifier}`}
-                                                className="ibexa-input ibexa-input--checkbox form-check-input"
+                                                className="ids-input ids-input--checkbox c-content-type-selector-list__checkbox"
                                                 value={contentType.identifier}
                                                 data-content-type-identifier={contentType.identifier}
                                                 onChange={handleContentTypeSelect}

From 0439e3eb80569f55a13ef0fd9ae983b3056f00ff Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:35 +0100
Subject: [PATCH 036/105] IBX-11506: Use DS checkbox classes in sub-items rows

---
 .../components/table-view/table.view.item.component.js        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js b/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
index 4a8df5e3eb..cf975b8119 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
@@ -422,7 +422,7 @@ export default class TableViewItemComponent extends PureComponent {
     }
 
     componentDidMount() {
-        parseCheckbox('.c-table-view-item__cell .ibexa-input--checkbox', 'c-table-view-item--active');
+        parseCheckbox('.c-table-view-item__cell .c-table-view-item__checkbox', 'c-table-view-item--active');
     }
 
     render() {
@@ -441,7 +441,7 @@ export default class TableViewItemComponent extends PureComponent {
                 <td className="ibexa-table__cell c-table-view-item__cell c-table-view-item__cell--checkbox">
                     <input
                         type="checkbox"
-                        className="ibexa-input ibexa-input--checkbox"
+                        className="ids-input ids-input--checkbox c-table-view-item__checkbox"
                         checked={isSelected}
                         onChange={this.onSelectCheckboxChange}
                     />

From 132fde78d2b4b6d0f708359c68d37bb9258632f1 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:02 +0100
Subject: [PATCH 037/105] IBX-11506: Update grid view checkbox styles

---
 src/bundle/Resources/public/scss/_grid-view-item.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/_grid-view-item.scss b/src/bundle/Resources/public/scss/_grid-view-item.scss
index ca2fde6265..27f8a28a52 100644
--- a/src/bundle/Resources/public/scss/_grid-view-item.scss
+++ b/src/bundle/Resources/public/scss/_grid-view-item.scss
@@ -28,7 +28,7 @@
         border-color: $ibexa-color-dark;
         text-decoration: none;
 
-        .ibexa-input--checkbox,
+        .ids-input--checkbox,
         .ids-input--radio {
             border-color: $ibexa-color-primary;
         }

From 10af9ebfe162e871c85ff9f0c4c2de1c44d64d55 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:01 +0100
Subject: [PATCH 038/105] IBX-11506: Use DS choice classes in UDW item
 selection

---
 .../components/toggle-selection/toggle.item.selection.js    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
index 1e665b1fbd..9eac172573 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
@@ -11,9 +11,9 @@ const ToggleItemSelection = ({ item, isDisabled = false, isPreselected = false,
     const isSelected = selectedItems.some((selectedItem) => selectedItem.type === item.type && selectedItem.id === item.id);
     const isSelectionBlocked = multipleItemsLimit !== 0 && selectedItems.length >= multipleItemsLimit && !isSelected;
     const className = createCssClassNames({
-        'c-udw-toggle-selection ibexa-input': true,
-        'ibexa-input--checkbox': multiple,
-        'ids-input ids-input--radio': !multiple,
+        'c-udw-toggle-selection ids-input': true,
+        'ids-input--checkbox': multiple,
+        'ids-input--radio': !multiple,
         'c-udw-toggle-selection--hidden': isHidden,
     });
     const inputType = multiple ? 'checkbox' : 'radio';

From 18e1050f6f92691e96b3515149677e15c5653ba4 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:01 +0100
Subject: [PATCH 039/105] IBX-11506: Use DS checkbox classes in sub-items
 header

---
 .../sub-items/components/table-view/table.view.component.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.component.js b/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.component.js
index 63173a2f1c..5ade196055 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.component.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.component.js
@@ -208,7 +208,7 @@ export default class TableViewComponent extends Component {
                             checked={anyLocationSelected}
                             onClick={this.selectAll} // We need onClick, because MS Edge does not trigger onChange when checkbox has indeterminate state. (ref: https://stackoverflow.com/a/33529024/5766602)
                             onChange={() => {}} // Dummy callback to not trigger React warning as we cannot use onChange on MS Edge
-                            className="ibexa-input ibexa-input--checkbox ibexa-table__header-cell-checkbox ibexa-table__header-cell-checkbox--custom-init"
+                            className="ids-input ids-input--checkbox ibexa-table__header-cell-checkbox ibexa-table__header-cell-checkbox--custom-init"
                         />
                     </th>
                     {this.renderBasicColumnsHeader()}

From 101b0cb52f04c761ea0ae25481b6cbbb8bfd57cb Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:43:01 +0100
Subject: [PATCH 040/105] IBX-11506: Use DS checkbox classes in React dropdown

---
 src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js     | 4 +---
 .../view-columns-toggler/view.columns.toggler.list.element.js | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
index e913b9e104..26c8e2a79e 100644
--- a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
+++ b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
@@ -82,9 +82,7 @@ const Dropdown = ({
                     }
                 }}
             >
-                {!single && (
-                    <input type="checkbox" className="ibexa-input ibexa-input--checkbox" checked={isItemSelected} onChange={() => {}} />
-                )}
+                {!single && <input type="checkbox" className="ids-input ids-input--checkbox ibexa-dropdown__item-checkbox" checked={isItemSelected} onChange={() => {}} />}
                 <span className="ibexa-dropdown__item-label">{item.label}</span>
                 {single && (
                     <div className="ibexa-dropdown__item-check">
diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.list.element.js b/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.list.element.js
index 9a893e85e9..a7262577ae 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.list.element.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.list.element.js
@@ -6,7 +6,7 @@ const ViewColumnsTogglerListElement = ({ label, isColumnVisible, toggleColumnVis
         <li className="ibexa-popup-menu__item c-view-columns-toggler-list-element">
             <button className="ibexa-popup-menu__item-content" type="button" onClick={() => toggleColumnVisibility(columnKey)}>
                 <input
-                    className="form-check-input ibexa-input ibexa-input--checkbox"
+                    className="ids-input ids-input--checkbox c-view-columns-toggler-list-element__checkbox"
                     type="checkbox"
                     checked={isColumnVisible}
                     readOnly={true}

From d9a069c7e2b01223238b1f432e900c507e737ed2 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:24:01 +0100
Subject: [PATCH 041/105] IBX-11506: Drop legacy checkbox classes from
 selection options

---
 .../themes/admin/content_type/field_types.html.twig  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/content_type/field_types.html.twig b/src/bundle/Resources/views/themes/admin/content_type/field_types.html.twig
index 8f3a3c9df7..7c7cc36e46 100644
--- a/src/bundle/Resources/views/themes/admin/content_type/field_types.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content_type/field_types.html.twig
@@ -186,9 +186,10 @@
             data-next-option-id="{{ form.options.vars.value is empty ? 0 : max(form.options.vars.value|keys) + 1 }}">
             {% for option in form.options %}
                 <li class="ibexa_selection-settings-option-value ibexa-selection-table-row mb-2 d-flex align-items-center">
-                    <input
-                        type="checkbox"
-                        class="ibexa-input ibexa-input--checkbox ibexa_selection-settings-option-checkbox ibexa-selection-table-checkbox">
+                    <twig:ibexa:checkbox:input
+                        name="{{ 'selection-option-checkbox-' ~ loop.index }}"
+                        inputClass="ibexa_selection-settings-option-checkbox ibexa-selection-table-checkbox"
+                    />
                     {{ form_errors(option) }}
                     {{ form_widget(option, { 'attr': { 'class': 'form-control ml-1 mb-0'}}) }}
                 </li>
@@ -199,7 +200,10 @@
             data-ibexa_selection-option-input-name="{{ form.options.vars.prototype.vars.full_name }}"
             data-ibexa_selection-option-input-id="{{ form.options.vars.prototype.vars.id }}">
             <li class="ibexa_selection-settings-option-value ibexa-selection-table-row mb-2 d-flex align-items-center">
-                <input type="checkbox" class="ibexa-input ibexa-input--checkbox ibexa_selection-settings-option-checkbox ibexa-selection-table-checkbox">
+                <twig:ibexa:checkbox:input
+                    name="selection-option-checkbox-prototype"
+                    inputClass="ibexa_selection-settings-option-checkbox ibexa-selection-table-checkbox"
+                />
                 {{ form_widget(form.options.vars.prototype, { 'attr': { 'class': 'form-control ml-1 mb-0'}}) }}
             </li>
         </script>

From ef0f13b8887ef0298b57f382049d53e0a8865eee Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:24:01 +0100
Subject: [PATCH 042/105] IBX-11506: Drop legacy checkbox classes from
 relations list

---
 .../themes/admin/ui/field_type/edit/relation_base.html.twig   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig
index 97a9bb7939..ab4f20f12d 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig
@@ -22,7 +22,7 @@
     {% set col_raw_checkbox_template %}
         <input
             type="checkbox"
-            class="ibexa-input ibexa-input--checkbox"
+            class="ids-input ids-input--checkbox ibexa-relations__checkbox"
             value="{{ '{{ content_id }}' }}"
             {{ readonly ? 'disabled' }}
         >
@@ -111,7 +111,7 @@
                 {% set col_raw_checkbox %}
                     <input
                         type="checkbox"
-                        class="ibexa-input ibexa-input--checkbox"
+                        class="ids-input ids-input--checkbox ibexa-relations__checkbox"
                         value="{{ relation.contentInfo.id }}"
                         {{ readonly ? 'disabled' }}
                     >

From 8c361f8ed8786a7875d71f38c8908cea7b88a627 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 11:22:14 +0100
Subject: [PATCH 043/105] IBX-11506: Update notifications filter checkbox
 selector

---
 .../public/js/scripts/admin.notifications.filters.js  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/bundle/Resources/public/js/scripts/admin.notifications.filters.js b/src/bundle/Resources/public/js/scripts/admin.notifications.filters.js
index 33fb21d9d9..f2027fbf72 100644
--- a/src/bundle/Resources/public/js/scripts/admin.notifications.filters.js
+++ b/src/bundle/Resources/public/js/scripts/admin.notifications.filters.js
@@ -1,4 +1,5 @@
 (function (global, doc) {
+    const SELECTOR_FILTER_CHECKBOX = '.ids-input--checkbox:not([name="dropdown-checkbox"])';
     const searchForm = doc.querySelector('.ibexa-list-search-form');
     const filtersContainerNode = doc.querySelector('.ibexa-list-filters');
     const applyFiltersBtn = filtersContainerNode.querySelector('.ibexa-btn--apply');
@@ -13,9 +14,7 @@
         }
 
         const sourceSelect = filterNode.querySelector('.ibexa-list-filters__item-content .ibexa-dropdown__source .ibexa-input--select');
-        const checkboxes = filterNode.querySelectorAll(
-            '.ibexa-list-filters__item-content .ibexa-input--checkbox:not([name="dropdown-checkbox"])',
-        );
+        const checkboxes = filterNode.querySelectorAll(`.ibexa-list-filters__item-content ${SELECTOR_FILTER_CHECKBOX}`);
         const timePicker = filterNode.querySelector('.ibexa-date-time-picker__input');
 
         if (sourceSelect) {
@@ -45,9 +44,7 @@
             return;
         }
 
-        const checkboxes = filterNode.querySelectorAll(
-            '.ibexa-list-filters__item-content .ibexa-input--checkbox:not([name="dropdown-checkbox"])',
-        );
+        const checkboxes = filterNode.querySelectorAll(`.ibexa-list-filters__item-content ${SELECTOR_FILTER_CHECKBOX}`);
         checkboxes.forEach((checkbox) => {
             checkbox.addEventListener('change', filterChange, false);
         });
@@ -80,7 +77,7 @@
         }
 
         const select = filterNode.querySelector('.ibexa-dropdown__source .ibexa-input--select');
-        const checkedCheckboxes = filterNode.querySelectorAll('.ibexa-input--checkbox:checked');
+        const checkedCheckboxes = filterNode.querySelectorAll(`${SELECTOR_FILTER_CHECKBOX}:checked`);
 
         if (isNodeDatePicker(filterNode)) {
             const timePicker = filterNode.querySelector('.ibexa-date-time-picker__input');

From d41781b90331a485e52881ea60221d8ca7f1c636 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:53:01 +0100
Subject: [PATCH 044/105] IBX-11506: Drop legacy checkbox classes from language
 details

---
 .../Resources/views/themes/admin/language/index.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/language/index.html.twig b/src/bundle/Resources/views/themes/admin/language/index.html.twig
index 5c7ac32078..faf9099ddc 100644
--- a/src/bundle/Resources/views/themes/admin/language/index.html.twig
+++ b/src/bundle/Resources/views/themes/admin/language/index.html.twig
@@ -63,7 +63,7 @@
             <input
                 type="checkbox"
                 title="{{ language.enabled ? 'language.enabled'|trans|desc('Enabled') : 'language.disabled'|trans|desc('Disabled') }}"
-                class="ibexa-input ibexa-input--checkbox form-check-input"
+                class="ibexa-language-status-checkbox form-check-input"
                 disabled
                 {% if language.enabled %}checked{% endif %}
             >

From 4f080b1ec1ac3e48775e4d1811044bcd3e2aa156 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:50:13 +0100
Subject: [PATCH 045/105] IBX-11506: Update binary preview checkbox styles

---
 .../Resources/public/scss/fieldType/edit/_ibexa_media.scss      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss
index f4dc7bb427..68b8c85f3a 100644
--- a/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss
+++ b/src/bundle/Resources/public/scss/fieldType/edit/_ibexa_media.scss
@@ -44,7 +44,7 @@
                 row-gap: calculateRem(12px);
                 column-gap: calculateRem(8px);
 
-                .ibexa-input--checkbox {
+                .ibexa-field-edit-preview__checkbox {
                     margin-top: calculateRem(4px);
                 }
             }

From a5259555f428152d55cc5d2d5d70af3c7635d559 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:50:04 +0100
Subject: [PATCH 046/105] IBX-11506: Drop legacy checkbox classes from binary
 preview

---
 .../admin/ui/field_type/edit/binary_base_fields.html.twig      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
index 6c5b21d9ee..89f31e52d4 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
@@ -1,7 +1,7 @@
 {% block checkbox_row %}
     <div class="ibexa-field-edit-preview__info ibexa-field-edit-preview__info--{{ name }}">
         <div class="ibexa-field-edit-preview__input-wrapper ibexa-field-edit-preview__input-wrapper--checkbox-input">
-            <input class="ibexa-input ibexa-input--checkbox" type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %}>
+            <input class="ibexa-field-edit-preview__checkbox" type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %}>
             <span class="ibexa-data-source__label-text">{{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }}</span>
         </div>
     </div>
@@ -23,4 +23,3 @@
         </div>
     </div>
 {% endblock %}
-

From 177397873dcfb9db0ea7256a2e0bcc74c9fe26b7 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:49:57 +0100
Subject: [PATCH 047/105] IBX-11506: Update notifications checkbox selector

---
 .../Resources/public/js/scripts/admin.notifications.list.js    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/js/scripts/admin.notifications.list.js b/src/bundle/Resources/public/js/scripts/admin.notifications.list.js
index e17cdcb55a..10ab3a0dee 100644
--- a/src/bundle/Resources/public/js/scripts/admin.notifications.list.js
+++ b/src/bundle/Resources/public/js/scripts/admin.notifications.list.js
@@ -1,6 +1,7 @@
 import { isFirefox } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/browser.helper.js';
 
 (function (global, doc, ibexa, Translator, Routing) {
+    const SELECTOR_NOTIFICATION_CHECKBOX = '.ibexa-notification-list__mark-row-checkbox';
     const SELECTOR_MODAL_ITEM = '.ibexa-notifications-modal__item';
     const SELECTOR_GO_TO_NOTIFICATION = '.ibexa-notification-view-all__show';
     const SELECTOR_TOGGLE_NOTIFICATION = '.ibexa-notification-view-all__mail';
@@ -10,7 +11,7 @@ import { isFirefox } from '@ibexa-admin-ui/src/bundle/Resources/public/js/script
     const markAsReadBtn = doc.querySelector('.ibexa-notification-list__btn-mark-as-read');
     const deleteBtn = doc.querySelector('.ibexa-notification-list__btn-delete');
     const notificationsCheckboxes = [
-        ...doc.querySelectorAll('.ibexa-notification-list .ibexa-table__cell--has-checkbox .ibexa-input--checkbox'),
+        ...doc.querySelectorAll(`.ibexa-notification-list .ibexa-table__cell--has-checkbox ${SELECTOR_NOTIFICATION_CHECKBOX}`),
     ];
     const notificationsTable = doc.querySelector('.ibexa-table--notifications');
     const uncheckCheckboxesEvent = new CustomEvent('ibexa-uncheck-checkboxes', {

From c019ac96306003198b95dce6f423ccf1365dcbc9 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:49:51 +0100
Subject: [PATCH 048/105] IBX-11506: Drop legacy checkbox classes from
 notifications list

---
 .../themes/admin/account/notifications/list_item_all.html.twig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/list_item_all.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/list_item_all.html.twig
index 2f3d3a0f1c..db8387fc5d 100644
--- a/src/bundle/Resources/views/themes/admin/account/notifications/list_item_all.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/notifications/list_item_all.html.twig
@@ -91,7 +91,7 @@
                         data-notification-id="{{ notification.id }}"
                         data-form-checkbox-id="notification_selection_notifications_{{ notification.id}}"
                         type="checkbox"
-                        class="ibexa-input ibexa-input--checkbox ibexa-notification-list__mark-row-checkbox form-check-input"
+                        class="ibexa-notification-list__mark-row-checkbox form-check-input"
                     />
                 </div>
             {% endblock %}
@@ -153,4 +153,3 @@
         {% endembed %}
     {% endblock %}
 {% endembed %}
-

From 8173dc989e6c969f9987ae0157dd184ff7a0d348 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:38:54 +0100
Subject: [PATCH 049/105] IBX-11506: Update table checkbox styles

---
 src/bundle/Resources/public/scss/_tables.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bundle/Resources/public/scss/_tables.scss b/src/bundle/Resources/public/scss/_tables.scss
index 2af7e8cd0d..7ae670c80f 100644
--- a/src/bundle/Resources/public/scss/_tables.scss
+++ b/src/bundle/Resources/public/scss/_tables.scss
@@ -40,7 +40,7 @@
                     border-color: $ibexa-color-primary;
                 }
 
-                .ibexa-input--checkbox,
+                .ids-input--checkbox,
                 .ids-input--radio {
                     border-color: $ibexa-color-primary;
                 }
@@ -149,7 +149,7 @@
     }
 
     &__header-cell-checkbox {
-        &.ibexa-input--checkbox {
+        &.ids-input--checkbox {
             margin-bottom: 0;
         }
     }
@@ -186,7 +186,7 @@
         &--has-checkbox {
             width: calculateRem(48px);
 
-            .ibexa-input--checkbox {
+            .ids-input--checkbox {
                 float: left;
                 margin-bottom: 0;
             }
@@ -212,7 +212,7 @@
         &--content-center {
             text-align: center;
 
-            .ibexa-input--checkbox {
+            .ids-input--checkbox {
                 margin-bottom: 0;
             }
         }

From 71bf6927b4e5426eb5660a546ce0e27e7e00cee2 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:38:47 +0100
Subject: [PATCH 050/105] IBX-11506: Update bulk toggle checkbox selectors

---
 src/bundle/Resources/public/js/scripts/button.state.toggle.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/js/scripts/button.state.toggle.js b/src/bundle/Resources/public/js/scripts/button.state.toggle.js
index a06a27b90f..e17acd6ac0 100644
--- a/src/bundle/Resources/public/js/scripts/button.state.toggle.js
+++ b/src/bundle/Resources/public/js/scripts/button.state.toggle.js
@@ -1,8 +1,9 @@
 (function (global, doc) {
+    const SELECTOR_TABLE_CHECKBOX = '.ids-input--checkbox';
     const toggleForms = doc.querySelectorAll('.ibexa-toggle-btn-state');
 
     toggleForms.forEach((toggleForm) => {
-        const checkboxes = [...toggleForm.querySelectorAll('.ibexa-table__cell--has-checkbox .ibexa-input--checkbox')];
+        const checkboxes = [...toggleForm.querySelectorAll(`.ibexa-table__cell--has-checkbox ${SELECTOR_TABLE_CHECKBOX}`)];
         const buttonRemove = doc.querySelector(toggleForm.dataset.toggleButtonId);
 
         if (!buttonRemove) {

From f20f431e0aa7ed04530a9ba2ee82e77ed374fbd9 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:38:39 +0100
Subject: [PATCH 051/105] IBX-11506: Update table checkbox selectors

---
 src/bundle/Resources/public/js/scripts/admin.table.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bundle/Resources/public/js/scripts/admin.table.js b/src/bundle/Resources/public/js/scripts/admin.table.js
index cd95832999..325c822c9c 100644
--- a/src/bundle/Resources/public/js/scripts/admin.table.js
+++ b/src/bundle/Resources/public/js/scripts/admin.table.js
@@ -1,4 +1,5 @@
 (function (global, doc) {
+    const SELECTOR_TABLE_CHECKBOX = '.ids-input--checkbox';
     const ibexaTables = doc.querySelectorAll('.ibexa-table');
     const setMainCheckboxState = (mainCheckbox, subCheckboxes, event) => {
         const isFromJS = event?.detail?.isFromJS ?? false;
@@ -61,9 +62,9 @@
             }
 
             const mainCheckboxIndex = [...headCells].indexOf(headCellWithCheckbox);
-            const mainCheckbox = headCellWithCheckbox.querySelector('.ibexa-input--checkbox');
+            const mainCheckbox = headCellWithCheckbox.querySelector(SELECTOR_TABLE_CHECKBOX);
             const subCheckboxes = tableBody.querySelectorAll(
-                `.ibexa-table__cell--has-checkbox:nth-child(${mainCheckboxIndex + 1}) .ibexa-input--checkbox`,
+                `.ibexa-table__cell--has-checkbox:nth-child(${mainCheckboxIndex + 1}) ${SELECTOR_TABLE_CHECKBOX}`,
             );
 
             if (!mainCheckbox) {
@@ -138,7 +139,7 @@
 
     const uncheckCheckboxes = (table) => {
         const mainCheckbox = table.querySelector('.ibexa-table__header-cell-checkbox');
-        const subCheckboxes = [...table.querySelectorAll('.ibexa-table__cell--has-checkbox .ibexa-input--checkbox')];
+        const subCheckboxes = [...table.querySelectorAll(`.ibexa-table__cell--has-checkbox ${SELECTOR_TABLE_CHECKBOX}`)];
 
         mainCheckbox.checked = false;
         mainCheckbox.indeterminate = false;

From ffd6cc51db23073539e9863f0c931ad09ccb3e21 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:38:31 +0100
Subject: [PATCH 052/105] IBX-11506: Drop legacy checkbox classes from table
 headers

---
 .../themes/admin/ui/component/table/table_head_cell.html.twig   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/component/table/table_head_cell.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/table/table_head_cell.html.twig
index 0712156e72..d5eb915727 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/table/table_head_cell.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/table/table_head_cell.html.twig
@@ -14,7 +14,7 @@
         {%- if has_checkbox|default(false) -%}
             <div class="ibexa-table__header-cell-checkbox-wrapper">
                 <input
-                    class="ibexa-input ibexa-input--checkbox ibexa-table__header-cell-checkbox
+                    class="ibexa-table__header-cell-checkbox
                         {%- if is_custom_bulk|default(false) %} ibexa-table__header-cell-checkbox--custom-init{%- endif -%}"
                     type="checkbox">
             </div>

From dba27e93f527b87260fee47cbcc2be9deaa7e1b8 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:36:33 +0100
Subject: [PATCH 053/105] IBX-11506: Update author checkbox selector

---
 .../Resources/public/js/scripts/fieldType/ibexa_author.js  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_author.js b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_author.js
index 117997bd48..94ee075d34 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ibexa_author.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ibexa_author.js
@@ -1,6 +1,7 @@
 (function (global, doc, ibexa) {
     const SELECTOR_REMOVE_AUTHOR = '.ibexa-btn--remove-author';
     const SELECTOR_AUTHOR = '.ibexa-data-source__author';
+    const SELECTOR_AUTHOR_CHECKBOX = '.ibexa-data-source__author-checkbox';
     const SELECTOR_FIELD = '.ibexa-field-edit--ibexa_author';
     const SELECTOR_LABEL = '.ibexa-data-source__label';
     const SELECTOR_FIELD_EMAIL = '.ibexa-data-source__field--email';
@@ -104,7 +105,7 @@
 
         toggleBulkDeleteButtonState(event) {
             const container = event.target.closest(SELECTOR_FIELD);
-            const checkboxes = container.querySelectorAll('.ibexa-input--checkbox');
+            const checkboxes = container.querySelectorAll(SELECTOR_AUTHOR_CHECKBOX);
             const isAnyCheckboxSelected = [...checkboxes].some((checkbox) => checkbox.checked);
             const bulkDeleteButton = container.querySelector('.ibexa-btn--bulk-remove-author');
 
@@ -113,7 +114,7 @@
 
         removeSelectedItems(event) {
             const container = event.target.closest(SELECTOR_FIELD);
-            const selectedCheckboxes = container.querySelectorAll('.ibexa-input--checkbox:checked');
+            const selectedCheckboxes = container.querySelectorAll(`${SELECTOR_AUTHOR_CHECKBOX}:checked`);
             const bulkDeleteButton = container.querySelector('.ibexa-btn--bulk-remove-author');
 
             selectedCheckboxes.forEach((checkbox) => checkbox.closest(SELECTOR_AUTHOR).remove());
@@ -246,7 +247,7 @@
             },
             {
                 isValueValidator: false,
-                selector: '.ibexa-data-source__author .ibexa-input--checkbox',
+                selector: `.ibexa-data-source__author ${SELECTOR_AUTHOR_CHECKBOX}`,
                 eventName: 'change',
                 callback: 'toggleBulkDeleteButtonState',
             },

From 1cf995f337b81828995b63e540a4071cc1b91748 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:36:11 +0100
Subject: [PATCH 054/105] IBX-11506: Drop legacy checkbox classes from author
 rows

---
 .../themes/admin/ui/field_type/edit/ibexa_author.html.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
index e7c79d7343..42202618a1 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
@@ -52,7 +52,7 @@
         <div class="ibexa-data-source__checkbox">
             <input
                 type="checkbox"
-                class="ibexa-input ibexa-input--checkbox"
+                class="ibexa-data-source__author-checkbox"
                 {{ readonly|default(false) ? 'disabled' }}
              />
         </div>

From f60dcce1865113a4a5af2d2370367665fffb7932 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:35:02 +0100
Subject: [PATCH 055/105] IBX-11506: Update dropdown checkbox selector

---
 src/bundle/Resources/public/js/scripts/core/dropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/js/scripts/core/dropdown.js b/src/bundle/Resources/public/js/scripts/core/dropdown.js
index b69bf0c740..705905be42 100644
--- a/src/bundle/Resources/public/js/scripts/core/dropdown.js
+++ b/src/bundle/Resources/public/js/scripts/core/dropdown.js
@@ -152,7 +152,7 @@
 
             this.sourceInput.querySelectorAll('option').forEach((option) => (option.selected = false));
             this.itemsListContainer.querySelectorAll('.ibexa-dropdown__item--selected').forEach((option) => {
-                const checkbox = option.querySelector('.ibexa-input--checkbox');
+                const checkbox = option.querySelector('.ibexa-dropdown__item-checkbox');
 
                 option.classList.remove('ibexa-dropdown__item--selected');
 

From f2e23af5f3a18b0c9e5027b3227ed9b36489c77e Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 10:34:55 +0100
Subject: [PATCH 056/105] IBX-11506: Drop legacy checkbox classes from dropdown
 items

---
 .../themes/admin/ui/component/dropdown/dropdown_item.html.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
index 2e8ed6dac9..6e04189b9a 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
@@ -23,7 +23,7 @@
             {% if is_selected %}ibexa-dropdown__item--selected{% endif %}"
     >
         {% if multiple is defined and multiple %}
-            <input type="checkbox" name="dropdown-checkbox" class="ibexa-input ibexa-input--checkbox" {% if is_selected %}checked{% endif %} />
+            <input type="checkbox" name="dropdown-checkbox" class="ibexa-dropdown__item-checkbox" {% if is_selected %}checked{% endif %} />
         {% endif %}
         {% if icon is defined and icon != '' %}
             <svg class="ibexa-icon ibexa-icon--small-medium {{ icon_class|default('') }}">

From a782ea54dea0d16e0afc2fde2c0e54eb30632a2d Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 09:52:15 +0100
Subject: [PATCH 057/105] IBX-11506: Use Twig checkbox tag in table header
 cells

---
 .../admin/ui/component/table/table_head_cell.html.twig     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/component/table/table_head_cell.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/table/table_head_cell.html.twig
index d5eb915727..5ae383acfb 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/table/table_head_cell.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/table/table_head_cell.html.twig
@@ -13,10 +13,11 @@
     {%- block content -%}
         {%- if has_checkbox|default(false) -%}
             <div class="ibexa-table__header-cell-checkbox-wrapper">
-                <input
-                    class="ibexa-table__header-cell-checkbox
+                <twig:ibexa:checkbox:input
+                    name="{{ attr.name|default('table-header-checkbox') }}"
+                    inputClass="ibexa-table__header-cell-checkbox
                         {%- if is_custom_bulk|default(false) %} ibexa-table__header-cell-checkbox--custom-init{%- endif -%}"
-                    type="checkbox">
+                />
             </div>
         {%- else -%}
             <span

From b4dcb5243135f80a1db8e90cccd59866f44448f4 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 09:50:23 +0100
Subject: [PATCH 058/105] IBX-11506: Use Twig checkbox tag in dropdown items

---
 .../admin/ui/component/dropdown/dropdown_item.html.twig     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
index 6e04189b9a..c5eeb0c030 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig
@@ -23,7 +23,11 @@
             {% if is_selected %}ibexa-dropdown__item--selected{% endif %}"
     >
         {% if multiple is defined and multiple %}
-            <input type="checkbox" name="dropdown-checkbox" class="ibexa-dropdown__item-checkbox" {% if is_selected %}checked{% endif %} />
+            <twig:ibexa:checkbox:input
+                name="dropdown-checkbox"
+                inputClass="ibexa-dropdown__item-checkbox"
+                :checked="is_selected"
+            />
         {% endif %}
         {% if icon is defined and icon != '' %}
             <svg class="ibexa-icon ibexa-icon--small-medium {{ icon_class|default('') }}">

From abb8b822aefa7f2d820a3e6dd3853011a907a2b9 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 09:45:25 +0100
Subject: [PATCH 059/105] IBX-11506: Use Twig checkbox tag in language list

---
 .../themes/admin/language/tab/languages.html.twig    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/language/tab/languages.html.twig b/src/bundle/Resources/views/themes/admin/language/tab/languages.html.twig
index ab47eae92b..2f9508cc13 100644
--- a/src/bundle/Resources/views/themes/admin/language/tab/languages.html.twig
+++ b/src/bundle/Resources/views/themes/admin/language/tab/languages.html.twig
@@ -39,13 +39,13 @@
 
         {% set col_raw %}
             <div class="form-check">
-                <input
-                    type="checkbox"
+                <twig:ibexa:checkbox:input
+                    name="{{ 'language-enabled-' ~ language.id }}"
+                    inputClass="ibexa-language-status-checkbox form-check-input"
                     title="{{ language.enabled ? 'language.enabled'|trans|desc('Enabled') : 'language.disabled'|trans|desc('Disabled') }}"
-                    class="ibexa-input ibexa-input--checkbox form-check-input"
-                    disabled
-                    {% if language.enabled %}checked{% endif %}
-                >
+                    :disabled="true"
+                    :checked="language.enabled"
+                />
             </div>
         {% endset %}
         {% set body_row_cols = body_row_cols|merge([{

From b27cd8271c8ba8bb2db76a8f38cb6eda9ea0b2f2 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 09:45:16 +0100
Subject: [PATCH 060/105] IBX-11506: Use Twig checkbox tag in binary preview

---
 .../ui/field_type/edit/binary_base_fields.html.twig      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
index 89f31e52d4..44feda7f3c 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
@@ -1,7 +1,14 @@
 {% block checkbox_row %}
     <div class="ibexa-field-edit-preview__info ibexa-field-edit-preview__info--{{ name }}">
         <div class="ibexa-field-edit-preview__input-wrapper ibexa-field-edit-preview__input-wrapper--checkbox-input">
-            <input class="ibexa-field-edit-preview__checkbox" type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %}>
+            <twig:ibexa:checkbox:input
+                name="{{ full_name }}"
+                inputClass="ibexa-field-edit-preview__checkbox"
+                value="{{ value|default('') }}"
+                :checked="checked"
+                :disabled="disabled"
+                :required="required"
+            />
             <span class="ibexa-data-source__label-text">{{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }}</span>
         </div>
     </div>

From 2f86b8200c40a33b29f881ea4064b37690c4f66a Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 09:45:16 +0100
Subject: [PATCH 061/105] IBX-11506: Use Twig checkbox tag in author rows

---
 .../admin/ui/field_type/edit/ibexa_author.html.twig    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
index 42202618a1..ac41b62722 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_author.html.twig
@@ -50,11 +50,11 @@
     <div class="ibexa-data-source__author form-row">
         {{- form_widget(form.id) -}}
         <div class="ibexa-data-source__checkbox">
-            <input
-                type="checkbox"
-                class="ibexa-data-source__author-checkbox"
-                {{ readonly|default(false) ? 'disabled' }}
-             />
+            <twig:ibexa:checkbox:input
+                name="{{ form.vars.id ~ '_author_checkbox' }}"
+                inputClass="ibexa-data-source__author-checkbox"
+                :disabled="readonly|default(false)"
+            />
         </div>
         {{- form_row(form.name, { label_wrapper_attr: { 'hidden': 'hidden' }, attr: { readonly: readonly }}) -}}
         {{- form_row(form.email, { label_wrapper_attr: { 'hidden': 'hidden' }, attr: {'class': 'ibexa-input--text', readonly: readonly }}) -}}

From 030909b2fe508f488b8a2e3afee891d6019113e7 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 09:45:16 +0100
Subject: [PATCH 062/105] IBX-11506: Use Twig checkbox tag in notifications
 list

---
 .../admin/account/notifications/list_item_all.html.twig   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/list_item_all.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/list_item_all.html.twig
index db8387fc5d..3f1b97dd8b 100644
--- a/src/bundle/Resources/views/themes/admin/account/notifications/list_item_all.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/notifications/list_item_all.html.twig
@@ -87,11 +87,11 @@
         {% embed '@ibexadesign/ui/component/table/table_body_cell.html.twig' with { class: 'ibexa-table__cell--has-checkbox' } %}
             {% block content %}
                 <div class="form-check">
-                    <input
+                    <twig:ibexa:checkbox:input
+                        name="{{ 'notification-checkbox-' ~ notification.id }}"
+                        inputClass="ibexa-notification-list__mark-row-checkbox form-check-input"
                         data-notification-id="{{ notification.id }}"
-                        data-form-checkbox-id="notification_selection_notifications_{{ notification.id}}"
-                        type="checkbox"
-                        class="ibexa-notification-list__mark-row-checkbox form-check-input"
+                        data-form-checkbox-id="notification_selection_notifications_{{ notification.id }}"
                     />
                 </div>
             {% endblock %}

From c9af3e3aa64e026b57efefdfa0e61c04a8b87462 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Mar 2026 09:45:16 +0100
Subject: [PATCH 063/105] IBX-11506: Use Twig checkbox tag in language details

---
 .../views/themes/admin/language/index.html.twig      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/language/index.html.twig b/src/bundle/Resources/views/themes/admin/language/index.html.twig
index faf9099ddc..608fa21844 100644
--- a/src/bundle/Resources/views/themes/admin/language/index.html.twig
+++ b/src/bundle/Resources/views/themes/admin/language/index.html.twig
@@ -60,13 +60,13 @@
 {% block content %}
     {% set enable_checkbox_raw %}
         <div class="form-check">
-            <input
-                type="checkbox"
+            <twig:ibexa:checkbox:input
+                name="{{ 'language-enabled-' ~ language.id }}"
+                inputClass="ibexa-language-status-checkbox form-check-input"
                 title="{{ language.enabled ? 'language.enabled'|trans|desc('Enabled') : 'language.disabled'|trans|desc('Disabled') }}"
-                class="ibexa-language-status-checkbox form-check-input"
-                disabled
-                {% if language.enabled %}checked{% endif %}
-            >
+                :disabled="true"
+                :checked="language.enabled"
+            />
         </div>
     {% endset %}
     {% set language_items = [

From 889ef8294f893117d48c5efa2b393a12b261cb0e Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sat, 28 Mar 2026 17:15:02 +0100
Subject: [PATCH 064/105] IBX-11506: Update language checkbox locator

---
 src/lib/Behat/Page/LanguagePage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Page/LanguagePage.php b/src/lib/Behat/Page/LanguagePage.php
index 9b51734af9..cf2287a71a 100644
--- a/src/lib/Behat/Page/LanguagePage.php
+++ b/src/lib/Behat/Page/LanguagePage.php
@@ -137,7 +137,7 @@ protected function specifyLocators(): array
         return [
             new VisibleCSSLocator('pageTitle', '.ibexa-page-title h1'),
             new VisibleCSSLocator('button', '.ibexa-btn'),
-            new VisibleCSSLocator('enabledField', '.ibexa-input--checkbox'),
+            new VisibleCSSLocator('enabledField', '.ibexa-language-status-checkbox'),
             new VisibleCSSLocator('languagePropertiesItem', '.ibexa-details__item'),
             new VisibleCSSLocator('languagePropertiesLabel', '.ibexa-details__item-label'),
             new VisibleCSSLocator('languagePropertiesValue', '.ibexa-details__item-content'),

From 0cd39b357290ecf154fb7a7a454a768d2d1f5545 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sat, 28 Mar 2026 17:15:02 +0100
Subject: [PATCH 065/105] IBX-11506: Update UDW checkbox locator

---
 src/lib/Behat/Component/UniversalDiscoveryWidget.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/UniversalDiscoveryWidget.php b/src/lib/Behat/Component/UniversalDiscoveryWidget.php
index 8a133284ec..4ce85b1d6f 100644
--- a/src/lib/Behat/Component/UniversalDiscoveryWidget.php
+++ b/src/lib/Behat/Component/UniversalDiscoveryWidget.php
@@ -222,7 +222,7 @@ protected function specifyLocators(): array
             new CSSLocator('categoryTabSelector', '.c-tab-selector__item'),
             new CSSLocator('selectedTab', '.c-tab-selector__item--selected'),
             new VisibleCSSLocator('contentIframe', '.c-content-edit__iframe, .m-content-create__iframe'),
-            new VisibleCSSLocator('multiselect', '.m-ud .c-finder-leaf .ibexa-input--checkbox'),
+            new VisibleCSSLocator('multiselect', '.m-ud .c-finder-leaf .ids-input--checkbox'),
             new VisibleCSSLocator('selectedItemName', '.c-content-meta-preview__content-name'),
             new VisibleCSSLocator('previewImage', '.c-content-meta-preview__preview'),
             new VisibleCSSLocator('createNewButton', '.c-content-create-button__btn'),

From a406c61c1c44812b6470249375f084b35d69c3fe Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sat, 28 Mar 2026 17:15:02 +0100
Subject: [PATCH 066/105] IBX-11506: Update delete dialog checkbox locator

---
 src/lib/Behat/Component/DeleteContentDialog.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/DeleteContentDialog.php b/src/lib/Behat/Component/DeleteContentDialog.php
index ed27cd3b2f..26912eab00 100644
--- a/src/lib/Behat/Component/DeleteContentDialog.php
+++ b/src/lib/Behat/Component/DeleteContentDialog.php
@@ -20,7 +20,7 @@ public function confirmTrashing(): void
     public function specifyLocators(): array
     {
         return array_merge(parent::specifyLocators(), [
-            new VisibleCSSLocator('trashConfirmCheckbox', '.modal-content .ibexa-input--checkbox'),
+            new VisibleCSSLocator('trashConfirmCheckbox', '.modal-content .ids-input--checkbox'),
         ]);
     }
 }

From fa41efb9359fc8b4128477c9eaf2ccdfd4afb58d Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Mon, 30 Mar 2026 15:21:54 +0200
Subject: [PATCH 067/105] IBX-11506: Fix dropdown checkbox selectors

---
 .../Resources/public/js/scripts/core/dropdown.js     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/public/js/scripts/core/dropdown.js b/src/bundle/Resources/public/js/scripts/core/dropdown.js
index 705905be42..f587021d99 100644
--- a/src/bundle/Resources/public/js/scripts/core/dropdown.js
+++ b/src/bundle/Resources/public/js/scripts/core/dropdown.js
@@ -211,7 +211,11 @@
             const value = this.getValueFromElement(element);
 
             if (value && !this.canSelectOnlyOne) {
-                element.querySelector('.ibexa-input').checked = selected;
+                const checkbox = element.querySelector('.ibexa-dropdown__item-checkbox');
+
+                if (checkbox) {
+                    checkbox.checked = selected;
+                }
             }
 
             this.itemsListContainer.querySelector(`[data-value=${value}]`).classList.toggle('ibexa-dropdown__item--selected', selected);
@@ -314,7 +318,11 @@
             itemSelected.classList.remove('ibexa-dropdown__item--selected');
 
             if (!this.canSelectOnlyOne) {
-                itemSelected.querySelector('.ibexa-input').checked = false;
+                const checkbox = itemSelected.querySelector('.ibexa-dropdown__item-checkbox');
+
+                if (checkbox) {
+                    checkbox.checked = false;
+                }
             }
 
             if (optionSelect) {

From a54dce5a496c581a423e9afe61ddb20cdd16c463 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Mon, 30 Mar 2026 15:22:29 +0200
Subject: [PATCH 068/105] IBX-11506: Update dropdown checkbox styles

---
 src/bundle/Resources/public/scss/_dropdown.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/_dropdown.scss b/src/bundle/Resources/public/scss/_dropdown.scss
index 5cb76a2d78..26f2965a36 100644
--- a/src/bundle/Resources/public/scss/_dropdown.scss
+++ b/src/bundle/Resources/public/scss/_dropdown.scss
@@ -281,7 +281,7 @@
             }
         }
 
-        .ibexa-input {
+        .ibexa-dropdown__item-checkbox {
             flex-shrink: 0;
             margin: 0 calculateRem(16px) 0 0;
         }

From dc2c31ef7ab2066aef9d2d99729b707d61dc819d Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Tue, 31 Mar 2026 10:49:57 +0200
Subject: [PATCH 069/105] IBX-11507-use-ds-radio-button: restore checked choice
 input background

---
 src/bundle/Resources/public/scss/_inputs.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/bundle/Resources/public/scss/_inputs.scss b/src/bundle/Resources/public/scss/_inputs.scss
index 05b9140b8b..b80fd66d33 100644
--- a/src/bundle/Resources/public/scss/_inputs.scss
+++ b/src/bundle/Resources/public/scss/_inputs.scss
@@ -529,6 +529,10 @@
     }
 }
 
+.form-check-input:checked {
+  background-color: $ibexa-color-white;
+}
+
 .form-check-input:checked[type=checkbox] {
   --bs-form-check-bg-image: none;
 }

From 0002a0860cc8a861a516599a03fa383b956e486b Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Tue, 31 Mar 2026 10:52:25 +0200
Subject: [PATCH 070/105] IBX-11507-use-ds-radio-button: restore
 form-check-input classes in form widgets

---
 .../views/themes/admin/ui/form_fields.html.twig       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index 2cdfdb26c1..ac7db64eb6 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -148,7 +148,13 @@
 {%- endblock -%}
 
 {%- block checkbox_widget -%}
-    {%- set attr = attr|merge({class: 'ids-input ids-input--checkbox ' ~ attr.class|default('') }) -%}
+    {%- set attr_class = attr.class|default('') -%}
+    {%- if 'btn-check' not in attr_class -%}
+        {%- set attr_class = 'ids-input ids-input--checkbox form-check-input ' ~ attr_class -%}
+    {%- else -%}
+        {%- set attr_class = 'ids-input ids-input--checkbox ' ~ attr_class -%}
+    {%- endif -%}
+    {%- set attr = attr|merge({class: attr_class|trim }) -%}
     {{ parent() }}
 {%- endblock -%}
 
@@ -156,6 +162,7 @@
     {%- set attr_class = attr.class|default('') -%}
     {%- set row_class = '' -%}
     {%- if 'btn-check' not in attr_class -%}
+        {%- set attr_class = attr_class ~ ' form-check-input' -%}
         {%- set row_class = 'form-check' -%}
     {%- endif -%}
     {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
@@ -185,7 +192,7 @@
 {%- endblock -%}
 
 {%- block trash_item_checkbox_widget -%}
-    <input type="checkbox" class="ids-input ids-input--checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
+    <input type="checkbox" class="ids-input ids-input--checkbox form-check-input" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
 {%- endblock -%}
 
 {%- block _trash_item_restore_restore_widget -%}

From 0bf4bdf50bf1eb9643d6dba9c9c6b48b882aca3f Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Wed, 1 Apr 2026 23:17:50 +0200
Subject: [PATCH 071/105] IBX-11506: update URL alias toggle locator

---
 src/lib/Behat/Component/CreateUrlAliasModal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/CreateUrlAliasModal.php b/src/lib/Behat/Component/CreateUrlAliasModal.php
index dabaa05191..215d82bb26 100644
--- a/src/lib/Behat/Component/CreateUrlAliasModal.php
+++ b/src/lib/Behat/Component/CreateUrlAliasModal.php
@@ -76,7 +76,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('createButton', '#custom_url_add_add'),
             new VisibleCSSLocator('pathInput', '#custom_url_add_path'),
             new VisibleCSSLocator('languageDropdown', '.ibexa-custom-url-from__item .ibexa-dropdown__selection-info'),
-            new VisibleCSSLocator('redirectToggle', '.ibexa-custom-url-from__item .ibexa-toggle'),
+            new VisibleCSSLocator('redirectToggle', '.ibexa-custom-url-from__item .ids-toggle'),
         ];
     }
 }

From 5bc980aec274d69c2861f7c6feba51f38d9d9eba Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Wed, 1 Apr 2026 23:18:10 +0200
Subject: [PATCH 072/105] IBX-11506: fix focus mode toggle state locator

---
 src/lib/Behat/Component/UpperMenu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/UpperMenu.php b/src/lib/Behat/Component/UpperMenu.php
index afa6258a23..9aa798661e 100644
--- a/src/lib/Behat/Component/UpperMenu.php
+++ b/src/lib/Behat/Component/UpperMenu.php
@@ -99,7 +99,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('userSettingsPopup', '.ibexa-header-user-menu .ibexa-header-user-menu__popup-menu'),
             new VisibleCSSLocator('searchInput', '.ibexa-main-header #search_query'),
             new VisibleCSSLocator('searchButton', '.ibexa-main-header .ibexa-input-text-wrapper__action-btn--search'),
-            new VisibleCSSLocator('userFocusEnabled', '[name="focus_mode_change"] .ids-toggle__label'),
+            new VisibleCSSLocator('userFocusEnabled', '[name="focus_mode_change"] .ids-toggle--checked'),
             new VisibleCSSLocator('userFocusMode', '[name="focus_mode_change"] .ids-toggle__widget'),
             new VisibleCSSLocator('focusModeBadge', '.ibexa-user-mode-badge'),
             new VisibleCSSLocator('siteDropdown', '.ibexa-preview-context-switch-form .ibexa-dropdown'),

From d0fd38c940ebff424b397689c6531f3781cff827 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Wed, 1 Apr 2026 23:19:05 +0200
Subject: [PATCH 073/105] IBX-11506: wait for dropdown popover visibility

---
 src/lib/Behat/Component/IbexaDropdown.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/Behat/Component/IbexaDropdown.php b/src/lib/Behat/Component/IbexaDropdown.php
index c1fad443b2..d9150afc9a 100644
--- a/src/lib/Behat/Component/IbexaDropdown.php
+++ b/src/lib/Behat/Component/IbexaDropdown.php
@@ -10,7 +10,6 @@
 
 use Ibexa\Behat\Browser\Component\Component;
 use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition;
-use Ibexa\Behat\Browser\Element\Condition\ElementTransitionHasEndedCondition;
 use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion;
 use Ibexa\Behat\Browser\Element\Criterion\ElementTextFragmentCriterion;
 use Ibexa\Behat\Browser\Locator\VisibleCSSLocator;
@@ -21,7 +20,7 @@ public function verifyIsLoaded(): void
     {
         $this->getHTMLPage()
             ->setTimeout(5)
-            ->waitUntilCondition(new ElementTransitionHasEndedCondition($this->getHTMLPage(), $this->getLocator('isIbexaDropdownVisible')));
+            ->waitUntilCondition(new ElementExistsCondition($this->getHTMLPage(), $this->getLocator('isIbexaDropdownVisible')));
     }
 
     protected function specifyLocators(): array

From 85e2669fe3ef544a0b425c9098eacb838620b6f2 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 09:46:58 +0200
Subject: [PATCH 074/105] IBX-11506: wait for focus mode state update

---
 src/lib/Behat/Component/UpperMenu.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/lib/Behat/Component/UpperMenu.php b/src/lib/Behat/Component/UpperMenu.php
index 9aa798661e..c4708dde07 100644
--- a/src/lib/Behat/Component/UpperMenu.php
+++ b/src/lib/Behat/Component/UpperMenu.php
@@ -65,6 +65,14 @@ public function setFocusMode(bool $expectedModeStatus): void
 
         if ($expectedModeStatus != $isEnabled) {
             $this->getHTMLPage()->find($this->getLocator('userFocusMode'))->click();
+
+            $this->getHTMLPage()->setTimeout(10)->waitUntil(function (): bool {
+                return !$this->getHTMLPage()->findAll($this->getLocator('userSettingsPopup'))->any();
+            }, 'Focus mode dropdown did not close after toggling');
+
+            $this->getHTMLPage()->setTimeout(10)->waitUntil(function () use ($expectedModeStatus): bool {
+                return $this->getHTMLPage()->findAll($this->getLocator('focusModeBadge'))->any() === $expectedModeStatus;
+            }, 'Focus mode state did not update after toggling');
         } else {
             $this->toggleUserDropdown();
         }

From 3b5f7999a40e079c8095852b86a8c59131d1179d Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 09:47:42 +0200
Subject: [PATCH 075/105] IBX-11506: scope user enabled toggle checks

---
 src/lib/Behat/Component/Fields/User.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/lib/Behat/Component/Fields/User.php b/src/lib/Behat/Component/Fields/User.php
index f39334bf41..dcfe808c2c 100644
--- a/src/lib/Behat/Component/Fields/User.php
+++ b/src/lib/Behat/Component/Fields/User.php
@@ -9,6 +9,7 @@
 namespace Ibexa\AdminUi\Behat\Component\Fields;
 
 use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition;
+use Ibexa\Behat\Browser\Element\Condition\ElementNotExistsCondition;
 use Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper;
 use Ibexa\Behat\Browser\Locator\CSSLocatorBuilder;
 use Ibexa\Behat\Browser\Locator\VisibleCSSLocator;
@@ -27,7 +28,7 @@ public function setValue(array $parameters): void
         $this->setSpecificFieldValue('password', $parameters['Password']);
         $this->setSpecificFieldValue('confirmPassword', $parameters['Confirm password']);
         $this->setSpecificFieldValue('email', $parameters['Email']);
-        $this->setEnabledField(true);
+        $this->setEnabledField(($parameters['Enabled'] ?? 'Yes') === 'Yes');
     }
 
     public function setSpecificFieldValue(string $fieldName, string $value): void
@@ -89,20 +90,29 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('password', '#ezplatform_content_forms_user_create_fieldsData_user_account_value_password_first,#ezplatform_content_forms_user_update_fieldsData_user_account_value_password_first'),
             new VisibleCSSLocator('confirmPassword', '#ezplatform_content_forms_user_create_fieldsData_user_account_value_password_second,#ezplatform_content_forms_user_update_fieldsData_user_account_value_password_second'),
             new VisibleCSSLocator('email', '#ezplatform_content_forms_user_create_fieldsData_user_account_value_email,#ezplatform_content_forms_user_update_fieldsData_user_account_value_email'),
-            new VisibleCSSLocator('buttonEnabled', '.ids-toggle'),
+            new VisibleCSSLocator('buttonEnabled', '.ids-toggle__widget'),
+            new VisibleCSSLocator('buttonEnabledWrapper', '.ids-toggle'),
             new VisibleCSSLocator('buttonEnabledToggleConfirmation', '.ids-toggle--checked'),
         ];
     }
 
     private function setEnabledField(bool $enabled): void
     {
-        $isCurrentlyEnabled = $this->getHTMLPage()->find($this->parentLocator)->find($this->getLocator('buttonEnabled'))->getText() === 'On';
+        $parentField = $this->getHTMLPage()->find($this->parentLocator);
+        $enabledToggleSelector = CSSLocatorBuilder::base($this->parentLocator)
+            ->withDescendant($this->getLocator('buttonEnabledToggleConfirmation'))
+            ->build();
+        $isCurrentlyEnabled = $parentField->findAll($this->getLocator('buttonEnabledToggleConfirmation'))->any();
+
         if ($isCurrentlyEnabled !== $enabled) {
             $script = sprintf("document.querySelector('%s %s').click()", $this->parentLocator->getSelector(), $this->getLocator('buttonEnabled')->getSelector());
             $this->getHTMLPage()->executeJavaScript($script);
-            $this->getHTMLPage()
-                ->setTimeout(10)
-                ->waitUntilCondition(new ElementExistsCondition($this->getHTMLPage(), $this->getLocator('buttonEnabledToggleConfirmation')));
+
+            $condition = $enabled
+                ? new ElementExistsCondition($this->getHTMLPage(), $enabledToggleSelector)
+                : new ElementNotExistsCondition($this->getHTMLPage(), $enabledToggleSelector);
+
+            $this->getHTMLPage()->setTimeout(10)->waitUntilCondition($condition);
         }
     }
 }

From 7fc7c2413290fd8d02efb455bdd21bfb249d0b87 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 09:48:36 +0200
Subject: [PATCH 076/105] IBX-11506: stabilize last field definition expansion

---
 src/lib/Behat/Page/ContentTypeUpdatePage.php | 32 +++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/lib/Behat/Page/ContentTypeUpdatePage.php b/src/lib/Behat/Page/ContentTypeUpdatePage.php
index 8c2c385171..a760fb5b07 100644
--- a/src/lib/Behat/Page/ContentTypeUpdatePage.php
+++ b/src/lib/Behat/Page/ContentTypeUpdatePage.php
@@ -12,7 +12,6 @@
 use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition;
 use Ibexa\Behat\Browser\Element\Condition\ElementNotExistsCondition;
 use Ibexa\Behat\Browser\Element\Condition\ElementsCountCondition;
-use Ibexa\Behat\Browser\Element\Condition\ElementTransitionHasEndedCondition;
 use Ibexa\Behat\Browser\Element\Criterion\ElementAttributeCriterion;
 use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion;
 use Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper;
@@ -23,7 +22,9 @@ class ContentTypeUpdatePage extends AdminUpdateItemPage
     public function fillFieldDefinitionFieldWithValue(string $fieldName, string $label, string $value): void
     {
         $this->expandLastFieldDefinition();
-        $this->getHTMLPage()
+        $lastFieldDefinition = $this->getHTMLPage()->findAll($this->getLocator('fieldDefinition'))->last();
+
+        $lastFieldDefinition
             ->find($this->getLocator('fieldDefinitionOpenContainer'))
             ->findAll($this->getLocator('field'))
             ->getByCriterion(new ElementTextCriterion($label))
@@ -40,27 +41,22 @@ public function expandLastFieldDefinition(): void
 
         $this->getHTMLPage()->setTimeout(10)->waitUntil(function () use ($fieldDefinitionLocator): bool {
             $fieldDefinition = $this->getHTMLPage()->findAll($fieldDefinitionLocator)->last();
-            $fieldDefinition->click();
+
+            if ($fieldDefinition->findAll($this->getLocator('fieldDefinitionOpenContainer'))->any()) {
+                return true;
+            }
+
+            $fieldDefinition->find($this->getLocator('fieldDefinitionToggle'))->click();
+
             $this->getHTMLPage()->setTimeout(3)->waitUntilCondition(
-                new ElementNotExistsCondition(
+                new ElementExistsCondition(
                     $fieldDefinition,
-                    new VisibleCSSLocator('isCollapsed', 'button.collapsed')
+                    $this->getLocator('fieldDefinitionOpenContainer')
                 )
             );
 
             return true;
         }, 'Error expanding the last Field definition');
-
-        $lastFieldDefinition = $this->getHTMLPage()->findAll($fieldDefinitionLocator)->last();
-        $this
-            ->getHTMLPage()
-            ->setTimeout(10)
-            ->waitUntilCondition(
-                new ElementTransitionHasEndedCondition(
-                    $lastFieldDefinition,
-                    new VisibleCSSLocator('transition', 'div')
-                )
-            );
     }
 
     public function specifyLocators(): array
@@ -72,9 +68,9 @@ public function specifyLocators(): array
             new VisibleCSSLocator('contentTypeCategoryList', ' div.ibexa-content-type-edit__add-field-definitions-group > ul > li:nth-child(n):not(.ibexa-popup-menu__item-action--disabled)'),
             new VisibleCSSLocator('availableFieldLabelList', '.ibexa-available-field-types__list > li:not(.ibexa-available-field-type--hidden)'),
             new VisibleCSSLocator('workspace', '.ibexa-collapse__body-content'),
-            new VisibleCSSLocator('fieldDefinitionToggle', '.ibexa-collapse:nth-last-child(2) > div.ibexa-collapse__header > button:last-child:not([data-bs-target="#content_collapse"])'),
+            new VisibleCSSLocator('fieldDefinitionToggle', '.ibexa-collapse__toggle-btn--status'),
             new VisibleCSSLocator('selectLaunchEditorMode', '.form-check .ids-input--radio'),
-            new VisibleCSSLocator('fieldDefinitionOpenContainer', '[data-collapsed="false"] .ibexa-content-type-edit__field-definition-content'),
+            new VisibleCSSLocator('fieldDefinitionOpenContainer', '.ibexa-collapse__body.show .ibexa-content-type-edit__field-definition-content'),
             new VisibleCSSLocator('selectBlocksDropdown', '.ibexa-page-select-items__toggler'),
             new VisibleCSSLocator('fieldDefinitionSearch', '.ibexa-available-field-types__sidebar-filter'),
         ]);

From 4c576f174416451808c315ad616b44f5e2252710 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 09:49:04 +0200
Subject: [PATCH 077/105] IBX-11506: cast DS toggle values to string

---
 .../themes/admin/ui/form_fields/toggle_widget_ds.html.twig    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields/toggle_widget_ds.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields/toggle_widget_ds.html.twig
index 5ba0505aa0..456d0f3d26 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields/toggle_widget_ds.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields/toggle_widget_ds.html.twig
@@ -9,7 +9,7 @@
         {% set attr = attr|merge({ 'checked': 'checked' }) %}
     {% endif %}
     {% if value is defined %}
-        {% set attr = attr|merge({ 'value': value }) %}
+        {% set attr = attr|merge({ 'value': value ~ '' }) %}
     {% endif %}
 
     {% set input_content %}
@@ -28,7 +28,7 @@
         :checked="checked|default(false)"
         :disabled="is_disabled"
         :required="required|default(false)"
-        :value="value is defined ? value : null"
+        value="{{ value is defined ? value ~ '' : '' }}"
         size="{{ small|default(false) ? 'small' : 'medium' }}"
         onLabel="{{ label_on|default(default_label_on) }}"
         offLabel="{{ label_off|default(default_label_off) }}"

From da1a9d657a39dfe57bd9e1c59e8bebd090afa5fe Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 09:49:33 +0200
Subject: [PATCH 078/105] IBX-11506: cast binary checkbox values to string

---
 .../admin/ui/field_type/edit/binary_base_fields.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
index 44feda7f3c..9c23e338c9 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base_fields.html.twig
@@ -4,7 +4,7 @@
             <twig:ibexa:checkbox:input
                 name="{{ full_name }}"
                 inputClass="ibexa-field-edit-preview__checkbox"
-                value="{{ value|default('') }}"
+                value="{{ value|default('') ~ '' }}"
                 :checked="checked"
                 :disabled="disabled"
                 :required="required"

From d4b1645f4d6d400ee06cb54547b6dda4843e2b18 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 09:50:07 +0200
Subject: [PATCH 079/105] IBX-11506: cast URL toggle values to string

---
 .../views/themes/admin/content/tab/url/checkbox.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
index e005f17794..79508080d5 100644
--- a/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
+++ b/src/bundle/Resources/views/themes/admin/content/tab/url/checkbox.html.twig
@@ -2,7 +2,7 @@
 
 {%- block checkbox_widget -%}
     {% if value is defined %}
-        {% set attr = attr|merge({'value': value}) %}
+        {% set attr = attr|merge({'value': value ~ ''}) %}
     {% endif %}
     {% if checked %}
         {% set attr = attr|merge({'checked': checked}) %}

From 68bb30e25dd103421f54a1aa065e26ab0659218a Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 10:09:51 +0200
Subject: [PATCH 080/105] IBX-11506: drop field definition hover transition
 wait

---
 src/lib/Behat/Page/ContentTypeUpdatePage.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/lib/Behat/Page/ContentTypeUpdatePage.php b/src/lib/Behat/Page/ContentTypeUpdatePage.php
index a760fb5b07..23332f8db9 100644
--- a/src/lib/Behat/Page/ContentTypeUpdatePage.php
+++ b/src/lib/Behat/Page/ContentTypeUpdatePage.php
@@ -91,14 +91,6 @@ public function addFieldDefinition(string $fieldName): void
 
         $this->getHTMLPage()->setTimeout(10)->waitUntil(function () use ($fieldSelector): bool {
             $this->getHTMLPage()->setTimeout(0)->find($fieldSelector)->mouseOver();
-            $this->getHTMLPage()
-                ->setTimeout(0)
-                ->waitUntilCondition(
-                    new ElementTransitionHasEndedCondition(
-                        $this->getHTMLPage(),
-                        $fieldSelector
-                    )
-                );
 
             return true;
         }, 'Error hovering over the Field Definition to add');

From f447519b7d0242c695b9e684b89ec747923e34eb Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 10:10:29 +0200
Subject: [PATCH 081/105] IBX-11506: verify language enabled state from
 checkbox

---
 src/lib/Behat/Page/LanguagePage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Page/LanguagePage.php b/src/lib/Behat/Page/LanguagePage.php
index cf2287a71a..27ed11946c 100644
--- a/src/lib/Behat/Page/LanguagePage.php
+++ b/src/lib/Behat/Page/LanguagePage.php
@@ -56,7 +56,7 @@ public function hasProperties(array $languageProperties): bool
             $hasEnabledField = $this
                 ->getHTMLPage()
                 ->find($this->getLocator('enabledField'))
-                ->getValue() === 'on';
+                ->isChecked();
 
             $shouldHaveEnabledField = 'true' === $languageProperties['Enabled'];
             $hasExpectedEnabledFieldValue = $hasEnabledField === $shouldHaveEnabledField;

From 6315a29ed3ef4564d2d3f8081c61c4a111969553 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 10:28:10 +0200
Subject: [PATCH 082/105] IBX-11506: fail cleanly when context menu has no more
 button

---
 src/lib/Behat/Component/ContentActionsMenu.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/lib/Behat/Component/ContentActionsMenu.php b/src/lib/Behat/Component/ContentActionsMenu.php
index edaab7b13e..25d899c00c 100644
--- a/src/lib/Behat/Component/ContentActionsMenu.php
+++ b/src/lib/Behat/Component/ContentActionsMenu.php
@@ -28,9 +28,7 @@ public function clickButton(string $buttonName, ?string $groupName = null): void
 
     private function clickStandaloneButton(string $buttonName): void
     {
-        $buttons = $this->getHTMLPage()
-            ->findAll($this->getLocator('menuButton'))
-            ->filterBy(new ElementTextCriterion($buttonName));
+        $buttons = $this->getStandaloneButtons($buttonName);
 
         if ($buttons->any()) {
             $buttons->single()->execute(new MouseOverAndClick());
@@ -38,12 +36,24 @@ private function clickStandaloneButton(string $buttonName): void
             return;
         }
 
-        $this->getHTMLPage()->find($this->getLocator('moreButton'))->click();
+        $moreButtons = $this->getHTMLPage()->findAll($this->getLocator('moreButton'));
+        if (!$moreButtons->any()) {
+            throw new \RuntimeException(sprintf('Standalone action button "%s" was not found.', $buttonName));
+        }
+
+        $moreButtons->single()->click();
         $this->getHTMLPage()
             ->findAll($this->getLocator('expandedMenuButton'))
             ->getByCriterion(new ElementTextCriterion($buttonName))->click();
     }
 
+    private function getStandaloneButtons(string $buttonName)
+    {
+        return $this->getHTMLPage()
+            ->findAll($this->getLocator('menuButton'))
+            ->filterBy(new ElementTextCriterion($buttonName));
+    }
+
     private function clickButtonInGroup(string $groupName, string $buttonName): void
     {
         $group = $this->getHTMLPage()

From aa54382a55b3a5074f2fad4d1eff99e197ca19ad Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 13:53:43 +0200
Subject: [PATCH 083/105] IBX-11506: use checkbox attribute for language state

---
 src/lib/Behat/Page/LanguagePage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Page/LanguagePage.php b/src/lib/Behat/Page/LanguagePage.php
index 27ed11946c..2806557fa6 100644
--- a/src/lib/Behat/Page/LanguagePage.php
+++ b/src/lib/Behat/Page/LanguagePage.php
@@ -56,7 +56,7 @@ public function hasProperties(array $languageProperties): bool
             $hasEnabledField = $this
                 ->getHTMLPage()
                 ->find($this->getLocator('enabledField'))
-                ->isChecked();
+                ->hasAttribute('checked');
 
             $shouldHaveEnabledField = 'true' === $languageProperties['Enabled'];
             $hasExpectedEnabledFieldValue = $hasEnabledField === $shouldHaveEnabledField;

From e67730f61780115661991945ef48f27b92382fd7 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 14:08:23 +0200
Subject: [PATCH 084/105] IBX-11506: expand field definitions from title toggle

---
 src/lib/Behat/Page/ContentTypeUpdatePage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/Behat/Page/ContentTypeUpdatePage.php b/src/lib/Behat/Page/ContentTypeUpdatePage.php
index 23332f8db9..81cbc4cc7f 100644
--- a/src/lib/Behat/Page/ContentTypeUpdatePage.php
+++ b/src/lib/Behat/Page/ContentTypeUpdatePage.php
@@ -46,9 +46,9 @@ public function expandLastFieldDefinition(): void
                 return true;
             }
 
-            $fieldDefinition->find($this->getLocator('fieldDefinitionToggle'))->click();
+            $fieldDefinition->find($this->getLocator('fieldDefinitionToggle'))->execute(new MouseOverAndClick());
 
-            $this->getHTMLPage()->setTimeout(3)->waitUntilCondition(
+            $this->getHTMLPage()->setTimeout(5)->waitUntilCondition(
                 new ElementExistsCondition(
                     $fieldDefinition,
                     $this->getLocator('fieldDefinitionOpenContainer')
@@ -68,7 +68,7 @@ public function specifyLocators(): array
             new VisibleCSSLocator('contentTypeCategoryList', ' div.ibexa-content-type-edit__add-field-definitions-group > ul > li:nth-child(n):not(.ibexa-popup-menu__item-action--disabled)'),
             new VisibleCSSLocator('availableFieldLabelList', '.ibexa-available-field-types__list > li:not(.ibexa-available-field-type--hidden)'),
             new VisibleCSSLocator('workspace', '.ibexa-collapse__body-content'),
-            new VisibleCSSLocator('fieldDefinitionToggle', '.ibexa-collapse__toggle-btn--status'),
+            new VisibleCSSLocator('fieldDefinitionToggle', '.ibexa-collapse__toggle-btn--title'),
             new VisibleCSSLocator('selectLaunchEditorMode', '.form-check .ids-input--radio'),
             new VisibleCSSLocator('fieldDefinitionOpenContainer', '.ibexa-collapse__body.show .ibexa-content-type-edit__field-definition-content'),
             new VisibleCSSLocator('selectBlocksDropdown', '.ibexa-page-select-items__toggler'),

From 11868f22dd245c7e5ff26bbacac1c6ea127b5141 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 14:19:27 +0200
Subject: [PATCH 085/105] IBX-11506: match IDS action buttons in context menu

---
 src/lib/Behat/Component/ContentActionsMenu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/ContentActionsMenu.php b/src/lib/Behat/Component/ContentActionsMenu.php
index 25d899c00c..e193d738e4 100644
--- a/src/lib/Behat/Component/ContentActionsMenu.php
+++ b/src/lib/Behat/Component/ContentActionsMenu.php
@@ -126,7 +126,7 @@ protected function specifyLocators(): array
     {
         return [
             new VisibleCSSLocator('label', '.ibexa-btn__label'),
-            new VisibleCSSLocator('menuButton', '.ibexa-context-menu .ibexa-btn'),
+            new VisibleCSSLocator('menuButton', '.ibexa-context-menu .ibexa-btn, .ibexa-context-menu .ids-button'),
             new VisibleCSSLocator('button', '.ibexa-popup-menu__item-content'),
             new VisibleCSSLocator('toggle', '.ibexa-split-btn__toggle-btn '),
             new VisibleCSSLocator('splitButton', '.ibexa-split-btn'),

From 7a2ffb1825bb9b46be7d1c6507f7a36b7ecfc37d Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 2 Apr 2026 14:21:09 +0200
Subject: [PATCH 086/105] IBX-11506: wait for URL alias redirect toggle state

---
 src/lib/Behat/Component/CreateUrlAliasModal.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/CreateUrlAliasModal.php b/src/lib/Behat/Component/CreateUrlAliasModal.php
index 215d82bb26..83955d6086 100644
--- a/src/lib/Behat/Component/CreateUrlAliasModal.php
+++ b/src/lib/Behat/Component/CreateUrlAliasModal.php
@@ -48,7 +48,13 @@ private function setRedirectToggle(bool $shouldBeChecked): void
         $toggle = $this->getHTMLPage()->find($this->getLocator('redirectToggle'));
         $isChecked = $toggle->hasClass('ids-toggle--checked');
         if ($shouldBeChecked !== $isChecked) {
-            $this->getHTMLPage()->find($this->getLocator('redirectToggle'))->click();
+            $toggle->click();
+
+            $this->getHTMLPage()->setTimeout(5)->waitUntil(function () use ($shouldBeChecked): bool {
+                $updatedToggle = $this->getHTMLPage()->find($this->getLocator('redirectToggle'));
+
+                return $updatedToggle->hasClass('ids-toggle--checked') === $shouldBeChecked;
+            }, 'Redirect toggle state did not update');
         }
     }
 

From eb754565bad6306f5f5323fc6988318ef7e1822c Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 16 Apr 2026 11:52:34 +0200
Subject: [PATCH 087/105] IBX-11506: use DS checkbox and radio label classes in
 form theme

---
 .../Resources/views/themes/admin/ui/form_fields.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index ac7db64eb6..3bacedb046 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -22,7 +22,7 @@
 {%- endblock form_label %}
 
 {% block checkbox_radio_label -%}
-    {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ibexa-label ibexa-label--checkbox-radio')|trim}) -%}
+    {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ids-choice-input-label ids-choice-input-field__label')|trim}) -%}
     {{ parent() }}
 {%- endblock checkbox_radio_label %}
 

From 62f5634a601b34819786ca9c68069d9c68032994 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 16 Apr 2026 12:10:00 +0200
Subject: [PATCH 088/105] IBX-11506: update DS choice input label selectors

---
 src/bundle/Resources/public/scss/_instant-filter.scss           | 2 +-
 src/bundle/Resources/public/scss/ui/modules/common/_popup.scss  | 2 +-
 .../components/content-create-widget/content.create.widget.js   | 2 +-
 src/lib/Behat/Component/CreateNewPopup.php                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bundle/Resources/public/scss/_instant-filter.scss b/src/bundle/Resources/public/scss/_instant-filter.scss
index 24c71b7606..31fb9ea605 100644
--- a/src/bundle/Resources/public/scss/_instant-filter.scss
+++ b/src/bundle/Resources/public/scss/_instant-filter.scss
@@ -64,7 +64,7 @@
                 }
 
                 &:hover {
-                    .ibexa-label--checkbox-radio {
+                    .ids-choice-input-label {
                         color: $ibexa-color-primary;
                     }
 
diff --git a/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss b/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss
index 6f16e7306a..5c7d48f9d2 100644
--- a/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss
+++ b/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss
@@ -74,7 +74,7 @@
         }
     }
 
-    .ibexa-label--checkbox-radio {
+    .ids-choice-input-label {
         padding-left: calculateRem(4px);
     }
 }
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
index 0d2615d30c..7ce7777023 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
@@ -243,7 +243,7 @@ const ContentCreateWidget = () => {
                                                 <div key={identifier} className={className} onClick={updateSelectedContentType}>
                                                     <Icon customPath={thumbnail} extraClasses="ibexa-icon--small-medium" />
                                                     <div className="form-check">
-                                                        <div className="ibexa-label ibexa-label--checkbox-radio form-check-label">
+                                                        <div className="ids-choice-input-label ids-choice-input-field__label form-check-label">
                                                             {name}
                                                         </div>
                                                     </div>
diff --git a/src/lib/Behat/Component/CreateNewPopup.php b/src/lib/Behat/Component/CreateNewPopup.php
index fcf26c7a29..87da161343 100644
--- a/src/lib/Behat/Component/CreateNewPopup.php
+++ b/src/lib/Behat/Component/CreateNewPopup.php
@@ -83,7 +83,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('label', '.ibexa-label'),
             new VisibleCSSLocator('dropdownValue', '.ibexa-dropdown__selection-info'),
             new VisibleCSSLocator('radioValue', '.ibexa-dc-extra-actions-applies-to__option'),
-            new VisibleCSSLocator('radioLabel', '.ibexa-label--checkbox-radio'),
+            new VisibleCSSLocator('radioLabel', '.ids-choice-input-label'),
         ];
     }
 }

From 01b810f503aa9a21aae4ec363e63b92acf14318c Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 16 Apr 2026 12:40:15 +0200
Subject: [PATCH 089/105] Revert "IBX-11506: use DS checkbox and radio label
 classes in form theme"

This reverts commit 5497deddf0aced496909881791ae02c14396231b.
---
 .../Resources/views/themes/admin/ui/form_fields.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index 3bacedb046..ac7db64eb6 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -22,7 +22,7 @@
 {%- endblock form_label %}
 
 {% block checkbox_radio_label -%}
-    {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ids-choice-input-label ids-choice-input-field__label')|trim}) -%}
+    {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ibexa-label ibexa-label--checkbox-radio')|trim}) -%}
     {{ parent() }}
 {%- endblock checkbox_radio_label %}
 

From c4f3d5bc71aad0a78f90516e516d1d3db633bd7e Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 16 Apr 2026 12:40:15 +0200
Subject: [PATCH 090/105] Revert "IBX-11506: update DS choice input label
 selectors"

This reverts commit 534fe40a578e684b131a030281ba7da565ab161c.
---
 src/bundle/Resources/public/scss/_instant-filter.scss           | 2 +-
 src/bundle/Resources/public/scss/ui/modules/common/_popup.scss  | 2 +-
 .../components/content-create-widget/content.create.widget.js   | 2 +-
 src/lib/Behat/Component/CreateNewPopup.php                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bundle/Resources/public/scss/_instant-filter.scss b/src/bundle/Resources/public/scss/_instant-filter.scss
index 31fb9ea605..24c71b7606 100644
--- a/src/bundle/Resources/public/scss/_instant-filter.scss
+++ b/src/bundle/Resources/public/scss/_instant-filter.scss
@@ -64,7 +64,7 @@
                 }
 
                 &:hover {
-                    .ids-choice-input-label {
+                    .ibexa-label--checkbox-radio {
                         color: $ibexa-color-primary;
                     }
 
diff --git a/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss b/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss
index 5c7d48f9d2..6f16e7306a 100644
--- a/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss
+++ b/src/bundle/Resources/public/scss/ui/modules/common/_popup.scss
@@ -74,7 +74,7 @@
         }
     }
 
-    .ids-choice-input-label {
+    .ibexa-label--checkbox-radio {
         padding-left: calculateRem(4px);
     }
 }
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
index 7ce7777023..0d2615d30c 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js
@@ -243,7 +243,7 @@ const ContentCreateWidget = () => {
                                                 <div key={identifier} className={className} onClick={updateSelectedContentType}>
                                                     <Icon customPath={thumbnail} extraClasses="ibexa-icon--small-medium" />
                                                     <div className="form-check">
-                                                        <div className="ids-choice-input-label ids-choice-input-field__label form-check-label">
+                                                        <div className="ibexa-label ibexa-label--checkbox-radio form-check-label">
                                                             {name}
                                                         </div>
                                                     </div>
diff --git a/src/lib/Behat/Component/CreateNewPopup.php b/src/lib/Behat/Component/CreateNewPopup.php
index 87da161343..fcf26c7a29 100644
--- a/src/lib/Behat/Component/CreateNewPopup.php
+++ b/src/lib/Behat/Component/CreateNewPopup.php
@@ -83,7 +83,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('label', '.ibexa-label'),
             new VisibleCSSLocator('dropdownValue', '.ibexa-dropdown__selection-info'),
             new VisibleCSSLocator('radioValue', '.ibexa-dc-extra-actions-applies-to__option'),
-            new VisibleCSSLocator('radioLabel', '.ids-choice-input-label'),
+            new VisibleCSSLocator('radioLabel', '.ibexa-label--checkbox-radio'),
         ];
     }
 }

From 94d07dba093cf26d0c59dbc1c6855a7e8fb388ef Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Fri, 17 Apr 2026 14:14:22 +0200
Subject: [PATCH 091/105] [Behat] Adjusted selector

---
 src/lib/Behat/Component/CreateUrlAliasModal.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/lib/Behat/Component/CreateUrlAliasModal.php b/src/lib/Behat/Component/CreateUrlAliasModal.php
index 83955d6086..215d82bb26 100644
--- a/src/lib/Behat/Component/CreateUrlAliasModal.php
+++ b/src/lib/Behat/Component/CreateUrlAliasModal.php
@@ -48,13 +48,7 @@ private function setRedirectToggle(bool $shouldBeChecked): void
         $toggle = $this->getHTMLPage()->find($this->getLocator('redirectToggle'));
         $isChecked = $toggle->hasClass('ids-toggle--checked');
         if ($shouldBeChecked !== $isChecked) {
-            $toggle->click();
-
-            $this->getHTMLPage()->setTimeout(5)->waitUntil(function () use ($shouldBeChecked): bool {
-                $updatedToggle = $this->getHTMLPage()->find($this->getLocator('redirectToggle'));
-
-                return $updatedToggle->hasClass('ids-toggle--checked') === $shouldBeChecked;
-            }, 'Redirect toggle state did not update');
+            $this->getHTMLPage()->find($this->getLocator('redirectToggle'))->click();
         }
     }
 

From a7e7047631b03ee41767289a2f21d2d06ecf4627 Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Mon, 20 Apr 2026 13:03:11 +0200
Subject: [PATCH 092/105] [Behat] Adjusted UrlAlias test

---
 src/lib/Behat/Component/CreateUrlAliasModal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/CreateUrlAliasModal.php b/src/lib/Behat/Component/CreateUrlAliasModal.php
index 215d82bb26..0e615eb6fb 100644
--- a/src/lib/Behat/Component/CreateUrlAliasModal.php
+++ b/src/lib/Behat/Component/CreateUrlAliasModal.php
@@ -48,7 +48,7 @@ private function setRedirectToggle(bool $shouldBeChecked): void
         $toggle = $this->getHTMLPage()->find($this->getLocator('redirectToggle'));
         $isChecked = $toggle->hasClass('ids-toggle--checked');
         if ($shouldBeChecked !== $isChecked) {
-            $this->getHTMLPage()->find($this->getLocator('redirectToggle'))->click();
+            $this->getHTMLPage()->find(new VisibleCSSLocator('toggle', '.ibexa-custom-url-from__item .ids-toggle .ids-toggle__widget'))->click();
         }
     }
 

From 460bac4bb0e1ac6eefd79ebdef3e02cfe74b750d Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Mon, 20 Apr 2026 15:10:47 +0200
Subject: [PATCH 093/105] [Behat] Adjusted tests

---
 src/lib/Behat/Page/ContentTypeUpdatePage.php | 29 +++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/lib/Behat/Page/ContentTypeUpdatePage.php b/src/lib/Behat/Page/ContentTypeUpdatePage.php
index 81cbc4cc7f..4db3bb3185 100644
--- a/src/lib/Behat/Page/ContentTypeUpdatePage.php
+++ b/src/lib/Behat/Page/ContentTypeUpdatePage.php
@@ -22,9 +22,7 @@ class ContentTypeUpdatePage extends AdminUpdateItemPage
     public function fillFieldDefinitionFieldWithValue(string $fieldName, string $label, string $value): void
     {
         $this->expandLastFieldDefinition();
-        $lastFieldDefinition = $this->getHTMLPage()->findAll($this->getLocator('fieldDefinition'))->last();
-
-        $lastFieldDefinition
+        $this->getHTMLPage()
             ->find($this->getLocator('fieldDefinitionOpenContainer'))
             ->findAll($this->getLocator('field'))
             ->getByCriterion(new ElementTextCriterion($label))
@@ -41,22 +39,27 @@ public function expandLastFieldDefinition(): void
 
         $this->getHTMLPage()->setTimeout(10)->waitUntil(function () use ($fieldDefinitionLocator): bool {
             $fieldDefinition = $this->getHTMLPage()->findAll($fieldDefinitionLocator)->last();
-
-            if ($fieldDefinition->findAll($this->getLocator('fieldDefinitionOpenContainer'))->any()) {
-                return true;
-            }
-
-            $fieldDefinition->find($this->getLocator('fieldDefinitionToggle'))->execute(new MouseOverAndClick());
-
-            $this->getHTMLPage()->setTimeout(5)->waitUntilCondition(
-                new ElementExistsCondition(
+            $fieldDefinition->find(new VisibleCSSLocator('collapseButton', 'button.ibexa-collapse__toggle-btn'))->click();
+            $this->getHTMLPage()->setTimeout(3)->waitUntilCondition(
+                new ElementNotExistsCondition(
                     $fieldDefinition,
-                    $this->getLocator('fieldDefinitionOpenContainer')
+                    new VisibleCSSLocator('isCollapsed', 'button.collapsed')
                 )
             );
 
             return true;
         }, 'Error expanding the last Field definition');
+
+        $lastFieldDefinition = $this->getHTMLPage()->findAll($fieldDefinitionLocator)->last();
+        $this
+            ->getHTMLPage()
+            ->setTimeout(10)
+            ->waitUntilCondition(
+                new ElementTransitionHasEndedCondition(
+                    $lastFieldDefinition,
+                    new VisibleCSSLocator('transition', 'div')
+                )
+            );
     }
 
     public function specifyLocators(): array

From 64c95fd70d838db807136caa022c66abb5d0664a Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Mon, 20 Apr 2026 15:13:21 +0200
Subject: [PATCH 094/105] [Behat] Adjusted tests

---
 src/lib/Behat/Page/ContentTypeUpdatePage.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/lib/Behat/Page/ContentTypeUpdatePage.php b/src/lib/Behat/Page/ContentTypeUpdatePage.php
index 4db3bb3185..f52b522609 100644
--- a/src/lib/Behat/Page/ContentTypeUpdatePage.php
+++ b/src/lib/Behat/Page/ContentTypeUpdatePage.php
@@ -94,6 +94,14 @@ public function addFieldDefinition(string $fieldName): void
 
         $this->getHTMLPage()->setTimeout(10)->waitUntil(function () use ($fieldSelector): bool {
             $this->getHTMLPage()->setTimeout(0)->find($fieldSelector)->mouseOver();
+            $this->getHTMLPage()
+                ->setTimeout(0)
+                ->waitUntilCondition(
+                    new ElementTransitionHasEndedCondition(
+                        $this->getHTMLPage(),
+                        $fieldSelector
+                    )
+                );
 
             return true;
         }, 'Error hovering over the Field Definition to add');

From e8e43a8ac8b7a8f166464d2ded5777cc6e7dd690 Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Mon, 20 Apr 2026 16:46:33 +0200
Subject: [PATCH 095/105] [Behat] Added import

---
 src/lib/Behat/Page/ContentTypeUpdatePage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/Behat/Page/ContentTypeUpdatePage.php b/src/lib/Behat/Page/ContentTypeUpdatePage.php
index f52b522609..f6dfc13b5f 100644
--- a/src/lib/Behat/Page/ContentTypeUpdatePage.php
+++ b/src/lib/Behat/Page/ContentTypeUpdatePage.php
@@ -12,6 +12,7 @@
 use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition;
 use Ibexa\Behat\Browser\Element\Condition\ElementNotExistsCondition;
 use Ibexa\Behat\Browser\Element\Condition\ElementsCountCondition;
+use Ibexa\Behat\Browser\Element\Condition\ElementTransitionHasEndedCondition;
 use Ibexa\Behat\Browser\Element\Criterion\ElementAttributeCriterion;
 use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion;
 use Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper;

From fabf13e9dd529f507b22936db9688d5e973a81dd Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Tue, 21 Apr 2026 12:58:17 +0200
Subject: [PATCH 096/105] [Behat] Adjusted tests

---
 features/standard/UserCreation.feature        |  4 ++--
 .../Behat/Component/ContentActionsMenu.php    |  2 +-
 src/lib/Behat/Component/Fields/User.php       | 21 ++++++-------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/features/standard/UserCreation.feature b/features/standard/UserCreation.feature
index 4bfe8d89d9..624e81c2e9 100644
--- a/features/standard/UserCreation.feature
+++ b/features/standard/UserCreation.feature
@@ -37,8 +37,8 @@ Feature: User management
       | First name  | testuseredited |
       | Last name   | lastnameedited |
     And I set content fields for user
-      | label         | Username  | Password    | Confirm password  | Email          |
-      | User account  | testuser  | Test123456  | Test123456        | test@test.org  |
+      | label         | Username  | Password    | Confirm password  | Email          | Enabled |
+      | User account  | testuser  | Test123456  | Test123456        | test@test.org  | Yes     | 
     And I perform the "Update" action
     Then I should be on Content view Page for "Users/testuseredited lastnameedited"
     And content attributes equal
diff --git a/src/lib/Behat/Component/ContentActionsMenu.php b/src/lib/Behat/Component/ContentActionsMenu.php
index e193d738e4..ce4cee91ee 100644
--- a/src/lib/Behat/Component/ContentActionsMenu.php
+++ b/src/lib/Behat/Component/ContentActionsMenu.php
@@ -47,7 +47,7 @@ private function clickStandaloneButton(string $buttonName): void
             ->getByCriterion(new ElementTextCriterion($buttonName))->click();
     }
 
-    private function getStandaloneButtons(string $buttonName)
+    private function getStandaloneButtons(string $buttonName): ElementCollectionInterface
     {
         return $this->getHTMLPage()
             ->findAll($this->getLocator('menuButton'))
diff --git a/src/lib/Behat/Component/Fields/User.php b/src/lib/Behat/Component/Fields/User.php
index dcfe808c2c..433ed7acce 100644
--- a/src/lib/Behat/Component/Fields/User.php
+++ b/src/lib/Behat/Component/Fields/User.php
@@ -9,7 +9,6 @@
 namespace Ibexa\AdminUi\Behat\Component\Fields;
 
 use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition;
-use Ibexa\Behat\Browser\Element\Condition\ElementNotExistsCondition;
 use Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper;
 use Ibexa\Behat\Browser\Locator\CSSLocatorBuilder;
 use Ibexa\Behat\Browser\Locator\VisibleCSSLocator;
@@ -28,7 +27,7 @@ public function setValue(array $parameters): void
         $this->setSpecificFieldValue('password', $parameters['Password']);
         $this->setSpecificFieldValue('confirmPassword', $parameters['Confirm password']);
         $this->setSpecificFieldValue('email', $parameters['Email']);
-        $this->setEnabledField(($parameters['Enabled'] ?? 'Yes') === 'Yes');
+        $this->setEnabledField(true);
     }
 
     public function setSpecificFieldValue(string $fieldName, string $value): void
@@ -91,28 +90,20 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('confirmPassword', '#ezplatform_content_forms_user_create_fieldsData_user_account_value_password_second,#ezplatform_content_forms_user_update_fieldsData_user_account_value_password_second'),
             new VisibleCSSLocator('email', '#ezplatform_content_forms_user_create_fieldsData_user_account_value_email,#ezplatform_content_forms_user_update_fieldsData_user_account_value_email'),
             new VisibleCSSLocator('buttonEnabled', '.ids-toggle__widget'),
-            new VisibleCSSLocator('buttonEnabledWrapper', '.ids-toggle'),
+            new VisibleCSSLocator('buttonEnabledLabel', '.ids-toggle__label'),
             new VisibleCSSLocator('buttonEnabledToggleConfirmation', '.ids-toggle--checked'),
         ];
     }
 
     private function setEnabledField(bool $enabled): void
     {
-        $parentField = $this->getHTMLPage()->find($this->parentLocator);
-        $enabledToggleSelector = CSSLocatorBuilder::base($this->parentLocator)
-            ->withDescendant($this->getLocator('buttonEnabledToggleConfirmation'))
-            ->build();
-        $isCurrentlyEnabled = $parentField->findAll($this->getLocator('buttonEnabledToggleConfirmation'))->any();
-
+        $isCurrentlyEnabled = $this->getHTMLPage()->find($this->parentLocator)->find($this->getLocator('buttonEnabledLabel'))->getText() === 'On';
         if ($isCurrentlyEnabled !== $enabled) {
             $script = sprintf("document.querySelector('%s %s').click()", $this->parentLocator->getSelector(), $this->getLocator('buttonEnabled')->getSelector());
             $this->getHTMLPage()->executeJavaScript($script);
-
-            $condition = $enabled
-                ? new ElementExistsCondition($this->getHTMLPage(), $enabledToggleSelector)
-                : new ElementNotExistsCondition($this->getHTMLPage(), $enabledToggleSelector);
-
-            $this->getHTMLPage()->setTimeout(10)->waitUntilCondition($condition);
+            $this->getHTMLPage()
+                ->setTimeout(10)
+                ->waitUntilCondition(new ElementExistsCondition($this->getHTMLPage(), $this->getLocator('buttonEnabledToggleConfirmation')));
         }
     }
 }

From 710469dc93ac8306992f44c282ea404f40f1f6ea Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Tue, 21 Apr 2026 13:02:13 +0200
Subject: [PATCH 097/105] [Behat] Adjusted return type

---
 src/lib/Behat/Component/ContentActionsMenu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/ContentActionsMenu.php b/src/lib/Behat/Component/ContentActionsMenu.php
index ce4cee91ee..37ab10cd3e 100644
--- a/src/lib/Behat/Component/ContentActionsMenu.php
+++ b/src/lib/Behat/Component/ContentActionsMenu.php
@@ -47,7 +47,7 @@ private function clickStandaloneButton(string $buttonName): void
             ->getByCriterion(new ElementTextCriterion($buttonName))->click();
     }
 
-    private function getStandaloneButtons(string $buttonName): ElementCollectionInterface
+    private function getStandaloneButtons(string $buttonName): string
     {
         return $this->getHTMLPage()
             ->findAll($this->getLocator('menuButton'))

From 8089bf2a3f89e301038fe16c5aaedda414c8f664 Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Tue, 21 Apr 2026 13:07:32 +0200
Subject: [PATCH 098/105] [Behat] Adjusted return type

---
 src/lib/Behat/Component/ContentActionsMenu.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/ContentActionsMenu.php b/src/lib/Behat/Component/ContentActionsMenu.php
index 37ab10cd3e..e2876707f8 100644
--- a/src/lib/Behat/Component/ContentActionsMenu.php
+++ b/src/lib/Behat/Component/ContentActionsMenu.php
@@ -11,6 +11,7 @@
 use Ibexa\Behat\Browser\Component\Component;
 use Ibexa\Behat\Browser\Element\Action\MouseOverAndClick;
 use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion;
+use Ibexa\Behat\Browser\Element\ElementCollectionInterface;
 use Ibexa\Behat\Browser\Locator\VisibleCSSLocator;
 
 final class ContentActionsMenu extends Component
@@ -47,7 +48,7 @@ private function clickStandaloneButton(string $buttonName): void
             ->getByCriterion(new ElementTextCriterion($buttonName))->click();
     }
 
-    private function getStandaloneButtons(string $buttonName): string
+    private function getStandaloneButtons(string $buttonName): ElementCollectionInterface
     {
         return $this->getHTMLPage()
             ->findAll($this->getLocator('menuButton'))

From 4b5334b15ea7b2bf20846f83701aca64fe9d5753 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sun, 26 Apr 2026 18:49:38 +0200
Subject: [PATCH 099/105] IBX-11506: use DS checkbox in three-state wrapper

---
 .../three.state.checkbox.component.js                | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/three-state-checkbox/three.state.checkbox.component.js b/src/bundle/ui-dev/src/modules/sub-items/components/three-state-checkbox/three.state.checkbox.component.js
index 6eb85900f4..27cb1734e5 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/three-state-checkbox/three.state.checkbox.component.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/three-state-checkbox/three.state.checkbox.component.js
@@ -1,16 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import { CheckboxInput } from '@ids-components/components/Checkbox';
+
 const ThreeStateCheckboxComponent = ({ indeterminate = false, ...restOfProps }) => (
-    <input
-        {...restOfProps}
-        type="checkbox"
-        ref={(input) => {
-            if (input) {
-                input.indeterminate = indeterminate;
-            }
-        }}
-    />
+    <CheckboxInput {...restOfProps} indeterminate={indeterminate} />
 );
 
 ThreeStateCheckboxComponent.propTypes = {

From 98bf314cedfcfadc66cd8b4c894f6ef73f667839 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sun, 26 Apr 2026 18:49:57 +0200
Subject: [PATCH 100/105] IBX-11506: use DS checkbox in UDW selection toggle

---
 .../components/toggle-selection/toggle.selection.js         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.selection.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.selection.js
index 08002f54c1..64544ef946 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.selection.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.selection.js
@@ -1,6 +1,8 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 
+import { CheckboxInput } from '@ids-components/components/Checkbox';
+
 import { createCssClassNames } from '../../../common/helpers/css.class.names';
 import { SelectedLocationsContext } from '../../universal.discovery.module';
 
@@ -21,9 +23,7 @@ const ToggleSelection = ({ multiple, location, isDisabled = false, isHidden = fa
         return null;
     }
 
-    return (
-        <input type="checkbox" className={className} checked={isSelected} disabled={isDisabled || isHidden} onChange={toggleSelection} />
-    );
+    return <CheckboxInput className={className} checked={isSelected} disabled={isDisabled || isHidden} onChange={toggleSelection} />;
 };
 
 ToggleSelection.propTypes = {

From a21884211f04f1acdee804a12b787fc91dcc72e5 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sun, 26 Apr 2026 18:50:19 +0200
Subject: [PATCH 101/105] IBX-11506: use DS checkbox in UDW item toggle

---
 .../toggle-selection/toggle.item.selection.js     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
index 9eac172573..22ab04b50f 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/toggle-selection/toggle.item.selection.js
@@ -1,6 +1,8 @@
 import React, { useContext, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 
+import { CheckboxInput } from '@ids-components/components/Checkbox';
+
 import { createCssClassNames } from '../../../common/helpers/css.class.names';
 import { MultipleConfigContext, SelectedItemsContext } from '../../universal.discovery.module';
 
@@ -26,6 +28,19 @@ const ToggleItemSelection = ({ item, isDisabled = false, isPreselected = false,
         inputRef.current.indeterminate = isIndeterminate;
     }, [isIndeterminate]);
 
+    if (multiple) {
+        return (
+            <CheckboxInput
+                ref={inputRef}
+                className={className}
+                checked={isPreselected || isSelected}
+                disabled={isSelectionBlocked || isDisabled || isHidden}
+                indeterminate={isIndeterminate}
+                readOnly={true}
+            />
+        );
+    }
+
     return (
         <input
             ref={inputRef}

From 842d7ba136e4126e152f0526b0a34431e2859de2 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sun, 26 Apr 2026 18:50:58 +0200
Subject: [PATCH 102/105] IBX-11506: use DS checkbox in sub-items rows

---
 .../components/table-view/table.view.item.component.js       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js b/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
index cf975b8119..0408ee805b 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/table-view/table.view.item.component.js
@@ -1,6 +1,8 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 
+import { CheckboxInput } from '@ids-components/components/Checkbox';
+
 import { getTranslator } from '@ibexa-admin-ui-helpers/context.helper';
 import { getContentTypeIconUrl } from '@ibexa-admin-ui-helpers/content.type.helper';
 import { formatShortDateTime } from '@ibexa-admin-ui-helpers/timezone.helper';
@@ -439,8 +441,7 @@ export default class TableViewItemComponent extends PureComponent {
         return (
             <tr className="ibexa-table__row c-table-view-item">
                 <td className="ibexa-table__cell c-table-view-item__cell c-table-view-item__cell--checkbox">
-                    <input
-                        type="checkbox"
+                    <CheckboxInput
                         className="ids-input ids-input--checkbox c-table-view-item__checkbox"
                         checked={isSelected}
                         onChange={this.onSelectCheckboxChange}

From be70e66b14592770e685db14363bb73d43979ad7 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sun, 26 Apr 2026 18:51:33 +0200
Subject: [PATCH 103/105] IBX-11506: use DS checkbox in dropdown items

---
 .../ui-dev/src/modules/common/dropdown/dropdown.js     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
index 26c8e2a79e..afe558613a 100644
--- a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
+++ b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js
@@ -2,6 +2,8 @@ import React, { useState, useEffect, useRef, useLayoutEffect } from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 
+import { CheckboxInput } from '@ids-components/components/Checkbox';
+
 import { createCssClassNames } from '../../common/helpers/css.class.names';
 import Icon from '../../common/icon/icon';
 import { getTranslator } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/context.helper';
@@ -82,7 +84,13 @@ const Dropdown = ({
                     }
                 }}
             >
-                {!single && <input type="checkbox" className="ids-input ids-input--checkbox ibexa-dropdown__item-checkbox" checked={isItemSelected} onChange={() => {}} />}
+                {!single && (
+                    <CheckboxInput
+                        className="ids-input ids-input--checkbox ibexa-dropdown__item-checkbox"
+                        checked={isItemSelected}
+                        onChange={() => {}}
+                    />
+                )}
                 <span className="ibexa-dropdown__item-label">{item.label}</span>
                 {single && (
                     <div className="ibexa-dropdown__item-check">

From 17bb4da45c7a8cbbb34be1ad77a5741fc36c2696 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sun, 26 Apr 2026 18:51:57 +0200
Subject: [PATCH 104/105] IBX-11506: use DS checkbox in columns toggler

---
 .../view.columns.toggler.list.element.js                     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.list.element.js b/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.list.element.js
index a7262577ae..5fb7f1bbb8 100644
--- a/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.list.element.js
+++ b/src/bundle/ui-dev/src/modules/sub-items/components/view-columns-toggler/view.columns.toggler.list.element.js
@@ -1,13 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import { CheckboxInput } from '@ids-components/components/Checkbox';
+
 const ViewColumnsTogglerListElement = ({ label, isColumnVisible, toggleColumnVisibility, columnKey }) => {
     return (
         <li className="ibexa-popup-menu__item c-view-columns-toggler-list-element">
             <button className="ibexa-popup-menu__item-content" type="button" onClick={() => toggleColumnVisibility(columnKey)}>
-                <input
+                <CheckboxInput
                     className="ids-input ids-input--checkbox c-view-columns-toggler-list-element__checkbox"
-                    type="checkbox"
                     checked={isColumnVisible}
                     readOnly={true}
                 />

From 6742b4f06027e1bfca7bb8fdf7902b14c1222aec Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Sun, 26 Apr 2026 18:52:25 +0200
Subject: [PATCH 105/105] IBX-11506: use DS checkbox in content type selector

---
 .../content-type-selector/content.type.selector.js       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-type-selector/content.type.selector.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-type-selector/content.type.selector.js
index 6f1a23e2ef..6b7a73f881 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-type-selector/content.type.selector.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-type-selector/content.type.selector.js
@@ -1,5 +1,7 @@
 import React, { useContext } from 'react';
 
+import { CheckboxInput } from '@ids-components/components/Checkbox';
+
 import { SelectedContentTypesContext } from '../search/search';
 import { AllowedContentTypesContext } from '../../universal.discovery.module';
 
@@ -11,8 +13,8 @@ const ContentTypeSelector = () => {
     const { contentTypes: contentTypesMap } = adminUiConfig;
     const allowedContentTypes = useContext(AllowedContentTypesContext);
     const [selectedContentTypes, dispatchSelectedContentTypesAction] = useContext(SelectedContentTypesContext);
-    const handleContentTypeSelect = ({ nativeEvent }) => {
-        const { contentTypeIdentifier } = nativeEvent.target.dataset;
+    const handleContentTypeSelect = (_checked, event) => {
+        const { contentTypeIdentifier } = event.currentTarget.dataset;
         const action = { contentTypeIdentifier };
 
         action.type = selectedContentTypes.includes(contentTypeIdentifier) ? 'REMOVE_CONTENT_TYPE' : 'ADD_CONTENT_TYPE';
@@ -44,8 +46,7 @@ const ContentTypeSelector = () => {
                                 return (
                                     <li key={contentType.identifier} className="c-content-type-selector-list__item">
                                         <div className="form-check form-check-inline">
-                                            <input
-                                                type="checkbox"
+                                            <CheckboxInput
                                                 id={`ibexa-search-content-type-${contentType.identifier}`}
                                                 className="ids-input ids-input--checkbox c-content-type-selector-list__checkbox"
                                                 value={contentType.identifier}