File tree Expand file tree Collapse file tree 7 files changed +11
-17
lines changed Expand file tree Collapse file tree 7 files changed +11
-17
lines changed Original file line number Diff line number Diff line change 33namespace Rappasoft \LaravelLivewireTables ;
44
55use Illuminate \Foundation \Console \AboutCommand ;
6- use Illuminate \Support \ServiceProvider ;
76use Illuminate \Support \Facades \Blade ;
7+ use Illuminate \Support \ServiceProvider ;
88use Livewire \ComponentHookRegistry ;
99use Rappasoft \LaravelLivewireTables \Commands \MakeCommand ;
1010use Rappasoft \LaravelLivewireTables \Features \AutoInjectRappasoftAssets ;
@@ -45,7 +45,7 @@ public function boot(): void
4545 $ this ->loadViewsFrom (__DIR__ .'/../resources/views ' , 'livewire-tables ' );
4646
4747 $ this ->consoleCommands ();
48-
48+
4949 if (config ('livewire-tables.inject_core_assets_enabled ' ) || config ('livewire-tables.inject_third_party_assets_enabled ' ) || config ('livewire-tables.enable_blade_directives ' )) {
5050 (new RappasoftFrontendAssets )->boot ();
5151 }
@@ -82,15 +82,15 @@ public function consoleCommands(): void
8282 ]);
8383 }
8484 }
85-
85+
8686 public function addBladeLoopDirective (): void
8787 {
8888 Blade::directive ('tableloop ' , function ($ expression ) {
8989 return "<?php foreach ( $ expression): ?> " ;
9090 });
91-
91+
9292 Blade::directive ('endtableloop ' , function ($ expression ) {
93- return " <?php endforeach; ?> " ;
93+ return ' <?php endforeach; ?> ' ;
9494 });
9595
9696 }
Original file line number Diff line number Diff line change @@ -31,5 +31,4 @@ public function unsetCollapsedStatuses(): void
3131 unset($ this ->shouldMobileCollapse );
3232 unset($ this ->shouldTabletCollapse );
3333 }
34-
3534}
Original file line number Diff line number Diff line change @@ -15,5 +15,4 @@ public function setAppendedColumns(array $appendedColumns): void
1515 $ this ->appendedColumns = collect ($ appendedColumns );
1616 $ this ->hasRunColumnSetup = false ;
1717 }
18-
1918}
Original file line number Diff line number Diff line change @@ -34,13 +34,13 @@ public function collapsingColumnsAreDisabled(): bool
3434 #[Computed]
3535 public function showCollapsingColumnSections (): bool
3636 {
37- return ( $ this ->collapsingColumnsAreEnabled () && $ this ->hasCollapsedColumns () );
37+ return $ this ->collapsingColumnsAreEnabled () && $ this ->hasCollapsedColumns ();
3838 }
3939
4040 #[Computed]
4141 public function hasCollapsedColumns (): bool
4242 {
43- return ( $ this ->hasCollapsingColumns () && ($ this ->shouldCollapseOnMobile () || $ this ->shouldCollapseOnTablet () || $ this ->shouldCollapseAlways () ));
43+ return $ this ->hasCollapsingColumns () && ($ this ->shouldCollapseOnMobile () || $ this ->shouldCollapseOnTablet () || $ this ->shouldCollapseAlways ());
4444 }
4545
4646 #[Computed]
@@ -150,10 +150,9 @@ public function getCollapsedColumnsForContent(): Collection
150150 {
151151 $ colspan = $ this ->getColspanCount ();
152152 $ columns = $ this ->getColumns ()
153- ->reject (fn (Column $ column ) => ($ column ->isHidden () || ($ column ->isSelectable () && ! $ this ->columnSelectIsEnabledForColumn ($ column ))))
154- ->reject (fn (Column $ column ) => $ column ->shouldNeverCollapse ());
153+ ->reject (fn (Column $ column ) => ($ column ->isHidden () || ($ column ->isSelectable () && ! $ this ->columnSelectIsEnabledForColumn ($ column ))))
154+ ->reject (fn (Column $ column ) => $ column ->shouldNeverCollapse ());
155155
156156 return $ columns ;
157157 }
158-
159158}
Original file line number Diff line number Diff line change @@ -125,7 +125,6 @@ public function getColumnCount(): int
125125 return $ this ->getColumns ()->count ();
126126 }
127127
128-
129128 public function getPrependedColumns (): Collection
130129 {
131130 return $ this ->prependedColumns ?? collect ($ this ->prependColumns ());
Original file line number Diff line number Diff line change 55use Rappasoft \LaravelLivewireTables \Traits \Configuration \CollapsingColumnConfiguration ;
66use Rappasoft \LaravelLivewireTables \Traits \Helpers \CollapsingColumnHelpers ;
77use Rappasoft \LaravelLivewireTables \Traits \Styling \Columns \HasCollapsingColumnsStyling ;
8+
89trait WithCollapsingColumns
910{
1011 use CollapsingColumnConfiguration,
@@ -18,5 +19,4 @@ trait WithCollapsingColumns
1819 protected ?bool $ shouldMobileCollapse ;
1920
2021 protected ?bool $ shouldTabletCollapse ;
21-
2222}
Original file line number Diff line number Diff line change @@ -12,7 +12,6 @@ trait IsCollapsible
1212
1313 protected bool $ collapseSometimes = false ;
1414
15-
1615 public function collapseOnMobile (): self
1716 {
1817 $ this ->collapseOnMobile = true ;
@@ -67,7 +66,6 @@ public function shouldNeverCollapse(): bool
6766
6867 public function shouldCollapseNever (): bool
6968 {
70- return (( $ this ->shouldCollapseOnMobile () === false ) && ($ this ->shouldCollapseOnTablet () === false ) && ($ this ->shouldCollapseAlways () === false ) );
69+ return ($ this ->shouldCollapseOnMobile () === false ) && ($ this ->shouldCollapseOnTablet () === false ) && ($ this ->shouldCollapseAlways () === false );
7170 }
72-
7371}
You can’t perform that action at this time.
0 commit comments