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

@@ -8,6 +8,8 @@
 
 namespace Magento\PageBuilder\Model\Stage\Renderer;
 
+use Psr\Log\LoggerInterface;
+
 /**
  * Renders a CMS Block for the stage
  *
@@ -26,18 +28,25 @@ class CmsStaticBlock implements \Magento\PageBuilder\Model\Stage\RendererInterfa
     private $widgetDirectiveRenderer;
 
     /**
-     * Constructor
+     * @var LoggerInterface
+     */
+    private $loggerInterface;
+
+    /**
+     * CmsStaticBlock constructor.
      *
-     * @param WidgetDirective $widgetDirectiveRenderer
      * @param \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory
+     * @param WidgetDirective $widgetDirectiveRenderer
+     * @param LoggerInterface $loggerInterface
      */
     public function __construct(
+        \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory,
         WidgetDirective $widgetDirectiveRenderer,
-        \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory
+        LoggerInterface $loggerInterface
     ) {
-
         $this->blockCollectionFactory = $blockCollectionFactory;
         $this->widgetDirectiveRenderer = $widgetDirectiveRenderer;
+        $this->loggerInterface = $loggerInterface;
     }
 
     /**
@@ -79,12 +88,37 @@ public function render(array $params): array
 
         if ($block->isActive()) {
             $directiveResult = $this->widgetDirectiveRenderer->render($params);
-            $result['content'] = $directiveResult['content'];
-            $result['error'] = $directiveResult['error'];
+            $result = $this->removeScriptTags($directiveResult);
         } else {
             $result['error'] = __('Block disabled');
         }
 
         return $result;
     }
+
+    /**
+     * Remove script tag from html
+     *
+     * @param array $directiveResult
+     * @return array
+     */
+    private function removeScriptTags(array $directiveResult): array
+    {
+        $dom = new \DOMDocument();
+        try {
+            $dom->loadHTML($directiveResult['content']);
+        } catch (\Exception $e) {
+            $this->loggerInterface->critical($e->getMessage());
+            return [
+                'error' => __('The block cannot be displayed because it contains errors.')
+            ];
+        }
+        foreach (iterator_to_array($dom->getElementsByTagName('script')) as $item) {
+            $item->parentNode->removeChild($item);
+        }
+        return [
+            'content' => $dom->saveHTML(),
+            'error' => $directiveResult['error']
+        ];
+    }
 }

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

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

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

@@ -18,6 +18,7 @@
         color: @color-gray65-lighten;
         font-size: 80px;
     }
+    div[data-role='video'],
     .pagebuilder-video {
         display: flex;
 

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/preview.html

@@ -7,9 +7,12 @@
 
 <div class="pagebuilder-content-type pagebuilder-block" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
     <div attr="data.main.attributes" ko-style="data.main.style" css="data.main.css">
-        <div if="displayPreview" class="rendered-content" html="data.main.html" afterRender="initializeWidgets"></div>
-        <div ifnot="displayPreview" class="pagebuilder-block-placeholder">
-            <span class="placeholder-text" text="placeholderText"/>
+        <div class="pagebuilder-block-wrapper">
+            <div class="pagebuilder-block-overlay"></div>
+            <div if="displayPreview" class="rendered-content" html="data.main.html" afterRender="initializeWidgets"></div>
+            <div ifnot="displayPreview" class="pagebuilder-block-placeholder">
+                <span class="placeholder-text" text="placeholderText"/>
+            </div>
         </div>
     </div>
     <div data-role="spinner"