Move LoadingPlaceholderStyling into new method

LowerRockLabs · Oct 1, 2024 · 141f395 · 141f395
1 parent 61a9b66
commit 141f395
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 74 deletions.
diff --git a/resources/views/components/includes/loading.blade.php b/resources/views/components/includes/loading.blade.php
@@ -1,35 +1,38 @@
-@aware(['isTailwind', 'isBootstrap', 'tableName', 'component'])
+@aware(['tableName'])
 @props(['colCount' => 1])
 
 @php
-$customAttributes['loader-wrapper'] = $this->getLoadingPlaceHolderWrapperAttributes();
-$customAttributes['loader-icon'] = $this->getLoadingPlaceHolderIconAttributes();
+$loaderWrapper = $this->getLoadingPlaceHolderWrapperAttributes();
+$loaderCell = $this->getLoadingPlaceHolderCellAttributes();
+$loaderIcon = $this->getLoadingPlaceHolderIconAttributes();
 @endphp
-@if($this->hasLoadingPlaceholderBlade())
-    @include($this->getLoadingPlaceHolderBlade(), ['colCount' => $colCount])
-@else
 
-    <tr wire:key="{{ $tableName }}-loader"
-    {{
-        $attributes->merge($customAttributes['loader-wrapper'])
-            ->class(['hidden w-full text-center h-screen place-items-center align-middle' => $isTailwind && ($customAttributes['loader-wrapper']['default'] ?? true)])
-            ->class(['d-none w-100 text-center h-100 align-items-center' => $isBootstrap && ($customAttributes['loader-wrapper']['default'] ?? true)]);
-    }}
-    wire:loading.class.remove="hidden d-none"
-    >
-        <td colspan="{{ $colCount }}" wire:key="{{ $tableName }}-loader-column" >
+<tr wire:key="{{ $tableName }}-loader" wire:loading.class.remove="hidden d-none" {{
+    $attributes->merge($loaderWrapper)
+        ->class(['hidden w-full text-center place-items-center align-middle' => $this->isTailwind && ($loaderWrapper['default'] ?? true)])
+        ->class(['d-none w-100 text-center align-items-center' => $this->isBootstrap && ($loaderWrapper['default'] ?? true)])
+        ->except(['default','default-styling','default-colors'])
+}}>
+    <td colspan="{{ $colCount }}" wire:key="{{ $tableName }}-loader-column" {{
+        $attributes->merge($loaderCell)
+            ->class(['py-4' => $this->isTailwind && ($loaderCell['default'] ?? true)])
+            ->class(['py-4' => $this->isBootstrap && ($loaderCell['default'] ?? true)])
+            ->except(['default','default-styling','default-colors', 'colspan','wire:key'])
+    }}>
+        @if($this->hasLoadingPlaceholderBlade())
+            @include($this->getLoadingPlaceHolderBlade(), ['colCount' => $colCount])
+        @else
+
             <div class="h-min self-center align-middle text-center">
-                <div class="lds-hourglass"
-                {{
-                        $attributes->merge($customAttributes['loader-icon'])
-                            ->class(['lds-hourglass' => $isTailwind && ($customAttributes['loader-icon']['default'] ?? true)])
-                            ->class(['lds-hourglass' => $isBootstrap && ($customAttributes['loader-icon']['default'] ?? true)])
+                <div class="lds-hourglass"{{
+                        $attributes->merge($loaderIcon)
+                            ->class(['lds-hourglass' => $this->isTailwind && ($loaderIcon['default'] ?? true)])
+                            ->class(['lds-hourglass' => $this->isBootstrap && ($loaderIcon['default'] ?? true)])
                             ->except(['default','default-styling','default-colors']);
-                }}
-                ></div>
-                <div>{{ $this->getLoadingPlaceholderContent() }}</div>
+                }}></div>
+                <div>{!! $this->getLoadingPlaceholderContent() !!}</div>
             </div>
-        </td>
-    </tr>
+        @endif
+    </td>
+</tr>
 
-@endif
diff --git a/src/Traits/Configuration/LoadingPlaceholderConfiguration.php b/src/Traits/Configuration/LoadingPlaceholderConfiguration.php
@@ -32,31 +32,4 @@ public function setLoadingPlaceholderContent(string $content): self
         return $this;
     }
 
-    public function setLoadingPlaceHolderAttributes(array $attributes): self
-    {
-        $this->loadingPlaceHolderAttributes = $attributes;
-
-        return $this;
-    }
-
-    public function setLoadingPlaceHolderIconAttributes(array $attributes): self
-    {
-        $this->loadingPlaceHolderIconAttributes = $attributes;
-
-        return $this;
-    }
-
-    public function setLoadingPlaceHolderWrapperAttributes(array $attributes): self
-    {
-        $this->loadingPlaceHolderWrapperAttributes = $attributes;
-
-        return $this;
-    }
-
-    public function setLoadingPlaceholderBlade(string $customBlade): self
-    {
-        $this->loadingPlaceholderBlade = $customBlade;
-
-        return $this;
-    }
 }
diff --git a/src/Traits/Helpers/LoadingPlaceholderHelpers.php b/src/Traits/Helpers/LoadingPlaceholderHelpers.php
@@ -19,22 +19,6 @@ public function getLoadingPlaceholderContent(): string
         return $this->loadingPlaceholderContent ?? __('livewire-tables:loading');
     }
 
-    public function getLoadingPlaceholderAttributes(): array
-    {
-        return count($this->loadingPlaceHolderAttributes) ? $this->loadingPlaceHolderAttributes : ['default' => true];
-
-    }
-
-    public function getLoadingPlaceHolderIconAttributes(): array
-    {
-        return count($this->loadingPlaceHolderIconAttributes) ? $this->loadingPlaceHolderIconAttributes : ['default' => true];
-    }
-
-    public function getLoadingPlaceHolderWrapperAttributes(): array
-    {
-        return count($this->loadingPlaceHolderWrapperAttributes) ? $this->loadingPlaceHolderWrapperAttributes : ['default' => true];
-    }
-
     public function hasLoadingPlaceholderBlade(): bool
     {
         return ! is_null($this->getLoadingPlaceHolderBlade());

diff --git a/src/Traits/Styling/Configuration/LoadingPlaceholderStylingConfiguration.php b/src/Traits/Styling/Configuration/LoadingPlaceholderStylingConfiguration.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration;
+
+trait LoadingPlaceholderStylingConfiguration
+{
+    public function setLoadingPlaceHolderAttributes(array $attributes): self
+    {
+        $this->loadingPlaceHolderAttributes = $attributes;
+
+        return $this;
+    }
+
+    public function setLoadingPlaceHolderIconAttributes(array $attributes): self
+    {
+        $this->loadingPlaceHolderIconAttributes = $attributes;
+
+        return $this;
+    }
+
+    public function setLoadingPlaceHolderWrapperAttributes(array $attributes): self
+    {
+        $this->loadingPlaceHolderWrapperAttributes = $attributes;
+
+        return $this;
+    }
+
+    public function setLoadingPlaceholderBlade(string $customBlade): self
+    {
+        $this->loadingPlaceholderBlade = $customBlade;
+
+        return $this;
+    }
+
+}
diff --git a/src/Traits/Styling/HasLoadingPlaceholderStyling.php b/src/Traits/Styling/HasLoadingPlaceholderStyling.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling;
+
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Configuration\LoadingPlaceholderStylingConfiguration;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers\LoadingPlaceholderStylingHelpers;
+
+trait HasLoadingPlaceholderStyling
+{
+    use LoadingPlaceholderStylingConfiguration,
+        LoadingPlaceholderStylingHelpers;
+
+    protected array $loadingPlaceHolderAttributes = [];
+
+    protected array $loadingPlaceHolderIconAttributes = [];
+
+    protected array $loadingPlaceHolderWrapperAttributes = [];
+
+    protected array $loadingPlaceHolderCellAttributes = ['class' => '', 'default' => true];
+
+}
diff --git a/src/Traits/Styling/Helpers/LoadingPlaceholderStylingHelpers.php b/src/Traits/Styling/Helpers/LoadingPlaceholderStylingHelpers.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits\Styling\Helpers;
+
+use Livewire\Attributes\Computed;
+
+trait LoadingPlaceholderStylingHelpers
+{
+    public function getLoadingPlaceholderAttributes(): array
+    {
+        return count($this->loadingPlaceHolderAttributes) ? $this->loadingPlaceHolderAttributes : ['default' => true];
+    }
+
+    public function getLoadingPlaceHolderIconAttributes(): array
+    {
+        return count($this->loadingPlaceHolderIconAttributes) ? $this->loadingPlaceHolderIconAttributes : ['default' => true];
+    }
+
+    public function getLoadingPlaceHolderWrapperAttributes(): array
+    {
+        return count($this->loadingPlaceHolderWrapperAttributes) ? $this->loadingPlaceHolderWrapperAttributes : ['default' => true];
+    }
+
+    public function getLoadingPlaceHolderCellAttributes(): array
+    {
+        return count($this->loadingPlaceHolderCellAttributes) ? $this->loadingPlaceHolderCellAttributes : ['default' => true];
+    }
+}
diff --git a/src/Traits/WithLoadingPlaceholder.php b/src/Traits/WithLoadingPlaceholder.php
@@ -4,21 +4,19 @@
 
 use Rappasoft\LaravelLivewireTables\Traits\Configuration\LoadingPlaceholderConfiguration;
 use Rappasoft\LaravelLivewireTables\Traits\Helpers\LoadingPlaceholderHelpers;
+use Rappasoft\LaravelLivewireTables\Traits\Styling\HasLoadingPlaceholderStyling;
 
 trait WithLoadingPlaceholder
 {
     use LoadingPlaceholderConfiguration,
-        LoadingPlaceholderHelpers;
+        LoadingPlaceholderHelpers,
+        HasLoadingPlaceholderStyling;
 
     protected bool $displayLoadingPlaceholder = false;
 
     protected string $loadingPlaceholderContent = 'Loading';
 
     protected ?string $loadingPlaceholderBlade = null;
 
-    protected array $loadingPlaceHolderAttributes = [];
 
-    protected array $loadingPlaceHolderIconAttributes = [];
-
-    protected array $loadingPlaceHolderWrapperAttributes = [];
 }