Merge branch 'MC-19863' into MC-16152

davemacaulay · davemacaulay · commit 548ca1b3477c · 2019-09-12T09:32:24.000-05:00
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection.xml
@@ -46,5 +46,6 @@
     <section name="MediaGallerySection">
         <!-- This goes in CE repo -->
         <element name="StorageRootArrowClicked" type="button" selector="#root > a.jstree-clicked"/>
+        <element name="currentSelectedDirectory" type="button" selector="a.jstree-clicked"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml
@@ -1948,9 +1948,6 @@
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
-            <skip>
-                <issueId value="MC-19863"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -2006,6 +2003,8 @@
         <actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
             <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
+        <click selector="{{MediaGallerySection.currentSelectedDirectory}}" stepKey="refreshFolder"/>
+        <waitForPageLoad stepKey="waitForRefresh"/>
         <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
             <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
diff --git a/docs/getting-started/install-pagebuilder-examples.md b/docs/getting-started/install-pagebuilder-examples.md
@@ -20,6 +20,14 @@ The [Example directory](https://github.com/magento-devdocs/pagebuilder-examples/
 
 - **[PageBuilderExtensionBanner](https://github.com/magento-devdocs/pagebuilder-examples/tree/master/Example/PageBuilderExtensionBanner)** — This Banner extension module shows the basic pattern for customizing existing content types using appearances.
 
+## Additional extension modules
+
+- **[PageBuilderLazyLoading](https://github.com/magento-devdocs/pagebuilder-examples/tree/master/Example/PageBuilderLazyLoading)** — This module shows how to add lazy loading behavior to the Image content type. For this example, we use the [lazysizes](https://github.com/aFarkas/lazysizes) loader. Created by @bruce on [#pagebuilder](https://app.slack.com/client/T4YUW69CM/CHB455HPF).
+- **[DeactivatingPageBuilder](https://github.com/magento-devdocs/pagebuilder-examples/tree/master/Example/DeactivatingPageBuilder)** — This example module shows you how to disable Page Builder for a particular page in Magento, specifically Pages, Blocks, and Dynamic Blocks. Created by @bruce on [#pagebuilder](https://app.slack.com/client/T4YUW69CM/CHB455HPF).
+- **[PageBuilderExtensionBaseForms](https://github.com/magento-devdocs/pagebuilder-examples/tree/master/Example/PageBuilderExtensionBaseForms)** — This module shows you how to remove fields and fieldsets from Page Builder's built-in forms. Created by @bruce on [#pagebuilder](https://app.slack.com/client/T4YUW69CM/CHB455HPF).
+- **[PageBuilderExtensionText](https://github.com/magento-devdocs/pagebuilder-examples/tree/master/Example/PageBuilderExtensionText)** — This module shows you how to customize the Page Builder's Text toolbar, integrate your own theme's typography, and add TinyMCE's `code` plugin to the toolbar so you can view the HTML code directly. Created by @bruce on [#pagebuilder](https://app.slack.com/client/T4YUW69CM/CHB455HPF).
+- **[PageBuilderExtensionSlider](https://github.com/magento-devdocs/pagebuilder-examples/tree/master/Example/PageBuilderExtensionSlider)** — This module shows you how to add `centerMode` and `centerPadding` settings from the [slick carousel](https://kenwheeler.github.io/slick/) used by the Slider. Create by @bruce on [#pagebuilder](https://app.slack.com/client/T4YUW69CM/CHB455HPF).
+
 ## Example code for how-to topics
 
 **In Progress**. The how-to directories in the repo correspond to the how-to topics in this documentation. Each how-to directory provides the files and code changes featured in the how-to topics.
@@ -28,7 +36,7 @@ For example, the topic [How to add a custom toolbar](../how-to/how-to-add-custom
 
 ## Installation
 
-Assuming you have Page Builder 1.0.0 already installed, you can install the example modules as follows:
+Assuming you have Page Builder already installed, you can install the example modules as follows:
 
 1. Clone the pagebuilder-examples repo:
 
diff --git a/docs/reference/architecture.md b/docs/reference/architecture.md
@@ -130,7 +130,7 @@ For example:
 
 Page Builder stores data for content types in a simple object called the DataStore: `Magento_PageBuilder/js/data-store`.
 
-The name parameter from the [content type configuration](configurations.md) (or storage_key if specified) is the name of a parameter in the DataStore. You can use the subscribe method to listen for changes in the DataStore and perform custom actions like updating the UI.
+The `name` parameter from the [content type configuration](configurations.md) (or `storage_key` if specified) is the name of a parameter in the DataStore. You can use the `subscribe` method to listen for changes in the `DataStore` and perform custom actions like updating the UI.
 
 This is how the system binds the data from the DataStore to your elements attribute or style. When you include a new attribute or style, you must specify where it should retrieve its data from the content type. These `name` values normally bind to the field names within UI component forms. The field names are the keys we use to save the data.
 
diff --git a/docs/reference/data-store.md b/docs/reference/data-store.md
@@ -26,25 +26,25 @@ dataStore.subscribe(() => {
 
 ## API
 
-#### `get(key: string, defaultValue?: any): any`
+### `get(key: string, defaultValue?: any): any`
 
 Retrieve a single value from the content type's data store based on its key. You can provide an optional default value if no data is present.
 
-#### `getState(): object`
+### `getState(): object`
 
 Get the entire state object for the current content type instance.
 
-#### `set(key: string, value: any): void`
+### `set(key: string, value: any): void`
 
 Set a single piece of data into the content type's data store.
 
-#### `setState(): void`
+### `setState(): void`
 
 Set the entire state for the current content type.
 
 ## Usage
 
-You can use the data store to modify your content type when its data changes. For example, the Page Builder native [Tabs content type](magento2-page-builder/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/preview.ts) subscribes to the data store and makes updates to it when a tab-item changes, as show here in TypeScript:
+You can use the data store to modify your content type when its data changes. For example, the Page Builder native Tabs content type (magento2-page-builder/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/preview.ts) subscribes to the data store and makes updates to it when a tab-item changes, as show here in TypeScript:
 
 ```typescript
 ...
