Skip to content

Commit ca9567b

Browse files
committed
Move Default Value Traits
1 parent 69545a6 commit ca9567b

File tree

6 files changed

+83
-3
lines changed

6 files changed

+83
-3
lines changed

src/Features/Columns/Views/ColorColumn.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
use Illuminate\Database\Eloquent\Model;
66
use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
77
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\Configuration\ColorColumnConfiguration;
8-
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\{HasDefaultStringValue, IsColumn};
8+
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\{IsColumn};
99
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\Helpers\ColorColumnHelpers;
10+
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\Defaults\HasDefaultStringValue;
1011

1112
class ColorColumn extends Column
1213
{
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?php
2+
3+
namespace Rappasoft\LaravelLivewireTables\Features\Columns\Views;
4+
5+
use Illuminate\Database\Eloquent\Model;
6+
use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
7+
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\{IsColumn};
8+
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\Defaults\{HasDefaultFloatValue};
9+
10+
class NumberColumn extends Column
11+
{
12+
use HasDefaultFloatValue;
13+
14+
/**
15+
* Undocumented function
16+
*
17+
* @param string $title
18+
* @param string|null $from
19+
*/
20+
public function __construct(string $title, ?string $from = null)
21+
{
22+
parent::__construct($title, $from);
23+
if (! isset($from)) {
24+
$this->label(fn () => null);
25+
}
26+
27+
}
28+
29+
/**
30+
* Undocumented function
31+
*
32+
* @param Model $row
33+
* @return string
34+
*/
35+
public function getValue(Model $row): string
36+
{
37+
return parent::getValue($row) ?? $this->getDefaultValue();
38+
}
39+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
3+
namespace Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\Defaults;
4+
5+
trait HasDefaultFloatValue
6+
{
7+
public float $defaultValue = 0;
8+
9+
public function defaultValue(int|float|string $defaultValue): self
10+
{
11+
$this->defaultValue = floatval($defaultValue);
12+
13+
return $this;
14+
}
15+
16+
public function getDefaultValue(): float
17+
{
18+
return $this->defaultValue;
19+
}
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
3+
namespace Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\Defaults;
4+
5+
trait HasDefaultIntegerValue
6+
{
7+
public int $defaultValue = 0;
8+
9+
public function defaultValue(int|string $defaultValue): self
10+
{
11+
$this->defaultValue = intval($defaultValue);
12+
13+
return $this;
14+
}
15+
16+
public function getDefaultValue(): int
17+
{
18+
return $this->defaultValue;
19+
}
20+
}

src/Features/Columns/Views/Traits/HasDefaultStringValue.php renamed to src/Features/Columns/Views/Traits/Defaults/HasDefaultStringValue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits;
3+
namespace Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\Defaults;
44

55
trait HasDefaultStringValue
66
{

src/Features/Columns/Views/Traits/Helpers/IconColumnHelpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Illuminate\Database\Eloquent\Model;
66
use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
7-
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\HasDefaultStringValue;
7+
use Rappasoft\LaravelLivewireTables\Features\Columns\Views\Traits\Defaults\HasDefaultStringValue;
88

99
trait IconColumnHelpers
1010
{

0 commit comments

Comments
 (0)