Roderik Muit · Roderik Muit
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
   *   the current content language.
   *
   * @return \Drupal\custom_elements\CustomElement
-   *   Extracted custom elements containing data attributes and slots.
+   *   Custom element containing entity properties as attributes and slots.
   */
  public function generate(ContentEntityInterface $entity, string $viewMode, string $langcode = NULL) {
-    // Get desired entity translation.
-    $entity = $this->entityRepository->getTranslationFromContext($entity, $langcode);
-    $custom_element = $this->getEntityDefaults($entity, $viewMode);
-    $this->buildEntityContent($entity, $custom_element, $viewMode);
-    $this->moduleHandler->alter('custom_element_entity', $custom_element, $entity, $viewMode);
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
+   * @param \Drupal\custom_elements\CustomElement[] $custom_elements
+   *   The custom elements to build into; these must have the same keys as the
+   *   array of entities.
   * @param string $viewMode
   *   The view mode being built.
   * @param \Drupal\Core\Session\AccountInterface|null $account
   *   (optional) The user for which to check access, or NULL to check access
   *   for the current user. Defaults to NULL.
   */
-  public function buildCeDisplay(ContentEntityInterface $entity, CustomElement $custom_element, EntityCeDisplayInterface $display, string $viewMode, AccountInterface $account = NULL) {
+  public function buildEntities(array $entities, array $custom_elements, string $viewMode, AccountInterface $account = NULL): void {
+    $ce_displays = $this->getEntityCeDisplaysByBundle($entities, $viewMode);
+
+    foreach ($entities as $id => $entity) {
+      // Silently skip if no accompanying custom elements are set; these may
+      // have been unset by prepareBuildEntities().
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
+      if (isset($custom_elements[$id])) {
+        $this->buildCeDisplay($entity, $custom_elements[$id], $ce_displays[$entity->bundle()], $viewMode, $account, TRUE);
+      }
+    }
+  }
+
+  /**
+   * Builds an entity's content as custom element using a CE display.
+   *
+   * @deprecated in 3.0.0-beta2 and is removed in 4.0.0. Use generate() or
+   *   prepareBuildEntities() + buildEntities() instead.
+   *
+   * @see \Drupal\custom_elements\CustomElementGenerator::prepareBuildEntities()
+   * @see \Drupal\custom_elements\CustomElementGenerator::buildEntities()
+   */
+  public function buildCeDisplay(ContentEntityInterface $entity, CustomElement $custom_element, EntityCeDisplayInterface $display, string $viewMode, AccountInterface $account = NULL, $skipPrepare = FALSE) {
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
+   *
+   * @return \Drupal\custom_elements\Entity\EntityCeDisplayInterface[]
+   *   An array of Custom Elements displays, keyed by entity bundle.
+   */
+  protected function getEntityCeDisplaysByBundle(array $entities, string $viewMode) {
+    $ce_displays = [];
+    foreach ($entities as $entity) {
+      $bundle = $entity->bundle();
+      if (!isset($ce_displays[$bundle])) {
+        $ce_displays[$bundle] = $this->getEntityCeDisplay($entity->getEntityTypeId(), $bundle, $viewMode);
+      }
+    }
+
+    return $ce_displays;
+  }
+
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
+    }
+
+    $ce_displays = $this->getEntityCeDisplaysByBundle($entities, $viewMode);
+
+    foreach ($entities_by_bundle as $bundle => $entities) {
+      foreach ($ce_displays[$bundle]->getComponents() as $component_name => $display_component) {
+        if ($formatter = $ce_displays[$bundle]->getRenderer($component_name)) {
+          $field_name = $display_component['field_name'];
+          $grouped_items = [];
+          foreach ($entities as $id => $entity) {
+            if ($this->fieldIsAccessible($entity, $field_name, $custom_elements[$id], $account)) {
+              $items = $entity->get($field_name);
+              $items->filterEmptyItems();
+              $grouped_items[$id] = $items;
+            }
+          }
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
-   *   Extracted custom elements containing data attributes and slots.
+   *   Custom element containing entity properties as attributes and slots.
   */
  public function generate(ContentEntityInterface $entity, string $viewMode, string $langcode = NULL) {
-    // Get desired entity translation.
-    $entity = $this->entityRepository->getTranslationFromContext($entity, $langcode);
-    $custom_element = $this->getEntityDefaults($entity, $viewMode);
-    $this->buildEntityContent($entity, $custom_element, $viewMode);
-    $this->moduleHandler->alter('custom_element_entity', $custom_element, $entity, $viewMode);
-    return $custom_element;
+    $custom_elements = $this->generateMultiple([$entity], $viewMode, $langcode);
+    return current($custom_elements);
+  }
+
+  /**
+   * Generates a custom element for the given entities and view mode.
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
+    foreach ($entities as $key => $entity) {
+      if ($langcode !== '') {
+        $entity = $this->entityRepository->getTranslationFromContext($entity, $langcode);
+      }
+      $entities_by_type_bundle_key[$entity->getEntityTypeId()][$entity->bundle()][$key] = $entity;
+
+      $custom_elements[$key] = $this->getEntityDefaults($entity, $viewMode);
+    }
+
+    foreach ($entities_by_type_bundle_key as $entity_type_id => $entities_by_bundle_key) {
+      foreach ($entities_by_bundle_key as $bundle => $entities) {
+        $ce_display = $this->getEntityCeDisplay($entity_type_id, $bundle, $viewMode);
+        $ce_display->setOriginalMode($viewMode);
+
+        $processed = FALSE;
+        if ($ce_display->getUseLayoutBuilder()) {
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
+          // display (for view mode or default), skip processing of display
+          // components and let layout builder render everything. Otherwise,
+          // fall through to next method.
+          $entity_view_displays = EntityViewDisplay::collectRenderDisplays([current($entities)], $viewMode);
+          $entity_view_display = $entity_view_displays[$bundle];
+          if ($entity_view_display->getThirdPartySetting('layout_builder', 'enabled')) {
+            assert($entity_view_display instanceof CustomElementsLayoutBuilderEntityViewDisplay);
+            foreach ($entities as $key => $entity) {
+              $custom_elements[$key]->addCacheableDependency($ce_display);
+              $this->buildLayoutBuilderContent($entity, $custom_elements[$key], $entity_view_display);
+            }
+            $processed = TRUE;
+          }
+        }
+
+        if (!$processed) {
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
+          $entity_view_display = $entity_view_displays[$bundle];
+          if ($entity_view_display->getThirdPartySetting('layout_builder', 'enabled')) {
+            assert($entity_view_display instanceof CustomElementsLayoutBuilderEntityViewDisplay);
+            foreach ($entities as $key => $entity) {
+              $custom_elements[$key]->addCacheableDependency($ce_display);
+              $this->buildLayoutBuilderContent($entity, $custom_elements[$key], $entity_view_display);
+            }
+            $processed = TRUE;
+          }
+        }
+
+        if (!$processed) {
+          $ce_name = $ce_display->getCustomElementName();
+          $force_auto = $ce_display->getForceAutoProcessing();
+          foreach ($entities as $key => $entity) {
+            $custom_elements[$key]->addCacheableDependency($ce_display);
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
-    return $custom_element;
+  public function generate(ContentEntityInterface $entity, string $viewMode, string $langcode = NULL, AccountInterface $account = NULL) {
+    $custom_elements = $this->generateMultiple([$entity], $viewMode, $langcode, $account);
+    return current($custom_elements);
+  }
+
+  /**
+   * Generates custom elements from entities, possibly after translation.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface[] $entities
+   *   Entities to process.
+   * @param string $viewMode
+   *   View mode used for rendering field values into slots.
+   * @param string|null $langcode
+   *   (optional) For which language the entities should be rendered. Defaults
+   *   to the current content language; empty string means do not try to
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
  }

  /**
-   * Generates a custom element tag for the given entity and view mode.
+   * Generates a custom element from entity, possibly after translation.
   *
   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
   *   Entity to process.
   * @param string $viewMode
   *   View mode used for rendering field values into slots.
   * @param string|null $langcode
-   *   (optional) For which language the entity should be rendered, defaults to
-   *   the current content language.
+   *   (optional) For which language the entities should be rendered. Defaults
+   *   to the current content language; empty string means do not try to
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
  /**
-   * Generates a custom element tag for the given entity and view mode.
+   * Generates a custom element from entity, possibly after translation.
   *
   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
   *   Entity to process.
   * @param string $viewMode
   *   View mode used for rendering field values into slots.
   * @param string|null $langcode
-   *   (optional) For which language the entity should be rendered, defaults to
-   *   the current content language.
+   *   (optional) For which language the entities should be rendered. Defaults
+   *   to the current content language; empty string means do not try to
+   *   translate.
+   * @param \Drupal\Core\Session\AccountInterface|null $account
+   *   (optional) The user for which to check access, or NULL to check access
--- a/src/CustomElementGenerator.php
+++ b/src/CustomElementGenerator.php
+   */
+  public function generateMultiple(array $entities, string $viewMode, string $langcode = NULL, AccountInterface $account = NULL): array {
+    foreach ($entities as &$entity) {
+      $entity = $this->entityRepository->getTranslationFromContext($entity, $langcode);
+    }
+
+    return $this->buildEntityContent($entities, $viewMode, $account);
+  }
+
+  /**
+   * Generates custom elements from entities.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface[] $entities
+   *   Entities to process.
+   * @param string $viewMode
+   *   View mode used for rendering field values into slots.