[EngCom] Public Pull Requests - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js

@@ -20,6 +20,7 @@ define([
     return Abstract.extend({
         defaults: {
             elementSelector: 'textarea',
+            suffixRegExpPattern: '\\${ \\$.wysiwygUniqueSuffix }',
             $wysiwygEditorButton: '',
             links: {
                 value: '${ $.provider }:${ $.dataScope }'
@@ -60,6 +61,25 @@ define([
             return this;
         },
 
+        /** @inheritdoc */
+        initConfig: function (config) {
+            var pattern = config.suffixRegExpPattern || this.constructor.defaults.suffixRegExpPattern;
+
+            config.content = config.content.replace(new RegExp(pattern, 'g'), this.getUniqueSuffix(config));
+            this._super();
+
+            return this;
+        },
+
+        /**
+         * Build unique id based on name, underscore separated.
+         *
+         * @param {Object} config
+         */
+        getUniqueSuffix: function (config) {
+            return config.name.replace(/(\.|-)/g, '_');
+        },
+
         /**
          * @inheritdoc
          */

lib/internal/Magento/Framework/Data/Form/Element/Editor.php

@@ -542,4 +542,13 @@ protected function getInlineJs($jsSetupObject, $forceLoad)
                 </script>';
         return $jsString;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getHtmlId()
+    {
+        $suffix = $this->getConfig('dynamic_id') ? '${ $.wysiwygUniqueSuffix }' : '';
+        return parent::getHtmlId() . $suffix;
+    }
 }