Merge remote-tracking branch 'origin/MC-3713-paddding-is-not-respected-on-text' into cms-team-1-delivery

Author: Hwashiang Yu

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest.xml

@@ -2567,4 +2567,46 @@
         <!-- Validate Image Editor On Storefront -->
         <seeElement selector="{{TextOnStorefront.messageContentTextAreaImage('1', PageBuilderBackgroundImage_JPG.value)}}" stepKey="validateImageFrontEnd"/>
     </test>
+    <test name="TextDisabledWYSIWYGUpdateAdvancedConfigurationValues" extends="TextUpdateAdvancedConfigurationValues">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Text"/>
+            <title value="Update Advanced Configuration Values With Disabled WYSIWYG"/>
+            <description value="Validate that updating every attribute in the Advanced Configuration form for Text will update the Stage and Storefront correctly with disabled wysiwyg."/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-3713"/>
+            <testCaseId value="MC-5731"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-text"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG" before="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG" before="logout"/>
+        </after>
+        <waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextOnEditPanel" before="enterText"/>
+        <fillField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="enterText"/>
+    </test>
+    <test name="TextDisabledByDefaultWYSIWYGUpdateAdvancedConfigurationValues" extends="TextUpdateAdvancedConfigurationValues">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Text"/>
+            <title value="Update Advanced Configuration Values With Disabled By Default WYSIWYG"/>
+            <description value="Validate that updating every attribute in the Advanced Configuration form for Text will update the Stage and Storefront correctly with disabled wysiwyg by default."/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-3713"/>
+            <testCaseId value="MC-5732"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-text"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled hidden" stepKey="disableByDefaultWYSIWYG" before="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG" before="logout"/>
+        </after>
+        <waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextOnEditPanel" before="enterText"/>
+        <fillField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="enterText"/>
+    </test>
 </tests>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/preview.html

@@ -9,7 +9,7 @@
     <div if="isWysiwygSupported()" class="inline-wysiwyg" ko-style="data.main.style" css="data.main.css" attr="data.main.attributes" afterRender="initWysiwyg" />
     <div if="isWysiwygSupported()" class="placeholder-text" ifnot="data.main.html" ko-style="getPlaceholderStyle()" translate="'Edit Text'"></div>
 
-    <div ifnot="isWysiwygSupported()">
+    <div ifnot="isWysiwygSupported()" ko-style="data.main.style" css="data.main.css" attr="data.main.attributes" >
         <textarea
             class="inline-wysiwyg-textarea"
             afterRender="initTextarea"