fixed rendering of an action column

Author: unclead

README.md

@@ -8,7 +8,7 @@ Yii2 widget for handle multiple inputs for an attribute of model and tabular inp
 [![License](https://poser.pugx.org/unclead/yii2-multiple-input/license)](https://packagist.org/packages/unclead/yii2-multiple-input)
 
 ## Latest release
-The latest stable version of the extension is v2.11.2 Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
+The latest stable version of the extension is v2.11.3 Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
 
 ## Installation
 The preferred way to install this extension is through [composer](http://getcomposer.org/download/).

composer.json

@@ -9,7 +9,7 @@
         "yii2 tabular input"
     ],
     "type": "yii2-extension",
-    "version": "2.11.2",
+    "version": "2.11.3",
     "license": "BSD-3-Clause",
     "support": {
         "issues": "https://github.com/unclead/yii2-multiple-input/issues?state=open",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.multipleInput",
-  "version": "2.11.2",
+  "version": "2.11.3",
   "description": "jQuery multipleInput",
   "scripts": {
     "build": "npm install && (gulp || node node_modules/gulp/bin/gulp.js)"

src/renderers/TableRenderer.php

@@ -174,7 +174,7 @@ private function renderRowContent($index = null, $item = null)
         $hiddenInputs = [];
         $isLastRow = $this->max === $this->min;
         if (!$isLastRow && $this->isAddButtonPositionRowBegin()) {
-            $cells[] = $this->renderActionColumn($index);
+            $cells[] = $this->renderActionColumn($index, true);
         }
 
         foreach ($this->columns as $column) {
@@ -187,8 +187,8 @@ private function renderRowContent($index = null, $item = null)
             }
         }
 
-        if (!$isLastRow && !$this->isAddButtonPositionRow()) {
-            $cells[] = $this->renderActionColumn($index);
+        if (!$isLastRow) {
+            $cells[] = $this->renderActionColumn($index, false);
         }
 
         if ($hiddenInputs) {
@@ -276,30 +276,44 @@ public function renderCellContent($column, $index)
      * Renders the action column.
      *
      * @param null|int $index
+     * @param bool $isFirstColumn
      * @return string
-     * @throws \Exception
      */
-    private function renderActionColumn($index = null)
+    private function renderActionColumn($index = null, $isFirstColumn = false)
     {
-        return Html::tag('td', $this->getActionButton($index), [
+        return Html::tag('td', $this->getActionButton($index, $isFirstColumn), [
             'class' => 'list-cell__button',
         ]);
     }
 
-    private function getActionButton($index)
+    private function getActionButton($index, $isFirstColumn)
     {
         if ($index === null || $this->min === 0) {
-            return $this->renderRemoveButton();
+            if ($isFirstColumn) {
+                return $this->isAddButtonPositionRowBegin() ? $this->renderRemoveButton() : '';
+            }
+
+            return $this->isAddButtonPositionRowBegin() ? '' : $this->renderRemoveButton();
         }
 
         $index++;
         if ($index < $this->min) {
             return '';
-        } elseif ($index === $this->min) {
-            return ($this->isAddButtonPositionRow() || $this->isAddButtonPositionRowBegin()) ? $this->renderAddButton() : '';
-        } else {
-            return $this->renderRemoveButton();
         }
+
+        if ($index === $this->min) {
+            if ($isFirstColumn) {
+                return $this->isAddButtonPositionRowBegin() ? $this->renderAddButton() : '';
+            }
+
+            return $this->isAddButtonPositionRow() ? $this->renderAddButton() : '';
+        }
+
+        if ($isFirstColumn) {
+            return $this->isAddButtonPositionRowBegin() ? $this->renderRemoveButton() : '';
+        }
+
+        return $this->isAddButtonPositionRowBegin() ? '' : $this->renderRemoveButton();
     }
 
     private function renderAddButton()