Skip to content

Commit

Permalink
v3.4.11 (#1878)
Browse files Browse the repository at this point in the history
## [v3.4.11] - 2024-08-23
### New Features
- Add setIconLeft/setIconRight for Actions by @lrljoe in #1877
  • Loading branch information
lrljoe committed Aug 23, 2024
1 parent 0c0047b commit 38eedc1
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to `laravel-livewire-tables` will be documented in this file

## [v3.4.11] - 2024-08-23
### New Features
- Add setIconLeft/setIconRight for Actions by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1877

## [v3.4.10] - 2024-08-23
### Bug Fixes
- Default UseComputedProperties to True to default to new views by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1873
Expand Down
32 changes: 32 additions & 0 deletions docs/misc/actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,38 @@ public function actions(): array
}
```

### setIconLeft

setIconLeft is used to prepend the Icon to the Text (Non-Default Behaviour)

```php
public function actions(): array
{
return [
Action::make('Edit Item')
->setIcon("fas fa-edit")
->setIconAttributes(['class' => 'font-4xl text-4xl'])
->setIconLeft(),
];
}
```

### setIconRight

setIconRight is used to append the Icon to the Text (Default Behaviour)

```php
public function actions(): array
{
return [
Action::make('Edit Item')
->setIcon("fas fa-edit")
->setIconAttributes(['class' => 'font-4xl text-4xl'])
->setIconRight(),
];
}
```

### setRoute

Used for non-wireable butons, to set the route that the action button should take the user to upon clicking.
Expand Down
23 changes: 16 additions & 7 deletions resources/views/includes/actions/button.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a {{ $attributes->merge()
->class(['justify-center text-center items-center inline-flex rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && $attributes['default-styling'] ?? true])
->class(['justify-center text-center items-center inline-flex space-x-2 rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && $attributes['default-styling'] ?? true])
->class(['focus:border-indigo-300 focus:ring-indigo-200' => $isTailwind && $attributes['default-colors'] ?? true])
->class(['btn btn-sm btn-success' => $isBootstrap && $attributes['default-styling'] ?? true])
->class(['' => $isBootstrap && $attributes['default-colors'] ?? true])
Expand All @@ -12,13 +12,22 @@
wire:navigate
@endif
>
{{ $action->getLabel() }}

@if($action->hasIcon())
@if($action->hasIcon() && $action->getIconRight())
<span>{{ $action->getLabel() }}</span>
<i {{ $action->getIconAttributes()
->class(["ms-1 ". $action->getIcon() => $isBootstrap])
->class(["ml-1 ". $action->getIcon() => $isTailwind])
->except('default-styling')
}}></i>
->class(["ms-1 ". $action->getIcon() => $isBootstrap])
->class(["ml-1 ". $action->getIcon() => $isTailwind])
->except('default-styling')
}}
></i>
@elseif($action->hasIcon() && !$action->getIconRight())
<i {{ $action->getIconAttributes()
->class(["ms-1 ". $action->getIcon() => $isBootstrap])
->class(["ml-1 ". $action->getIcon() => $isTailwind])
->except('default-styling')
}}
></i>
<span>{{ $action->getLabel() }}</span>
@endif
</a>
21 changes: 21 additions & 0 deletions src/Views/Traits/Core/HasIcon.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ trait HasIcon

public array $iconAttributes = ['default-styling' => true];

public bool $iconRight = true;

public function setIcon(string $icon): self
{
$this->icon = $icon;
Expand Down Expand Up @@ -39,4 +41,23 @@ public function getIconAttributes(): ComponentAttributeBag
{
return new ComponentAttributeBag([...['default-styling' => true], ...$this->iconAttributes]);
}

public function getIconRight(): bool
{
return $this->iconRight ?? true;
}

public function setIconLeft(): self
{
$this->iconRight = false;

return $this;
}

public function setIconRight(): self
{
$this->iconRight = true;

return $this;
}
}
38 changes: 37 additions & 1 deletion tests/Views/Actions/ActionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,42 @@ public function exportBulk($items)

}

public function test_can_set_icon_to_right_default(): void
{
$action = Action::make('Update Summaries')
->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
->setIcon('fas fa-minus')
->setIconAttributes(['class' => 'font-sm text-sm'])
->setWireAction('wire:click')
->setWireActionParams('testactionparams');
$this->assertTrue($action->getIconRight());
}

public function test_can_set_icon_to_left(): void
{
$action = Action::make('Update Summaries')
->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
->setIcon('fas fa-minus')
->setIconAttributes(['class' => 'font-sm text-sm'])
->setIconLeft()
->setWireAction('wire:click')
->setWireActionParams('testactionparams');
$this->assertFalse($action->getIconRight());
}

public function test_can_set_icon_to_right(): void
{
$action = Action::make('Update Summaries')
->setActionAttributes(['class' => 'dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800', 'default-styling' => true, 'default-colors' => true])
->setIcon('fas fa-minus')
->setIconAttributes(['class' => 'font-sm text-sm'])
->setWireAction('wire:click')
->setWireActionParams('testactionparams')
->setIconLeft()
->setIconRight();
$this->assertTrue($action->getIconRight());
}

public function test_action_renders_correctly(): void
{
$action = Action::make('Update Summaries')
Expand All @@ -305,6 +341,6 @@ public function test_action_renders_correctly(): void
)
->route('dashboard22');

$this->assertStringContainsString('<a class="focus:border-indigo-300 focus:ring-indigo-200 justify-center text-center items-center inline-flex rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50 dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800" href="dashboard22"', $action->render());
$this->assertStringContainsString('<a class="focus:border-indigo-300 focus:ring-indigo-200 justify-center text-center items-center inline-flex space-x-2 rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50 dark:bg-green-500 dark:text-white dark:border-green-600 dark:hover:border-green-900 dark:hover:bg-green-800" href="dashboard22"', $action->render());
}
}

0 comments on commit 38eedc1

Please sign in to comment.