[TASK] Improve compatibility to container 3.0.1

As an event was enhanced, two classes in this extension are not needed anymore.
evoWeb · Nov 8, 2024 · 5164e08 · 5164e08
1 parent fec3860
commit 5164e08
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 168 deletions.
diff --git a/Classes/EventListener/BeforeContainerPreviewIsRenderedListener.php b/Classes/EventListener/BeforeContainerPreviewIsRenderedListener.php
@@ -15,9 +15,9 @@
 
 namespace Evoweb\EwCollapsibleContainer\EventListener;
 
-use B13\Container\Backend\Grid\ContainerGridColumn;
-use Evoweb\EwCollapsibleContainer\Xclass\BeforeContainerPreviewIsRenderedEvent;
-use Evoweb\EwCollapsibleContainer\Xclass\ContainerGridColumn as BaseContainerGridColumn;
+use B13\Container\Events\BeforeContainerPreviewIsRenderedEvent;
+use B13\Container\Backend\Grid\ContainerGridColumn as BaseContainerGridColumn;
+use Evoweb\EwCollapsibleContainer\Xclass\ContainerGridColumn;
 use TYPO3\CMS\Core\Attribute\AsEventListener;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 
@@ -35,16 +35,16 @@ public function __invoke(BeforeContainerPreviewIsRenderedEvent $event): void
         }
     }
 
-    protected function setColumnCollapsedState(int $recordUid, BaseContainerGridColumn $columnObject): void
+    protected function setColumnCollapsedState(int $recordUid, ContainerGridColumn $column): void
     {
         $backendUser = $this->getBackendUser();
-        $collapseId = $recordUid . ContainerGridColumn::CONTAINER_COL_POS_DELIMITER . $columnObject->getColumnNumber();
+        $collapseId = $recordUid . BaseContainerGridColumn::CONTAINER_COL_POS_DELIMITER . $column->getColumnNumber();
         if (isset($backendUser->uc['moduleData']['list']['containerExpanded'][$collapseId])) {
             $collapsed = $backendUser->uc['moduleData']['list']['containerExpanded'][$collapseId] > 0;
         } else {
-            $collapsed = (bool)($columnObject->getDefinition()['collapsed'] ?? false);
+            $collapsed = (bool)($column->getDefinition()['collapsed'] ?? false);
         }
-        $columnObject->setCollapsed($collapsed);
+        $column->setCollapsed($collapsed);
     }
 
     protected function getBackendUser(): BackendUserAuthentication

diff --git a/Classes/Xclass/BeforeContainerPreviewIsRenderedEvent.php b/Classes/Xclass/BeforeContainerPreviewIsRenderedEvent.php
diff --git a/Classes/Xclass/ContainerPreviewRenderer.php b/Classes/Xclass/ContainerPreviewRenderer.php
diff --git a/Documentation/Example/Index.rst b/Documentation/Example/Index.rst
@@ -0,0 +1,34 @@
+..  include:: /Includes.rst.txt
+..  index:: Example
+..  _example:
+
+=======
+Example
+=======
+
+..  code-block:: php
+    :caption: Configuration/TCA/Overrides/tt_content.php
+
+    $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+        \B13\Container\Tca\ContainerConfiguration::class,
+        'demo_container',
+        $languageFile . 'CType.I.demo_container',
+        $languageFile . 'CType.I.demo_container-plus_wiz_description',
+        [
+            [
+                [
+                    'name' => 'Elements',
+                    'colPos' => 200,
+                    'allowed' => ['CType' => 'kwicks_element'],
+                    'collapsed' => true,
+                    'minitems' => 1,
+                    'maxitems' => 5,
+                ]
+            ]
+        ]
+    );
+
+    $configuration->setGroup('ew_fischer');
+    $configuration->setIcon('content-card-group');
+
+    GeneralUtility::makeInstance(Registry::class)->configureContainer($configuration);
diff --git a/Documentation/Index.rst b/Documentation/Index.rst
@@ -49,6 +49,7 @@ a GNU/GPL CMS/Framework available from http://typo3.org
    :titlesonly:
 
    Installation/Index
+   Example/Index
 
 .. Meta Menu
 

diff --git a/README.md b/README.md
@@ -31,10 +31,17 @@ $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                 'colPos' => 200,
                 'allowed' => ['CType' => 'kwicks_element'],
                 'collapsed' => true,
+                'minitems' => 1,
+                'maxitems' => 5,
             ]
         ]
     ]
 );
+
+$configuration->setGroup('ew_fischer');
+$configuration->setIcon('content-card-group');
+
+GeneralUtility::makeInstance(Registry::class)->configureContainer($configuration);
 ```
 
 Add setTemplate to disable ability to collapse for defined container elements.

diff --git a/Resources/Public/Css/container.css b/Resources/Public/Css/container.css
@@ -2,10 +2,7 @@
     display: inline-block;
 }
 
-[data-collapse-state="collapsed"] {
-    display: none;
-}
-
+[data-collapse-state="collapsed"],
 .container-collapsed-column-marker {
     display: none;
 }
@@ -23,10 +20,7 @@
         display: block;
     }
 
-    .t3-page-ce {
-        display: none;
-    }
-
+    .t3-page-ce,
     .t3-page-ce-wrapper {
         display: none;
     }

diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
 	],
 	"require": {
 		"typo3/cms-backend": "^13.0 || 13.0.x-dev || dev-main",
-		"typo3/cms-core": "^13.0 || 13.0.x-dev || dev-main"
+		"typo3/cms-core": "^13.0 || 13.0.x-dev || dev-main",
+		"b13/container": "^3.0.1 || dev-master"
 	},
 	"require-dev": {
 		"friendsofphp/php-cs-fixer": "^3.62.0"

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -1,20 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 defined('TYPO3') or die();
 
 use B13\Container\Backend\Grid\ContainerGridColumn as BaseContainerGridColumn;
-use B13\Container\Backend\Preview\ContainerPreviewRenderer as BaseContainerPreviewRenderer;
 use Evoweb\EwCollapsibleContainer\Xclass\ContainerGridColumn;
-use Evoweb\EwCollapsibleContainer\Xclass\ContainerPreviewRenderer;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
-call_user_func(function () {
-    if (ExtensionManagementUtility::isLoaded('container')) {
-        $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][BaseContainerGridColumn::class] = [
-            'className' => ContainerGridColumn::class,
-        ];
-        $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][BaseContainerPreviewRenderer::class] = [
-            'className' => ContainerPreviewRenderer::class,
-        ];
-    }
-});
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][BaseContainerGridColumn::class] = [
+    'className' => ContainerGridColumn::class,
+];