Merge pull request #322 from ua0leg/master

Ability to add custom tabindex

Author: unclead

CHANGELOG.md

@@ -3,6 +3,7 @@ Yii2 multiple input change log
 
 2.23.0 (in development)
 =======================
+- Ability to add custom tabindex via options array
 
 2.22.0
 =======================

src/components/BaseColumn.php

@@ -367,7 +367,9 @@ protected function renderDropDownList($name, $value, $options)
             Html::addCssClass($options, 'form-control');
         }
 
-        $options['tabindex'] = self::TABINDEX;
+        if (!isset($options['tabindex'])) {
+            $options['tabindex'] = self::TABINDEX;
+        }
 
         return Html::dropDownList($name, $value, $this->prepareItems($this->items), $options);
     }
@@ -401,7 +403,9 @@ protected function renderListBox($name, $value, $options)
             Html::addCssClass($options, 'form-control');
         }
 
-        $options['tabindex'] = self::TABINDEX;
+        if (!isset($options['tabindex'])) {
+            $options['tabindex'] = self::TABINDEX;
+        }
 
         return Html::listBox($name, $value, $this->prepareItems($this->items), $options);
     }
@@ -429,7 +433,9 @@ protected function renderHiddenInput($name, $value, $options)
      */
     protected function renderRadio($name, $value, $options)
     {
-        $options['tabindex'] = self::TABINDEX;
+        if (!isset($options['tabindex'])) {
+            $options['tabindex'] = self::TABINDEX;
+        }
 
         if (!isset($options['label'])) {
             $options['label'] = '';
@@ -454,7 +460,9 @@ protected function renderRadio($name, $value, $options)
      */
     protected function renderRadioList($name, $value, $options)
     {
-        $options['tabindex'] = self::TABINDEX;
+        if (!isset($options['tabindex'])) {
+            $options['tabindex'] = self::TABINDEX;
+        }
 
         if (!array_key_exists('unselect', $options)) {
             $options['unselect'] = '';
@@ -486,7 +494,9 @@ protected function renderRadioList($name, $value, $options)
      */
     protected function renderCheckbox($name, $value, $options)
     {
-        $options['tabindex'] = self::TABINDEX;
+        if (!isset($options['tabindex'])) {
+            $options['tabindex'] = self::TABINDEX;
+        }
 
         if (!isset($options['label'])) {
             $options['label'] = '';
@@ -511,7 +521,9 @@ protected function renderCheckbox($name, $value, $options)
      */
     protected function renderCheckboxList($name, $value, $options)
     {
-        $options['tabindex'] = self::TABINDEX;
+        if (!isset($options['tabindex'])) {
+            $options['tabindex'] = self::TABINDEX;
+        }
 
         if (!array_key_exists('unselect', $options)) {
             $options['unselect'] = '';
@@ -543,7 +555,9 @@ protected function renderCheckboxList($name, $value, $options)
      */
     protected function renderStatic($name, $value, $options)
     {
-        $options['tabindex'] = self::TABINDEX;
+        if (!isset($options['tabindex'])) {
+            $options['tabindex'] = self::TABINDEX;
+        }
 
         if ($this->renderer->isBootstrapTheme()) {
             Html::addCssClass($options, 'form-control-static');
@@ -590,7 +604,9 @@ protected function renderDefault($name, $value, $options)
         $type = $this->type;
 
         if (method_exists('yii\helpers\Html', $type)) {
-            $options['tabindex'] = self::TABINDEX;
+            if (!isset($options['tabindex'])) {
+                $options['tabindex'] = self::TABINDEX;
+            }
 
             if ($this->renderer->isBootstrapTheme()) {
                 Html::addCssClass($options, 'form-control');
@@ -617,6 +633,8 @@ 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']);
 
         $model = $this->getModel();
@@ -628,7 +646,7 @@ protected function renderWidget($type, $name, $value, $options)
                 'options'   => [
                     'id'        => $this->normalize($name),
                     'name'      => $name,
-                    'tabindex'  => self::TABINDEX,
+                    'tabindex'  => $tabindex,
                     'value'     => $value
                 ]
             ];
@@ -639,7 +657,7 @@ protected function renderWidget($type, $name, $value, $options)
                 'options'   => [
                     'id'        => $this->normalize($name),
                     'name'      => $name,
-                    'tabindex'  => self::TABINDEX,
+                    'tabindex'  => $tabindex,
                     'value'     => $value
                 ]
             ];