Merge remote-tracking branch 'magento-l3/ACP2E-17' into L3_PR_21-12-10

Author: veloraven

app/code/Magento/PageBuilder/view/adminhtml/web/js/mass-converter/widget-directive-abstract.js

@@ -19,7 +19,7 @@ export default class WidgetDirectiveAbstract implements ConverterInterface {
         let attributes: object = {};
 
         get<string>(data, config.html_variable)
-            .replace(/\{\{widget(.*?)\}\}/i, ((match: string, attributeString: string) => {
+            .replace(/\{\{widget([\S\s]*?)\}\}/i, ((match: string, attributeString: string) => {
                 attributes = this.parseAttributesString(attributeString);
             }).bind(this));
 

app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.js

@@ -107,7 +107,7 @@ function convertVariablesToHtmlPreview(content: string) {
 function convertWidgetsToHtmlPreview(content: string) {
     const config = Config.getConfig("tinymce").widgets;
 
-    return content.replace(/\{\{widget(.*?)\}\}/ig, (match, widgetBody) => {
+    return content.replace(/\{\{widget([\S\s]*?)\}\}/ig, (match, widgetBody) => {
         const attributes = parseAttributesString(widgetBody);
         let imageSrc;
 
@@ -431,7 +431,7 @@ function normalizeTableCellSelection(range: Range): Range {
  * @returns {string}
  */
 export function escapeDoubleQuoteWithinWidgetDirective(content: string): string {
-    return content.replace(/\{\{widget.*?\}\}/ig,  (match: string) => {
+    return content.replace(/\{\{widget[\S\s]*?\}\}/ig,  (match: string) => {
         return match.replace(/"/g, "\\\"");
     });
 }
@@ -443,7 +443,7 @@ export function escapeDoubleQuoteWithinWidgetDirective(content: string): string
  * @returns {string}
  */
 export function unescapeDoubleQuoteWithinWidgetDirective(content: string): string {
-    return content.replace(/\{\{widget.*?\}\}/ig,  (match: string) => {
+    return content.replace(/\{\{widget[\S\s]*?\}\}/ig,  (match: string) => {
         return match.replace(/\\+"/g, """);
     });
 }

app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/nesting-widget-dialog.js

@@ -28,7 +28,7 @@ export default function nestingWidgetDialog(
     const dataStoreContent = dataStore.getState() as DataObject;
     const inlineMessage = dataStoreContent[inlineMessageField] as string;
     const linkUrl = dataStoreContent[linkUrlField] as FieldDefaultsInterface;
-    const widgetRegex = /\{\{widget(.*?)\}\}/ig;
+    const widgetRegex = /\{\{widget([\S\s]*?)\}\}/ig;
     const widgetPlaceholderRegex = /<span.*(class=)(\"|\').*((magento-placeholder).*(magento-widget)|(magento-widget).*(magento-placeholder)).*<\/span>/igm;
 
     if (wysiwyg &&