@griddo/ax 1.75.210 → 1.75.212

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.75.210",
+  "version": "1.75.212",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -235,5 +235,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2b9df0e7e16083025b24814e8952c45078a732a8"
+  "gitHead": "ea263310a45b718e25b02b662d57d6dd3c341f02"
 }

package/src/components/Fields/RichText/index.tsx

@@ -5,7 +5,7 @@ import { markdownToDraft, draftToMarkdown } from "markdown-draft-js";
 import draftToHtml from "draftjs-to-html";
 import htmlToDraft from "html-to-draftjs";
 import { stateFromHTML } from "draft-js-import-html";
-import { formatIframe, customEntityTransformFunc } from "./utils";
+import { formatIframe } from "./utils";
 import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css";
 
 import * as S from "./style";
@@ -50,11 +50,7 @@ const RichText = (props: IRichTextProps): JSX.Element => {
     const plainContent = content.getPlainText();
     const rawObject = convertToRaw(content);
     const markdownString =
-      plainContent === ""
-        ? plainContent
-        : html
-        ? formatIframe(draftToHtml(rawObject, undefined, undefined, customEntityTransformFunc))
-        : draftToMarkdown(rawObject);
+      plainContent === "" ? plainContent : html ? formatIframe(draftToHtml(rawObject)) : draftToMarkdown(rawObject);
 
     onChange(markdownString);
     error && handleValidation && handleValidation(plainContent);
@@ -64,9 +60,7 @@ const RichText = (props: IRichTextProps): JSX.Element => {
     const content = stateFromHTML(pastedValue);
     setEditorState(() => EditorState.createWithContent(content));
     const rawObject = convertToRaw(content);
-    const markdownString = html
-      ? formatIframe(draftToHtml(rawObject, undefined, undefined, customEntityTransformFunc))
-      : draftToMarkdown(rawObject);
+    const markdownString = html ? formatIframe(draftToHtml(rawObject)) : draftToMarkdown(rawObject);
 
     onChange(markdownString);
     return false;

package/src/components/Fields/RichText/utils.tsx

@@ -1,19 +1,6 @@
-import { DraftEntityMutability, DraftEntityType } from "draft-js";
-
-type DraftEntity = {
-  type: DraftEntityType;
-  mutability: DraftEntityMutability;
-  data: any;
-};
-const customEntityTransformFunc = (entity: DraftEntity, text: string): string | undefined => {
-  if (entity.type === "LINK" && entity.data.href) {
-    return entity.data.url;
-  }
-  return `<a href="${entity.data.url}" target="${entity.data.targetOption}">${text}</a>`;
-};
-
 const formatIframe = (iframeToFormat: string, firstConversion?: boolean) => {
-  let iframeFormatted = iframeToFormat;
+  let iframeFormatted: string = iframeToFormat;
+
   if (firstConversion) {
     if (iframeFormatted.match(/<iframe[^>]*?(?:\/>|>[^<]*?<\/iframe>)/g)) {
       iframeFormatted = iframeToFormat.replaceAll("<iframe", "&lt;iframe");
@@ -25,9 +12,19 @@ const formatIframe = (iframeToFormat: string, firstConversion?: boolean) => {
       iframeFormatted = iframeFormatted.replaceAll("&gt;&lt;/iframe&gt;", "></iframe>");
       iframeFormatted = iframeFormatted.replace(/&quot;/g, '"');
       iframeFormatted = iframeFormatted.replace(/&amp;/g, "&");
+
+      const urlFromIframe: string =
+        iframeFormatted.split("src=")[1].split(/"/g)[1] === "<a href="
+          ? iframeFormatted.split("src=")[1].split(/"/g)[2]
+          : iframeFormatted.split("src=")[1].split(/"/g)[1];
+
+      iframeFormatted = iframeFormatted.replace(
+        /(src="|src='|src=”<a.*?>).*?(<\/a>'|<\/a>"|<\/a>”)/,
+        `src="${urlFromIframe}"`
+      );
     }
   }
   return iframeFormatted;
 };
 
-export { formatIframe, customEntityTransformFunc };
+export { formatIframe };