MC-3103: Custom Product Attributes with FullWidth Page Layout

- Change attributes block to use constants to determine attribute visibility
- Rename title wrapper and attributes to better illustrate their purpose

Author: davemacaulay

app/code/Magento/PageBuilder/Block/Catalog/Block/Product/View/Attributes.php

@@ -9,11 +9,15 @@
 
 class Attributes extends \Magento\Catalog\Block\Product\View\Attributes
 {
+    const DISPLAY_ATTRIBUTES_NON_PAGEBUILDER = 'non_pagebuilder';
+
+    const DISPLAY_ATTRIBUTES_PAGEBUILDER_ONLY = 'pagebuilder_only';
+
     /**
      * Determine if we should display the attribute on the front-end, add support for exclude page builder & page
      * builder only options on class.
      *
-     * pagebuilder_attributes can be set to determine whether to include just Page Builder attributes or to exclude
+     * display_attributes can be set to determine whether to include just Page Builder attributes or to exclude
      * them.
      *
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
@@ -24,9 +28,11 @@ class Attributes extends \Magento\Catalog\Block\Product\View\Attributes
     protected function isVisibleOnFrontend(
         \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
         array $excludeAttr
-    ) {
+    ) : bool {
         return parent::isVisibleOnFrontend($attribute, $excludeAttr)
-            && (($this->getPagebuilderAttributes() && $attribute->getIsPagebuilderEnabled())
-            || (!$this->getPagebuilderAttributes() && !$attribute->getIsPagebuilderEnabled()));
+            && (($this->getDisplayAttributes() == self::DISPLAY_ATTRIBUTES_NON_PAGEBUILDER
+                    && !$attribute->getIsPagebuilderEnabled())
+            || ($this->getDisplayAttributes() == self::DISPLAY_ATTRIBUTES_PAGEBUILDER_ONLY
+                    && $attribute->getIsPagebuilderEnabled()));
     }
 }

app/code/Magento/PageBuilder/view/frontend/page_layout/product-full-width.xml

@@ -24,28 +24,28 @@
         <container name="product.info.description.wrapper" after="main.content" before="product.info.details.after.wrapper" htmlTag="div" htmlClass="page-main-description product-full-width-section" htmlId="description"/>
         <!-- Create a new wrapper to house the custom Page Builder attributes -->
         <container name="product.attributes.pagebuilder.wrapper" after="product.info.description.wrapper" before="product.info.details.after.wrapper" htmlTag="div" htmlClass="page-main-pagebuilder-attributes">
-            <block class="Magento\PageBuilder\Block\Catalog\Block\Product\View\Attributes" name="product.attributes.only.pagebuilder" as="additional.pagebuilder" template="Magento_PageBuilder::catalog/product/view/attributes.phtml">
+            <block class="Magento\PageBuilder\Block\Catalog\Block\Product\View\Attributes" name="product.attributes.only.pagebuilder" as="additional.pagebuilder" template="Magento_PageBuilder::catalog/product/view/attribute_list.phtml">
                 <arguments>
-                    <argument name="pagebuilder_attributes" xsi:type="boolean">true</argument>
+                    <argument name="display_attributes" xsi:type="string">pagebuilder_only</argument>
                 </arguments>
             </block>
         </container>
         <!-- Create new product details wrapper under main.content for tabs section -->
         <container name="product.info.details.after.wrapper" after="product.attributes.pagebuilder.wrapper" before="product.info.details.wrapper" htmlTag="div" htmlClass="page-main page-main-details">
             <container name="product.info.details.after.wrapper.columns" htmlTag="div" htmlClass="columns">
                 <container name="product.info.details.after.wrapper.main" label="Product Details Main Content Container" htmlTag="div" htmlClass="column main">
-                    <block class="Magento\Framework\View\Element\Template" name="product.attributes.wrapper" template="Magento_PageBuilder::catalog/product/view/title_wrapper.phtml">
+                    <block class="Magento\Framework\View\Element\Template" name="product.attributes.wrapper" template="Magento_PageBuilder::catalog/product/view/section_wrapper.html">
                         <arguments>
                             <argument name="title" translate="true" xsi:type="string">More Information</argument>
                         </arguments>
                         <!-- Create a new instance of attributes which excludes Page Builder attributes -->
-                        <block class="Magento\PageBuilder\Block\Catalog\Block\Product\View\Attributes" name="product.attributes.exclude.pagebuilder" as="additional" template="Magento_Catalog::product/view/attributes.phtml">
+                        <block class="Magento\PageBuilder\Block\Catalog\Block\Product\View\Attributes" name="product.attributes.exclude.pagebuilder" as="additional" template="Magento_Catalog::product/view/attribute_list.phtml">
                             <arguments>
-                                <argument name="pagebuilder_attributes" xsi:type="boolean">false</argument>
+                                <argument name="display_attributes" xsi:type="string">non_pagebuilder</argument>
                             </arguments>
                         </block>
                     </block>
-                    <block class="Magento\Framework\View\Element\Template" name="product.reviews.wrapper" after="product.attributes.wrapper" template="Magento_PageBuilder::catalog/product/view/title_wrapper.phtml">
+                    <block class="Magento\Framework\View\Element\Template" name="product.reviews.wrapper" after="product.attributes.wrapper" template="Magento_PageBuilder::catalog/product/view/section_wrapper.html">
                         <arguments>
                             <argument name="title" translate="true" xsi:type="string">Reviews</argument>
                         </arguments>