Merge remote-tracking branch 'origin/develop' into AC-233-test

Author: kieuphan2406

app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php

@@ -41,7 +41,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
     {
         $config->addData(
             [
-                'tinymce4' => [
+                'tinymce' => [
                     'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheightselect | forecolor backcolor ' .
                         '| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
                         '| link image table charmap',

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

@@ -579,15 +579,15 @@
         <arguments>
             <argument name="editors" xsi:type="array">
                 <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" xsi:type="array">
-                    <item name="component" xsi:type="string">Magento_PageBuilder/js/wysiwyg/tinymce4</item>
+                    <item name="component" xsi:type="string">Magento_PageBuilder/js/wysiwyg/tinymce</item>
                     <item name="component_initializers" xsi:type="array">
-                        <item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce4/component-initializer</item>
-                        <item name="slide" xsi:type="string">Magento_PageBuilder/js/content-type/slide/wysiwyg/tinymce4/component-initializer</item>
-                        <item name="banner" xsi:type="string">Magento_PageBuilder/js/content-type/banner/wysiwyg/tinymce4/component-initializer</item>
+                        <item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce/component-initializer</item>
+                        <item name="slide" xsi:type="string">Magento_PageBuilder/js/content-type/slide/wysiwyg/tinymce/component-initializer</item>
+                        <item name="banner" xsi:type="string">Magento_PageBuilder/js/content-type/banner/wysiwyg/tinymce/component-initializer</item>
                     </item>
                     <item name="config_modifiers" xsi:type="array">
-                        <item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce4/config-modifier</item>
-                        <item name="slide" xsi:type="string">Magento_PageBuilder/js/content-type/slide/wysiwyg/tinymce4/config-modifier</item>
+                        <item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce/config-modifier</item>
+                        <item name="slide" xsi:type="string">Magento_PageBuilder/js/content-type/slide/wysiwyg/tinymce/config-modifier</item>
                     </item>
                     <item name="mode" xsi:type="string">inline</item>
                     <item name="minToolbarWidth" xsi:type="number">360</item>