Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Classes/Rendering/ComponentRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ public function __construct(
private readonly EventDispatcherInterface $eventDispatcher,
) {}

public function renderComponent(ComponentRenderingData $componentRenderingData, ContentObjectRenderer $contentObjectRenderer): string
public function renderComponent(ComponentRenderingData $componentRenderingData, ContentObjectRenderer $contentObjectRenderer, ?TagBuilder $tagBuilder = null): string
{
$event = new ComponentWillBeRendered($componentRenderingData, $contentObjectRenderer);
$this->eventDispatcher->dispatch($event);
return $this->renderMarkup($event->getComponentRenderingData());
return $this->renderMarkup($event->getComponentRenderingData(), $tagBuilder);
}

/**
Expand Down Expand Up @@ -58,14 +58,15 @@ public function evaluateComponent(InputData $inputData, string $componentClassNa
return $event->getComponentRenderingData();
}

private function renderMarkup(ComponentRenderingData $componentRenderingData): string
private function renderMarkup(ComponentRenderingData $componentRenderingData, ?TagBuilder $tagBuilder = null): string
{
if ($componentRenderingData->getTagName() === null) {
throw new AssertionFailedException('No tag name provided', 1730800497);
}

/** @var TagBuilder $tagBuilder */
$tagBuilder = GeneralUtility::makeInstance(TagBuilder::class);
if ($tagBuilder === null) {
$tagBuilder = GeneralUtility::makeInstance(TagBuilder::class);
}
$tagBuilder->setTagName($componentRenderingData->getTagName());
if (!empty($componentRenderingData->getTagContent())) {
$tagBuilder->setContent($componentRenderingData->getTagContent());
Expand Down
8 changes: 5 additions & 3 deletions Classes/ViewHelpers/RenderViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@
use TYPO3\CMS\Core\Log\LogManager;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;

class RenderViewHelper extends AbstractViewHelper
class RenderViewHelper extends AbstractTagBasedViewHelper
{
protected $escapeOutput = false;

public function initializeArguments(): void
{
$this->registerUniversalTagAttributes();

$this->registerArgument('component', 'string', 'Class name', true);
$this->registerArgument('inputData', 'array', 'input data', false, []);
$this->registerArgument('contentObjectRenderer', ContentObjectRenderer::class, 'current cObj');
Expand All @@ -43,7 +45,7 @@ public function render(): string
return $e->getRenderingPlaceholder();
}

return $componentRenderer->renderComponent($componentRenderingData, $contentObjectRenderer);
return $componentRenderer->renderComponent($componentRenderingData, $contentObjectRenderer, $this->tag);
}

protected function getContentObjectRenderer(): ContentObjectRenderer
Expand Down