Fix #5000

src/Admin.php

@@ -25,7 +25,7 @@ class Admin
      *
      * @var string
      */
-    const VERSION = '1.8.4';
+    const VERSION = '1.8.6';
 
     /**
      * @var Navbar

src/Grid.php

@@ -572,7 +572,7 @@ public function build()
             $this->columnNames[] = $column->getName();
         });
 
-        $this->buildRows($data);
+        $this->buildRows($data, $collection);
 
         $this->builded = true;
     }
@@ -581,13 +581,14 @@ public function build()
      * Build the grid rows.
      *
      * @param array $data
+     * @param Collection $collection
      *
      * @return void
      */
-    protected function buildRows(array $data)
+    protected function buildRows(array $data, Collection $collection)
     {
-        $this->rows = collect($data)->map(function ($model, $number) {
-            return new Row($number, $model, $this->keyName);
+        $this->rows = collect($data)->map(function ($model, $number) use ($collection) {
+            return new Row($number, $model, $collection->get($number)->getKey());
         });
 
         if ($this->rowsCallback) {

src/Grid/Row.php

@@ -34,22 +34,22 @@ class Row
     /**
      * @var string
      */
-    protected $keyName;
+    protected $key;
 
     /**
-     * Constructor.
-     *
-     * @param $number
-     * @param $data
+     * Row constructor.
+     * @param mixed $number
+     * @param array $data
+     * @param mixed $key
      */
-    public function __construct($number, $data, $keyName)
+    public function __construct($number, $data, $key)
     {
         $this->data = $data;
         $this->number = $number;
-        $this->keyName = $keyName;
+        $this->key = $key;
 
         $this->attributes = [
-            'data-key' => $this->getKey(),
+            'data-key' => $key,
         ];
     }
 
@@ -60,7 +60,7 @@ public function __construct($number, $data, $keyName)
      */
     public function getKey()
     {
-        return Arr::get($this->data, $this->keyName);
+        return $this->key;
     }
 
     /**