[FIX] UI #37151: add aria-expanded attribute to metabar more-button (I…

…LIAS-eLearning#6318)
surlabs · Sep 28, 2023 · 89cc751 · 89cc751
1 parent 89d5577
commit 89cc751
Show file tree

Hide file tree

Showing 10 changed files with 755 additions and 328 deletions.
diff --git a/src/UI/Implementation/Component/MainControls/Renderer.php b/src/UI/Implementation/Component/MainControls/Renderer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 namespace ILIAS\UI\Implementation\Component\MainControls;
 
 use ILIAS\UI\Component;
@@ -103,7 +103,7 @@ protected function renderToolEntry(
             $this->trigger_signals[] = $trigger_signal;
             $btn_removetool = $close_buttons[$entry_id]
                ->withAdditionalOnloadCode(
-                   fn ($id) => "il.UI.maincontrols.mainbar.addPartIdAndEntry('$mb_id', 'remover', '$id', true);"
+                   fn($id) => "il.UI.maincontrols.mainbar.addPartIdAndEntry('$mb_id', 'remover', '$id', true);"
                )
                 ->withOnClick($trigger_signal);
 
@@ -268,13 +268,16 @@ function ($id) use ($signals) {
                 $entry_signal = $signals['entry'];
                 $close_slates_signal = $signals['close_slates'];
                 return "
-					il.UI.maincontrols.metabar.registerSignals(
-						'$id',
+					il.UI.maincontrols.metabar.init('$id');
+                    il.UI.maincontrols.metabar.get('$id').registerSignals(
 						'$entry_signal',
 						'$close_slates_signal',
 					);
-					il.UI.maincontrols.metabar.init();
-					$(window).resize(il.UI.maincontrols.metabar.init);
+                    il.UI.maincontrols.metabar.get('$id').init();
+                    window.addEventListener(
+                        'resize',
+                        ()=>{il.UI.maincontrols.metabar.get('$id').init()}
+                    );
 				";
             }
         );
@@ -321,13 +324,13 @@ protected function renderSystemInfo(
             $close = $close->withOnClick($signal);
             $tpl->setVariable('CLOSE_BUTTON', $default_renderer->render($close));
             $tpl->setVariable('CLOSE_URI', (string) $component->getDismissAction());
-            $component = $component->withAdditionalOnLoadCode(fn ($id) => "$(document).on('$signal', function() { il.UI.maincontrols.system_info.close('$id'); });");
+            $component = $component->withAdditionalOnLoadCode(fn($id) => "$(document).on('$signal', function() { il.UI.maincontrols.system_info.close('$id'); });");
         }
 
         $more = $this->getUIFactory()->symbol()->glyph()->more("#");
         $tpl->setVariable('MORE_BUTTON', $default_renderer->render($more));
 
-        $component = $component->withAdditionalOnLoadCode(fn ($id) => "il.UI.maincontrols.system_info.init('$id')");
+        $component = $component->withAdditionalOnLoadCode(fn($id) => "il.UI.maincontrols.system_info.init('$id')");
 
         $id = $this->bindJavaScript($component);
         $tpl->setVariable('ID', $id);
@@ -454,7 +457,7 @@ public function registerResources(ResourceRegistry $registry): void
     {
         parent::registerResources($registry);
         $registry->register('./src/UI/templates/js/MainControls/dist/mainbar.js');
-        $registry->register('./src/UI/templates/js/MainControls/metabar.js');
+        $registry->register('./src/UI/templates/js/MainControls/dist/maincontrols.min.js');
         $registry->register('./src/GlobalScreen/Client/dist/GS.js');
         $registry->register('./src/UI/templates/js/MainControls/system_info.js');
     }

diff --git a/src/UI/Implementation/Component/MainControls/Slate/Renderer.php b/src/UI/Implementation/Component/MainControls/Slate/Renderer.php
@@ -65,7 +65,7 @@ protected function getCombinedSlateContents(
                     $triggerer = $triggerer
                         ->withOnClick($trigger_signal)
                         ->withAdditionalOnLoadCode(
-                            fn ($id) => "
+                            fn($id) => "
                                     il.UI.maincontrols.mainbar.addTriggerSignal('{$trigger_signal}');
                                     il.UI.maincontrols.mainbar.addPartIdAndEntry('{$mb_id}', 'triggerer', '{$id}');
                                 "
@@ -132,9 +132,15 @@ protected function renderSlate(
 
         $component = $component->withAdditionalOnLoadCode(
             function ($id) use ($slate_signals, $mb_id): string {
-                $js = "fn = il.UI.maincontrols.slate.onSignal;";
+                $js = "";
                 foreach ($slate_signals as $key => $signal) {
-                    $js .= "$(document).on('{$signal}', function(event, signalData) { fn('{$key}', event, signalData, '{$id}'); return false;});";
+                    $js .= "$(document).on('{$signal}', function(event, signalData) { 
+                        il.UI.maincontrols.slate.onSignal('{$key}', 
+                        event, 
+                        signalData, 
+                        '{$id}'
+                    ); 
+                    return false;});";
                 }
 
                 if ($mb_id) {
@@ -168,7 +174,7 @@ protected function renderNotificationSlate(
     public function registerResources(\ILIAS\UI\Implementation\Render\ResourceRegistry $registry): void
     {
         parent::registerResources($registry);
-        $registry->register('./src/UI/templates/js/MainControls/slate.js');
+        $registry->register('./src/UI/templates/js/MainControls/dist/maincontrols.min.js');
     }
 
     /**

diff --git a/src/UI/templates/js/MainControls/dist/maincontrols.min.js b/src/UI/templates/js/MainControls/dist/maincontrols.min.js
diff --git a/src/UI/templates/js/MainControls/metabar.js b/src/UI/templates/js/MainControls/metabar.js