Fix selection widget stealing focus after focusing another cell

This takes into account widgets like suggest-box where active element that triggers show selection may not be the input. RM-63743
anlem12 · Jun 13, 2023 · 6e29b93 · 6e29b93
1 parent d70041d
commit 6e29b93
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/axelor-web/src/main/webapp/js/form/form.input.select.js b/axelor-web/src/main/webapp/js/form/form.input.select.js
@@ -96,8 +96,12 @@ ui.formWidget('BaseSelect', {
       input.addClass('.x-focus');
       doSetup(input);
       setTimeout(function () {
-        var inSlickEditor = input.parents(".slick-editor").first().length;
-        if (input.is(':focus') || inSlickEditor) {
+        var inSlickEditor = input.parents(".slick-editor").first().length > 0;
+        function isSlickEditorFocused() {
+          var active = $(document.activeElement);
+          return inSlickEditor && (!active.is("input, textarea") || active.is(input));
+        }
+        if (input.is(':focus') || isSlickEditorFocused()) {
           input.autocomplete("search" , '');
           input.removeClass('.x-focus');
           if (inSlickEditor) input.focus();

diff --git a/changelogs/unreleased/fix-editable-grid-show-selection-focus.yml b/changelogs/unreleased/fix-editable-grid-show-selection-focus.yml
@@ -0,0 +1,3 @@
+---
+title: Fix selection widget stealing focus after focusing another cell
+type: fix