fix: focus the fix in how typography handle dynamic content

Author: Arukuen

src/block-components/typography/edit.js

@@ -116,11 +116,12 @@ export const Controls = props => {
 					value={ unescape( text ) }
 					onChange={ onChangeContent }
 					/**
-					 * Pass the unescaped Dynamic Content `onChange` function.
+					 * Dynamic Content generates this markup itself. Preserve it because
+					 * HTML validation normalizes string ampersands in its attribute.
 					 *
 					 * @param {string} text Text with dynamic content.
 					 */
-					changeDynamicContent={ onChangeContent }
+					changeDynamicContent={ text => updateAttribute( 'text', text ) }
 					isDynamic={ true }
 				/>
 			) }

src/components/dynamic-content-control/index.js

@@ -15,7 +15,6 @@ import { QueryLoopContext } from '~stackable/higher-order/with-query-loop-contex
  */
 import { __ } from '@wordpress/i18n'
 import { useBlockEditContext } from '@wordpress/block-editor'
-import { escapeAttribute } from '@wordpress/escape-html'
 import {
 	Button,
 	TextControl,
@@ -123,10 +122,8 @@ export const useDynamicContentControlProps = props => {
 
 	const onChange = ( newValue, editorQueryString, frontendQueryString ) => {
 		// If `isFormatType` is true, the onChange function will generate a `stackable/dynamic-content` format type.
-		// Custom date formats add query parameters with "&"" character. Escape it so
-		// HTML validation in Typography preserves this as markup, not text.
 		const willChangeValue = props.isFormatType
-			? `<span data-stk-dynamic="${ escapeAttribute( frontendQueryString ) }" contenteditable="false" class="stk-dynamic-content">${ newValue }</span>`
+			? `<span data-stk-dynamic="${ frontendQueryString }" contenteditable="false" class="stk-dynamic-content">${ newValue }</span>`
 			: `!#stk_dynamic/${ frontendQueryString }!#`
 
 		props.onChange( willChangeValue )