MC-3653: Can Drag & Drop Child Content Types Into Hidden Content Types

- Resolve issue with dragging content types into same position causing them to be removed

Author: davemacaulay

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-menu/hide-show-option.js

@@ -42,8 +42,8 @@ export default class HideShowOption extends Option implements OptionInterface {
             this.icon(HideShowOption.hideIcon);
             this.title(HideShowOption.hideText);
         } else {
-            this.icon(HideShowOption.showText);
-            this.title(HideShowOption.showIcon);
+            this.icon(HideShowOption.showIcon);
+            this.title(HideShowOption.showText);
         }
     }
 }

app/code/Magento/PageBuilder/view/adminhtml/web/js/drag-drop/sortable.js

@@ -159,7 +159,6 @@ function onSort(preview: Preview, event: Event, ui: JQueryUI.SortableUIParams) {
  * On sort stop hide any indicators
  */
 function onSortStop(preview: Preview, event: Event, ui: JQueryUI.SortableUIParams) {
-    sortedContentType = null;
     ui.item.removeClass("pagebuilder-sorting-original");
     hideDropIndicators();
     setDraggedContentTypeConfig(null);
@@ -169,9 +168,11 @@ function onSortStop(preview: Preview, event: Event, ui: JQueryUI.SortableUIParam
         events.trigger("stage:interactionStop");
     }
 
-    if (ui.item) {
+    if (ui.item && sortedContentType === null) {
         ui.item.remove();
     }
+
+    sortedContentType = null;
 }
 
 /**