Merge remote-tracking branch 'origin/MC-1416' into MC-1416

Author: danmooney2

app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Wysiwyg/Config.php

@@ -61,7 +61,7 @@ public function getData(string $itemName) : array
     {
         $config = [];
         $activeEditorPath = $this->activeEditor->getWysiwygAdapterPath();
-        if ($this->inlineEditingChecker->isAvailable($activeEditorPath)) {
+        if ($this->inlineEditingChecker->isSupported($activeEditorPath)) {
             $config['adapter'] = $this->wysiwygConfig->getConfig()->getData();
             if (isset($this->additionalConfig[$activeEditorPath])) {
                 $config['additional'] = $this->additionalConfig[$activeEditorPath];

app/code/Magento/PageBuilder/Model/Stage/Config.php

@@ -203,6 +203,6 @@ private function isWysiwygProvisionedForEditingOnStage()
     {
         $activeEditorPath = $this->activeEditor->getWysiwygAdapterPath();
 
-        return $this->inlineEditingChecker->isAvailable($activeEditorPath);
+        return $this->inlineEditingChecker->isSupported($activeEditorPath);
     }
 }

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

@@ -41,7 +41,7 @@ public function __construct(
      * @param string $editorPath
      * @return bool
      */
-    public function isAvailable(string $editorPath) : bool
+    public function isSupported(string $editorPath) : bool
     {
 
         return $this->wysiwygAdaptersSupportingInlineEditing[$editorPath] && $this->wysiwygConfig->isEnabled() ?? false;

app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/text.xml

@@ -52,6 +52,7 @@
                     <item name="parentSelectorsToUnderlay" xsi:type="array">
                         <item name="0" xsi:type="string">.tabs-content</item>
                         <item name="1" xsi:type="string">.column-container</item>
+                        <item name="2" xsi:type="string">.row-container</item>
                     </item>
                 </item>
             </additional_data>