Merge pull request MedicOneSystems#353 from chrisjimallen/export-highlight-fix

Move highlight call before export callback calls.

Author: thyseus

src/Http/Livewire/LivewireDatatable.php

@@ -1548,6 +1548,9 @@ public function mapCallbacks($paginatedCollection, $export = false)
  {
  $paginatedCollection->collect()->map(function ($row, $i) use ($export) {
  foreach ($row as $name => $value) {
+ if ($this->search && ! config('livewire-datatables.suppress_search_highlights') && $this->searchableColumns()->firstWhere('name', $name)) {
+ $row->$name = $this->highlight($row->$name, $this->search);
+ }
  if ($export && isset($this->export_callbacks[$name])) {
  $values = Str::contains($value, static::SEPARATOR) ? explode(static::SEPARATOR, $value) : [$value, $row];
  $row->$name = $this->export_callbacks[$name](...$values);
@@ -1567,10 +1570,6 @@ public function mapCallbacks($paginatedCollection, $export = false)
  } elseif (isset($this->callbacks[$name]) && is_callable($this->callbacks[$name])) {
  $row->$name = $this->callbacks[$name]($value, $row);
  }
-
- if ($this->search && ! config('livewire-datatables.suppress_search_highlights') && $this->searchableColumns()->firstWhere('name', $name)) {
- $row->$name = $this->highlight($row->$name, $this->search);
- }
  }
 
  return $row;