Skip to content

Commit

Permalink
update & rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
danharrin committed Jan 10, 2025
1 parent 0bd91d5 commit 38fd76a
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/03-icons.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Alternatively, you may pass an SVG element into the component's slot instead of
- `tables::filters.remove-all-button` - Button to remove all filters
- `tables::grouping.collapse-button` - Button to collapse a group of records
- `tables::header-cell.sort-asc-button` - Sort button of a column sorted in ascending order
- `tables::header-cell.sort-button'` - Sort button of a column when it is currently not sorted
- `tables::header-cell.sort-button` - Sort button of a column when it is currently not sorted
- `tables::header-cell.sort-desc-button` - Sort button of a column sorted in descending order
- `tables::reorder.handle` - Handle to grab in order to reorder a record with drag and drop
- `tables::search-field` - Search input
Expand Down
8 changes: 8 additions & 0 deletions resources/lang/hr/components/pagination.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,18 @@

'actions' => [

'first' => [
'label' => 'Prva',
],

'go_to_page' => [
'label' => 'Idi na stranicu :page',
],

'last' => [
'label' => 'Zadnja',
],

'next' => [
'label' => 'Naprijed',
],
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/tabs/item.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
'role' => 'tab',
])
->class([
'fi-tabs-item group flex items-center justify-center gap-x-2 rounded-lg px-3 py-2 text-sm font-medium outline-none transition duration-75',
'fi-tabs-item group flex items-center justify-center gap-x-2 whitespace-nowrap rounded-lg px-3 py-2 text-sm font-medium outline-none transition duration-75',
$inactiveItemClasses => (! $hasAlpineActiveClasses) && (! $active),
$activeItemClasses => (! $hasAlpineActiveClasses) && $active,
])
Expand Down
6 changes: 3 additions & 3 deletions src/Assets/Asset.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ abstract class Asset
{
protected string $id;

protected ?string $path = null;

protected bool $isLoadedOnRequest = false;

protected string $package;

protected ?string $path = null;

final public function __construct(string $id, ?string $path = null)
{
$this->id = $id;
Expand Down Expand Up @@ -50,7 +50,7 @@ public function getPackage(): string
return $this->package;
}

public function getPath(): string
public function getPath(): ?string
{
return $this->path;
}
Expand Down
5 changes: 5 additions & 0 deletions src/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ function generate_search_column_expression(string $column, ?bool $isSearchForced
};

if ($isSearchForcedCaseInsensitive) {
if (in_array($driverName, ['mysql', 'mariadb'], true) && str($column)->contains('->') && ! str($column)->startsWith('json_extract(')) {
[$field, $path] = invade($databaseConnection->getQueryGrammar())->wrapJsonFieldAndPath($column); /** @phpstan-ignore-line */
$column = "json_extract({$field}{$path})";
}

$column = "lower({$column})";
}

Expand Down

0 comments on commit 38fd76a

Please sign in to comment.