Skip to content

Commit 93f30c2

Browse files
committed
Merge branch 'LowerRockLabs-SlideDown-Menus' into develop
# Conflicts: # tests/Traits/Configuration/FilterConfigurationTest.php # tests/Traits/Helpers/FilterHelpersTest.php
2 parents 3ca6e23 + 02f49ea commit 93f30c2

File tree

7 files changed

+80
-36
lines changed

7 files changed

+80
-36
lines changed

docs/filters/available-methods.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,31 @@ public function configure(): void
158158
}
159159
```
160160

161+
### setFilterSlideDownDefaultStatusEnabled
162+
163+
Set the filter slide down to visible by default
164+
165+
```php
166+
public function configure(): void
167+
{
168+
// Shorthand for $this->setFilterSlideDownDefaultStatus(true)
169+
$this->setFilterSlideDownDefaultStatusEnabled();
170+
}
171+
```
172+
173+
### setFilterSlideDownDefaultStatusDisabled
174+
175+
Set the filter slide down to collapsed by default
176+
177+
```php
178+
public function configure(): void
179+
{
180+
// Shorthand for $this->setFilterSlideDownDefaultStatus(false)
181+
$this->setFilterSlideDownDefaultStatusDisabled();
182+
}
183+
```
184+
185+
161186
----
162187

163188
## Filter Methods

resources/views/components/wrapper.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@endif
1414

1515
@if ($component->isFilterLayoutSlideDown())
16-
x-data="{ filtersOpen: false }"
16+
wire:ignore.self x-data="{ filtersOpen: $wire.filterSlideDownDefaultVisible }"
1717
@endif
1818
>
1919
@include('livewire-tables::includes.debug')

src/Traits/Configuration/FilterConfiguration.php

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,36 @@ public function setFilterLayoutSlideDown(): self
137137

138138
return $this;
139139
}
140+
141+
/**
142+
* @param bool $status
143+
*
144+
* @return $this
145+
*/
146+
public function setFilterSlideDownDefaultStatus(bool $status): self
147+
{
148+
$this->filterSlideDownDefaultVisible = $status;
149+
150+
return $this;
151+
}
152+
153+
/**
154+
* @return $this
155+
*/
156+
public function setFilterSlideDownDefaultStatusDisabled(): self
157+
{
158+
$this->setFilterSlideDownDefaultStatus(false);
159+
160+
return $this;
161+
}
162+
163+
/**
164+
* @return $this
165+
*/
166+
public function setFilterSlideDownDefaultStatusEnabled(): self
167+
{
168+
$this->setFilterSlideDownDefaultStatus(true);
169+
170+
return $this;
171+
}
140172
}

src/Traits/Helpers/FilterHelpers.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@ public function filtersVisibilityIsDisabled(): bool
3939
return $this->getFiltersVisibilityStatus() === false;
4040
}
4141

42+
public function getFilterSlideDownDefaultStatus(): bool
43+
{
44+
return $this->filterSlideDownDefaultVisible;
45+
}
46+
47+
public function filtersSlideDownIsDefaultVisible(): bool
48+
{
49+
return $this->getFilterSlideDownDefaultStatus() === true;
50+
}
51+
52+
public function filtersSlideDownIsDefaultHidden(): bool
53+
{
54+
return $this->getFilterSlideDownDefaultStatus() === false;
55+
}
56+
4257
public function getFilterPillsStatus(): bool
4358
{
4459
return $this->filterPillsStatus;

src/Traits/WithFilters.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ trait WithFilters
1414
public bool $filtersStatus = true;
1515
public bool $filtersVisibilityStatus = true;
1616
public bool $filterPillsStatus = true;
17+
public bool $filterSlideDownDefaultVisible = false;
1718
public string $filterLayout = 'popover';
1819

1920
public function filters(): array

tests/Traits/Configuration/FilterConfigurationTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ public function filters_layout_can_be_set(): void
102102
}
103103

104104
/** @test */
105-
/* Not present in this branch
106105
public function filters_layout_popover_default_can_be_set(): void
107106
{
108107
$this->assertFalse($this->basicTable->filterSlideDownDefaultVisible);
@@ -122,5 +121,5 @@ public function filters_layout_popover_default_can_be_set(): void
122121
$this->basicTable->setFilterSlideDownDefaultStatus(false);
123122

124123
$this->assertFalse($this->basicTable->filterSlideDownDefaultVisible);
125-
}*/
124+
}
126125
}

tests/Traits/Helpers/FilterHelpersTest.php

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Helpers;
44

55
use Rappasoft\LaravelLivewireTables\Tests\TestCase;
6-
use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter;
76
use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter;
87

98
class FilterHelpersTest extends TestCase
@@ -60,13 +59,12 @@ public function can_check_if_component_has_filters(): void
6059
public function can_get_component_filters(): void
6160
{
6261
$this->assertInstanceOf(MultiSelectFilter::class, $this->basicTable->getFilters()[0]);
63-
$this->assertInstanceOf(MultiSelectDropdownFilter::class, $this->basicTable->getFilters()[1]);
6462
}
6563

6664
/** @test */
6765
public function can_get_component_filter_count(): void
6866
{
69-
$this->assertEquals(2, $this->basicTable->getFiltersCount());
67+
$this->assertEquals(1, $this->basicTable->getFiltersCount());
7068
}
7169

7270
/** @test */
@@ -75,10 +73,6 @@ public function can_get_component_filter_by_key(): void
7573
$this->assertNotInstanceOf(MultiSelectFilter::class, $this->basicTable->getFilterByKey('test'));
7674

7775
$this->assertInstanceOf(MultiSelectFilter::class, $this->basicTable->getFilterByKey('breed'));
78-
79-
$this->assertNotInstanceOf(MultiSelectDropdownFilter::class, $this->basicTable->getFilterByKey('test'));
80-
81-
$this->assertInstanceOf(MultiSelectDropdownFilter::class, $this->basicTable->getFilterByKey('species'));
8276
}
8377

8478
/** @test */
@@ -87,12 +81,6 @@ public function can_set_filter_value(): void
8781
$this->basicTable->setFilter('breed', ['1']);
8882

8983
$this->assertSame(['1'], $this->basicTable->getAppliedFilterWithValue('breed'));
90-
91-
$this->basicTable->setFilter('breed', ['0']);
92-
93-
$this->basicTable->setFilter('species', ['1']);
94-
95-
$this->assertSame(['1'], $this->basicTable->getAppliedFilterWithValue('species'));
9684
}
9785

9886
/** @test */
@@ -123,7 +111,7 @@ public function can_set_filter_defaults(): void
123111

124112
$this->basicTable->setFilterDefaults();
125113

126-
$this->assertSame(['breed' => [], 'species' => []], $this->basicTable->getAppliedFilters());
114+
$this->assertSame(['breed' => []], $this->basicTable->getAppliedFilters());
127115
}
128116

129117
/** @test */
@@ -144,24 +132,14 @@ public function can_see_if_filters_set_with_values(): void
144132
$this->basicTable->setFilter('breed', ['1']);
145133

146134
$this->assertTrue($this->basicTable->hasAppliedFiltersWithValues());
147-
148-
$this->basicTable->setFilter('breed', []);
149-
150-
$this->assertFalse($this->basicTable->hasAppliedFiltersWithValues());
151-
152-
$this->basicTable->setFilter('species', ['1']);
153-
154-
$this->assertTrue($this->basicTable->hasAppliedFiltersWithValues());
155135
}
156136

157137
/** @test */
158138
public function can_get_all_applied_filters_with_values(): void
159139
{
160140
$this->basicTable->setFilter('breed', ['1']);
161141

162-
$this->basicTable->setFilter('species', ['0']);
163-
164-
$this->assertSame(['breed' => ['1'], 'species' => ['0']], $this->basicTable->getAppliedFiltersWithValues());
142+
$this->assertSame(['breed' => ['1']], $this->basicTable->getAppliedFiltersWithValues());
165143
}
166144

167145
/** @test */
@@ -172,10 +150,6 @@ public function can_get_all_applied_filters_with_values_count(): void
172150
$this->basicTable->setFilter('breed', ['1']);
173151

174152
$this->assertSame(1, $this->basicTable->getAppliedFiltersWithValuesCount());
175-
176-
$this->basicTable->setFilter('species', ['1']);
177-
178-
$this->assertSame(2, $this->basicTable->getAppliedFiltersWithValuesCount());
179153
}
180154

181155
/** @test */
@@ -195,24 +169,22 @@ public function can_check_if_filter_layout_is_slidedown(): void
195169
}
196170

197171
/** @test */
198-
/*
199172
public function can_check_if_filter_layout_slidedown_is_visible(): void
200173
{
201174
$this->assertFalse($this->basicTable->getFilterSlideDownDefaultStatus());
202175

203176
$this->basicTable->setFilterSlideDownDefaultStatusEnabled();
204177

205178
$this->assertTrue($this->basicTable->getFilterSlideDownDefaultStatus());
206-
}*/
179+
}
207180

208181
/** @test */
209-
/*
210182
public function can_check_if_filter_layout_slidedown_is_hidden(): void
211183
{
212184
$this->assertFalse($this->basicTable->getFilterSlideDownDefaultStatus());
213185

214186
$this->basicTable->setFilterSlideDownDefaultStatusDisabled();
215187

216188
$this->assertFalse($this->basicTable->getFilterSlideDownDefaultStatus());
217-
}*/
189+
}
218190
}

0 commit comments

Comments
 (0)