Issue #3410295 by simonbaese, anthonygray47: Active trail indicator is...

Issue #3410295 by simonbaese, anthonygray47: Active trail indicator is overwritten by current page indicator

src/ExpandBookManager.php

@@ -138,12 +138,19 @@ class ExpandBookManager extends BookManager {
         $element['is_collapsed'] = TRUE;
       }
 
-      // Set a helper variable to indicate if the link is in the active trail.
+      // Set a helper variable to indicate whether the link is in the active
+      // trail.
       $element['in_active_trail'] = FALSE;
       if ($data['link']['in_active_trail']) {
         $element['in_active_trail'] = TRUE;
       }
 
+      // Set a helper variable to indicate whether the link is the active link.
+      $element['is_active'] = FALSE;
+      if (($node instanceof NodeInterface) && $data['link']['nid'] === $node->id()) {
+        $element['is_active'] = TRUE;
+      }
+
       // Allow book-specific theme overrides.
       $element['attributes'] = new Attribute();
       $element['title'] = $data['link']['title'];
@@ -151,11 +158,6 @@ class ExpandBookManager extends BookManager {
         'langcode' => $langcode,
       ]);
 
-      $element['in_active_trail'] = FALSE;
-      if (($node instanceof NodeInterface) && $data['link']['nid'] == $node->id()) {
-        $element['in_active_trail'] = TRUE;
-      }
-
       $element['localized_options'] = !empty($data['link']['localized_options']) ? $data['link']['localized_options'] : [];
       $element['localized_options']['set_active_class'] = TRUE;
       $element['below'] = $data['below'] ? $this->buildItems($data['below']) : [];