UI/Mainbar: 42574, keep context and focus slate entries

ILIAS-eLearning · Nov 21, 2024 · 6df0aa5 · 6df0aa5
1 parent ceae261
commit 6df0aa5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/components/ILIAS/UI/resources/js/MainControls/dist/mainbar.js b/components/ILIAS/UI/resources/js/MainControls/dist/mainbar.js
@@ -984,17 +984,28 @@ var renderer = function($) {
                     .children().first();
             someting_to_focus_on_if_listing = someting_to_focus_on.children().first().children().first();
             if(someting_to_focus_on[0]) {
-                if(!someting_to_focus_on.is(":focusable")) { //cannot focus w/o index
+                if(!actions.isFocusable(someting_to_focus_on[0])) {
                     someting_to_focus_on.attr('tabindex', '-1');
                     if(someting_to_focus_on_if_listing[0]
-                      && someting_to_focus_on_if_listing.is(":focusable")) { //cannot focus w/o index
+                      && actions.isFocusable(someting_to_focus_on_if_listing[0])) {
                         someting_to_focus_on_if_listing[0].focus();
                     }
                 } else {
                     someting_to_focus_on[0].focus();
                 }
             }
         },
+        isFocusable: function(element) {
+            return (
+               ['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON'].includes(element.tagName)
+                && element.getAttribute('disabled') === null
+            )
+            || element.getAttribute('href') !== null
+            || (
+                element.getAttribute('tabindex') !== null
+                && element.getAttribute('tabindex') !== -1
+            );
+        },
         focusTopentry: function(top_entry_id) {
             var  triggerer = dom_references[top_entry_id];
             if (triggerer) {

diff --git a/components/ILIAS/UI/resources/js/MainControls/dist/maincontrols.min.js b/components/ILIAS/UI/resources/js/MainControls/dist/maincontrols.min.js
diff --git a/components/ILIAS/UI/resources/js/MainControls/src/mainbar.renderer.js b/components/ILIAS/UI/resources/js/MainControls/src/mainbar.renderer.js
@@ -292,17 +292,28 @@ var renderer = function($) {
                     .children().first();
             someting_to_focus_on_if_listing = someting_to_focus_on.children().first().children().first();
             if(someting_to_focus_on[0]) {
-                if(!someting_to_focus_on.is(":focusable")) { //cannot focus w/o index
+                if(!actions.isFocusable(someting_to_focus_on[0])) {
                     someting_to_focus_on.attr('tabindex', '-1');
                     if(someting_to_focus_on_if_listing[0]
-                      && someting_to_focus_on_if_listing.is(":focusable")) { //cannot focus w/o index
+                      && actions.isFocusable(someting_to_focus_on_if_listing[0])) {
                         someting_to_focus_on_if_listing[0].focus();
                     }
                 } else {
                     someting_to_focus_on[0].focus();
                 }
             }
         },
+        isFocusable: function(element) {
+            return (
+               ['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON'].includes(element.tagName)
+                && element.getAttribute('disabled') === null
+            )
+            || element.getAttribute('href') !== null
+            || (
+                element.getAttribute('tabindex') !== null
+                && element.getAttribute('tabindex') !== -1
+            );
+        },
         focusTopentry: function(top_entry_id) {
             var  triggerer = dom_references[top_entry_id];
             if (triggerer) {