menu: After disabled state tabindex has not been set

fix #1767

common.blocks/control/control.js

@@ -32,7 +32,10 @@ provide(BEMDOM.decl(this.name, /** @lends control.prototype */{
                     // if block already has focused mod, we need to focus control
                     this.hasMod('focused') && this._focus();
 
-                this._tabIndex = this.elem('control').attr('tabindex');
+                this._tabIndex = typeof this.params.tabIndex !== 'undefined'?
+                    this.params.tabIndex :
+                    this.elem('control').attr('tabindex');
+
                 if(this.hasMod('disabled') && this._tabIndex !== 'undefined')
                     this.elem('control').removeAttr('tabindex');
             }

common.blocks/menu/menu.bemhtml

@@ -49,5 +49,9 @@ block('menu')(
         return attrs;
     }),
     js()(true),
-    mix()([{ elem : 'control' }])
+    mix()({ elem : 'control' }),
+    mod('disabled', true)
+        .js()(function() {
+            return this.extend(applyNext(), { tabIndex : 0 });
+        })
 );

common.blocks/menu/menu.bh.js

@@ -5,13 +5,16 @@ module.exports = function(bh) {
             attrs = { role : 'menu' };
 
         ctx
-            .js(true)
             .tParam('menuMods', mods)
             .mix({ elem : 'control' });
 
-        mods.disabled?
-            attrs['aria-disabled'] = 'true' :
+        if(mods.disabled) {
+            attrs['aria-disabled'] = 'true';
+            ctx.js({ tabIndex : 0 });
+        } else {
             attrs.tabindex = 0;
+            ctx.js(true);
+        }
 
         ctx.attrs(attrs);
 

common.blocks/menu/menu.spec.js

@@ -80,6 +80,26 @@ describe('menu', function() {
             control.attr('tabindex').should.be.equal('0');
         });
 
+        it('should restore "tabindex" attribute on enable if was disabled initially', function() {
+            var menu = buildMenu({
+                    block : 'menu',
+                    mods : { disabled : true },
+                    content : [
+                        {
+                            block : 'menu-item',
+                            content : 'item 1'
+                        }
+                    ]
+                }),
+                control = menu.elem('control');
+
+            expect(control.attr('tabindex')).to.be.undefined;
+            menu.delMod('disabled');
+            control.attr('tabindex').should.be.equal('0');
+
+            BEMDOM.destruct(menu.domElem);
+        });
+
         it('should pass disabled mod to menu items', function() {
             menu.setMod('disabled');
             menuItems.forEach(function(menuItem) {

common.blocks/menu/menu.tmpl-specs/10-default.html

@@ -1,4 +1,4 @@
-<div aria-disabled="true" class="menu menu_theme_islands menu_disabled menu__control i-bem" data-bem="{&quot;menu&quot;:{}}" role="menu">
+<div aria-disabled="true" class="menu menu_theme_islands menu_disabled menu__control i-bem" data-bem="{&quot;menu&quot;:{&quot;tabIndex&quot;:0}}" role="menu">
     <div aria-disabled="true" role="menuitem" id class="menu-item menu-item_theme_islands menu-item_disabled i-bem" data-bem="{&quot;menu-item&quot;:{&quot;val&quot;:1}}">item 1</div>
     <div aria-disabled="true" role="menuitem" id class="menu-item menu-item_theme_islands menu-item_disabled i-bem" data-bem="{&quot;menu-item&quot;:{&quot;val&quot;:2}}">item 2</div>
 </div>

common.blocks/menu/menu.tmpl-specs/40-disabled-with-link.html

@@ -1,4 +1,4 @@
-<div aria-disabled="true" class="menu menu_theme_islands menu_size_m menu_disabled menu__control i-bem" role="menu" data-bem="{&quot;menu&quot;:{}}">
+<div aria-disabled="true" class="menu menu_theme_islands menu_size_m menu_disabled menu__control i-bem" role="menu" data-bem="{&quot;menu&quot;:{&quot;tabIndex&quot;:0}}">
     <div aria-disabled="true" id class="menu-item menu-item_theme_islands menu-item_disabled menu-item_type_link i-bem" role="menuitem" data-bem="{&quot;menu-item&quot;:{}}">
         <a aria-disabled="true" class="link link_disabled link__control i-bem" data-bem="{&quot;link&quot;:{&quot;url&quot;:&quot;//yandex.ru&quot;}}" role="link">Yandex</a>
     </div>

common.blocks/select/select.tmpl-specs/20-control-disabled.html

@@ -2,7 +2,7 @@
     <input class="select__control" type="hidden" value="1" disabled="disabled" autocomplete="off" />
     <button aria-labelledby="" class="button button_theme_islands button_disabled button__control select__button i-bem" data-bem="{&quot;button&quot;:{}}" role="listbox" aria-owns="{{\w+\s\w+}}" type="button" disabled="disabled"><span class="button__text" id>first</span><span class="icon select__tick"></span></button>
     <div aria-hidden="true" class="popup popup_theme_islands popup_autoclosable popup_target_anchor i-bem" data-bem="{&quot;popup&quot;:{&quot;directions&quot;:[&quot;bottom-left&quot;,&quot;bottom-right&quot;,&quot;top-left&quot;,&quot;top-right&quot;]}}">
-        <div aria-disabled="true" class="menu menu_theme_islands menu_disabled menu_mode_radio menu__control select__menu i-bem" data-bem="{&quot;menu&quot;:{}}">
+        <div aria-disabled="true" class="menu menu_theme_islands menu_disabled menu_mode_radio menu__control select__menu i-bem" data-bem="{&quot;menu&quot;:{&quot;tabIndex&quot;:0}}">
             <div id aria-checked="true" aria-disabled="true" class="menu-item menu-item_checked menu-item_disabled menu-item_theme_islands i-bem" data-bem="{&quot;menu-item&quot;:{&quot;val&quot;:1}}" role="option">first</div>
             <div id aria-checked="false" aria-disabled="true" class="menu-item menu-item_disabled menu-item_theme_islands i-bem" data-bem="{&quot;menu-item&quot;:{&quot;val&quot;:2}}" role="option">second</div>
         </div>