MC-4126: Duplicate row border after switching Row appearance

- Resolve further typing issues

Author: davemacaulay

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/tabs/preview.js

@@ -12,9 +12,9 @@ import { moveArrayItemIntoArray, removeArrayItem } from "./utils/array";
  * @api
  */
 export default class Collection {
-    public children: KnockoutObservableArray<any>;
+    public children: KnockoutObservableArray<ContentTypeInterface | ContentTypeCollectionInterface>;
 
-    constructor(children?: KnockoutObservableArray<any>) {
+    constructor(children?: KnockoutObservableArray<ContentTypeInterface | ContentTypeCollectionInterface>) {
         this.children = children ? children : ko.observableArray([]);
     }
 
@@ -56,7 +56,7 @@ export default class Collection {
      *
      * @param children
      */
-    public setChildren(children: KnockoutObservableArray<any>) {
+    public setChildren(children: KnockoutObservableArray<ContentTypeInterface | ContentTypeCollectionInterface>) {
         this.children = children;
     }
 }

app/code/Magento/PageBuilder/view/adminhtml/web/js/drag-drop/move-content-type.js

@@ -38,6 +38,7 @@ import {getDragColumn, removeDragColumn, setDragColumn} from "./registry";
  * @api
  */
 export default class Preview extends PreviewCollection {
+    public parent: ContentTypeCollectionInterface<ColumnGroupPreview>;
     public resizing: KnockoutObservable<boolean> = ko.observable(false);
     public hasEmptyChild: KnockoutComputed<boolean> = ko.computed(() => {
         let empty: boolean = false;
@@ -347,9 +348,7 @@ export default class Preview extends PreviewCollection {
                 const columnInstance: ContentTypeCollectionInterface = ko.dataFor($(event.target)[0]);
                 // Use the global state as columns can be dragged between groups
                 setDragColumn((columnInstance.parent as ContentTypeCollectionInterface<ColumnPreview>));
-                this.dropPositions = calculateDropPositions(
-                    this.parent as ContentTypeCollectionInterface<ColumnGroupPreview>,
-                );
+                this.dropPositions = calculateDropPositions(this.parent);
 
                 events.trigger("column:dragStart", {
                     column: columnInstance,
@@ -395,7 +394,7 @@ export default class Preview extends PreviewCollection {
             if (newGridSize !== this.resizeUtils.getGridSize()) {
                 try {
                     resizeGrid(
-                        (this.parent as ContentTypeCollectionInterface<Preview>),
+                        this.parent,
                         newGridSize,
                         this.gridSizeHistory,
                     );
@@ -777,9 +776,7 @@ export default class Preview extends PreviewCollection {
         if (dragColumn) {
             // If the drop positions haven't been calculated for this group do so now
             if (this.dropPositions.length === 0) {
-                this.dropPositions = calculateDropPositions(
-                    this.parent as ContentTypeCollectionInterface<ColumnGroupPreview>,
-                );
+                this.dropPositions = calculateDropPositions(this.parent);
             }
             const columnInstance = dragColumn;
             const currentX = event.pageX - groupPosition.left;

app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/read/configurable.js

@@ -12,5 +12,5 @@ import ContentTypeInterface from "../content-type.d";
 export default interface ContentTypeAfterRenderEventParamsInterface {
     id: string;
     element: Element;
-    contentType: ContentTypeInterface & ContentTypeCollectionInterface;
+    contentType: ContentTypeInterface | ContentTypeCollectionInterface;
 }

app/code/Magento/PageBuilder/view/adminhtml/web/js/property/link.js

@@ -10,7 +10,7 @@ import ContentTypeInterface from "../content-type.d";
  * @api
  */
 export interface ContentTypeBeforeMoveEventParams {
-    contentType: ContentTypeInterface & ContentTypeCollectionInterface;
+    contentType: ContentTypeInterface | ContentTypeCollectionInterface;
     sourceParent: ContentTypeCollectionInterface;
     targetParent: ContentTypeCollectionInterface;
     targetIndex: number;

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/collection.ts

@@ -11,5 +11,5 @@ import ContentTypeInterface from "../content-type.d";
  */
 export default interface ContentTypeCreateEventParamsInterface {
     id: string;
-    contentType: ContentTypeInterface & ContentTypeCollectionInterface;
+    contentType: ContentTypeInterface | ContentTypeCollectionInterface;
 }

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts

@@ -11,5 +11,5 @@ import ContentTypeInterface from "../content-type.d";
  */
 export default interface ContentTypeDroppedCreateEventParamsInterface {
     id: string;
-    contentType: ContentTypeInterface & ContentTypeCollectionInterface;
+    contentType: ContentTypeInterface | ContentTypeCollectionInterface;
 }