fix: regex to match child content on block tags (#433)

VitaliiDC8 · web-flow · commit a4d4129af7d1 · 2023-06-28T12:37:30.000+02:00
* fix: regex to match child content on block tags

* fix: comment review
diff --git a/src/blocks/Header/Header.tsx b/src/blocks/Header/Header.tsx
@@ -121,21 +121,21 @@ export const HeaderBlock = (props: WithChildren<HeaderBlockFullProps>) => {
                             >
                                 <Col sizes={titleSizes} className={b('content-inner')}>
                                     {overtitle && (
-                                        <div className={b('overtitle')}>
+                                        <p className={b('overtitle')}>
                                             <HTML>{overtitle}</HTML>
-                                        </div>
+                                        </p>
                                     )}
                                     <h1 className={b('title')}>
                                         {status}
                                         <HTML>{title}</HTML>
                                     </h1>
                                     {description && (
-                                        <div className={b('description')}>
+                                        <p className={b('description')}>
                                             <YFMWrapper
                                                 content={description}
                                                 modifiers={{constructor: true}}
                                             />
-                                        </div>
+                                        </p>
                                     )}
                                     {buttons && (
                                         <div className={b('buttons')} data-qa="header-buttons">
diff --git a/src/utils/blocks.ts b/src/utils/blocks.ts
@@ -38,6 +38,8 @@ const BLOCK_ELEMENTS = [
     'td',
 ];
 
+const BLOCK_ELEMENTS_REGEX = `<(${BLOCK_ELEMENTS.join('|')})[^>]*>`;
+
 export function getHeaderTag(size: TextSize) {
     switch (size) {
         case 'l':
@@ -53,10 +55,8 @@ export function getHeaderTag(size: TextSize) {
 }
 
 export function hasBlockTag(content: string): boolean {
-    const blockElementRegex = `/<(${BLOCK_ELEMENTS.join('|')})\b[^>]*>/gi`;
-    const blockTags = content.match(blockElementRegex);
-
-    return Boolean(blockTags);
+    const regex = new RegExp(BLOCK_ELEMENTS_REGEX, 'g');
+    return regex.test(content);
 }
 
 export function getBlockKey(block: ConstructorBlock, index: number) {
