#339 don't set tabindex explicitly

Author: Eugene Tupikov

CHANGELOG.md

@@ -1,9 +1,13 @@
 Yii2 multiple input change log
 ==============================
 
-2.24.0 (in development)
+2.25.0 (in development)
 =======================
 
+2.24.0
+======
+- #339 don't set tabindex explicitly
+
 2.23.0
 ======
 - always use `id` from the settings if it is specified

src/components/BaseColumn.php

@@ -39,8 +39,6 @@ abstract class BaseColumn extends BaseObject
     const TYPE_RADIO            = 'radio';
     const TYPE_DRAGCOLUMN       = 'dragColumn';
 
-    const TABINDEX = 1;
-
     const DEFAULT_STATIC_COLUMN_NAME = 'static-column';
 
     /**
@@ -366,11 +364,7 @@ protected function renderDropDownList($name, $value, $options)
         if ($this->renderer->isBootstrapTheme()) {
             Html::addCssClass($options, 'form-control');
         }
-
-        if (!isset($options['tabindex'])) {
-            $options['tabindex'] = self::TABINDEX;
-        }
-
+        
         return Html::dropDownList($name, $value, $this->prepareItems($this->items), $options);
     }
 
@@ -402,11 +396,7 @@ protected function renderListBox($name, $value, $options)
         if ($this->renderer->isBootstrapTheme()) {
             Html::addCssClass($options, 'form-control');
         }
-
-        if (!isset($options['tabindex'])) {
-            $options['tabindex'] = self::TABINDEX;
-        }
-
+        
         return Html::listBox($name, $value, $this->prepareItems($this->items), $options);
     }
 
@@ -433,10 +423,6 @@ protected function renderHiddenInput($name, $value, $options)
      */
     protected function renderRadio($name, $value, $options)
     {
-        if (!isset($options['tabindex'])) {
-            $options['tabindex'] = self::TABINDEX;
-        }
-
         if (!isset($options['label'])) {
             $options['label'] = '';
         }
@@ -460,10 +446,6 @@ protected function renderRadio($name, $value, $options)
      */
     protected function renderRadioList($name, $value, $options)
     {
-        if (!isset($options['tabindex'])) {
-            $options['tabindex'] = self::TABINDEX;
-        }
-
         if (!array_key_exists('unselect', $options)) {
             $options['unselect'] = '';
         }
@@ -473,7 +455,6 @@ protected function renderRadioList($name, $value, $options)
                 'label'     => $label,
                 'value'     => $value,
                 'data-id'   => ArrayHelper::getValue($options, 'id'),
-                'tabindex'  => self::TABINDEX
             ]);
 
             return Html::tag('div', $content, ['class' => 'radio']);
@@ -494,10 +475,6 @@ protected function renderRadioList($name, $value, $options)
      */
     protected function renderCheckbox($name, $value, $options)
     {
-        if (!isset($options['tabindex'])) {
-            $options['tabindex'] = self::TABINDEX;
-        }
-
         if (!isset($options['label'])) {
             $options['label'] = '';
         }
@@ -521,10 +498,6 @@ protected function renderCheckbox($name, $value, $options)
      */
     protected function renderCheckboxList($name, $value, $options)
     {
-        if (!isset($options['tabindex'])) {
-            $options['tabindex'] = self::TABINDEX;
-        }
-
         if (!array_key_exists('unselect', $options)) {
             $options['unselect'] = '';
         }
@@ -534,7 +507,6 @@ protected function renderCheckboxList($name, $value, $options)
                 'label'     => $label,
                 'value'     => $value,
                 'data-id'   => ArrayHelper::getValue($options, 'id'),
-                'tabindex'  => self::TABINDEX
             ]);
 
             return Html::tag('div', $content, ['class' => 'checkbox']);
@@ -555,10 +527,6 @@ protected function renderCheckboxList($name, $value, $options)
      */
     protected function renderStatic($name, $value, $options)
     {
-        if (!isset($options['tabindex'])) {
-            $options['tabindex'] = self::TABINDEX;
-        }
-
         if ($this->renderer->isBootstrapTheme()) {
             Html::addCssClass($options, 'form-control-static');
         }
@@ -604,10 +572,6 @@ protected function renderDefault($name, $value, $options)
         $type = $this->type;
 
         if (method_exists('yii\helpers\Html', $type)) {
-            if (!isset($options['tabindex'])) {
-                $options['tabindex'] = self::TABINDEX;
-            }
-
             if ($this->renderer->isBootstrapTheme()) {
                 Html::addCssClass($options, 'form-control');
             }
@@ -633,10 +597,15 @@ protected function renderDefault($name, $value, $options)
      */
     protected function renderWidget($type, $name, $value, $options)
     {
-
-        $tabindex = isset($options['options']['tabindex']) ? $options['options']['tabindex'] : self::TABINDEX;
-        unset($options['tabindex']);
-
+        if (isset($options['options']['tabindex'])) {
+            $tabindex = $options['options']['tabindex'];
+        } elseif (isset($options['tabindex'])) {
+            $tabindex = $options['tabindex'];
+            unset($options['tabindex']);
+        } else {
+            $tabindex = null;
+        }
+        
         $id = isset($options['id']) ? $options['id'] : $this->normalize($name);
         $model = $this->getModel();
         if ($model instanceof Model) {