Merge remote-tracking branch 'origin/cms-team-1-delivery' into cms-team-1-delivery

Author: Cari Spruiell

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderActionsSection.xml

@@ -52,7 +52,7 @@
         <element name="contentTypeInStageByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]' parameterized="true"/>
         <element name="contentTypeContainer" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]/descendant::div[contains(@class, "element-children")]' parameterized="true"/>
         <element name="contentTypeInsideContainerStage" type="button" selector='(//div[contains(@class, "{{arg1}}-container")])[{{arg2}}]//div[contains(@class,"pagebuilder-content-type-wrapper")][{{arg3}}]//div[contains(@class,"pagebuilder-{{arg4}}")][{{arg5}}]' parameterized="true"/>
-        <element name="contentTypeInsideContainerStorefront" type="button" selector='(//div[@class="pagebuilder-{{arg1}}"])[{{arg2}}]//div[@data-role="{{arg3}}"][{{arg4}}]' parameterized="true"/>
+        <element name="contentTypeInsideContainerStorefront" type="button" selector='(//div[@data-role="{{arg1}}"])[{{arg2}}]//div[@data-role="{{arg3}}"][{{arg4}}]' parameterized="true"/>
         <element name="contentTypePreviewInStage" type="button" selector="div.pagebuilder-{{arg1}}.pagebuilder-content-type" parameterized="true"/>
         <element name="contentTypeOptionsMenu" type="button" selector='div.pagebuilder-{{arg1}}.pagebuilder-content-type div.pagebuilder-options' parameterized="true"/>
         <element name="contentTypeOptionsMenuByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]//div[contains(@class,"pagebuilder-options-visible")]' parameterized="true"/>

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

@@ -6,6 +6,7 @@
 import ko from "knockout";
 import $t from "mage/translate";
 import events from "uiEvents";
+import ContentTypeCollectionInterface from "../../content-type-collection";
 import ContentTypeConfigInterface from "../../content-type-config.d";
 import Options from "../../content-type-menu";
 import Option from "../../content-type-menu/option";
@@ -17,7 +18,6 @@ import {percentToDecimal} from "../../utils/number-converter";
 import ObservableUpdater from "../observable-updater";
 import BasePreview from "../preview";
 import Uploader from "../uploader";
-import ContentTypeCollectionInterface from "../../content-type-collection";
 
 export default class Preview extends BasePreview {
     private showOverlayHover: KnockoutObservable<boolean> = ko.observable(false);

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

@@ -12,11 +12,13 @@ import _ from "underscore";
 import "../../binding/focus";
 import {PreviewSortableSortUpdateEventParams} from "../../binding/sortable-children";
 import Config from "../../config";
+import ContentTypeCollectionInterface from "../../content-type-collection";
 import ContentTypeConfigInterface from "../../content-type-config.d";
 import createContentType from "../../content-type-factory";
 import Option from "../../content-type-menu/option";
 import OptionInterface from "../../content-type-menu/option.d";
 import ContentTypeInterface from "../../content-type.d";
+import ContentTypeAfterRenderEventParamsInterface from "../content-type-after-render-event-params";
 import ContentTypeCreateEventParamsInterface from "../content-type-create-event-params.d";
 import ContentTypeMountEventParamsInterface from "../content-type-mount-event-params.d";
 import ContentTypeDuplicateEventParamsInterface from "../content-type-ready-event-params.d";
@@ -26,8 +28,6 @@ import ObservableUpdater from "../observable-updater";
 import PreviewCollection from "../preview-collection";
 import Slide from "../slide/preview";
 import {default as SliderPreview} from "../slider/preview";
-import ContentTypeAfterRenderEventParamsInterface from "../content-type-after-render-event-params";
-import ContentTypeCollectionInterface from "../../content-type-collection";
 
 export default class Preview extends PreviewCollection {
     public focusedSlide: KnockoutObservable<number> = ko.observable();
@@ -247,8 +247,6 @@ export default class Preview extends PreviewCollection {
      */
     protected bindEvents() {
         super.bindEvents();
-
-
         // We only start forcing the containers height once the slider is ready
         let sliderReady: boolean = false;
         events.on("slider:contentType:ready", (args: ContentTypeReadyEventParamsInterface) => {

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

@@ -9,22 +9,21 @@ import $t from "mage/translate";
 import "tabs";
 import events from "uiEvents";
 import _ from "underscore";
+import {ActiveOptionsInterface} from "../../binding/active-options.d";
 import {PreviewSortableSortUpdateEventParams} from "../../binding/sortable-children";
+import {SortableOptionsInterface} from "../../binding/sortable-options.d";
 import Config from "../../config";
 import ContentTypeConfigInterface from "../../content-type-config.d";
 import createContentType from "../../content-type-factory";
 import Option from "../../content-type-menu/option";
 import OptionInterface from "../../content-type-menu/option.d";
 import ContentTypeRemovedParamsInterface from "../../content-type-removed-params.d";
 import ContentTypeInterface from "../../content-type.d";
-import {ContentTypeMountEventParamsInterface} from "../content-type-mount-event-params.d";
-import {ContentTypeReadyEventParamsInterface} from "../content-type-ready-event-params.d";
-import {ContentTypeRemovedEventParamsInterface} from "../content-type-removed-event-params.d";
+import ContentTypeMountEventParamsInterface from "../content-type-mount-event-params.d";
+import ContentTypeReadyEventParamsInterface from "../content-type-ready-event-params.d";
+import ContentTypeRemovedEventParamsInterface from "../content-type-removed-event-params.d";
 import ObservableUpdater from "../observable-updater";
 import PreviewCollection from "../preview-collection";
-import {ActiveOptionsInterface} from "./active-options.d";
-import {SortableOptionsInterface} from "./sortable-options.d";
-import ContentTypeAfterRenderEventParamsInterface from "../content-type-after-render-event-params";
 
 export default class Preview extends PreviewCollection {
     public static focusOperationTime: number;