chore(bpmn-replace): reorganize toggling collapsed state

barmac · nikku · commit e1efb556f2cb · 2021-10-20T14:58:50.000+02:00
diff --git a/lib/features/replace/BpmnReplace.js b/lib/features/replace/BpmnReplace.js
@@ -45,20 +45,22 @@ var CUSTOM_PROPERTIES = [
   'isInterrupting'
 ];
 
-
-function toggeling(element, target) {
+/**
+ * Check if element should be collapsed or expanded.
+ */
+function shouldToggleCollapsed(element, targetElement) {
 
   var oldCollapsed = (
     element && has(element, 'collapsed') ? element.collapsed : !isExpanded(element)
   );
 
   var targetCollapsed;
 
-  if (target && (has(target, 'collapsed') || has(target, 'isExpanded'))) {
+  if (targetElement && (has(targetElement, 'collapsed') || has(targetElement, 'isExpanded'))) {
 
     // property is explicitly set so use it
     targetCollapsed = (
-      has(target, 'collapsed') ? target.collapsed : !target.isExpanded
+      has(targetElement, 'collapsed') ? targetElement.collapsed : !targetElement.isExpanded
     );
   } else {
 
@@ -67,15 +69,13 @@ function toggeling(element, target) {
   }
 
   if (oldCollapsed !== targetCollapsed) {
-    element.collapsed = oldCollapsed;
     return true;
   }
 
   return false;
 }
 
 
-
 /**
  * This module takes care of replacing BPMN elements
  */
@@ -106,15 +106,13 @@ export default function BpmnReplace(
     var type = target.type,
         oldBusinessObject = element.businessObject;
 
-    if (isSubProcess(oldBusinessObject)) {
-      if (type === 'bpmn:SubProcess') {
-        if (toggeling(element, target)) {
+    if (isSubProcess(oldBusinessObject) && type === 'bpmn:SubProcess') {
+      if (shouldToggleCollapsed(element, target)) {
 
-          // expanding or collapsing process
-          modeling.toggleCollapse(element);
+        // expanding or collapsing process
+        modeling.toggleCollapse(element);
 
-          return element;
-        }
+        return element;
       }
     }
 
