Performance Tweaks

Author: lrljoe

resources/views/components/tools/toolbar/items/bulk-actions.blade.php

@@ -28,10 +28,10 @@
 
 
             @if($isTailwind)
-                        x-on:click="open = !open"
-                        @else
-                        data-toggle="dropdown" data-bs-toggle="dropdown"
-                        @endif
+                x-on:click="open = !open"
+            @else
+                data-toggle="dropdown" data-bs-toggle="dropdown"
+            @endif
             aria-haspopup="true" aria-expanded="false">
 
             {{ __($localisationPath.'Bulk Actions') }}

resources/views/components/tools/toolbar/items/filter-popover.blade.php

@@ -1,16 +1,19 @@
-@aware(['tableName'])
-@if($this->isBootstrap)
+@aware(['tableName','isBootstrap','isBootstrap4','isBootstrap5'])
+@php($filterPopoverAttributes = $this->getFilterPopoverAttributes())
+@php($filterGenericData = $this->getFilterGenericData())
+
+@if($isBootstrap)
     <ul x-cloak {{ $attributes
-            ->merge($this->getFilterPopoverAttributes())
+            ->merge($filterPopoverAttributes)
             ->merge(['role' => 'menu'])
             ->class([
-                'w-100' => $this->getFilterPopoverAttributes['default-width'] ?? true,
-                'dropdown-menu mt-md-5' => $this->isBootstrap4,
-                'dropdown-menu' => $this->isBootstrap5,
+                'w-100' => $filterPopoverAttributes['default-width'] ?? true,
+                'dropdown-menu mt-md-5' => $isBootstrap4,
+                'dropdown-menu' => $isBootstrap5,
             ]) }} x-bind:class="{ 'show': filterPopoverOpen }">
         @foreach ($this->getVisibleFilters() as $filter)
             <div id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper" wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-toolbar" class="p-2">
-                {{ $filter->setGenericDisplayData($this->getFilterGenericData())->render() }}
+                {{ $filter->setGenericDisplayData($filterGenericData)->render() }}
             </div>
         @endforeach
 
@@ -23,7 +26,7 @@
     <div x-cloak x-show="filterPopoverOpen"
         {{ 
             $attributes
-            ->merge($this->getFilterPopoverAttributes())
+            ->merge($filterPopoverAttributes)
             ->merge([
                 'role' => 'menu',
                 'aria-orientation' => 'vertical',
@@ -36,17 +39,17 @@
                 'x-transition:leave-end' => 'transform opacity-0 scale-95',
             ])
             ->class([
-                'w-full md:w-56' => $this->getFilterPopoverAttributes()['default-width'] ?? true,
-                'origin-top-left absolute left-0 mt-2 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $this->getFilterPopoverAttributes()['default-styling'] ?? true,
-                'bg-white divide-gray-100 ring-black dark:bg-gray-700 dark:text-white dark:divide-gray-600' => $this->getFilterPopoverAttributes()['default-colors'] ?? true,
+                'w-full md:w-56' => $filterPopoverAttributes['default-width'] ?? true,
+                'origin-top-left absolute left-0 mt-2 rounded-md shadow-lg ring-1 ring-opacity-5 divide-y focus:outline-none z-50' => $filterPopoverAttributes['default-styling'] ?? true,
+                'bg-white divide-gray-100 ring-black dark:bg-gray-700 dark:text-white dark:divide-gray-600' => $filterPopoverAttributes['default-colors'] ?? true,
             ])
             ->except(['x-cloak', 'x-show', 'default','default-width', 'default-styling','default-colors']) 
         }}>
 
         @foreach ($this->getVisibleFilters() as $filter)
             <div class="py-1" role="none">
                 <div id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper" wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-toolbar" class="block px-4 py-2 text-sm text-gray-700 space-y-1" role="menuitem">
-                    {{ $filter->setGenericDisplayData($this->getFilterGenericData())->render() }}
+                    {{ $filter->setGenericDisplayData($filterGenericData)->render() }}
                 </div>
             </div>
         @endforeach

resources/views/components/tools/toolbar/items/filter-slidedown.blade.php

@@ -1,8 +1,10 @@
 @aware([ 'tableName', 'isTailwind', 'isBootstrap'])
 @props([])
+@php($filterSlidedownWrapperAttributes = $this->getFilterSlidedownWrapperAttributes())
+@php($filterGenericData = $this->getFilterGenericData())
 
 <div x-cloak x-show="filtersOpen" {{ $attributes
-            ->merge($this->getFilterSlidedownWrapperAttributes())
+            ->merge($filterSlidedownWrapperAttributes)
             ->merge($isTailwind ? [
                 'x-transition:enter' => 'transition ease-out duration-100',
                 'x-transition:enter-start' => 'transform opacity-0',
@@ -12,7 +14,7 @@
                 'x-transition:leave-end' => 'transform opacity-0',
             ] : [])
             ->class([
-                'container' => $isBootstrap && ($this->getFilterSlidedownWrapperAttributes()['default'] ?? true),
+                'container' => $isBootstrap && ($filterSlidedownWrapperAttributes['default'] ?? true),
             ])
             ->except(['default','default-colors','default-styling'])
         }} 
@@ -68,7 +70,7 @@
                     ])
                     id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper"
                 >
-                    {{ $filter->setGenericDisplayData($this->getFilterGenericData)->render() }}
+                    {{ $filter->setGenericDisplayData($filterGenericData)->render() }}
                 </div>
             @endforeach
         </div>