From 9df337284cc4c2eccd6831e4b054f9c8af9715c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ostafin?= <ostafin.lucas@gmail.com>
Date: Mon, 23 Sep 2024 10:30:21 +0200
Subject: [PATCH 1/2] IBX-8130: UDW gets closed while switching into Grid view
 (#1346)

---
 .../modules/universal-discovery/universal.discovery.module.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js
index b3343578e1..7c63e58203 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js
@@ -458,7 +458,7 @@ const UniversalDiscoveryModule = (props) => {
 
     useEffect(() => {
         if (currentView === 'grid') {
-            setGridActiveLocationId(markedLocationId);
+            setGridActiveLocationId(markedLocationId ?? defaultMarkedLocationId);
         }
     }, [currentView]);
 

From db4475a0ba4ce10e589bd15b1a4d2a6b0cf633e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ostafin?= <ostafin.lucas@gmail.com>
Date: Mon, 23 Sep 2024 10:30:38 +0200
Subject: [PATCH 2/2] IBX-8829: [Richtext] Distraction free mode button should
 be disabled when richtext field isn't translatable (#1343)

---
 .../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 eac49f040c..e21c39a455 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
@@ -532,7 +532,7 @@
                 {{- form_label(form) -}}
             </div>
             <div class="ibexa-field-edit__distraction-free-mode-btns">
-                 <button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--enable">
+                 <button {{ (fieldtype_is_not_translatable or disabled) ? 'disabled' }} type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--enable">
                     <svg class="ibexa-icon ibexa-icon--tiny-small">
                         <use xlink:href="{{ ibexa_icon_path('focus') }}"></use>
                     </svg>
@@ -543,7 +543,7 @@
                         {{ 'distraction_free_mode.enable.label'|trans|desc('Distraction free mode') }}
                     </span>
                 </button>
-                <button type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--disable">
+                <button {{ (fieldtype_is_not_translatable or disabled) ? 'disabled' }} type="button" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-field-edit__distraction-free-mode-control-btn ibexa-field-edit__distraction-free-mode-control-btn--disable">
                     <svg class="ibexa-icon ibexa-icon--tiny-small">
                         <use xlink:href="{{ ibexa_icon_path('un-focus') }}"></use>
                     </svg>