Use 'category-item' links only.

This change prevents adding custom links, like 'contacts', 'home', etc.into breadcrumbs

Author: vovayatsyuk

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

@@ -162,6 +162,7 @@ private function getCategoryAsArray($category, $currentCategory, $isParentActive
             'url' => $this->catalogCategory->getCategoryUrl($category),
             'has_active' => in_array((string)$category->getId(), explode('/', $currentCategory->getPath()), true),
             'is_active' => $category->getId() == $currentCategory->getId(),
+            'is_category' => true,
             'is_parent_active' => $isParentActive
         ];
     }

app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js

@@ -13,10 +13,10 @@ define([
 
         $.widget('mage.breadcrumbs', widget, {
             options: {
-                categoryPathRegex: /(nav\-)[0-9]+(\-[0-9]+)+/gi,
                 categoryUrlSuffix: '',
                 useCategoryPathInUrl: false,
                 product: '',
+                categoryItemSelector: '.category-item',
                 menuContainer: '[data-action="navigation"] > ul'
             },
 
@@ -137,7 +137,7 @@ define([
                 }
 
                 classes = menuItem.parent().attr('class');
-                classNav = classes.match(this.options.categoryPathRegex);
+                classNav = classes.match(/(nav\-)[0-9]+(\-[0-9]+)+/gi);
 
                 if (classNav) {
                     classNav = classNav[0];
@@ -164,20 +164,13 @@ define([
             _resolveCategoryMenuItem: function () {
                 var categoryUrl = this._resolveCategoryUrl(),
                     menu = $(this.options.menuContainer),
-                    categoryMenuItem = null,
-                    isCategoryMenuItem;
+                    categoryMenuItem = null;
 
                 if (categoryUrl && menu.length) {
-                    categoryMenuItem = menu.find('a[href="' + categoryUrl + '"]');
-
-                    // Check if this is a category (Not a link to contacts, homepage, etc)
-                    isCategoryMenuItem = categoryMenuItem.parent('li')
-                        .attr('class')
-                        .match(this.options.categoryPathRegex);
-
-                    if (!isCategoryMenuItem) {
-                        categoryMenuItem = null;
-                    }
+                    categoryMenuItem = menu.find(
+                        this.options.categoryItemSelector +
+                        ' > a[href="' + categoryUrl + '"]'
+                    );
                 }
 
                 return categoryMenuItem;

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

@@ -309,6 +309,10 @@ protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item)
         $classes[] = 'level' . $item->getLevel();
         $classes[] = $item->getPositionClass();
 
+        if ($item->getIsCategory()) {
+            $classes[] = 'category-item';
+        }
+
         if ($item->getIsFirst()) {
             $classes[] = 'first';
         }