MC-3103: Custom Product Attributes with FullWidth Page Layout

- Update shouldDisplay to use new function name
- Rename template to be more descriptive
- Remove use of underscore variables to portray scope

Author: davemacaulay

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

@@ -13,17 +13,20 @@ class Attributes extends \Magento\Catalog\Block\Product\View\Attributes
      * 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
+     * them.
+     *
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @param array $excludeAttr
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function shouldDisplay(
+    protected function isVisibleOnFrontend(
         \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
         array $excludeAttr
     ) {
-        return parent::shouldDisplay($attribute, $excludeAttr)
-            && (($this->getExcludePagebuilder() && !$attribute->getIsPagebuilderEnabled())
-            || ($this->getPagebuilderOnly() && $attribute->getIsPagebuilderEnabled()));
+        return parent::isVisibleOnFrontend($attribute, $excludeAttr)
+            && (($this->getPagebuilderAttributes() && $attribute->getIsPagebuilderEnabled())
+            || (!$this->getPagebuilderAttributes() && !$attribute->getIsPagebuilderEnabled()));
     }
 }

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

@@ -24,9 +24,9 @@
         <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/title_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/attributes.phtml">
                 <arguments>
-                    <argument name="pagebuilder_only" xsi:type="boolean">true</argument>
+                    <argument name="pagebuilder_attributes" xsi:type="boolean">true</argument>
                 </arguments>
             </block>
         </container>
@@ -41,7 +41,7 @@
                         <!-- 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">
                             <arguments>
-                                <argument name="exclude_pagebuilder" xsi:type="boolean">true</argument>
+                                <argument name="pagebuilder_attributes" xsi:type="boolean">false</argument>
                             </arguments>
                         </block>
                     </block>

app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/title_attributes.phtml renamed to app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/attributes.phtml

@@ -14,15 +14,15 @@
     $helper = $this->helper(Magento\Catalog\Helper\Output::class);
     $product = $block->getProduct();
 ?>
-<?php if ($_additional = $block->getAdditionalData()) : ?>
+<?php if ($additional = $block->getAdditionalData()) : ?>
     <div class="pagebuilder-attributes-wrapper">
-        <?php foreach ($_additional as $_data) : ?>
+        <?php foreach ($additional as $data) : ?>
             <div class="product-full-width-section">
                 <div class="page-main">
-                    <h2 class="product-section-title"><?= $block->escapeHtml(__($_data['label'])) ?></h2>
+                    <h2 class="product-section-title"><?= $block->escapeHtml(__($data['label'])) ?></h2>
                 </div>
                 <div class="pagebuilder-attribute-wrapper">
-                    <?= /* @escapeNotVerified */ $helper->productAttribute($product, $_data['value'], $_data['code']) ?>
+                    <?= /* @noEscape */ $helper->productAttribute($product, $data['value'], $data['code']) ?>
                 </div>
             </div>
         <?php endforeach; ?>