[TASK] Further reduce need to override partials and templates

evoWeb · Dec 1, 2024 · 5868eff · 5868eff
1 parent d61f376
commit 5868eff
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 46 deletions.
diff --git a/Classes/EventListener/BeforeContainerConfigurationIsAppliedListener.php b/Classes/EventListener/BeforeContainerConfigurationIsAppliedListener.php
@@ -23,13 +23,7 @@ class BeforeContainerConfigurationIsAppliedListener
     #[AsEventListener('collapsible-container-beforecontainer', BeforeContainerConfigurationIsAppliedEvent::class)]
     public function __invoke(BeforeContainerConfigurationIsAppliedEvent $event): void
     {
-        $containerConfiguration = $event->getContainerConfiguration();
-
-        $containerConfiguration->setGridTemplate(
-            'EXT:ew_collapsible_container/Resources/Private/Templates/Grid.html'
-        );
-
-        $containerConfiguration->setGridPartialPaths([
+        $event->getContainerConfiguration()->setGridPartialPaths([
             'EXT:backend/Resources/Private/Partials/',
             'EXT:container/Resources/Private/Partials/',
             'EXT:ew_collapsible_container/Resources/Private/Partials/',

diff --git a/Classes/EventListener/BeforeContainerPreviewIsRenderedListener.php b/Classes/EventListener/BeforeContainerPreviewIsRenderedListener.php
@@ -21,9 +21,15 @@
 use Evoweb\EwCollapsibleContainer\Xclass\ContainerGridColumn;
 use TYPO3\CMS\Core\Attribute\AsEventListener;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Page\JavaScriptModuleInstruction;
+use TYPO3\CMS\Core\Page\PageRenderer;
 
 class BeforeContainerPreviewIsRenderedListener
 {
+    public function __construct(protected PageRenderer $pageRenderer)
+    {
+    }
+
     #[AsEventListener('collapsible-container-beforepreview', BeforeContainerPreviewIsRenderedEvent::class)]
     public function __invoke(BeforeContainerPreviewIsRenderedEvent $event): void
     {
@@ -38,6 +44,8 @@ public function __invoke(BeforeContainerPreviewIsRenderedEvent $event): void
                 'showMinItemsWarning' => $this->getShowMinItemsWarning($column, $countOfHiddenItems)
             ]);
         }
+
+        $this->addFrontendResources();
     }
 
     protected function getCountOfHiddenItems(ContainerGridColumn $columnObject): int
@@ -71,6 +79,14 @@ protected function getShowMinItemsWarning(ContainerGridColumn $columnObject, int
         return $itemCount > 0 && ($itemCount - $hiddenItemCount) < $minItems;
     }
 
+    protected function addFrontendResources(): void
+    {
+        $this->pageRenderer->addCssFile('EXT:ew_collapsible_container/Resources/Public/Css/container.css');
+        $this->pageRenderer->getJavaScriptRenderer()->addJavaScriptModuleInstruction(
+            JavaScriptModuleInstruction::create('@evoweb/ew-collapsible-container/container.js')
+        );
+    }
+
     protected function getBackendUser(): BackendUserAuthentication
     {
         return $GLOBALS['BE_USER'];

diff --git a/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html b/Resources/Private/Partials/PageLayout/Grid/ColumnHeader.html
@@ -39,22 +39,20 @@
 <f:render section="collapsibleExpandIcon" arguments="{_all}"/>
 
 <f:section name="collapsibleToggleIcon">
-    <f:if condition="{collapsable}">
-        <a href="#"
-           class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
-           title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
-           data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
-           data-collapse-state="collapsed">
-            <core:icon identifier="actions-view-list-expand" />
-        </a>
-        <a href="#"
-           class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
-           title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
-           data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
-           data-collapse-state="expanded">
-            <core:icon identifier="actions-view-list-collapse" />
-        </a>
-    </f:if>
+    <a href="#"
+       class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
+       title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
+       data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
+       data-collapse-state="collapsed">
+        <core:icon identifier="actions-view-list-expand" />
+    </a>
+    <a href="#"
+       class="btn btn-sm btn-default btn-borderless t3js-toggle-container-column"
+       title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:collapsecontent')}"
+       data-toggle-title="{f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:expandcontent')}"
+       data-collapse-state="expanded">
+        <core:icon identifier="actions-view-list-collapse" />
+    </a>
 </f:section>
 
 <f:section name="collapsibleMinitemWarning">
@@ -73,14 +71,12 @@
 </f:section>
 
 <f:section name="collapsibleExpandIcon">
-    <f:if condition="{collapsable}">
-        <div class="m-3 container-collapsed-column-marker t3js-expand-column">
-            <button type="button" class="btn btn-default btn-sm me-2">
-                <core:icon identifier="actions-view-list-expand"/>
-            </button>
-            {f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:contentcollapsed')}
-        </div>
-    </f:if>
+    <div class="m-3 container-collapsed-column-marker t3js-expand-column">
+        <button type="button" class="btn btn-default btn-sm me-2">
+            <core:icon identifier="actions-view-list-expand"/>
+        </button>
+        {f:translate(key: 'LLL:EXT:ew_collapsible_container/Resources/Private/Language/locallang.xlf:contentcollapsed')}
+    </div>
 </f:section>
 
 </html>
diff --git a/Resources/Private/Templates/Grid.html b/Resources/Private/Templates/Grid.html