Merge branch 'develop' into PR-2024-07-11

Author: magento-devops-queue-mgr-svc

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

@@ -634,6 +634,7 @@
             <argument name="overrideSnapshot" xsi:type="boolean">true</argument>
         </arguments>
     </virtualType>
+    <preference for="Magento\Catalog\Ui\Component\Category\Form\Element\Wysiwyg" type="Magento\PageBuilder\Component\Form\Element\CategoryWysiwyg" />
     <type name="Magento\PageBuilder\Ui\Component\Template\DataProvider">
         <arguments>
             <argument name="additionalFilterPool" xsi:type="array">

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

@@ -7,7 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Ui\Component\Form\Element\Wysiwyg" type="Magento\PageBuilder\Component\Form\Element\Wysiwyg" />
-    <preference for="Magento\Catalog\Ui\Component\Category\Form\Element\Wysiwyg" type="Magento\PageBuilder\Component\Form\Element\CategoryWysiwyg" />
     <preference for="Magento\Framework\Data\Form\Element\Editor" type="Magento\PageBuilder\Block\Element\Editor" />
     <preference for="Magento\PageBuilder\Model\ConfigInterface" type="Magento\PageBuilder\Model\Config" />
     <preference for="Magento\PageBuilder\Model\Dom\Adapter\AttrInterface" type="Magento\PageBuilder\Model\Dom\Attr" />