Skip to content

Commit dde327e

Browse files
lrljoegithub-actions[bot]
authored andcommitted
Fix styling
1 parent f1a6541 commit dde327e

File tree

3 files changed

+104
-118
lines changed

3 files changed

+104
-118
lines changed

src/Traits/HasAllTraits.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
namespace Rappasoft\LaravelLivewireTables\Traits;
44

55
use Rappasoft\LaravelLivewireTables\Traits\Core\{HasCustomAttributes, HasLocalisations};
6-
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasTheme;
76
use Rappasoft\LaravelLivewireTables\Traits\Styling\HasDefaultFilterInputStyling;
7+
use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasTheme;
88

99
trait HasAllTraits
1010
{
Lines changed: 64 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,64 @@
1-
<?php
2-
3-
namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
4-
5-
use Livewire\Attributes\Computed;
6-
7-
trait HasDefaultFilterInputStyling
8-
{
9-
public ?string $defaultFilterInputColors;
10-
public ?string $defaultFilterInputStyling;
11-
12-
protected function setDefaultFilterInputColors(string $defaultFilterInputColors): self
13-
{
14-
$this->defaultFilterInputColors = $defaultFilterInputColors;
15-
16-
return $this;
17-
}
18-
19-
protected function setDefaultFilterInputStyling(string $defaultFilterInputStyling): self
20-
{
21-
$this->defaultFilterInputStyling = $defaultFilterInputStyling;
22-
23-
return $this;
24-
}
25-
26-
public function hasDefaultFilterInputColors(): bool
27-
{
28-
return isset($this->defaultFilterInputColors);
29-
}
30-
31-
#[Computed]
32-
public function getDefaultFilterInputColors(): string
33-
{
34-
if (isset($this->defaultFilterInputColors))
35-
{
36-
return $this->defaultFilterInputColors;
37-
}
38-
else
39-
{
40-
if ($this->isTailwind())
41-
{
42-
return 'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600';
43-
}
44-
else
45-
{
46-
return '';
47-
}
48-
}
49-
}
50-
51-
public function hasDefaultFilterInputStyling(): bool
52-
{
53-
return isset($this->defaultFilterInputStyling);
54-
}
55-
56-
#[Computed]
57-
public function getDefaultFilterInputStyling(): string
58-
{
59-
if (isset($this->defaultFilterInputStyling))
60-
{
61-
return $this->defaultFilterInputStyling;
62-
}
63-
else
64-
{
65-
if ($this->isTailwind())
66-
{
67-
return 'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50';
68-
}
69-
else
70-
{
71-
return 'form-control';
72-
}
73-
}
74-
}
75-
76-
}
1+
<?php
2+
3+
namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
4+
5+
use Livewire\Attributes\Computed;
6+
7+
trait HasDefaultFilterInputStyling
8+
{
9+
public ?string $defaultFilterInputColors;
10+
11+
public ?string $defaultFilterInputStyling;
12+
13+
protected function setDefaultFilterInputColors(string $defaultFilterInputColors): self
14+
{
15+
$this->defaultFilterInputColors = $defaultFilterInputColors;
16+
17+
return $this;
18+
}
19+
20+
protected function setDefaultFilterInputStyling(string $defaultFilterInputStyling): self
21+
{
22+
$this->defaultFilterInputStyling = $defaultFilterInputStyling;
23+
24+
return $this;
25+
}
26+
27+
public function hasDefaultFilterInputColors(): bool
28+
{
29+
return isset($this->defaultFilterInputColors);
30+
}
31+
32+
#[Computed]
33+
public function getDefaultFilterInputColors(): string
34+
{
35+
if (isset($this->defaultFilterInputColors)) {
36+
return $this->defaultFilterInputColors;
37+
} else {
38+
if ($this->isTailwind()) {
39+
return 'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600';
40+
} else {
41+
return '';
42+
}
43+
}
44+
}
45+
46+
public function hasDefaultFilterInputStyling(): bool
47+
{
48+
return isset($this->defaultFilterInputStyling);
49+
}
50+
51+
#[Computed]
52+
public function getDefaultFilterInputStyling(): string
53+
{
54+
if (isset($this->defaultFilterInputStyling)) {
55+
return $this->defaultFilterInputStyling;
56+
} else {
57+
if ($this->isTailwind()) {
58+
return 'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50';
59+
} else {
60+
return 'form-control';
61+
}
62+
}
63+
}
64+
}
Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,39 @@
1-
<?php
2-
3-
namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Styling;
4-
5-
use PHPUnit\Framework\Attributes\Group;
6-
use Rappasoft\LaravelLivewireTables\Tests\TestCase;
7-
8-
#[Group('Filters')]
9-
#[Group('Styling')]
10-
final class FilterInputDefaultStylingTest extends TestCase
11-
{
12-
13-
public function test_has_filter_default_input_styling(): void
14-
{
15-
$this->assertFalse($this->basicTable->hasDefaultFilterInputStyling());
16-
}
17-
18-
public function test_has_filter_default_input_colors(): void
19-
{
20-
$this->assertFalse($this->basicTable->hasDefaultFilterInputColors());
21-
}
22-
23-
public function test_can_set_filter_default_input_styling(): void
24-
{
25-
$this->assertFalse($this->basicTable->hasDefaultFilterInputStyling());
26-
27-
$this->basicTable->setDefaultFilterInputStyling('p-4');
28-
29-
$this->assertTrue($this->basicTable->hasDefaultFilterInputStyling());
30-
}
31-
32-
public function test_can_set_filter_default_input_colors(): void
33-
{
34-
$this->assertFalse($this->basicTable->hasDefaultFilterInputColors());
35-
36-
$this->basicTable->setDefaultFilterInputColors('bg-blue-500');
37-
38-
$this->assertTrue($this->basicTable->hasDefaultFilterInputColors());
39-
}
40-
41-
}
1+
<?php
2+
3+
namespace Rappasoft\LaravelLivewireTables\Tests\Unit\Traits\Styling;
4+
5+
use PHPUnit\Framework\Attributes\Group;
6+
use Rappasoft\LaravelLivewireTables\Tests\TestCase;
7+
8+
#[Group('Filters')]
9+
#[Group('Styling')]
10+
final class FilterInputDefaultStylingTest extends TestCase
11+
{
12+
public function test_has_filter_default_input_styling(): void
13+
{
14+
$this->assertFalse($this->basicTable->hasDefaultFilterInputStyling());
15+
}
16+
17+
public function test_has_filter_default_input_colors(): void
18+
{
19+
$this->assertFalse($this->basicTable->hasDefaultFilterInputColors());
20+
}
21+
22+
public function test_can_set_filter_default_input_styling(): void
23+
{
24+
$this->assertFalse($this->basicTable->hasDefaultFilterInputStyling());
25+
26+
$this->basicTable->setDefaultFilterInputStyling('p-4');
27+
28+
$this->assertTrue($this->basicTable->hasDefaultFilterInputStyling());
29+
}
30+
31+
public function test_can_set_filter_default_input_colors(): void
32+
{
33+
$this->assertFalse($this->basicTable->hasDefaultFilterInputColors());
34+
35+
$this->basicTable->setDefaultFilterInputColors('bg-blue-500');
36+
37+
$this->assertTrue($this->basicTable->hasDefaultFilterInputColors());
38+
}
39+
}

0 commit comments

Comments
 (0)