Merge branch 'MC-1416' of github.com:magento-trigger/magento2-page-builder into MC-1416

Author: nathanjosiah

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/wysiwyg-factory.js

@@ -27,7 +27,7 @@ export default interface ContentTypeConfigInterface {
     readers: string[];
     allowed_parents: string[];
     is_visible: boolean;
-    additional_data: any;
+    additional_data: AdditionalDataConfigInterface;
 }
 
 export interface ContentTypeConfigAppearanceInterface {
@@ -104,3 +104,7 @@ export interface DataMappingTagInterface {
     var: string;
     converter: string;
 }
+
+export interface AdditionalDataConfigInterface {
+    [key: string]: any;
+}

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

@@ -4,18 +4,20 @@
  */
 
 import WysiwygSetup from "mage/adminhtml/wysiwyg/tiny_mce/setup";
+import WysiwygInstance from "wysiwygAdapter";
+import {AdditionalDataConfigInterface} from "../content-type-config";
 
 /**
  * Create new wysiwyg adapter instance
  * @param {string} elementId
- * @param {object} config
- * @returns {WysiwygSetup}
+ * @param {AdditionalDataConfigInterface} config
+ * @returns {WysiwygInstance}
  * @api
  */
 export default function create(
     elementId: string,
-    config: object,
-): WysiwygSetup {
+    config: AdditionalDataConfigInterface,
+): WysiwygInstance {
     const wysiwygSetup =  new WysiwygSetup(elementId, config.adapter);
 
     if (config.additional.mode) {

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-config.d.ts

@@ -7,6 +7,8 @@ import $ from "jquery";
 import WysiwygSetup from "mage/adminhtml/wysiwyg/tiny_mce/setup";
 import events from "Magento_PageBuilder/js/events";
 import _ from "underscore";
+import WysiwygInstance from "wysiwygAdapter";
+import {AdditionalDataConfigInterface} from "../content-type-config";
 import DataStore from "../data-store";
 import WysiwygFactory from "./wysiwyg-factory";
 
@@ -24,7 +26,7 @@ export default class Wysiwyg {
     /**
      * Wysiwyg adapter instance
      */
-    private wysiwygAdapter: WysiwygSetup;
+    private wysiwygAdapter: WysiwygInstance;
 
     /**
      * Content type's data store
@@ -39,13 +41,13 @@ export default class Wysiwyg {
     /**
      * @param {String} contentTypeId
      * @param {String} elementId
-     * @param {Object} config
+     * @param {AdditionalDataConfigInterface} config
      * @param {DataStore} dataStore
      */
     constructor(
         contentTypeId: string,
         elementId: string,
-        config: object,
+        config: AdditionalDataConfigInterface,
         dataStore: DataStore,
     ) {
         this.contentTypeId = contentTypeId;
@@ -155,13 +157,12 @@ export default class Wysiwyg {
     /**
      * Prepend specific config with id to encapsulate its targeting by the vendor wysiwyg editor
      *
-     * @param {object} config
-     * @returns {object} - interpolated configuration
-     * //todo move in the separate function
+     * @param {AdditionalDataConfigInterface} config
+     * @returns {AdditionalDataConfigInterface} - interpolated configuration
      */
     private encapsulateConfigBasedOnContentType(config: object)
     {
-        const clonedConfig = Object.assign( {}, config);
+        const clonedConfig = $.extend(true, {}, config);
 
         if (!clonedConfig.additional.encapsulateSelectorConfigKeys) {
             return clonedConfig;

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/wysiwyg-factory.ts

@@ -10,15 +10,30 @@ interface EventBus {
 interface WysiwygSetup {
     eventBus: EventBus,
     setup(mode: string): void,
+    wysiwygInstance: WysiwygInstance
+}
+
+interface WysiwygInstance {
+    eventBus: EventBus,
+    EVENT: any,
     getContent(): string,
-    setContent(content: string): void,
+    setContent(content: string): void
 }
 
 declare var WysiwygSetup: {
     prototype: WysiwygSetup;
     new (id: string, config: object): WysiwygSetup;
 };
 
+declare var WysiwygInstance: {
+    prototype: WysiwygInstance;
+    new (id: string, config: object): WysiwygInstance
+};
+
 declare module "mage/adminhtml/wysiwyg/tiny_mce/setup" {
     export = WysiwygSetup;
 }
+
+declare module "wysiwygAdapter" {
+    export = WysiwygInstance;
+}