From 18fe30803674c387be9392ce79b552b0f11fd6e2 Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Sat, 1 Feb 2025 12:02:31 +0000
Subject: [PATCH] Avoid double evaluation on Blade components

---
 .../resources/views/action-modal.blade.php    |  57 +++++--
 .../tables/resources/views/index.blade.php    | 158 +++++++++++++-----
 .../views/components/widgets.blade.php        |   2 +
 3 files changed, 156 insertions(+), 61 deletions(-)

diff --git a/packages/actions/resources/views/action-modal.blade.php b/packages/actions/resources/views/action-modal.blade.php
index 1ab1729c749..a3705df41ea 100644
--- a/packages/actions/resources/views/action-modal.blade.php
+++ b/packages/actions/resources/views/action-modal.blade.php
@@ -1,23 +1,44 @@
 <form wire:submit.prevent="callMountedAction">
+    @php
+        $actionModalAlignment = $action->getModalAlignment();
+        $actionIsModalAutofocused = $action->isModalAutofocused();
+        $actionHasModalCloseButton = $action->hasModalCloseButton();
+        $actionIsModalClosedByClickingAway = $action->isModalClosedByClickingAway();
+        $actionIsModalClosedByEscaping = $action->isModalClosedByEscaping();
+        $actionModalDescription = $action->getModalDescription();
+        $actionExtraModalWindowAttributeBag = $action->getExtraModalWindowAttributeBag();
+        $actionModalFooterActions = $action->getVisibleModalFooterActions();
+        $actionModalFooterActionsAlignment = $action->getModalFooterActionsAlignment();
+        $actionModalHeading = $action->getModalHeading();
+        $actionModalIcon = $action->getModalIcon();
+        $actionModalIconColor = $action->getModalIconColor();
+        $actionModalId = "fi-{$this->getId()}-action-{$action->getNestingIndex()}";
+        $actionIsModalSlideOver = $action->isModalSlideOver();
+        $actionIsModalFooterSticky = $action->isModalFooterSticky();
+        $actionIsModalHeaderSticky = $action->isModalHeaderSticky();
+        $actionModalWidth = $action->getModalWidth();
+        $actionModalWireKey = "{$this->getId()}.actions.{$action->getName()}.modal";
+    @endphp
+
     <x-filament::modal
-        :alignment="$action->getModalAlignment()"
-        :autofocus="$action?->isModalAutofocused()"
-        :close-button="$action?->hasModalCloseButton()"
-        :close-by-clicking-away="$action?->isModalClosedByClickingAway()"
-        :close-by-escaping="$action?->isModalClosedByEscaping()"
-        :description="$action->getModalDescription()"
-        :extra-modal-window-attribute-bag="$action->getExtraModalWindowAttributeBag()"
-        :footer-actions="$action->getVisibleModalFooterActions()"
-        :footer-actions-alignment="$action->getModalFooterActionsAlignment()"
-        :heading="$action->getModalHeading()"
-        :icon="$action->getModalIcon()"
-        :icon-color="$action->getModalIconColor()"
-        :id="'fi-' . $this->getId() . '-action-' . $action->getNestingIndex()"
-        :slide-over="$action->isModalSlideOver()"
-        :sticky-footer="$action->isModalFooterSticky()"
-        :sticky-header="$action->isModalHeaderSticky()"
-        :width="$action->getModalWidth()"
-        :wire:key="$this->getId() . '.actions.' . $action->getName() . '.modal'"
+        :alignment="$actionModalAlignment"
+        :autofocus="$actionIsModalAutofocused"
+        :close-button="$actionHasModalCloseButton"
+        :close-by-clicking-away="$actionIsModalClosedByClickingAway"
+        :close-by-escaping="$actionIsModalClosedByEscaping"
+        :description="$actionModalDescription"
+        :extra-modal-window-attribute-bag="$actionExtraModalWindowAttributeBag"
+        :footer-actions="$actionModalFooterActions"
+        :footer-actions-alignment="$actionModalFooterActionsAlignment"
+        :heading="$actionModalHeading"
+        :icon="$actionModalIcon"
+        :icon-color="$actionModalIconColor"
+        :id="$actionModalId"
+        :slide-over="$actionIsModalSlideOver"
+        :sticky-footer="$actionIsModalFooterSticky"
+        :sticky-header="$actionIsModalHeaderSticky"
+        :width="$actionModalWidth"
+        :wire:key="$actionModalWireKey"
         x-on:modal-closed.stop="$wire.unmountAction(false)"
     >
         {{ $action->getModalContent() }}
diff --git a/packages/tables/resources/views/index.blade.php b/packages/tables/resources/views/index.blade.php
index e0ceeceae4b..9966c379f99 100644
--- a/packages/tables/resources/views/index.blade.php
+++ b/packages/tables/resources/views/index.blade.php
@@ -29,6 +29,9 @@
     $contentGrid = $getContentGrid();
     $contentFooter = $getContentFooter();
     $filterIndicators = $getFilterIndicators();
+    $filtersApplyAction = $getFiltersApplyAction();
+    $filtersForm = $getFiltersForm();
+    $filtersFormWidth = $getFiltersFormWidth();
     $hasColumnGroups = $hasColumnGroups();
     $hasColumnsLayout = $hasColumnsLayout();
     $hasSummary = $hasSummary();
@@ -173,8 +176,8 @@ class="fi-ta-header-heading"
                     ])
                 >
                     <x-filament-tables::filters
-                        :apply-action="$getFiltersApplyAction()"
-                        :form="$getFiltersForm()"
+                        :apply-action="$filtersApplyAction"
+                        :form="$filtersForm"
                         :heading-tag="$secondLevelHeadingTag"
                         x-cloak
                         x-show="areFiltersOpen"
@@ -374,10 +377,14 @@ class="fi-ta-grouping-settings"
                         {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\Tables\View\TablesRenderHook::TOOLBAR_SEARCH_BEFORE, scopes: static::class) }}
 
                         @if ($isGlobalSearchVisible)
+                            @php
+                                $searchPlaceholder = $getSearchPlaceholder();
+                            @endphp
+
                             <x-filament-tables::search-field
                                 :debounce="$searchDebounce"
                                 :on-blur="$isSearchOnBlur"
-                                :placeholder="$getSearchPlaceholder()"
+                                :placeholder="$searchPlaceholder"
                             />
                         @endif
 
@@ -386,23 +393,40 @@ class="fi-ta-grouping-settings"
                         @if ($hasFiltersDialog || $hasColumnToggleDropdown)
                             @if ($hasFiltersDialog)
                                 @if (($filtersLayout === FiltersLayout::Modal) || $filtersTriggerAction->isModalSlideOver())
+                                    @php
+                                        $filtersTriggerActionModalAlignment = $filtersTriggerAction->getModalAlignment();
+                                        $filtersTriggerActionIsModalAutofocused = $filtersTriggerAction->isModalAutofocused();
+                                        $filtersTriggerActionHasModalCloseButton = $filtersTriggerAction->hasModalCloseButton();
+                                        $filtersTriggerActionIsModalClosedByClickingAway = $filtersTriggerAction->isModalClosedByClickingAway();
+                                        $filtersTriggerActionIsModalClosedByEscaping = $filtersTriggerAction->isModalClosedByEscaping();
+                                        $filtersTriggerActionModalDescription = $filtersTriggerAction->getModalDescription();
+                                        $filtersTriggerActionVisibleModalFooterActions = $filtersTriggerAction->getVisibleModalFooterActions();
+                                        $filtersTriggerActionModalFooterActionsAlignment = $filtersTriggerAction->getModalFooterActionsAlignment();
+                                        $filtersTriggerActionModalHeading = $filtersTriggerAction->getCustomModalHeading() ?? __('filament-tables::table.filters.heading');
+                                        $filtersTriggerActionModalIcon = $filtersTriggerAction->getModalIcon();
+                                        $filtersTriggerActionModalIconColor = $filtersTriggerAction->getModalIconColor();
+                                        $filtersTriggerActionIsModalSlideOver = $filtersTriggerAction->isModalSlideOver();
+                                        $filtersTriggerActionIsModalFooterSticky = $filtersTriggerAction->isModalFooterSticky();
+                                        $filtersTriggerActionIsModalHeaderSticky = $filtersTriggerAction->isModalHeaderSticky();
+                                    @endphp
+
                                     <x-filament::modal
-                                        :alignment="$filtersTriggerAction->getModalAlignment()"
-                                        :autofocus="$filtersTriggerAction->isModalAutofocused()"
-                                        :close-button="$filtersTriggerAction->hasModalCloseButton()"
-                                        :close-by-clicking-away="$filtersTriggerAction->isModalClosedByClickingAway()"
-                                        :close-by-escaping="$filtersTriggerAction?->isModalClosedByEscaping()"
-                                        :description="$filtersTriggerAction->getModalDescription()"
-                                        :footer-actions="$filtersTriggerAction->getVisibleModalFooterActions()"
-                                        :footer-actions-alignment="$filtersTriggerAction->getModalFooterActionsAlignment()"
-                                        :heading="$filtersTriggerAction->getCustomModalHeading() ?? __('filament-tables::table.filters.heading')"
-                                        :icon="$filtersTriggerAction->getModalIcon()"
-                                        :icon-color="$filtersTriggerAction->getModalIconColor()"
-                                        :slide-over="$filtersTriggerAction->isModalSlideOver()"
-                                        :sticky-footer="$filtersTriggerAction->isModalFooterSticky()"
-                                        :sticky-header="$filtersTriggerAction->isModalHeaderSticky()"
-                                        :width="$getFiltersFormWidth()"
-                                        wire:key="{{ $this->getId() }}.table.filters"
+                                        :alignment="$filtersTriggerActionModalAlignment"
+                                        :autofocus="$filtersTriggerActionIsModalAutofocused"
+                                        :close-button="$filtersTriggerActionHasModalCloseButton"
+                                        :close-by-clicking-away="$filtersTriggerActionIsModalClosedByClickingAway"
+                                        :close-by-escaping="$filtersTriggerActionIsModalClosedByEscaping"
+                                        :description="$filtersTriggerActionModalDescription"
+                                        :footer-actions="$filtersTriggerActionVisibleModalFooterActions"
+                                        :footer-actions-alignment="$filtersTriggerActionModalFooterActionsAlignment"
+                                        :heading="$filtersTriggerActionModalHeading"
+                                        :icon="$filtersTriggerActionModalIcon"
+                                        :icon-color="$filtersTriggerActionModalIconColor"
+                                        :slide-over="$filtersTriggerActionModalSlideOver"
+                                        :sticky-footer="$filtersTriggerActionModalFooterSticky"
+                                        :sticky-header="$filtersTriggerActionModalHeaderSticky"
+                                        :width="$filtersFormWidth"
+                                        :wire:key="$this->getId() . '.table.filters'"
                                         class="fi-ta-filters-modal"
                                     >
                                         <x-slot name="trigger">
@@ -411,17 +435,21 @@ class="fi-ta-filters-modal"
 
                                         {{ $filtersTriggerAction->getModalContent() }}
 
-                                        {{ $getFiltersForm() }}
+                                        {{ $filtersForm }}
 
                                         {{ $filtersTriggerAction->getModalContentFooter() }}
                                     </x-filament::modal>
                                 @else
+                                    @php
+                                        $filtersFormMaxHeight = $getFiltersFormMaxHeight();
+                                    @endphp
+
                                     <x-filament::dropdown
-                                        :max-height="$getFiltersFormMaxHeight()"
+                                        :max-height="$filtersFormMaxHeight"
                                         placement="bottom-end"
                                         shift
-                                        :width="$getFiltersFormWidth()"
-                                        wire:key="{{ $this->getId() }}.table.filters"
+                                        :width="$filtersFormWidth"
+                                        :wire:key="$this->getId() . '.table.filters'"
                                         class="fi-ta-filters-dropdown"
                                     >
                                         <x-slot name="trigger">
@@ -429,8 +457,8 @@ class="fi-ta-filters-dropdown"
                                         </x-slot>
 
                                         <x-filament-tables::filters
-                                            :apply-action="$getFiltersApplyAction()"
-                                            :form="$getFiltersForm()"
+                                            :apply-action="$filtersApplyAction"
+                                            :form="$filtersForm"
                                             :heading-tag="$secondLevelHeadingTag"
                                         />
                                     </x-filament::dropdown>
@@ -440,12 +468,17 @@ class="fi-ta-filters-dropdown"
                             {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\Tables\View\TablesRenderHook::TOOLBAR_TOGGLE_COLUMN_TRIGGER_BEFORE, scopes: static::class) }}
 
                             @if ($hasColumnToggleDropdown)
+                                @php
+                                    $columnToggleFormMaxHeight = $getColumnToggleFormMaxHeight();
+                                    $columnToggleFormWidth = $getColumnToggleFormWidth();
+                                @endphp
+
                                 <x-filament::dropdown
-                                    :max-height="$getColumnToggleFormMaxHeight()"
+                                    :max-height="$columnToggleFormMaxHeight"
                                     placement="bottom-end"
                                     shift
-                                    :width="$getColumnToggleFormWidth()"
-                                    wire:key="{{ $this->getId() }}.table.column-toggle"
+                                    :width="$columnToggleFormWidth"
+                                    :wire:key="$this->getId() . '.table.column-toggle'"
                                     class="fi-ta-col-toggle"
                                 >
                                     <x-slot name="trigger">
@@ -552,14 +585,22 @@ class="fi-ta-selection-indicator"
 
                     <div class="fi-ta-filter-indicators-badges-ctn">
                         @foreach ($filterIndicators as $indicator)
-                            <x-filament::badge :color="$indicator->getColor()">
+                            @php
+                                $indicatorColor = $indicator->getColor();
+                            @endphp
+
+                            <x-filament::badge :color="$indicatorColor">
                                 {{ $indicator->getLabel() }}
 
                                 @if ($indicator->isRemovable())
+                                    @php
+                                        $indicatorRemoveLivewireClickHandler = $indicator->getRemoveLivewireClickHandler();
+                                    @endphp
+
                                     <x-slot
                                         name="deleteButton"
                                         :label="__('filament-tables::table.filters.actions.remove.label')"
-                                        wire:click="{{ $indicator->getRemoveLivewireClickHandler() }}"
+                                        :wire:click="$indicatorRemoveLivewireClickHandler"
                                         wire:loading.attr="disabled"
                                         wire:target="removeTableFilter"
                                     ></x-slot>
@@ -776,6 +817,10 @@ function (array $carry, $action) use ($record): array {
                                             ])
                                         >
                                             <tbody>
+                                                @php
+                                                    $groupScopedAllTableSummaryQuery = $group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord);
+                                                @endphp
+
                                                 <x-filament-tables::summary.row
                                                     :columns="$columns"
                                                     extra-heading-column
@@ -786,7 +831,7 @@ function (array $carry, $action) use ($record): array {
                                                         ])
                                                     "
                                                     :placeholder-columns="false"
-                                                    :query="$group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord)"
+                                                    :query="$groupScopedAllTableSummaryQuery"
                                                     :selected-state="$groupedSummarySelectedState[$previousRecordGroupKey] ?? []"
                                                 />
                                             </tbody>
@@ -1018,12 +1063,16 @@ class="fi-ta-record-collapse-btn fi-icon-btn"
                             @if ($hasSummary && (! $isReordering) && filled($previousRecordGroupTitle) && ((! $records instanceof \Illuminate\Contracts\Pagination\Paginator) || (! $records->hasMorePages())))
                                 <table class="fi-ta-table">
                                     <tbody>
+                                        @php
+                                            $groupScopedAllTableSummaryQuery = $group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord);
+                                        @endphp
+
                                         <x-filament-tables::summary.row
                                             :columns="$columns"
                                             extra-heading-column
                                             :heading="__('filament-tables::table.summary.subheadings.group', ['group' => $previousRecordGroupTitle, 'label' => $pluralModelLabel])"
                                             :placeholder-columns="false"
-                                            :query="$group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord)"
+                                            :query="$groupScopedAllTableSummaryQuery"
                                             :selected-state="$groupedSummarySelectedState[$previousRecordGroupKey] ?? []"
                                         />
                                     </tbody>
@@ -1327,18 +1376,22 @@ class="fi-ta-actions-header-cell fi-ta-empty-header-cell"
                                     @endif
 
                                     @foreach ($columns as $column)
+                                        @php
+                                            $columnName = $column->getName();
+                                        @endphp
+
                                         <td
                                             @class([
                                                 'fi-ta-cell',
                                                 'fi-ta-individual-search-cell' => $isIndividuallySearchable = $column->isIndividuallySearchable(),
-                                                'fi-ta-individual-search-cell-' . str($column->getName())->camel()->kebab() => $isIndividuallySearchable,
+                                                'fi-ta-individual-search-cell-' . str($columnName)->camel()->kebab() => $isIndividuallySearchable,
                                             ])
                                         >
                                             @if ($isIndividuallySearchable)
                                                 <x-filament-tables::search-field
                                                     :debounce="$searchDebounce"
                                                     :on-blur="$isSearchOnBlur"
-                                                    wire-model="tableColumnSearches.{{ $column->getName() }}"
+                                                    :wire-model="'tableColumnSearches.' . $columnName"
                                                 />
                                             @endif
                                         </td>
@@ -1398,14 +1451,19 @@ function (array $carry, $action) use ($record): array {
 
                                     @if ($recordGroupTitle !== $previousRecordGroupTitle)
                                         @if ($hasSummary && (! $isReordering) && filled($previousRecordGroupTitle))
+                                            @php
+                                                $groupColumn = $group->getColumn();
+                                                $groupScopedAllTableSummaryQuery = $group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord);
+                                            @endphp
+
                                             <x-filament-tables::summary.row
                                                 :actions="count($actions)"
                                                 :actions-position="$actionsPosition"
                                                 :columns="$columns"
-                                                :group-column="$group?->getColumn()"
+                                                :group-column="$groupColumn"
                                                 :groups-only="$isGroupsOnly"
                                                 :heading="$isGroupsOnly ? $previousRecordGroupTitle : __('filament-tables::table.summary.subheadings.group', ['group' => $previousRecordGroupTitle, 'label' => $pluralModelLabel])"
-                                                :query="$group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord)"
+                                                :query="$groupScopedAllTableSummaryQuery"
                                                 :record-checkbox-position="$recordCheckboxPosition"
                                                 :selected-state="$groupedSummarySelectedState[$previousRecordGroupKey] ?? []"
                                                 :selection-enabled="$isSelectionEnabled"
@@ -1768,14 +1826,19 @@ class="fi-ta-record-checkbox fi-checkbox-input"
                                 @endforeach
 
                                 @if ($hasSummary && (! $isReordering) && filled($previousRecordGroupTitle) && ((! $records instanceof \Illuminate\Contracts\Pagination\Paginator) || (! $records->hasMorePages())))
+                                    @php
+                                        $groupColumn = $group->getColumn();
+                                        $groupScopedAllTableSummaryQuery = $group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord);
+                                    @endphp
+
                                     <x-filament-tables::summary.row
                                         :actions="count($actions)"
                                         :actions-position="$actionsPosition"
                                         :columns="$columns"
-                                        :group-column="$group?->getColumn()"
+                                        :group-column="$groupColumn"
                                         :groups-only="$isGroupsOnly"
                                         :heading="$isGroupsOnly ? $previousRecordGroupTitle : __('filament-tables::table.summary.subheadings.group', ['group' => $previousRecordGroupTitle, 'label' => $pluralModelLabel])"
-                                        :query="$group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord)"
+                                        :query="$groupScopedAllTableSummaryQuery"
                                         :record-checkbox-position="$recordCheckboxPosition"
                                         :selected-state="$groupedSummarySelectedState[$previousRecordGroupKey] ?? []"
                                         :selection-enabled="$isSelectionEnabled"
@@ -1783,11 +1846,15 @@ class="fi-ta-record-checkbox fi-checkbox-input"
                                 @endif
 
                                 @if ($hasSummary && (! $isReordering))
+                                    @php
+                                        $groupColumn = $group?->getColumn();
+                                    @endphp
+
                                     <x-filament-tables::summary
                                         :actions="count($actions)"
                                         :actions-position="$actionsPosition"
                                         :columns="$columns"
-                                        :group-column="$group?->getColumn()"
+                                        :group-column="$groupColumn"
                                         :groups-only="$isGroupsOnly"
                                         :plural-model-label="$pluralModelLabel"
                                         :record-checkbox-position="$recordCheckboxPosition"
@@ -1858,17 +1925,22 @@ class="fi-ta-actions fi-align-center fi-wrapped"
 
         @if ((($records instanceof \Illuminate\Contracts\Pagination\Paginator) || ($records instanceof \Illuminate\Contracts\Pagination\CursorPaginator)) &&
              ((! ($records instanceof \Illuminate\Contracts\Pagination\LengthAwarePaginator)) || $records->total()))
+            @php
+                $hasExtremePaginationLinks = $hasExtremePaginationLinks();
+                $paginationPageOptions = $getPaginationPageOptions();
+            @endphp
+
             <x-filament::pagination
-                :extreme-links="$hasExtremePaginationLinks()"
-                :page-options="$getPaginationPageOptions()"
+                :extreme-links="$hasExtremePaginationLinks"
+                :page-options="$paginationPageOptions"
                 :paginator="$records"
             />
         @endif
 
         @if ($hasFiltersBelowContent)
             <x-filament-tables::filters
-                :apply-action="$getFiltersApplyAction()"
-                :form="$getFiltersForm()"
+                :apply-action="$filtersApplyAction"
+                :form="$filtersForm"
                 :heading-tag="$secondLevelHeadingTag"
                 class="fi-ta-filters-below-content"
             />
diff --git a/packages/widgets/resources/views/components/widgets.blade.php b/packages/widgets/resources/views/components/widgets.blade.php
index 09c0c40c141..31b5bc31e91 100644
--- a/packages/widgets/resources/views/components/widgets.blade.php
+++ b/packages/widgets/resources/views/components/widgets.blade.php
@@ -1,3 +1,5 @@
+{{-- @deprecated Use a schema to render widgets. --}}
+
 @props([
     'columns' => [
         'lg' => 2,