Issue #3027938 by tim.plunkett, xjm, phenaproxima: Abstract the contents of LayoutBuilderController into a render element
xjm
parent
898feb654c
commit
0e165d7d0a
|
|
@ -3,7 +3,6 @@
|
|||
namespace Drupal\layout_builder\Controller;
|
||||
|
||||
use Drupal\Core\Ajax\AjaxHelperTrait;
|
||||
use Drupal\Core\DependencyInjection\ClassResolverInterface;
|
||||
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
|
||||
use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
|
||||
use Drupal\layout_builder\Section;
|
||||
|
|
@ -33,12 +32,9 @@ class AddSectionController implements ContainerInjectionInterface {
|
|||
*
|
||||
* @param \Drupal\layout_builder\LayoutTempstoreRepositoryInterface $layout_tempstore_repository
|
||||
* The layout tempstore repository.
|
||||
* @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
|
||||
* The class resolver.
|
||||
*/
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ClassResolverInterface $class_resolver) {
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository) {
|
||||
$this->layoutTempstoreRepository = $layout_tempstore_repository;
|
||||
$this->classResolver = $class_resolver;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -46,8 +42,7 @@ class AddSectionController implements ContainerInjectionInterface {
|
|||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('layout_builder.tempstore_repository'),
|
||||
$container->get('class_resolver')
|
||||
$container->get('layout_builder.tempstore_repository')
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,10 @@ namespace Drupal\layout_builder\Controller;
|
|||
use Drupal\Core\Ajax\AjaxHelperTrait;
|
||||
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
|
||||
use Drupal\Core\Messenger\MessengerInterface;
|
||||
use Drupal\Core\Plugin\PluginFormInterface;
|
||||
use Drupal\Core\StringTranslation\StringTranslationTrait;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\layout_builder\Context\LayoutBuilderContextTrait;
|
||||
use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
|
||||
use Drupal\layout_builder\OverridesSectionStorageInterface;
|
||||
use Drupal\layout_builder\Section;
|
||||
use Drupal\layout_builder\SectionStorageInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||
|
|
@ -89,235 +86,10 @@ class LayoutBuilderController implements ContainerInjectionInterface {
|
|||
* A render array.
|
||||
*/
|
||||
public function layout(SectionStorageInterface $section_storage, $is_rebuilding = FALSE) {
|
||||
$this->prepareLayout($section_storage, $is_rebuilding);
|
||||
|
||||
$output = [];
|
||||
if ($this->isAjax()) {
|
||||
$output['status_messages'] = [
|
||||
'#type' => 'status_messages',
|
||||
];
|
||||
}
|
||||
$count = 0;
|
||||
for ($i = 0; $i < $section_storage->count(); $i++) {
|
||||
$output[] = $this->buildAddSectionLink($section_storage, $count);
|
||||
$output[] = $this->buildAdministrativeSection($section_storage, $count);
|
||||
$count++;
|
||||
}
|
||||
$output[] = $this->buildAddSectionLink($section_storage, $count);
|
||||
$output['#attached']['library'][] = 'layout_builder/drupal.layout_builder';
|
||||
$output['#type'] = 'container';
|
||||
$output['#attributes']['id'] = 'layout-builder';
|
||||
// Mark this UI as uncacheable.
|
||||
$output['#cache']['max-age'] = 0;
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepares a layout for use in the UI.
|
||||
*
|
||||
* @param \Drupal\layout_builder\SectionStorageInterface $section_storage
|
||||
* The section storage.
|
||||
* @param bool $is_rebuilding
|
||||
* Indicates if the layout is rebuilding.
|
||||
*/
|
||||
protected function prepareLayout(SectionStorageInterface $section_storage, $is_rebuilding) {
|
||||
// If the layout has pending changes, add a warning.
|
||||
if ($this->layoutTempstoreRepository->has($section_storage)) {
|
||||
$this->messenger->addWarning($this->t('You have unsaved changes.'));
|
||||
}
|
||||
|
||||
// Only add sections if the layout is new and empty.
|
||||
if (!$is_rebuilding && $section_storage->count() === 0) {
|
||||
$sections = [];
|
||||
// If this is an empty override, copy the sections from the corresponding
|
||||
// default.
|
||||
if ($section_storage instanceof OverridesSectionStorageInterface) {
|
||||
$sections = $section_storage->getDefaultSectionStorage()->getSections();
|
||||
}
|
||||
|
||||
// For an empty layout, begin with a single section of one column.
|
||||
if (!$sections) {
|
||||
$sections[] = new Section('layout_onecol');
|
||||
}
|
||||
|
||||
foreach ($sections as $section) {
|
||||
$section_storage->appendSection($section);
|
||||
}
|
||||
$this->layoutTempstoreRepository->set($section_storage);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a link to add a new section at a given delta.
|
||||
*
|
||||
* @param \Drupal\layout_builder\SectionStorageInterface $section_storage
|
||||
* The section storage.
|
||||
* @param int $delta
|
||||
* The delta of the section to splice.
|
||||
*
|
||||
* @return array
|
||||
* A render array for a link.
|
||||
*/
|
||||
protected function buildAddSectionLink(SectionStorageInterface $section_storage, $delta) {
|
||||
$storage_type = $section_storage->getStorageType();
|
||||
$storage_id = $section_storage->getStorageId();
|
||||
|
||||
// If the delta and the count are the same, it is either the end of the
|
||||
// layout or an empty layout.
|
||||
if ($delta === count($section_storage)) {
|
||||
if ($delta === 0) {
|
||||
$title = $this->t('Add Section');
|
||||
}
|
||||
else {
|
||||
$title = $this->t('Add Section <span class="visually-hidden">at end of layout</span>');
|
||||
}
|
||||
}
|
||||
// If the delta and the count are different, it is either the beginning of
|
||||
// the layout or in between two sections.
|
||||
else {
|
||||
if ($delta === 0) {
|
||||
$title = $this->t('Add Section <span class="visually-hidden">at start of layout</span>');
|
||||
}
|
||||
else {
|
||||
$title = $this->t('Add Section <span class="visually-hidden">between @first and @second</span>', ['@first' => $delta, '@second' => $delta + 1]);
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'link' => [
|
||||
'#type' => 'link',
|
||||
'#title' => $title,
|
||||
'#url' => Url::fromRoute('layout_builder.choose_section',
|
||||
[
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
],
|
||||
[
|
||||
'attributes' => [
|
||||
'class' => ['use-ajax', 'new-section__link'],
|
||||
'data-dialog-type' => 'dialog',
|
||||
'data-dialog-renderer' => 'off_canvas',
|
||||
],
|
||||
]
|
||||
),
|
||||
],
|
||||
'#type' => 'container',
|
||||
'#attributes' => [
|
||||
'class' => ['new-section'],
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the render array for the layout section while editing.
|
||||
*
|
||||
* @param \Drupal\layout_builder\SectionStorageInterface $section_storage
|
||||
* The section storage.
|
||||
* @param int $delta
|
||||
* The delta of the section.
|
||||
*
|
||||
* @return array
|
||||
* The render array for a given section.
|
||||
*/
|
||||
protected function buildAdministrativeSection(SectionStorageInterface $section_storage, $delta) {
|
||||
$storage_type = $section_storage->getStorageType();
|
||||
$storage_id = $section_storage->getStorageId();
|
||||
$section = $section_storage->getSection($delta);
|
||||
|
||||
$layout = $section->getLayout();
|
||||
$build = $section->toRenderArray($this->getAvailableContexts($section_storage), TRUE);
|
||||
$layout_definition = $layout->getPluginDefinition();
|
||||
|
||||
$region_labels = $layout_definition->getRegionLabels();
|
||||
foreach ($layout_definition->getRegions() as $region => $info) {
|
||||
if (!empty($build[$region])) {
|
||||
foreach ($build[$region] as $uuid => $block) {
|
||||
$build[$region][$uuid]['#attributes']['class'][] = 'draggable';
|
||||
$build[$region][$uuid]['#attributes']['data-layout-block-uuid'] = $uuid;
|
||||
$build[$region][$uuid]['#contextual_links'] = [
|
||||
'layout_builder_block' => [
|
||||
'route_parameters' => [
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
'region' => $region,
|
||||
'uuid' => $uuid,
|
||||
],
|
||||
],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
$build[$region]['layout_builder_add_block']['link'] = [
|
||||
'#type' => 'link',
|
||||
// Add one to the current delta since it is zero-indexed.
|
||||
'#title' => $this->t('Add Block <span class="visually-hidden">in section @section, @region region</span>', ['@section' => $delta + 1, '@region' => $region_labels[$region]]),
|
||||
'#url' => Url::fromRoute('layout_builder.choose_block',
|
||||
[
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
'region' => $region,
|
||||
],
|
||||
[
|
||||
'attributes' => [
|
||||
'class' => ['use-ajax', 'new-block__link'],
|
||||
'data-dialog-type' => 'dialog',
|
||||
'data-dialog-renderer' => 'off_canvas',
|
||||
],
|
||||
]
|
||||
),
|
||||
];
|
||||
$build[$region]['layout_builder_add_block']['#type'] = 'container';
|
||||
$build[$region]['layout_builder_add_block']['#attributes'] = ['class' => ['new-block']];
|
||||
$build[$region]['layout_builder_add_block']['#weight'] = 1000;
|
||||
$build[$region]['#attributes']['data-region'] = $region;
|
||||
$build[$region]['#attributes']['class'][] = 'layout-builder--layout__region';
|
||||
}
|
||||
|
||||
$build['#attributes']['data-layout-update-url'] = Url::fromRoute('layout_builder.move_block', [
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
])->toString();
|
||||
$build['#attributes']['data-layout-delta'] = $delta;
|
||||
$build['#attributes']['class'][] = 'layout-builder--layout';
|
||||
|
||||
return [
|
||||
'#type' => 'container',
|
||||
'#attributes' => [
|
||||
'class' => ['layout-section'],
|
||||
],
|
||||
'configure' => [
|
||||
'#type' => 'link',
|
||||
'#title' => $this->t('Configure section'),
|
||||
'#access' => $layout instanceof PluginFormInterface,
|
||||
'#url' => Url::fromRoute('layout_builder.configure_section', [
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
]),
|
||||
'#attributes' => [
|
||||
'class' => ['use-ajax', 'configure-section'],
|
||||
'data-dialog-type' => 'dialog',
|
||||
'data-dialog-renderer' => 'off_canvas',
|
||||
],
|
||||
],
|
||||
'remove' => [
|
||||
'#type' => 'link',
|
||||
'#title' => $this->t('Remove section <span class="visually-hidden">@section</span>', ['@section' => $delta + 1]),
|
||||
'#url' => Url::fromRoute('layout_builder.remove_section', [
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
]),
|
||||
'#attributes' => [
|
||||
'class' => ['use-ajax', 'remove-section'],
|
||||
'data-dialog-type' => 'dialog',
|
||||
'data-dialog-renderer' => 'off_canvas',
|
||||
],
|
||||
],
|
||||
'layout-section' => $build,
|
||||
'#type' => 'layout_builder',
|
||||
'#section_storage' => $section_storage,
|
||||
'#is_rebuilding' => $is_rebuilding,
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,6 @@ use Drupal\layout_builder\SectionStorageInterface;
|
|||
*/
|
||||
trait LayoutRebuildTrait {
|
||||
|
||||
/**
|
||||
* The class resolver.
|
||||
*
|
||||
* @var \Drupal\Core\DependencyInjection\ClassResolverInterface
|
||||
*/
|
||||
protected $classResolver;
|
||||
|
||||
/**
|
||||
* Rebuilds the layout.
|
||||
*
|
||||
|
|
@ -49,8 +42,11 @@ trait LayoutRebuildTrait {
|
|||
*/
|
||||
protected function rebuildLayout(SectionStorageInterface $section_storage) {
|
||||
$response = new AjaxResponse();
|
||||
$layout_controller = $this->classResolver->getInstanceFromDefinition(LayoutBuilderController::class);
|
||||
$layout = $layout_controller->layout($section_storage, TRUE);
|
||||
$layout = [
|
||||
'#type' => 'layout_builder',
|
||||
'#section_storage' => $section_storage,
|
||||
'#is_rebuilding' => TRUE,
|
||||
];
|
||||
$response->addCommand(new ReplaceCommand('#layout-builder', $layout));
|
||||
return $response;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace Drupal\layout_builder\Controller;
|
||||
|
||||
use Drupal\Core\DependencyInjection\ClassResolverInterface;
|
||||
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
|
||||
use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
|
||||
use Drupal\layout_builder\SectionStorageInterface;
|
||||
|
|
@ -29,12 +28,9 @@ class MoveBlockController implements ContainerInjectionInterface {
|
|||
*
|
||||
* @param \Drupal\layout_builder\LayoutTempstoreRepositoryInterface $layout_tempstore_repository
|
||||
* The layout tempstore repository.
|
||||
* @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
|
||||
* The class resolver.
|
||||
*/
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ClassResolverInterface $class_resolver) {
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository) {
|
||||
$this->layoutTempstoreRepository = $layout_tempstore_repository;
|
||||
$this->classResolver = $class_resolver;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -42,8 +38,7 @@ class MoveBlockController implements ContainerInjectionInterface {
|
|||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('layout_builder.tempstore_repository'),
|
||||
$container->get('class_resolver')
|
||||
$container->get('layout_builder.tempstore_repository')
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,342 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\layout_builder\Element;
|
||||
|
||||
use Drupal\Core\Ajax\AjaxHelperTrait;
|
||||
use Drupal\Core\Messenger\MessengerInterface;
|
||||
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
|
||||
use Drupal\Core\Plugin\PluginFormInterface;
|
||||
use Drupal\Core\Render\Element\RenderElement;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\layout_builder\Context\LayoutBuilderContextTrait;
|
||||
use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
|
||||
use Drupal\layout_builder\OverridesSectionStorageInterface;
|
||||
use Drupal\layout_builder\Section;
|
||||
use Drupal\layout_builder\SectionStorageInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Defines a render element for building the Layout Builder UI.
|
||||
*
|
||||
* @RenderElement("layout_builder")
|
||||
*/
|
||||
class LayoutBuilder extends RenderElement implements ContainerFactoryPluginInterface {
|
||||
|
||||
use AjaxHelperTrait;
|
||||
use LayoutBuilderContextTrait;
|
||||
|
||||
/**
|
||||
* The layout tempstore repository.
|
||||
*
|
||||
* @var \Drupal\layout_builder\LayoutTempstoreRepositoryInterface
|
||||
*/
|
||||
protected $layoutTempstoreRepository;
|
||||
|
||||
/**
|
||||
* The messenger service.
|
||||
*
|
||||
* @var \Drupal\Core\Messenger\MessengerInterface
|
||||
*/
|
||||
protected $messenger;
|
||||
|
||||
/**
|
||||
* Constructs a new LayoutBuilder.
|
||||
*
|
||||
* @param array $configuration
|
||||
* A configuration array containing information about the plugin instance.
|
||||
* @param string $plugin_id
|
||||
* The plugin ID for the plugin instance.
|
||||
* @param mixed $plugin_definition
|
||||
* The plugin implementation definition.
|
||||
* @param \Drupal\layout_builder\LayoutTempstoreRepositoryInterface $layout_tempstore_repository
|
||||
* The layout tempstore repository.
|
||||
* @param \Drupal\Core\Messenger\MessengerInterface $messenger
|
||||
* The messenger service.
|
||||
*/
|
||||
public function __construct(array $configuration, $plugin_id, $plugin_definition, LayoutTempstoreRepositoryInterface $layout_tempstore_repository, MessengerInterface $messenger) {
|
||||
parent::__construct($configuration, $plugin_id, $plugin_definition);
|
||||
$this->layoutTempstoreRepository = $layout_tempstore_repository;
|
||||
$this->messenger = $messenger;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
|
||||
return new static(
|
||||
$configuration,
|
||||
$plugin_id,
|
||||
$plugin_definition,
|
||||
$container->get('layout_builder.tempstore_repository'),
|
||||
$container->get('messenger')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getInfo() {
|
||||
return [
|
||||
'#section_storage' => NULL,
|
||||
'#is_rebuilding' => FALSE,
|
||||
'#pre_render' => [
|
||||
[$this, 'preRender'],
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Pre-render callback: Renders the Layout Builder UI.
|
||||
*/
|
||||
public function preRender($element) {
|
||||
if ($element['#section_storage'] instanceof SectionStorageInterface) {
|
||||
$element['layout_builder'] = $this->layout($element['#section_storage'], $element['#is_rebuilding']);
|
||||
}
|
||||
return $element;
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders the Layout UI.
|
||||
*
|
||||
* @param \Drupal\layout_builder\SectionStorageInterface $section_storage
|
||||
* The section storage.
|
||||
* @param bool $is_rebuilding
|
||||
* Indicates if the layout is rebuilding.
|
||||
*
|
||||
* @return array
|
||||
* A render array.
|
||||
*/
|
||||
protected function layout(SectionStorageInterface $section_storage, $is_rebuilding) {
|
||||
$this->prepareLayout($section_storage, $is_rebuilding);
|
||||
|
||||
$output = [];
|
||||
if ($this->isAjax()) {
|
||||
$output['status_messages'] = [
|
||||
'#type' => 'status_messages',
|
||||
];
|
||||
}
|
||||
$count = 0;
|
||||
for ($i = 0; $i < $section_storage->count(); $i++) {
|
||||
$output[] = $this->buildAddSectionLink($section_storage, $count);
|
||||
$output[] = $this->buildAdministrativeSection($section_storage, $count);
|
||||
$count++;
|
||||
}
|
||||
$output[] = $this->buildAddSectionLink($section_storage, $count);
|
||||
$output['#attached']['library'][] = 'layout_builder/drupal.layout_builder';
|
||||
$output['#type'] = 'container';
|
||||
$output['#attributes']['id'] = 'layout-builder';
|
||||
// Mark this UI as uncacheable.
|
||||
$output['#cache']['max-age'] = 0;
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepares a layout for use in the UI.
|
||||
*
|
||||
* @param \Drupal\layout_builder\SectionStorageInterface $section_storage
|
||||
* The section storage.
|
||||
* @param bool $is_rebuilding
|
||||
* Indicates if the layout is rebuilding.
|
||||
*/
|
||||
protected function prepareLayout(SectionStorageInterface $section_storage, $is_rebuilding) {
|
||||
// If the layout has pending changes, add a warning.
|
||||
if ($this->layoutTempstoreRepository->has($section_storage)) {
|
||||
$this->messenger->addWarning($this->t('You have unsaved changes.'));
|
||||
}
|
||||
|
||||
// Only add sections if the layout is new and empty.
|
||||
if (!$is_rebuilding && $section_storage->count() === 0) {
|
||||
$sections = [];
|
||||
// If this is an empty override, copy the sections from the corresponding
|
||||
// default.
|
||||
if ($section_storage instanceof OverridesSectionStorageInterface) {
|
||||
$sections = $section_storage->getDefaultSectionStorage()->getSections();
|
||||
}
|
||||
|
||||
// For an empty layout, begin with a single section of one column.
|
||||
if (!$sections) {
|
||||
$sections[] = new Section('layout_onecol');
|
||||
}
|
||||
|
||||
foreach ($sections as $section) {
|
||||
$section_storage->appendSection($section);
|
||||
}
|
||||
$this->layoutTempstoreRepository->set($section_storage);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a link to add a new section at a given delta.
|
||||
*
|
||||
* @param \Drupal\layout_builder\SectionStorageInterface $section_storage
|
||||
* The section storage.
|
||||
* @param int $delta
|
||||
* The delta of the section to splice.
|
||||
*
|
||||
* @return array
|
||||
* A render array for a link.
|
||||
*/
|
||||
protected function buildAddSectionLink(SectionStorageInterface $section_storage, $delta) {
|
||||
$storage_type = $section_storage->getStorageType();
|
||||
$storage_id = $section_storage->getStorageId();
|
||||
|
||||
// If the delta and the count are the same, it is either the end of the
|
||||
// layout or an empty layout.
|
||||
if ($delta === count($section_storage)) {
|
||||
if ($delta === 0) {
|
||||
$title = $this->t('Add Section');
|
||||
}
|
||||
else {
|
||||
$title = $this->t('Add Section <span class="visually-hidden">at end of layout</span>');
|
||||
}
|
||||
}
|
||||
// If the delta and the count are different, it is either the beginning of
|
||||
// the layout or in between two sections.
|
||||
else {
|
||||
if ($delta === 0) {
|
||||
$title = $this->t('Add Section <span class="visually-hidden">at start of layout</span>');
|
||||
}
|
||||
else {
|
||||
$title = $this->t('Add Section <span class="visually-hidden">between @first and @second</span>', ['@first' => $delta, '@second' => $delta + 1]);
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'link' => [
|
||||
'#type' => 'link',
|
||||
'#title' => $title,
|
||||
'#url' => Url::fromRoute('layout_builder.choose_section',
|
||||
[
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
],
|
||||
[
|
||||
'attributes' => [
|
||||
'class' => ['use-ajax', 'new-section__link'],
|
||||
'data-dialog-type' => 'dialog',
|
||||
'data-dialog-renderer' => 'off_canvas',
|
||||
],
|
||||
]
|
||||
),
|
||||
],
|
||||
'#type' => 'container',
|
||||
'#attributes' => [
|
||||
'class' => ['new-section'],
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the render array for the layout section while editing.
|
||||
*
|
||||
* @param \Drupal\layout_builder\SectionStorageInterface $section_storage
|
||||
* The section storage.
|
||||
* @param int $delta
|
||||
* The delta of the section.
|
||||
*
|
||||
* @return array
|
||||
* The render array for a given section.
|
||||
*/
|
||||
protected function buildAdministrativeSection(SectionStorageInterface $section_storage, $delta) {
|
||||
$storage_type = $section_storage->getStorageType();
|
||||
$storage_id = $section_storage->getStorageId();
|
||||
$section = $section_storage->getSection($delta);
|
||||
|
||||
$layout = $section->getLayout();
|
||||
$build = $section->toRenderArray($this->getAvailableContexts($section_storage), TRUE);
|
||||
$layout_definition = $layout->getPluginDefinition();
|
||||
|
||||
$region_labels = $layout_definition->getRegionLabels();
|
||||
foreach ($layout_definition->getRegions() as $region => $info) {
|
||||
if (!empty($build[$region])) {
|
||||
foreach ($build[$region] as $uuid => $block) {
|
||||
$build[$region][$uuid]['#attributes']['class'][] = 'draggable';
|
||||
$build[$region][$uuid]['#attributes']['data-layout-block-uuid'] = $uuid;
|
||||
$build[$region][$uuid]['#contextual_links'] = [
|
||||
'layout_builder_block' => [
|
||||
'route_parameters' => [
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
'region' => $region,
|
||||
'uuid' => $uuid,
|
||||
],
|
||||
],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
$build[$region]['layout_builder_add_block']['link'] = [
|
||||
'#type' => 'link',
|
||||
// Add one to the current delta since it is zero-indexed.
|
||||
'#title' => $this->t('Add Block <span class="visually-hidden">in section @section, @region region</span>', ['@section' => $delta + 1, '@region' => $region_labels[$region]]),
|
||||
'#url' => Url::fromRoute('layout_builder.choose_block',
|
||||
[
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
'region' => $region,
|
||||
],
|
||||
[
|
||||
'attributes' => [
|
||||
'class' => ['use-ajax', 'new-block__link'],
|
||||
'data-dialog-type' => 'dialog',
|
||||
'data-dialog-renderer' => 'off_canvas',
|
||||
],
|
||||
]
|
||||
),
|
||||
];
|
||||
$build[$region]['layout_builder_add_block']['#type'] = 'container';
|
||||
$build[$region]['layout_builder_add_block']['#attributes'] = ['class' => ['new-block']];
|
||||
$build[$region]['layout_builder_add_block']['#weight'] = 1000;
|
||||
$build[$region]['#attributes']['data-region'] = $region;
|
||||
$build[$region]['#attributes']['class'][] = 'layout-builder--layout__region';
|
||||
}
|
||||
|
||||
$build['#attributes']['data-layout-update-url'] = Url::fromRoute('layout_builder.move_block', [
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
])->toString();
|
||||
$build['#attributes']['data-layout-delta'] = $delta;
|
||||
$build['#attributes']['class'][] = 'layout-builder--layout';
|
||||
|
||||
return [
|
||||
'#type' => 'container',
|
||||
'#attributes' => [
|
||||
'class' => ['layout-section'],
|
||||
],
|
||||
'configure' => [
|
||||
'#type' => 'link',
|
||||
'#title' => $this->t('Configure section'),
|
||||
'#access' => $layout instanceof PluginFormInterface,
|
||||
'#url' => Url::fromRoute('layout_builder.configure_section', [
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
]),
|
||||
'#attributes' => [
|
||||
'class' => ['use-ajax', 'configure-section'],
|
||||
'data-dialog-type' => 'dialog',
|
||||
'data-dialog-renderer' => 'off_canvas',
|
||||
],
|
||||
],
|
||||
'remove' => [
|
||||
'#type' => 'link',
|
||||
'#title' => $this->t('Remove section <span class="visually-hidden">@section</span>', ['@section' => $delta + 1]),
|
||||
'#url' => Url::fromRoute('layout_builder.remove_section', [
|
||||
'section_storage_type' => $storage_type,
|
||||
'section_storage' => $storage_id,
|
||||
'delta' => $delta,
|
||||
]),
|
||||
'#attributes' => [
|
||||
'class' => ['use-ajax', 'remove-section'],
|
||||
'data-dialog-type' => 'dialog',
|
||||
'data-dialog-renderer' => 'off_canvas',
|
||||
],
|
||||
],
|
||||
'layout-section' => $build,
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -6,7 +6,6 @@ use Drupal\Component\Uuid\UuidInterface;
|
|||
use Drupal\Core\Ajax\AjaxFormHelperTrait;
|
||||
use Drupal\Core\Block\BlockManagerInterface;
|
||||
use Drupal\Core\Block\BlockPluginInterface;
|
||||
use Drupal\Core\DependencyInjection\ClassResolverInterface;
|
||||
use Drupal\Core\Form\BaseFormIdInterface;
|
||||
use Drupal\Core\Form\FormBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
|
|
@ -109,17 +108,14 @@ abstract class ConfigureBlockFormBase extends FormBase implements BaseFormIdInte
|
|||
* The block manager.
|
||||
* @param \Drupal\Component\Uuid\UuidInterface $uuid
|
||||
* The UUID generator.
|
||||
* @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
|
||||
* The class resolver.
|
||||
* @param \Drupal\Core\Plugin\PluginFormFactoryInterface $plugin_form_manager
|
||||
* The plugin form manager.
|
||||
*/
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ContextRepositoryInterface $context_repository, BlockManagerInterface $block_manager, UuidInterface $uuid, ClassResolverInterface $class_resolver, PluginFormFactoryInterface $plugin_form_manager) {
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ContextRepositoryInterface $context_repository, BlockManagerInterface $block_manager, UuidInterface $uuid, PluginFormFactoryInterface $plugin_form_manager) {
|
||||
$this->layoutTempstoreRepository = $layout_tempstore_repository;
|
||||
$this->contextRepository = $context_repository;
|
||||
$this->blockManager = $block_manager;
|
||||
$this->uuidGenerator = $uuid;
|
||||
$this->classResolver = $class_resolver;
|
||||
$this->pluginFormFactory = $plugin_form_manager;
|
||||
}
|
||||
|
||||
|
|
@ -132,7 +128,6 @@ abstract class ConfigureBlockFormBase extends FormBase implements BaseFormIdInte
|
|||
$container->get('context.repository'),
|
||||
$container->get('plugin.manager.block'),
|
||||
$container->get('uuid'),
|
||||
$container->get('class_resolver'),
|
||||
$container->get('plugin_form.factory')
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace Drupal\layout_builder\Form;
|
||||
|
||||
use Drupal\Core\Ajax\AjaxFormHelperTrait;
|
||||
use Drupal\Core\DependencyInjection\ClassResolverInterface;
|
||||
use Drupal\Core\Form\FormBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Form\SubformState;
|
||||
|
|
@ -74,14 +73,11 @@ class ConfigureSectionForm extends FormBase {
|
|||
*
|
||||
* @param \Drupal\layout_builder\LayoutTempstoreRepositoryInterface $layout_tempstore_repository
|
||||
* The layout tempstore repository.
|
||||
* @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
|
||||
* The class resolver.
|
||||
* @param \Drupal\Core\Plugin\PluginFormFactoryInterface $plugin_form_manager
|
||||
* The plugin form manager.
|
||||
*/
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ClassResolverInterface $class_resolver, PluginFormFactoryInterface $plugin_form_manager) {
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, PluginFormFactoryInterface $plugin_form_manager) {
|
||||
$this->layoutTempstoreRepository = $layout_tempstore_repository;
|
||||
$this->classResolver = $class_resolver;
|
||||
$this->pluginFormFactory = $plugin_form_manager;
|
||||
}
|
||||
|
||||
|
|
@ -91,7 +87,6 @@ class ConfigureSectionForm extends FormBase {
|
|||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('layout_builder.tempstore_repository'),
|
||||
$container->get('class_resolver'),
|
||||
$container->get('plugin_form.factory')
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace Drupal\layout_builder\Form;
|
||||
|
||||
use Drupal\Core\Ajax\AjaxFormHelperTrait;
|
||||
use Drupal\Core\DependencyInjection\ClassResolverInterface;
|
||||
use Drupal\Core\Form\ConfirmFormBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\layout_builder\Controller\LayoutRebuildTrait;
|
||||
|
|
@ -47,12 +46,9 @@ abstract class LayoutRebuildConfirmFormBase extends ConfirmFormBase {
|
|||
*
|
||||
* @param \Drupal\layout_builder\LayoutTempstoreRepositoryInterface $layout_tempstore_repository
|
||||
* The layout tempstore repository.
|
||||
* @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
|
||||
* The class resolver.
|
||||
*/
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository, ClassResolverInterface $class_resolver) {
|
||||
public function __construct(LayoutTempstoreRepositoryInterface $layout_tempstore_repository) {
|
||||
$this->layoutTempstoreRepository = $layout_tempstore_repository;
|
||||
$this->classResolver = $class_resolver;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -60,8 +56,7 @@ abstract class LayoutRebuildConfirmFormBase extends ConfirmFormBase {
|
|||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('layout_builder.tempstore_repository'),
|
||||
$container->get('class_resolver')
|
||||
$container->get('layout_builder.tempstore_repository')
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue