Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
leandrocfe committed Jun 2, 2023
2 parents 8163ccf + 7b48acd commit af32c6f
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 28 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## 1.0.3

### Fixed

- Add x-cloak to dropdown filter by [howdu](https://github.com/howdu).
- Fix duplicate database queries by [howdu](https://github.com/howdu).
- ability to hide header content by [Valpuia](https://github.com/Valpuia).
- Fix dark mode if theme is not set by [billmn](https://github.com/billmn).

## 1.0.2

### Fixed
Expand Down
58 changes: 30 additions & 28 deletions resources/views/widgets/components/header.blade.php
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
<div>
<div class="flex items-center justify-between gap-8 py-2">
@if ($heading)
<div class="flex items-center justify-between gap-8 py-2">

<x-filament::card.heading>
{!! $heading !!}
</x-filament::card.heading>
<x-filament::card.heading>
{!! $heading !!}
</x-filament::card.heading>

<div class="relative h-10">
<div class="relative h-10">

<div class="flex items-center justify-between gap-4">
@if ($filters)
<select wire:model="filter" @class([
'text-gray-900 border-gray-300 block h-10 transition duration-75 rounded-lg shadow-sm focus:border-primary-500 focus:ring-1 focus:ring-inset focus:ring-primary-500',
'dark:bg-gray-700 dark:border-gray-600 dark:text-gray-200 dark:focus:border-primary-500' => config(
'filament.dark_mode'),
]) wire:loading.class="animate-pulse">
@foreach ($filters as $value => $label)
<option value="{{ $value }}">
{{ $label }}
</option>
@endforeach
</select>
@endif
<div class="flex items-center justify-between gap-4">
@if ($filters)
<select wire:model="filter" @class([
'text-gray-900 border-gray-300 block h-10 transition duration-75 rounded-lg shadow-sm focus:border-primary-500 focus:ring-1 focus:ring-inset focus:ring-primary-500',
'dark:bg-gray-700 dark:border-gray-600 dark:text-gray-200 dark:focus:border-primary-500' => config(
'filament.dark_mode'),
]) wire:loading.class="animate-pulse">
@foreach ($filters as $value => $label)
<option value="{{ $value }}">
{{ $label }}
</option>
@endforeach
</select>
@endif

@if ($filterForm)
<x-filament-apex-charts::filter-form width="xs" darkMode="{{ config('filament.dark_mode') }}"
:indicatorsCount="$indicatorsCount">
{!! $filterForm !!}
</x-filament-apex-charts::filter-form>
@endif
@if ($filterForm)
<x-filament-apex-charts::filter-form width="xs" darkMode="{{ config('filament.dark_mode') }}"
:indicatorsCount="$indicatorsCount">
{!! $filterForm !!}
</x-filament-apex-charts::filter-form>
@endif
</div>
</div>
</div>

</div>
</div>

<x-filament::hr class="py-2" />
<x-filament::hr class="py-2" />
@endif
</div>

0 comments on commit af32c6f

Please sign in to comment.