From 0a7dd88bf6cbd0c52563d775bb5641756a2e045e Mon Sep 17 00:00:00 2001
From: Jarek Danielak <jarek.danielak@camunda.com>
Date: Fri, 17 Jan 2025 20:45:01 +0100
Subject: [PATCH] fix: move elements into subprocess after all elements are
 created

---
 .../behavior/SubProcessPlaneBehavior.js       | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/features/modeling/behavior/SubProcessPlaneBehavior.js b/lib/features/modeling/behavior/SubProcessPlaneBehavior.js
index 8bc0333708..88f0d32144 100644
--- a/lib/features/modeling/behavior/SubProcessPlaneBehavior.js
+++ b/lib/features/modeling/behavior/SubProcessPlaneBehavior.js
@@ -107,17 +107,23 @@ export default function SubProcessPlaneBehavior(
   }, true);
 
 
-  this.postExecuted('shape.create', function(context) {
-    var shape = context.shape,
-        rootElement = context.newRootElement;
+  this.postExecuted('elements.create', function(context) {
 
-    if (!rootElement || !shape.children) {
-      return;
-    }
+    var elements = context.elements;
+
+    elements.forEach(function(element) {
 
-    self._showRecursively(shape.children);
+      var rootElement = elementRegistry.get(getPlaneIdFromShape(element));
 
-    self._moveChildrenToShape(shape, rootElement);
+      if (!rootElement || !element.children) {
+        return;
+      }
+
+      self._showRecursively(element.children);
+
+      self._moveChildrenToShape(element, rootElement);
+
+    });
   }, true);