Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: [FEATURE] Introduce concept of multiple renderers per component #25

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: [FEATURE] Introduce concept of multiple renderers per component #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a7d954
[FEATURE] Introduce concept of multiple renderers per component
s2b Jun 22, 2020
64b5b30
Merge branch 'master' into feature/multipleRenderers
s2b Jul 22, 2020
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
49 changes: 32 additions & 17 deletions Classes/ViewHelpers/Component/ExampleViewHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Sitegeist\FluidStyleguide\Domain\Model\Component;
use Sitegeist\FluidStyleguide\Domain\Model\ComponentName;
use Sitegeist\FluidStyleguide\Exception\RequiredComponentArgumentException;
use Sitegeist\FluidStyleguide\ViewHelpers\Component\RenderExampleViewHelper;
use SMS\FluidComponents\Fluid\ViewHelper\ComponentRenderer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
Expand Down Expand Up @@ -60,16 +61,17 @@ public static function renderStatic(
), 1566377563);
}

$fixtureData = $arguments['fixtureData'] ?? [];
$component = $arguments['component'];
$componentContext = $arguments['context'];
$fixtureData = $arguments['fixtureData'] ?? [];

if (isset($arguments['fixtureName'])) {
$componentFixture = $arguments['component']->getFixture($arguments['fixtureName']);
$componentFixture = $component->getFixture($arguments['fixtureName']);
if (!$componentFixture) {
throw new \InvalidArgumentException(sprintf(
'Invalid fixture name "%s" specified for component %s.',
$arguments['fixtureName'],
$arguments['component']->getName()->getIdentifier()
$component->getName()->getIdentifier()
), 1566377564);
}

Expand All @@ -84,25 +86,36 @@ public static function renderStatic(
}

if ($arguments['execute']) {
try {
$closure = function (RenderingContextInterface $renderingContext) use ($fixtureData, $component) {
// Parse fluid code in fixtures
$fixtureData = self::renderFluidInExampleData($fixtureData, $renderingContext);

$componentMarkup = self::renderComponent(
$arguments['component'],
// Render component
return self::renderComponent(
$component,
$fixtureData,
$renderingContext
);
};

$contextData = array_replace(
$component->getDefaultValues(),
$fixtureData
);

try {
$viewHelperVariableContainer = $renderingContext->getViewHelperVariableContainer();
$previousClosure = $viewHelperVariableContainer->get(RenderExampleViewHelper::class, 'closure');
$viewHelperVariableContainer->add(RenderExampleViewHelper::class, 'closure', $closure);

$componentWithContext = self::applyComponentContext(
$componentMarkup,
'<fsv:component.renderExample />',
$componentContext,
$renderingContext,
array_replace(
$arguments['component']->getDefaultValues(),
$fixtureData
)
$contextData
);

$viewHelperVariableContainer->add(RenderExampleViewHelper::class, 'closure', $previousClosure);
} catch (\Exception $e) {
if ($arguments['handleExceptions']) {
return sprintf(
Expand All @@ -117,7 +130,7 @@ public static function renderStatic(
}
} else {
$componentMarkup = static::renderComponentTag(
$arguments['component']->getName(),
$component->getName(),
$fixtureData
);

Expand Down Expand Up @@ -226,18 +239,20 @@ public static function applyComponentContext(
$context = self::checkObtainComponentContextFromFile($context);

if (isset($renderingContext)) {
// Use unique value as component markup marker
$marker = '###COMPONENT_MARKUP_' . mt_rand() . '###';
$context = str_replace('|', $marker, $context);
$renderingContext->getViewHelperResolver()->addNamespace(
'fsv',
'Sitegeist\\FluidStyleguide\\ViewHelpers'
);

$context = str_replace('|', $componentMarkup, $context);

// Parse fluid tags in context string
$originalVariableContainer = $renderingContext->getVariableProvider();
$renderingContext->setVariableProvider(new StandardVariableProvider($data));
$context = $renderingContext->getTemplateParser()->parse($context)->render($renderingContext);
$renderingContext->setVariableProvider($originalVariableContainer);

// Wrap component markup
return str_replace($marker, $componentMarkup, $context);
return $context;
} else {
return str_replace('|', $componentMarkup, $context);
}
Expand Down
30 changes: 30 additions & 0 deletions Classes/ViewHelpers/Component/RenderExampleViewHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace Sitegeist\FluidStyleguide\ViewHelpers\Component;

use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;

class RenderExampleViewHelper extends AbstractViewHelper
{
/**
* @var boolean
*/
protected $escapeOutput = false;

/*
* @param array $arguments
* @param \Closure $renderChildrenClosure
* @param RenderingContextInterface $renderingContext
* @return string
*/
public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
{
$viewHelperVariableContainer = $renderingContext->getViewHelperVariableContainer();
$closure = $viewHelperVariableContainer->get(self::class, 'closure');

if (isset($closure)) {
return $closure($renderingContext);
}
}
}