Merge branch 'MC-1405' of github.com:magento-trigger/magento2-page-builder into MC-1405

Author: nathanjosiah

app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php

@@ -106,13 +106,13 @@ private function removeScriptTags(array $directiveResult): array
     {
         $dom = new \DOMDocument();
         try {
+            //this code is required because of https://bugs.php.net/bug.php?id=60021
+            $previous = libxml_use_internal_errors(true);
             $dom->loadHTML($directiveResult['content']);
         } catch (\Exception $e) {
             $this->loggerInterface->critical($e->getMessage());
-            return [
-                'error' => __('The block cannot be displayed because it contains errors.')
-            ];
         }
+        libxml_use_internal_errors($previous);
         foreach (iterator_to_array($dom->getElementsByTagName('script')) as $item) {
             $item->parentNode->removeChild($item);
         }

app/code/Magento/PageBuilder/docs/content-type-configuration.md

@@ -37,6 +37,8 @@
 @icon-pagebuilder-align-right__content: '\e91c';
 @icon-pagebuilder-variable__content: '\e917';
 @icon-pagebuilder-widgets__content: '\e918';
+@icon-pagebuilder-show__content: '\e91f';
+@icon-pagebuilder-hide__content: '\e920';
 
 .icon-pagebuilder-accordion:before {
     content: @icon-pagebuilder-accordion__content;
@@ -168,6 +170,14 @@
     content: @icon-pagebuilder-widgets__content;
 }
 
+.icon-pagebuilder-show:before {
+    content: @icon-pagebuilder-show__content;
+}
+
+.icon-pagebuilder-hide:before {
+    content: @icon-pagebuilder-hide__content;
+}
+
 .icon-admin-pagebuilder-remove {
     .abs-icon;
     &:before {

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_icons.less

@@ -152,6 +152,30 @@
         }
     }
 
+    &:before {
+        &:extend(.pagebuilder-icon all);
+        -moz-transition: opacity 200ms, top 200ms, visibility 200ms;
+        -o-transition: opacity 200ms, top 200ms, visibility 200ms;
+        -webkit-transition: opacity 200ms, top 200ms, visibility 200ms;
+        align-items: center;
+        background: rgba(238, 238, 238, .7);
+        color: @color-gray65;
+        content: @icon-pagebuilder-hide__content;
+        display: flex;
+        font-size: 3.5em;
+        height: 100%;
+        justify-content: center;
+        left: 0;
+        line-height: 0;
+        opacity: 0;
+        position: absolute;
+        text-shadow: 0 0 25px rgba(238, 238, 238, .7);
+        top: 0;
+        transition: opacity 200ms, top 200ms, visibility 200ms;
+        visibility: hidden;
+        width: 100%;
+        z-index: 15;
+    }
 }
 
 .no-user-select {
@@ -560,3 +584,21 @@
         }
     }
 }
+
+.pagebuilder-content-type-hidden {
+    .pagebuilder-system-border-hover {
+        z-index: 10;
+    }
+    .pagebuilder-display-label {
+        z-index: 12;
+    }
+    > .pagebuilder-content-type:before {
+        opacity: 1;
+        visibility: visible;
+    }
+    .pagebuilder-drop-indicator,
+    .pagebuilder-content-type.type-container.empty-container > .content-type-container:before {
+        opacity: 0 !important;
+        visibility: hidden !important;
+    }
+}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less

@@ -21,26 +21,6 @@
             font-weight: lighter;
         }
     }
-    > div:first-child {
-        &:before {
-            content: '';
-            height: 100%;
-            opacity: .7;
-            position: absolute;
-            -moz-transition: background-color 500ms ease;
-            -o-transition: background-color 500ms ease;
-            -webkit-transition: background-color 500ms ease;
-            transition: background-color 500ms ease;
-            width: 100%;
-            z-index: 10;
-        }
-
-        &:hover {
-            &:before {
-                background-color: @color-gray98;
-            }
-        }
-    }
     .rendered-content {
         min-height: 50px;
         pointer-events: none;