From 72b018355bfdf771fc1d0ede1250c8dc8901473d Mon Sep 17 00:00:00 2001 From: Pavel Dohnal Date: Fri, 24 Sep 2021 13:59:51 +0200 Subject: [PATCH] Update code after react replace string upgrade [MAILPOET-3724] --- .../email_opens_absolute_count.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/assets/js/src/segments/dynamic/dynamic_segments_filters/email_opens_absolute_count.tsx b/assets/js/src/segments/dynamic/dynamic_segments_filters/email_opens_absolute_count.tsx index 09b0fafdac..08f52f81ee 100644 --- a/assets/js/src/segments/dynamic/dynamic_segments_filters/email_opens_absolute_count.tsx +++ b/assets/js/src/segments/dynamic/dynamic_segments_filters/email_opens_absolute_count.tsx @@ -1,5 +1,4 @@ import React, { useEffect } from 'react'; -import ReactStringReplace from 'react-string-replace'; import { useSelect, useDispatch } from '@wordpress/data'; import { Grid } from 'common/grid'; @@ -17,6 +16,12 @@ function replaceElementsInDaysSentence(fn): JSX.Element[] { .map(fn); } +function replaceEmailActionOpensSentence(fn): JSX.Element[] { + return MailPoet.I18n.t('emailActionOpensSentence') + .split(/({condition})|({opens})|(\b[a-zA-Z]+\b)/gim) + .map(fn); +} + type Props = { filterIndex: number; } @@ -37,10 +42,7 @@ export const EmailOpensAbsoluteCountFields: React.FunctionComponent = ({ return ( <> - {ReactStringReplace( - MailPoet.I18n.t('emailActionOpensSentence'), - // ReactStringReplace is buggy, a simpler version of this regex doesn't work - /({condition})|( )|({opens})|( )|(\b[a-zA-Z]+\b)/gim, + {replaceEmailActionOpensSentence( (match) => { if (match === '{condition}') { return (