MAGETWO-30068: Customer menu tabs aren't displayed as selected for child pages

Author: okarpenko

app/code/Magento/Sales/Controller/AbstractController/View.php

@@ -52,6 +52,7 @@ public function execute()
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getLayout()->initMessages();
 
+        /** @var \Magento\Framework\View\Element\Html\Links $navigationBlock */
         $navigationBlock = $resultPage->getLayout()->getBlock('customer_account_navigation');
         if ($navigationBlock) {
             $navigationBlock->setActive('sales/order/history');

app/code/Magento/Theme/etc/di.xml

@@ -76,7 +76,4 @@
         </arguments>
     </type>
     <preference for="Magento\Framework\View\Model\PageLayout\Config\BuilderInterface" type="Magento\Theme\Model\PageLayout\Config\Builder"/>
-    <type name="Magento\Framework\View\Element\Html\Link\Current">
-        <plugin name="saleOrderViewMenu" type="Magento\Framework\View\Plugin\Element\Html\Link\Current"/>
-    </type>
 </config>

lib/internal/Magento/Framework/View/Element/Html/Link/Current.php

@@ -110,7 +110,19 @@ protected function _toHtml()
             $html .= $this->getTitle()
                 ? ' title="' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getTitle())) . '"'
                 : '';
-            $html .= '>' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel())) . '</a></li>';
+            $html .= '>';
+
+            if ($this->getIsHighlighted()) {
+                $html .= '<strong>';
+            }
+
+            $html .= $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()));
+
+            if ($this->getIsHighlighted()) {
+                $html .= '</strong>';
+            }
+
+            $html .= '</a></li>';
         }
 
         return $html;

lib/internal/Magento/Framework/View/Element/Html/Links.php

@@ -20,6 +20,35 @@ public function getLinks()
         return $this->_layout->getChildBlocks($this->getNameInLayout());
     }
 
+    /**
+     * Find link by path
+     *
+     * @param string $path
+     * @return \Magento\Framework\View\Element\Html\Link
+     */
+    protected function getLinkByPath($path)
+    {
+        foreach ($this->getLinks() as $link) {
+            if ($link->getPath() == $path) {
+                return $link;
+            }
+        }
+    }
+
+    /**
+     * Set active link
+     *
+     * @param string $path
+     * @return void
+     */
+    public function setActive($path)
+    {
+        $link = $this->getLinkByPath($path);
+        if ($link) {
+            $link->setIsHighlighted(true);
+        }
+    }
+
     /**
      * Render Block
      *

lib/internal/Magento/Framework/View/Plugin/Element/Html/Link/Current.php

@@ -49,6 +49,31 @@ public function testGetLinks()
         $this->assertEquals($blocks, $this->_block->getLinks());
     }
 
+    public function testSetActive()
+    {
+        $link = $this->getMock('Magento\Framework\View\Element\Html\Link', [], [], '', false);
+        $link
+            ->expects($this->at(1))
+            ->method('__call')
+            ->with('setIsHighlighted', [true]);
+        $link
+            ->expects($this->at(0))
+            ->method('__call')
+            ->with('getPath', [])
+            ->willReturn('test/path');
+
+        $name = 'test_name';
+        $this->_context->getLayout()
+            ->expects($this->once())
+            ->method('getChildBlocks')
+            ->with($name)
+            ->willReturn([$link]);
+
+        $this->_block->setNameInLayout($name);
+
+        $this->_block->setActive('test/path');
+    }
+
     public function testRenderLink()
     {
         $blockHtml = 'test';