From 2e05f448e20d12183f39c9e44ad048947dde59b4 Mon Sep 17 00:00:00 2001
From: justin2pin <justin2pin@278450.no-reply.drupal.org>
Date: Thu, 7 Jul 2022 15:32:54 +0000
Subject: [PATCH] Issue #3281169: Incorrect region is passed when clicking "+"
after moving a component from one region to another
---
src/Controller/ChooseComponentController.php | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/Controller/ChooseComponentController.php b/src/Controller/ChooseComponentController.php
index ac173e4..1c02cff 100644
--- a/src/Controller/ChooseComponentController.php
+++ b/src/Controller/ChooseComponentController.php
@@ -88,6 +88,14 @@ class ChooseComponentController extends ControllerBase {
'sibling_uuid' => $request->query->get('sibling_uuid', NULL),
'placement' => $request->query->get('placement', NULL),
];
+ // If inserting a new item adjecent to a sibling component, the region
+ // passed in the URL will be incorrect if the existing sibling component
+ // was dragged into another region. In that case, always use the existing
+ // sibling's region.
+ if ($query_params['sibling_uuid']) {
+ $sibling = $layout_paragraphs_layout->getComponentByUuid($query_params['sibling_uuid']);
+ $query_params['region'] = $sibling->getRegion();
+ }
$types = $this->getAllowedComponentTypes($layout_paragraphs_layout, $query_params['parent_uuid'], $query_params['region']);
// If there is only one type to render,
// return the component form instead of a list of links.
--
GitLab