Merge up 4.6 to main of IBX-10416

Author: OstafinL

src/bundle/Resources/public/scss/_extra-actions.scss

@@ -1,6 +1,7 @@
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/custom.scss' as *;
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins/general' as *;
+@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins/edit-language-selector' as *;
 
 .ibexa-extra-actions {
     @include container-box-shadow-left;

src/bundle/Resources/public/scss/_mixins.scss

@@ -1,7 +1,6 @@
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/custom.scss' as *;
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins/inputs' as *;
-@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins/edit-language-selector' as *;
 
 @mixin datetime-field() {
     &.is-invalid {

src/bundle/Resources/public/scss/_translation-selector.scss

@@ -1,5 +1,6 @@
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/custom.scss' as *;
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
+@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins/edit-language-selector' as *;
 
 .ibexa-translation-selector {
     .ibexa-instant-filter__group-item {

src/bundle/Resources/public/scss/mixins/_edit-language-selector.scss

@@ -1,3 +1,6 @@
+@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/custom.scss' as *;
+@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
+
 @mixin edit-language-item {
     display: block;
     margin: 0 0 calculateRem(12px) 0;

src/bundle/Resources/public/scss/ui/modules/sub-items-list/_language-selector.scss

@@ -1,5 +1,6 @@
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/custom.scss' as *;
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
+@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins/edit-language-selector' as *;
 
 .c-language-selector {
     .ibexa-instant-filter {

src/bundle/Resources/public/scss/ui/modules/universal-discovery/_translation-selector.scss

@@ -1,5 +1,6 @@
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/custom.scss' as *;
 @use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
+@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins/edit-language-selector' as *;
 
 .c-translation-selector {
     .ibexa-instant-filter {

src/bundle/ui-dev/src/modules/sub-items/components/sub-items-list/instant.filter.component.js

@@ -5,7 +5,7 @@ import { getTranslator } from '@ibexa-admin-ui/src/bundle/Resources/public/js/sc
 import { createCssClassNames } from '@ibexa-admin-ui-modules/common/helpers/css.class.names';
 
 const InstantFilter = ({ items = [], handleItemChange = () => {}, isSearchEnabled = true, activeLanguage = '' }) => {
-    const _refInstantFilter = useRef(null);
+    const Translator = getTranslator();
     const [filterQuery, setFilterQuery] = useState('');
     const searchInputWrapperClassName = createCssClassNames({
         'ibexa-instant-filter__input-wrapper': true,

src/bundle/ui-dev/src/modules/sub-items/components/sub-items-list/language.selector.compoment.js

@@ -30,21 +30,17 @@ const LanguageSelector = ({ isOpen = false, label = '', languageItems = [], hand
     const dispatchSubmitFormEvent = () => {
         document.body.dispatchEvent(new CustomEvent('ibexa-sub-items:submit-version-edit-form'));
     };
-    const handleItemChange = (value) => {
-        handleItemChange(value);
-        setActiveLanguage(value);
-    };
     const resetLanguageSelector = () => {
         setActiveLanguage('');
     };
 
     useEffect(() => {
-        discardBtnRef.current?.addEventListener('click', closeLanguageSelector, false);
+        discardBtnRef.current?.addEventListener('click', closeSelector, false);
         submitBtnRef.current?.addEventListener('click', dispatchSubmitFormEvent, false);
         document.body.addEventListener('ibexa:edit-content-reset-language-selector', resetLanguageSelector, false);
 
         return () => {
-            discardBtnRef.current?.removeEventListener('click', closeLanguageSelector);
+            discardBtnRef.current?.removeEventListener('click', closeSelector);
             submitBtnRef.current?.removeEventListener('click', dispatchSubmitFormEvent);
             document.body.removeEventListener('ibexa:edit-content-reset-language-selector', resetLanguageSelector);
         };
@@ -59,7 +55,10 @@ const LanguageSelector = ({ isOpen = false, label = '', languageItems = [], hand
                 <InstantFilter
                     items={languageItems}
                     activeLanguage={activeLanguage}
-                    handleItemChange={handleItemChange}
+                    handleItemChange={(value) => {
+                        handleItemChange(value);
+                        setActiveLanguage(value);
+                    }}
                     isSearchEnabled={isSearchEnabled}
                 />
             </div>
@@ -85,7 +84,6 @@ LanguageSelector.propTypes = {
     label: PropTypes.string,
     languageItems: PropTypes.array,
     handleItemChange: PropTypes.func,
-    closeLanguageSelector: PropTypes.func,
     close: PropTypes.func,
 };