Issue #2845319 by bnjmnm, juanolalla, douggreen, gauravvvv, _utsavsharma,...

Issue #2845319 by bnjmnm, juanolalla, douggreen, gauravvvv, _utsavsharma, akram khan, ankithashetty, neograph734, jungle, nitin shrivastava, danylevskyi, imot3k, artusamak, DuaelFr: The highlighting of the active menu-link does not respect query strings and fragment identifiers

Closes #2845319

core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php

@@ -204,16 +204,15 @@ public static function setLinkActiveClass($html_markup, $current_path, $is_front
       }
       // The query parameters of an active link are equal to the current
       // parameters.
-      if ($add_active) {
-        if ($query) {
-          if (!$node->hasAttribute('data-drupal-link-query') || $node->getAttribute('data-drupal-link-query') !== Json::encode($query)) {
-            $add_active = FALSE;
-          }
-        }
-        else {
-          if ($node->hasAttribute('data-drupal-link-query')) {
-            $add_active = FALSE;
-          }
+      if ($add_active && $node->hasAttribute('data-drupal-link-query')) {
+        $query_match = empty(array_filter(
+          Json::decode($node->getAttribute('data-drupal-link-query')),
+          fn ($value, $key) => $value !== ($query[$key] ?? NULL),
+          ARRAY_FILTER_USE_BOTH
+        ));
+
+        if (!$query_match) {
+          $add_active = FALSE;
         }
       }