Remove active category in the cache key

- Remove setting of active related classes in ViewModel layer as they are now defined on JS side;

Author: adifucan

app/code/Magento/Catalog/Plugin/Block/Topmenu.php

@@ -12,7 +12,8 @@
 use Magento\Framework\Data\Tree\Node;
 
 /**
- * Plugin for top menu block
+ * Plugin that enhances the top menu block by building and managing the category tree
+ * for menu rendering in a storefront.
  */
 class Topmenu
 {
@@ -78,7 +79,6 @@ public function beforeGetHtml(
         $storeId = $this->storeManager->getStore()->getId();
         /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
         $collection = $this->getCategoryTree($storeId, $rootId);
-        $currentCategory = $this->getCurrentCategory();
         $mapping = [$rootId => $subject->getMenu()];  // use nodes stack to avoid recursion
         foreach ($collection as $category) {
             $categoryParentId = $category->getParentId();
@@ -95,11 +95,7 @@ public function beforeGetHtml(
             $parentCategoryNode = $mapping[$categoryParentId];
 
             $categoryNode = new Node(
-                $this->getCategoryAsArray(
-                    $category,
-                    $currentCategory,
-                    $category->getParentId() == $categoryParentId
-                ),
+                $this->getCategoryAsArray($category),
                 'id',
                 $parentCategoryNode->getTree(),
                 $parentCategoryNode
@@ -132,41 +128,20 @@ public function beforeGetIdentities(\Magento\Theme\Block\Html\Topmenu $subject)
         }
     }
 
-    /**
-     * Get current Category from catalog layer
-     *
-     * @return \Magento\Catalog\Model\Category
-     */
-    private function getCurrentCategory()
-    {
-        $catalogLayer = $this->layerResolver->get();
-
-        if (!$catalogLayer) {
-            return null;
-        }
-
-        return $catalogLayer->getCurrentCategory();
-    }
-
     /**
      * Convert category to array
      *
      * @param \Magento\Catalog\Model\Category $category
-     * @param \Magento\Catalog\Model\Category $currentCategory
-     * @param bool $isParentActive
      * @return array
      */
-    private function getCategoryAsArray($category, $currentCategory, $isParentActive)
+    private function getCategoryAsArray($category)
     {
         $categoryId = $category->getId();
         return [
             'name' => $category->getName(),
             'id' => 'category-node-' . $categoryId,
             'url' => $this->catalogCategory->getCategoryUrl($category),
-            'has_active' => in_array((string)$categoryId, explode('/', (string)$currentCategory->getPath()), true),
-            'is_active' => $categoryId == $currentCategory->getId(),
-            'is_category' => true,
-            'is_parent_active' => $isParentActive
+            'is_category' => true
         ];
     }
 

app/code/Magento/Theme/Block/Html/Topmenu.php

@@ -7,7 +7,6 @@
 
 use Magento\Backend\Model\Menu;
 use Magento\Framework\Data\Tree\Node;
-use Magento\Framework\Data\Tree\Node\Collection;
 use Magento\Framework\Data\Tree\NodeFactory;
 use Magento\Framework\Data\TreeFactory;
 use Magento\Framework\DataObject;
@@ -218,7 +217,6 @@ protected function _getHtml(
 
         $children = $menuTree->getChildren();
         $childLevel = $this->getChildLevel($menuTree->getLevel());
-        $this->removeChildrenWithoutActiveParent($children, $childLevel);
 
         $counter = 1;
         $childrenCount = $children->count();
@@ -312,12 +310,6 @@ protected function _getMenuItemClasses(Node $item)
             $classes[] = 'first';
         }
 
-        if ($item->getIsActive()) {
-            $classes[] = 'active';
-        } elseif ($item->getHasActive()) {
-            $classes[] = 'has-active';
-        }
-
         if ($item->getIsLast()) {
             $classes[] = 'last';
         }
@@ -379,23 +371,6 @@ public function getMenu()
         return $this->_menu;
     }
 
-    /**
-     * Remove children from collection when the parent is not active
-     *
-     * @param Collection $children
-     * @param int $childLevel
-     * @return void
-     */
-    private function removeChildrenWithoutActiveParent(Collection $children, int $childLevel): void
-    {
-        /** @var Node $child */
-        foreach ($children as $child) {
-            if ($childLevel === 0 && $child->getData('is_parent_active') === false) {
-                $children->delete($child);
-            }
-        }
-    }
-
     /**
      * Retrieve child level based on parent level
      *