.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+set classes = [
+'field-layout--onecol',
+]
+%}
+{% if content %}
+
+{% endif %}
diff --git a/core/modules/field_layout/layouts/twocol/field-layout--twocol.html.twig b/core/modules/field_layout/layouts/twocol/field-layout--twocol.html.twig
new file mode 100644
index 0000000..4dffc01
--- /dev/null
+++ b/core/modules/field_layout/layouts/twocol/field-layout--twocol.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Default theme implementation to display a two column layout.
+ *
+ * Available variables:
+ * - content: The content for this layout.
+ * - attributes: HTML attributes for the layout
.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+set classes = [
+'field-layout--twocol',
+]
+%}
+{% if content %}
+
+
+ {{ content.left }}
+
+
+
+ {{ content.right }}
+
+
+{% endif %}
diff --git a/core/modules/field_layout/layouts/twocol/twocol.layout.css b/core/modules/field_layout/layouts/twocol/twocol.layout.css
new file mode 100644
index 0000000..8e2f623
--- /dev/null
+++ b/core/modules/field_layout/layouts/twocol/twocol.layout.css
@@ -0,0 +1,14 @@
+.field-layout--twocol {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+}
+.field-layout--twocol > .field-layout-region {
+ flex: 0 1 50%;
+ max-width: 50%;
+}
+
+.field-layout--twocol > .field-layout-region--left {
+ max-width: calc(50% - 10px);
+ margin-right: 10px;
+}
diff --git a/core/modules/field_layout/src/Display/EntityDisplayWithLayoutInterface.php b/core/modules/field_layout/src/Display/EntityDisplayWithLayoutInterface.php
new file mode 100644
index 0000000..f98087f
--- /dev/null
+++ b/core/modules/field_layout/src/Display/EntityDisplayWithLayoutInterface.php
@@ -0,0 +1,38 @@
+getThirdPartySetting('field_layout', 'layout');
+ }
+
+ /**
+ * Implements \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface::setLayoutId().
+ */
+ public function setLayoutId($layout_id) {
+ $this->setThirdPartySetting('field_layout', 'layout', $layout_id);
+ return $this;
+ }
+
+}
diff --git a/core/modules/field_layout/src/Entity/FieldLayoutEntityFormDisplay.php b/core/modules/field_layout/src/Entity/FieldLayoutEntityFormDisplay.php
new file mode 100644
index 0000000..2dfa838
--- /dev/null
+++ b/core/modules/field_layout/src/Entity/FieldLayoutEntityFormDisplay.php
@@ -0,0 +1,26 @@
+getLayout($this->getLayoutId() ?: 'onecol');
+ return isset($layout_definition['default_region']) ? $layout_definition['default_region'] : key($layout_definition['regions']);
+ }
+
+}
diff --git a/core/modules/field_layout/src/Entity/FieldLayoutEntityViewDisplay.php b/core/modules/field_layout/src/Entity/FieldLayoutEntityViewDisplay.php
new file mode 100644
index 0000000..e34fc57
--- /dev/null
+++ b/core/modules/field_layout/src/Entity/FieldLayoutEntityViewDisplay.php
@@ -0,0 +1,26 @@
+getLayout($this->getLayoutId() ?: 'onecol');
+ return isset($layout_definition['default_region']) ? $layout_definition['default_region'] : key($layout_definition['regions']);
+ }
+
+}
diff --git a/core/modules/field_layout/src/FieldLayoutBuilder.php b/core/modules/field_layout/src/FieldLayoutBuilder.php
new file mode 100644
index 0000000..8b35c74
--- /dev/null
+++ b/core/modules/field_layout/src/FieldLayoutBuilder.php
@@ -0,0 +1,128 @@
+layoutRepository = $layout_repository;
+ $this->entityFieldManager = $entity_field_manager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container) {
+ return new static(
+ $container->get('field_layout.layout_repository'),
+ $container->get('entity_field.manager')
+ );
+ }
+
+ /**
+ * Applies the layout to an entity build.
+ *
+ * @param array $build
+ * A renderable array representing the entity content or form.
+ * @param \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface $display
+ * The entity display holding the display options configured for the entity
+ * components.
+ * @param string $display_context
+ * The display context, either 'form' or 'view'. If in a 'form' context, an
+ * alternate method will be used to render fields in their regions.
+ */
+ public function build(array &$build, EntityDisplayWithLayoutInterface $display, $display_context) {
+ $layout_definition = $this->layoutRepository->getLayout($display->getLayoutId());
+ if ($layout_definition && $fields = $this->getFields($build, $display, $display_context)) {
+ // Wrap the regions in a layout element.
+ $build['field_layout']['#theme'] = $layout_definition['theme'];
+ if (isset($layout_definition['library'])) {
+ $build['field_layout']['#attached']['library'][] = $layout_definition['library'];
+ }
+
+ // Add the regions to the $build in the correct order.
+ foreach ($layout_definition['regions'] as $region => $region_info) {
+ $build['field_layout'][$region] = [];
+ if ($display_context === 'form') {
+ $build['field_layout'][$region]['#process'][] = '\Drupal\Core\Render\Element\RenderElement::processGroup';
+ $build['field_layout'][$region]['#pre_render'][] = '\Drupal\Core\Render\Element\RenderElement::preRenderGroup';
+ }
+ }
+
+ foreach ($fields as $name => $field) {
+ // If this is a form, #group can be used to relocate the fields. This
+ // avoids breaking hook_form_alter() implementations by not actually
+ // moving the field in the form structure.
+ if ($display_context === 'form') {
+ $build[$name]['#group'] = $field['region'];
+ }
+ // Otherwise, move the field from the top-level of $build into a
+ // region-specific section.
+ else {
+ $build['field_layout'][$field['region']][$name] = $build[$name];
+ unset($build[$name]);
+ }
+ }
+ }
+ }
+
+ /**
+ * Gets the fields that need to be processed.
+ *
+ * @param array $build
+ * A renderable array representing the entity content or form.
+ * @param \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface $display
+ * The entity display holding the display options configured for the entity
+ * components.
+ * @param string $display_context
+ * The display context, either 'form' or 'view'.
+ *
+ * @return array
+ * An array of configurable fields present in the build.
+ */
+ protected function getFields(array $build, EntityDisplayWithLayoutInterface $display, $display_context) {
+ $components = $display->getComponents();
+
+ $field_definitions = $this->entityFieldManager->getFieldDefinitions($display->getTargetEntityTypeId(), $display->getTargetBundle());
+ $non_configurable_fields = array_filter($field_definitions, function (FieldDefinitionInterface $field_definition) use ($display_context) {
+ return !$field_definition->isDisplayConfigurable($display_context);
+ });
+ // Remove non-configurable fields.
+ $components = array_diff_key($components, $non_configurable_fields);
+
+ // Only include fields present in the build.
+ $components = array_intersect_key($components, $build);
+
+ return $components;
+ }
+
+}
diff --git a/core/modules/field_layout/src/Form/FieldLayoutEntityDisplayFormTrait.php b/core/modules/field_layout/src/Form/FieldLayoutEntityDisplayFormTrait.php
new file mode 100644
index 0000000..46c90d3
--- /dev/null
+++ b/core/modules/field_layout/src/Form/FieldLayoutEntityDisplayFormTrait.php
@@ -0,0 +1,115 @@
+fieldLayoutRepository->getLayout($this->getEntity()->getLayoutId() ?: 'onecol');
+ foreach ($layout['regions'] as $name => $region) {
+ $regions[$name] = [
+ 'title' => $region['label'],
+ 'message' => $this->t('No field is displayed.')
+ ];
+ }
+
+ $regions['hidden'] = [
+ 'title' => $this->t('Disabled', [], ['context' => 'Plural']),
+ 'message' => $this->t('No field is hidden.')
+ ];
+
+ return $regions;
+ }
+
+ /**
+ * Adds the field layout section to the form.
+ *
+ * @param array $form
+ * An associative array containing the structure of the form.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ * The current state of the form.
+ *
+ * @return array
+ */
+ protected function addFieldLayout(array $form, FormStateInterface $form_state) {
+ $form['#entity_builders'][] = [static::class, 'updateFieldLayout'];
+
+ $form['field_layouts'] = [
+ '#type' => 'details',
+ '#title' => $this->t('Layout settings'),
+ ];
+ $layout_options = [];
+ foreach ($this->fieldLayoutRepository->getGroupedDefinitions() as $category => $layouts) {
+ foreach ($layouts as $name => $layout) {
+ $layout_options[$category][$name] = $layout['label'];
+ }
+ }
+ $form['field_layouts']['field_layout'] = [
+ '#type' => 'select',
+ '#title' => $this->t('Select a layout'),
+ '#options' => $layout_options,
+ '#default_value' => $this->getEntity()->getLayoutId() ?: 'onecol',
+ ];
+
+ return $form;
+ }
+
+ /**
+ * An #entity_builder callback to update the Field Layout settings.
+ *
+ * @param string $entity_type_id
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ * @param array $form
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ */
+ public static function updateFieldLayout($entity_type_id, EntityInterface $entity, &$form, FormStateInterface $form_state) {
+ if ($form_state->isSubmitted() && $entity instanceof EntityDisplayWithLayoutInterface) {
+ $old_layout = $entity->getLayoutId();
+ $new_layout = $form_state->getValue('field_layout');
+ $entity->setLayoutId($new_layout);
+ // If the layout is changing, reset all fields.
+ if ($new_layout !== $old_layout) {
+ // @todo Devise a mechanism for mapping old regions to new ones in
+ // https://www.drupal.org/node/2796877.
+ $new_region = $entity->getDefaultRegion();
+ foreach ($form_state->getValue('fields') as $field_name => $values) {
+ if (($component = $entity->getComponent($field_name)) && $new_region !== 'hidden') {
+ $component['region'] = $new_region;
+ $entity->setComponent($field_name, $component);
+ }
+ else {
+ $entity->removeComponent($field_name);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Gets the form entity.
+ *
+ * @return \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface
+ * The current form entity.
+ */
+ abstract public function getEntity();
+
+}
diff --git a/core/modules/field_layout/src/Form/FieldLayoutEntityFormDisplayEditForm.php b/core/modules/field_layout/src/Form/FieldLayoutEntityFormDisplayEditForm.php
new file mode 100644
index 0000000..d57912e
--- /dev/null
+++ b/core/modules/field_layout/src/Form/FieldLayoutEntityFormDisplayEditForm.php
@@ -0,0 +1,54 @@
+fieldLayoutRepository = $field_layout_repository;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container) {
+ return new static(
+ $container->get('plugin.manager.field.field_type'),
+ $container->get('plugin.manager.field.widget'),
+ $container->get('field_layout.layout_repository')
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function form(array $form, FormStateInterface $form_state) {
+ $form = parent::form($form, $form_state);
+ return $this->addFieldLayout($form, $form_state);
+ }
+
+}
diff --git a/core/modules/field_layout/src/Form/FieldLayoutEntityViewDisplayEditForm.php b/core/modules/field_layout/src/Form/FieldLayoutEntityViewDisplayEditForm.php
new file mode 100644
index 0000000..5c9f26f
--- /dev/null
+++ b/core/modules/field_layout/src/Form/FieldLayoutEntityViewDisplayEditForm.php
@@ -0,0 +1,54 @@
+fieldLayoutRepository = $field_layout_repository;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container) {
+ return new static(
+ $container->get('plugin.manager.field.field_type'),
+ $container->get('plugin.manager.field.formatter'),
+ $container->get('field_layout.layout_repository')
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function form(array $form, FormStateInterface $form_state) {
+ $form = parent::form($form, $form_state);
+ return $this->addFieldLayout($form, $form_state);
+ }
+
+}
diff --git a/core/modules/field_layout/src/LayoutRepository.php b/core/modules/field_layout/src/LayoutRepository.php
new file mode 100644
index 0000000..6e18755
--- /dev/null
+++ b/core/modules/field_layout/src/LayoutRepository.php
@@ -0,0 +1,142 @@
+moduleHandler = $module_handler;
+ $this->themeHandler = $theme_handler;
+ $this->stringTranslation = $string_translation;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDefinitions() {
+ // @todo Replace with layout_plugin in https://www.drupal.org/node/2296423.
+ $layouts = [
+ 'onecol' => [
+ 'label' => $this->t('One column'),
+ 'theme' => 'field_layout__onecol',
+ 'path' => 'layouts/onecol',
+ 'provider' => 'field_layout',
+ 'category' => $this->t('Columns: 1'),
+ 'default_region' => 'content',
+ 'regions' => [
+ 'content' => [
+ 'label' => $this->t('Content'),
+ ],
+ ],
+ ],
+ 'twocol' => [
+ 'label' => $this->t('Two column'),
+ 'library' => 'field_layout/drupal.field_layout.twocol',
+ 'theme' => 'field_layout__twocol',
+ 'path' => 'layouts/twocol',
+ 'provider' => 'field_layout',
+ 'category' => $this->t('Columns: 2'),
+ 'default_region' => 'left',
+ 'regions' => [
+ 'left' => [
+ 'label' => $this->t('Left'),
+ ],
+ 'right' => [
+ 'label' => $this->t('Right'),
+ ],
+ ],
+ ],
+ ];
+ foreach ($layouts as $layout_id => &$layout) {
+ $this->processDefinition($layout, $layout_id);
+ }
+ return $layouts;
+ }
+
+ /**
+ * Performs extra processing on layout definitions.
+ */
+ protected function processDefinition(&$definition, $plugin_id) {
+ $definition['layout'] = $plugin_id;
+
+ // Add the module or theme path to the 'path'.
+ if ($this->moduleHandler->moduleExists($definition['provider'])) {
+ $definition['provider_type'] = 'module';
+ $base_path = $this->moduleHandler->getModule($definition['provider'])->getPath();
+ }
+ elseif ($this->themeHandler->themeExists($definition['provider'])) {
+ $definition['provider_type'] = 'theme';
+ $base_path = $this->themeHandler->getTheme($definition['provider'])->getPath();
+ }
+ else {
+ $base_path = '';
+ }
+ $definition['path'] = !empty($definition['path']) ? $base_path . '/' . $definition['path'] : NULL;
+
+ // Either a theme or a template must be defined.
+ if (empty($definition['template']) && empty($definition['theme'])) {
+ throw new InvalidPluginDefinitionException($plugin_id);
+ }
+
+ if (empty($definition['template'])) {
+ $definition['template'] = strtr($definition['theme'], '_', '-');
+ }
+ elseif (empty($definition['theme'])) {
+ $definition['theme'] = strtr($definition['template'], '-', '_');
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getLayout($layout_id) {
+ $layout_definitions = $this->getDefinitions();
+ if (!$layout_id || !isset($layout_definitions[$layout_id])) {
+ return [];
+ }
+
+ return $layout_definitions[$layout_id];
+ }
+
+}
diff --git a/core/modules/field_layout/src/LayoutRepositoryInterface.php b/core/modules/field_layout/src/LayoutRepositoryInterface.php
new file mode 100644
index 0000000..0587d55
--- /dev/null
+++ b/core/modules/field_layout/src/LayoutRepositoryInterface.php
@@ -0,0 +1,43 @@
+createContentType([
+ 'type' => 'article',
+ ]);
+ $this->createNode([
+ 'type' => 'article',
+ 'title' => 'The node title',
+ 'body' => [[
+ 'value' => 'The node body',
+ ]],
+ ]);
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access administration pages',
+ 'administer content types',
+ 'administer nodes',
+ 'administer node fields',
+ 'administer node display',
+ 'administer node form display',
+ 'view the administration theme',
+ ]));
+ }
+
+ /**
+ * Tests an entity type that has fields shown by default.
+ */
+ public function testNodeView() {
+ // By default, the one column layout is used.
+ $this->drupalGet('node/1');
+ $this->assertSession()->elementExists('css', '.field-layout--onecol');
+ $this->assertSession()->elementExists('css', '.field-layout-region--content .field--name-body');
+
+ $this->drupalGet('admin/structure/types/manage/article/display');
+ $this->assertEquals(['Content', 'Disabled'], $this->getRegionTitles());
+ $this->assertSession()->optionExists('fields[body][region]', 'content');
+ }
+
+ /**
+ * Gets the region titles on the page.
+ *
+ * @return string[]
+ * An array of region titles.
+ */
+ protected function getRegionTitles() {
+ $region_titles = [];
+ $region_title_elements = $this->getSession()->getPage()->findAll('css', '.region-title td');
+ /** @var \Behat\Mink\Element\NodeElement[] $region_title_elements */
+ foreach ($region_title_elements as $region_title_element) {
+ $region_titles[] = $region_title_element->getText();
+ }
+ return $region_titles;
+ }
+
+}
diff --git a/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
new file mode 100644
index 0000000..c3517ad
--- /dev/null
+++ b/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
@@ -0,0 +1,224 @@
+ 'The name for this entity',
+ 'field_test_text' => [[
+ 'value' => 'The field test text value',
+ ]],
+ ]);
+ $entity->save();
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access administration pages',
+ 'view test entity',
+ 'administer entity_test content',
+ 'administer entity_test fields',
+ 'administer entity_test display',
+ 'administer entity_test form display',
+ 'view the administration theme',
+ ]));
+ }
+
+ /**
+ * Tests that layouts are unique per-view mode.
+ */
+ public function testEntityViewModes() {
+ // By default, the field is not visible.
+ $this->drupalGet('entity_test/1/test');
+ $this->assertSession()->elementNotExists('css', '.field-layout-region--content .field--name-field-test-text');
+ $this->drupalGet('entity_test/1');
+ $this->assertSession()->elementNotExists('css', '.field-layout-region--content .field--name-field-test-text');
+
+ // Change the layout for the "test" view mode. See
+ // core.entity_view_mode.entity_test.test.yml.
+ $this->drupalGet('entity_test/structure/entity_test/display');
+ $this->click('#edit-modes');
+ $this->getSession()->getPage()->checkField('display_modes_custom[test]');
+ $this->submitForm([], 'Save');
+ $this->clickLink('configure them');
+ $this->getSession()->getPage()->pressButton('Show row weights');
+ $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'content');
+ $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->submitForm([], 'Save');
+
+ // Each view mode has a different layout.
+ $this->drupalGet('entity_test/1/test');
+ $this->assertSession()->elementExists('css', '.field-layout-region--content .field--name-field-test-text');
+ $this->drupalGet('entity_test/1');
+ $this->assertSession()->elementNotExists('css', '.field-layout-region--content .field--name-field-test-text');
+ }
+
+ /**
+ * Tests the use of field layout for entity form displays.
+ */
+ public function testEntityForm() {
+ // By default, the one column layout is used.
+ $this->drupalGet('entity_test/manage/1/edit');
+ $this->assertFieldInRegion('field_test_text[0][value]', 'content');
+
+ // The one column layout is in use.
+ $this->drupalGet('entity_test/structure/entity_test/form-display');
+ $this->assertEquals(['Content', 'Disabled'], $this->getRegionTitles());
+
+ // Switch the layout to two columns.
+ $this->click('#edit-field-layouts');
+ $this->getSession()->getPage()->selectFieldOption('field_layout', 'twocol');
+ $this->submitForm([], 'Save');
+
+ // The field is moved to the default region for the new layout.
+ $this->assertSession()->pageTextContains('Your settings have been saved.');
+ $this->assertEquals(['Left', 'Right', 'Disabled'], $this->getRegionTitles());
+
+ $this->drupalGet('entity_test/manage/1/edit');
+ // No fields are visible, and the regions don't display when empty.
+ $this->assertFieldInRegion('field_test_text[0][value]', 'left');
+ $this->assertSession()->elementExists('css', '.field-layout-region--left .field--name-field-test-text');
+
+ // After a refresh the new regions are still there.
+ $this->drupalGet('entity_test/structure/entity_test/form-display');
+ $this->assertEquals(['Left', 'Right', 'Disabled'], $this->getRegionTitles());
+
+ // Drag the field to the right region.
+ $field_test_text_row = $this->getSession()->getPage()->find('css', '#field-test-text');
+ $left_region_row = $this->getSession()->getPage()->find('css', '.region-right-message');
+ $field_test_text_row->find('css', '.handle')->dragTo($left_region_row);
+ $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->submitForm([], 'Save');
+ $this->assertSession()->pageTextContains('Your settings have been saved.');
+
+ // The new layout is used.
+ $this->drupalGet('entity_test/manage/1/edit');
+ $this->assertSession()->elementExists('css', '.field-layout-region--right .field--name-field-test-text');
+ $this->assertFieldInRegion('field_test_text[0][value]', 'right');
+
+ // Move the field to the right region without tabledrag.
+ $this->drupalGet('entity_test/structure/entity_test/form-display');
+ $this->getSession()->getPage()->pressButton('Show row weights');
+ $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'right');
+ $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->submitForm([], 'Save');
+ $this->assertSession()->pageTextContains('Your settings have been saved.');
+
+ // The updated region is used.
+ $this->drupalGet('entity_test/manage/1/edit');
+ $this->assertFieldInRegion('field_test_text[0][value]', 'right');
+
+ // The layout is still in use without Field UI.
+ $this->container->get('module_installer')->uninstall(['field_ui']);
+ $this->drupalGet('entity_test/manage/1/edit');
+ $this->assertFieldInRegion('field_test_text[0][value]', 'right');
+ }
+
+ /**
+ * Tests the use of field layout for entity view displays.
+ */
+ public function testEntityView() {
+ // The one column layout is in use.
+ $this->drupalGet('entity_test/structure/entity_test/display');
+ $this->assertEquals(['Content', 'Disabled'], $this->getRegionTitles());
+
+ // Switch the layout to two columns.
+ $this->click('#edit-field-layouts');
+ $this->getSession()->getPage()->selectFieldOption('field_layout', 'twocol');
+ $this->submitForm([], 'Save');
+
+ $this->assertSession()->pageTextContains('Your settings have been saved.');
+ $this->assertEquals(['Left', 'Right', 'Disabled'], $this->getRegionTitles());
+
+ $this->drupalGet('entity_test/1');
+ // No fields are visible, and the regions don't display when empty.
+ $this->assertSession()->elementNotExists('css', '.field-layout--twocol');
+ $this->assertSession()->elementNotExists('css', '.field-layout-region');
+ $this->assertSession()->elementNotExists('css', '.field--name-field-test-text');
+
+ // After a refresh the new regions are still there.
+ $this->drupalGet('entity_test/structure/entity_test/display');
+ $this->assertEquals(['Left', 'Right', 'Disabled'], $this->getRegionTitles());
+
+ // Drag the field to the left region.
+ $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][type]', 'hidden')->isSelected());
+ $field_test_text_row = $this->getSession()->getPage()->find('css', '#field-test-text');
+ $left_region_row = $this->getSession()->getPage()->find('css', '.region-left-message');
+ $field_test_text_row->find('css', '.handle')->dragTo($left_region_row);
+ $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->assertFalse($this->assertSession()->optionExists('fields[field_test_text][type]', 'hidden')->isSelected());
+ $this->submitForm([], 'Save');
+ $this->assertSession()->pageTextContains('Your settings have been saved.');
+
+ // The new layout is used.
+ $this->drupalGet('entity_test/1');
+ $this->assertSession()->elementExists('css', '.field-layout--twocol');
+ $this->assertSession()->elementExists('css', '.field-layout-region--left .field--name-field-test-text');
+
+ // Move the field to the right region without tabledrag.
+ $this->drupalGet('entity_test/structure/entity_test/display');
+ $this->getSession()->getPage()->pressButton('Show row weights');
+ $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'right');
+ $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->submitForm([], 'Save');
+ $this->assertSession()->pageTextContains('Your settings have been saved.');
+
+ // The updated region is used.
+ $this->drupalGet('entity_test/1');
+ $this->assertSession()->elementExists('css', '.field-layout-region--right .field--name-field-test-text');
+
+ // The layout is still in use without Field UI.
+ $this->container->get('module_installer')->uninstall(['field_ui']);
+ $this->drupalGet('entity_test/1');
+ $this->assertSession()->elementExists('css', '.field-layout--twocol');
+ $this->assertSession()->elementExists('css', '.field-layout-region--right .field--name-field-test-text');
+ }
+
+ /**
+ * Gets the region titles on the page.
+ *
+ * @return string[]
+ * An array of region titles.
+ */
+ protected function getRegionTitles() {
+ $region_titles = [];
+ $region_title_elements = $this->getSession()->getPage()->findAll('css', '.region-title td');
+ /** @var \Behat\Mink\Element\NodeElement[] $region_title_elements */
+ foreach ($region_title_elements as $region_title_element) {
+ $region_titles[] = $region_title_element->getText();
+ }
+ return $region_titles;
+ }
+
+ /**
+ * Asserts that a field exists in a given region.
+ *
+ * @param string $field_selector
+ * The field selector, one of field id|name|label|value.
+ * @param string $region_name
+ * The machine name of the region.
+ */
+ protected function assertFieldInRegion($field_selector, $region_name) {
+ $region_element = $this->getSession()->getPage()->find('css', ".field-layout-region--$region_name");
+ $this->assertNotNull($region_element);
+ $this->assertSession()->fieldExists($field_selector, $region_element);
+ }
+
+}
diff --git a/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php b/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php
new file mode 100644
index 0000000..3a08663
--- /dev/null
+++ b/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php
@@ -0,0 +1,247 @@
+layoutRepository = $this->prophesize(LayoutRepositoryInterface::class);
+ $this->layoutRepository->getLayout('unknown')->willReturn([]);
+ $this->layoutRepository->getLayout('twocol')->willReturn([
+ 'library' => 'field_layout/drupal.field_layout.twocol',
+ 'theme' => 'field_layout__twocol',
+ 'regions' => [
+ 'left' => [
+ 'label' => 'Left',
+ ],
+ 'right' => [
+ 'label' => 'Right',
+ ],
+ ],
+ ]);
+ $this->entityFieldManager = $this->prophesize(EntityFieldManagerInterface::class);
+ $this->fieldLayoutBuilder = new FieldLayoutBuilder($this->layoutRepository->reveal(), $this->entityFieldManager->reveal());
+ }
+
+ /**
+ * @covers ::build
+ * @covers ::getFields
+ */
+ public function testBuildView() {
+ $definitions = [];
+ $non_configurable_field_definition = $this->prophesize(FieldDefinitionInterface::class);
+ $non_configurable_field_definition->isDisplayConfigurable('view')->willReturn(FALSE);
+ $definitions['non_configurable_field'] = $non_configurable_field_definition->reveal();
+ $this->entityFieldManager->getFieldDefinitions('the_entity_type_id', 'the_entity_type_bundle')->willReturn($definitions);
+
+ $build = [
+ 'test1' => [
+ '#markup' => 'Test1',
+ ],
+ 'non_configurable_field' => [
+ '#markup' => 'Non-configurable',
+ ],
+ ];
+
+ $display = $this->prophesize(EntityDisplayWithLayoutInterface::class);
+ $display->getTargetEntityTypeId()->willReturn('the_entity_type_id');
+ $display->getTargetBundle()->willReturn('the_entity_type_bundle');
+ $display->getLayoutId()->willReturn('twocol');
+ $display->getComponents()->willReturn([
+ 'test1' => [
+ 'region' => 'right',
+ ],
+ 'non_configurable_field' => [
+ 'region' => 'left',
+ ],
+ ]);
+
+ $display_context = 'view';
+
+ $expected = [
+ 'non_configurable_field' => [
+ '#markup' => 'Non-configurable',
+ ],
+ 'field_layout' => [
+ '#theme' => 'field_layout__twocol',
+ '#attached' => [
+ 'library' => [
+ 'field_layout/drupal.field_layout.twocol',
+ ],
+ ],
+ 'left' => [],
+ 'right' => [
+ 'test1' => [
+ '#markup' => 'Test1',
+ ],
+ ],
+ ],
+ ];
+ $this->fieldLayoutBuilder->build($build, $display->reveal(), $display_context);
+ $this->assertSame($expected, $build);
+ }
+
+ /**
+ * @covers ::build
+ * @covers ::getFields
+ */
+ public function testBuildForm() {
+ $definitions = [];
+ $non_configurable_field_definition = $this->prophesize(FieldDefinitionInterface::class);
+ $non_configurable_field_definition->isDisplayConfigurable('form')->willReturn(FALSE);
+ $definitions['non_configurable_field'] = $non_configurable_field_definition->reveal();
+ $this->entityFieldManager->getFieldDefinitions('the_entity_type_id', 'the_entity_type_bundle')->willReturn($definitions);
+
+ $build = [
+ 'test1' => [
+ '#markup' => 'Test1',
+ ],
+ 'non_configurable_field' => [
+ '#markup' => 'Non-configurable',
+ ],
+ ];
+
+ $display = $this->prophesize(EntityDisplayWithLayoutInterface::class);
+ $display->getTargetEntityTypeId()->willReturn('the_entity_type_id');
+ $display->getTargetBundle()->willReturn('the_entity_type_bundle');
+ $display->getLayoutId()->willReturn('twocol');
+ $display->getComponents()->willReturn([
+ 'test1' => [
+ 'region' => 'right',
+ ],
+ 'non_configurable_field' => [
+ 'region' => 'left',
+ ],
+ ]);
+
+ $display_context = 'form';
+
+ $expected = [
+ 'test1' => [
+ '#markup' => 'Test1',
+ '#group' => 'right',
+ ],
+ 'non_configurable_field' => [
+ '#markup' => 'Non-configurable',
+ ],
+ 'field_layout' => [
+ '#theme' => 'field_layout__twocol',
+ '#attached' => [
+ 'library' => [
+ 'field_layout/drupal.field_layout.twocol',
+ ],
+ ],
+ 'left' => [
+ '#process' => ['\Drupal\Core\Render\Element\RenderElement::processGroup'],
+ '#pre_render' => ['\Drupal\Core\Render\Element\RenderElement::preRenderGroup'],
+ ],
+ 'right' => [
+ '#process' => ['\Drupal\Core\Render\Element\RenderElement::processGroup'],
+ '#pre_render' => ['\Drupal\Core\Render\Element\RenderElement::preRenderGroup'],
+ ],
+ ],
+ ];
+ $this->fieldLayoutBuilder->build($build, $display->reveal(), $display_context);
+ $this->assertSame($expected, $build);
+ }
+
+ /**
+ * @covers ::build
+ */
+ public function testBuildEmpty() {
+ $definitions = [];
+ $non_configurable_field_definition = $this->prophesize(FieldDefinitionInterface::class);
+ $non_configurable_field_definition->isDisplayConfigurable('form')->willReturn(FALSE);
+ $definitions['non_configurable_field'] = $non_configurable_field_definition->reveal();
+ $this->entityFieldManager->getFieldDefinitions('the_entity_type_id', 'the_entity_type_bundle')->willReturn($definitions);
+
+ $build = [
+ 'non_configurable_field' => [
+ '#markup' => 'Non-configurable',
+ ],
+ ];
+
+ $display = $this->prophesize(EntityDisplayWithLayoutInterface::class);
+ $display->getTargetEntityTypeId()->willReturn('the_entity_type_id');
+ $display->getTargetBundle()->willReturn('the_entity_type_bundle');
+ $display->getLayoutId()->willReturn('twocol');
+ $display->getComponents()->willReturn([
+ 'test1' => [
+ 'region' => 'right',
+ ],
+ 'non_configurable_field' => [
+ 'region' => 'left',
+ ],
+ ]);
+
+ $display_context = 'form';
+
+ $expected = [
+ 'non_configurable_field' => [
+ '#markup' => 'Non-configurable',
+ ],
+ ];
+ $this->fieldLayoutBuilder->build($build, $display->reveal(), $display_context);
+ $this->assertSame($expected, $build);
+ }
+
+ /**
+ * @covers ::build
+ */
+ public function testBuildNoLayout() {
+ $this->entityFieldManager->getFieldDefinitions(Argument::any(), Argument::any())->shouldNotBeCalled();
+
+ $build = [
+ 'test1' => [
+ '#markup' => 'Test1',
+ ],
+ ];
+
+ $display = $this->prophesize(EntityDisplayWithLayoutInterface::class);
+ $display->getLayoutId()->willReturn('unknown');
+ $display->getComponents()->shouldNotBeCalled();
+
+ $display_context = 'form';
+
+ $expected = [
+ 'test1' => [
+ '#markup' => 'Test1',
+ ],
+ ];
+ $this->fieldLayoutBuilder->build($build, $display->reveal(), $display_context);
+ $this->assertSame($expected, $build);
+ }
+
+}
diff --git a/core/modules/field_layout/tests/src/Unit/LayoutRepositoryTest.php b/core/modules/field_layout/tests/src/Unit/LayoutRepositoryTest.php
new file mode 100644
index 0000000..dc70ebc
--- /dev/null
+++ b/core/modules/field_layout/tests/src/Unit/LayoutRepositoryTest.php
@@ -0,0 +1,86 @@
+moduleHandler = $this->prophesize(ModuleHandlerInterface::class);
+ $this->moduleHandler->moduleExists('field_layout')->willReturn(TRUE);
+ $extension = new Extension('/', 'module', 'core/modules/field_layout/field_layout.info.yml');
+ $this->moduleHandler->getModule('field_layout')->willReturn($extension);
+
+ $this->themeHandler = $this->prophesize(ThemeHandlerInterface::class);
+
+ $this->layoutRepository = new LayoutRepository($this->moduleHandler->reveal(), $this->themeHandler->reveal(), $this->getStringTranslationStub());
+ }
+
+ /**
+ * @covers ::getDefinitions
+ */
+ public function testGetDefinitions() {
+ $expected = ['onecol', 'twocol'];
+
+ $layout_definitions = $this->layoutRepository->getDefinitions();
+ $this->assertEquals($expected, array_keys($layout_definitions));
+ }
+
+ /**
+ * @covers ::getLayout
+ */
+ public function testGetLayout() {
+ $expected = [
+ 'label' => 'Two column',
+ 'theme' => 'field_layout__twocol',
+ 'provider' => 'field_layout',
+ 'category' => 'Columns: 2',
+ 'default_region' => 'left',
+ 'regions' => [
+ 'left' => [
+ 'label' => 'Left',
+ ],
+ 'right' => [
+ 'label' => 'Right',
+ ],
+ ],
+ 'path' => 'core/modules/field_layout/layouts/twocol',
+ 'template' => 'field-layout--twocol',
+ 'layout' => 'twocol',
+ 'library' => 'field_layout/drupal.field_layout.twocol',
+ 'provider_type' => 'module',
+ ];
+ $layout_definition = $this->layoutRepository->getLayout('twocol');
+ $this->assertEquals($expected, $layout_definition);
+ }
+
+}