Skip to content

Commit 66d3866

Browse files
wip
1 parent e477901 commit 66d3866

5 files changed

Lines changed: 37 additions & 4 deletions

File tree

resources/views/report.blade.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
@if($this->rows->count())
4747

48-
<div class="relative overflow-x-auto">
48+
<div id="{{ $this->identifier() }}" class="relative overflow-x-auto">
4949
<table class="w-full text-sm text-left text-gray-500">
5050
<thead class="text-xs text-gray-700 uppercase bg-gray-50">
5151
<tr class="border-y border-gray-200">
@@ -166,7 +166,11 @@ class="sr-only ml-2 text-sm font-medium text-gray-900 dark:text-gray-300"></labe
166166

167167
@if($this->isPaginated() && $this->rows->hasPages())
168168
<div class="border-b border-gray-200 shadow-sm">
169-
<div class="py-2 px-6">{{ $this->rows->links(data: ['scrollTo' => $this->scroll()]) }}</div>
169+
@if($this->scroll() === true)
170+
<div class="py-2 px-6">{{ $this->rows->links() }}</div>
171+
@else
172+
<div class="py-2 px-6">{{ $this->rows->links(data: ['scrollTo' => $this->scroll()]) }}</div>
173+
@endif
170174
</div>
171175
@endif
172176
@endif

resources/views/table.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
@endif
2222
</div>
2323

24-
<div>
24+
<div id="{{ $this->identifier() }}">
2525
@if($this->rows->count())
2626
<div class="relative overflow-x-auto overflow-y-auto">
27-
<table class="w-full text-sm text-left text-gray-500" wire:key="table-1">
27+
<table class="w-full text-sm text-left text-gray-500" wire:key="{{ $this->identifier() }}">
2828
<thead class="text-xs text-gray-700 uppercase bg-gray-50">
2929
<tr class="border-y border-gray-200">
3030

src/QueryBuilder.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use ACTTraining\QueryBuilder\Support\Concerns\WithCaching;
1010
use ACTTraining\QueryBuilder\Support\Concerns\WithColumns;
1111
use ACTTraining\QueryBuilder\Support\Concerns\WithFilters;
12+
use ACTTraining\QueryBuilder\Support\Concerns\WithIdentifier;
1213
use ACTTraining\QueryBuilder\Support\Concerns\WithIndicator;
1314
use ACTTraining\QueryBuilder\Support\Concerns\WithPagination;
1415
use ACTTraining\QueryBuilder\Support\Concerns\WithQueryBuilder;
@@ -28,10 +29,12 @@
2829

2930
abstract class QueryBuilder extends Component
3031
{
32+
3133
use WithActions;
3234
use WithCaching;
3335
use WithColumns;
3436
use WithFilters;
37+
use WithIdentifier;
3538
use WithIndicator;
3639
use WithPagination;
3740
use WithQueryBuilder;
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
namespace ACTTraining\QueryBuilder\Support\Concerns;
4+
5+
use ACTTraining\QueryBuilder\Support\Actions\BaseAction;
6+
use Illuminate\Support\Enumerable;
7+
8+
trait WithIdentifier
9+
{
10+
protected string $identifier = 'table-builder';
11+
12+
public function identifier(): string
13+
{
14+
return $this->identifier;
15+
}
16+
17+
public function setIdentifier(string $identifier = 'table-builder'): static
18+
{
19+
$this->identifier = $identifier;
20+
21+
return $this;
22+
}
23+
24+
}

src/TableBuilder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use ACTTraining\QueryBuilder\Support\Concerns\WithColumns;
88
use ACTTraining\QueryBuilder\Support\Concerns\WithFilters;
9+
use ACTTraining\QueryBuilder\Support\Concerns\WithIdentifier;
910
use ACTTraining\QueryBuilder\Support\Concerns\WithIndicator;
1011
use ACTTraining\QueryBuilder\Support\Concerns\WithMessage;
1112
use ACTTraining\QueryBuilder\Support\Concerns\WithPagination;
@@ -27,6 +28,7 @@ abstract class TableBuilder extends Component
2728
{
2829
use WithColumns;
2930
use WithFilters;
31+
use WithIdentifier;
3032
use WithIndicator;
3133
use WithMessage;
3234
use WithPagination;

0 commit comments

Comments
 (0)