@churchapps/apphelper 0.2.57 → 0.2.58

package/dist/components/markdownEditor/MarkdownPreviewLight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkdownPreviewLight.d.ts","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,UAAU,KAAK;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAA;CACxC;AAED,wBAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,cAAmB,EAAE,SAAS,EAAE,EAAE,KAAK,qBAKpF"}
+{"version":3,"file":"MarkdownPreviewLight.d.ts","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,UAAU,KAAK;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAA;CACxC;AAED,wBAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,cAAmB,EAAE,SAAS,EAAE,EAAE,KAAK,qBAiCpF"}

package/dist/components/markdownEditor/MarkdownPreviewLight.js

@@ -7,7 +7,35 @@ exports.MarkdownPreviewLight = void 0;
 const marked_1 = require("marked");
 const react_1 = __importDefault(require("react"));
 function MarkdownPreviewLight({ value: markdownString = "", textAlign }) {
-    const html = marked_1.marked.parse(markdownString || "");
+    const getTargetAndClasses = (extra) => {
+        const classRegex = /\.[^( |\})]+/g;
+        let classes = extra.match(classRegex).join(" ");
+        classes = classes.replaceAll(".", "");
+        let result = " class=\"" + classes + "\"";
+        const targetRegex = /:target="([^"]+)"/g;
+        let targets = targetRegex.exec(extra);
+        if (targets)
+            result += " " + targets[0].replace(":", "");
+        return result;
+    };
+    // \[([^\]]+)\] - text
+    // \(([^)]+)\) - url
+    // \{([^\}]+)\} - target and classes
+    // \[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\} - full
+    const getSpecialLinks = (markdownString) => {
+        const regex = /\[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\}/g;
+        const convertedText = markdownString.replace(regex, (match, text, url, extra) => {
+            if (!match)
+                return "";
+            let result = "<a href=\"" + url + "\"";
+            result += getTargetAndClasses(extra);
+            result += ">" + text + "</a>";
+            return result;
+        });
+        return convertedText;
+    };
+    const convertedText = getSpecialLinks(markdownString);
+    const html = marked_1.marked.parse(convertedText || "");
     const style = (textAlign) ? { textAlign } : {};
     return react_1.default.createElement("div", { style: style, dangerouslySetInnerHTML: { __html: html } });
 }

package/dist/components/markdownEditor/MarkdownPreviewLight.js.map

@@ -1 +1 @@
-{"version":3,"file":"MarkdownPreviewLight.js","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":";;;;;;AAAA,mCAA8B;AAC9B,kDAA0B;AAO1B,SAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,cAAc,GAAG,EAAE,EAAE,SAAS,EAAS;IACnF,MAAM,IAAI,GAAG,eAAM,CAAC,KAAK,CAAC,cAAc,IAAI,EAAE,CAAC,CAAA;IAC/C,MAAM,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAC,SAAS,EAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC5C,OAAO,uCAAK,KAAK,EAAE,KAAK,EAAE,uBAAuB,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,GAAQ,CAAA;AAE3E,CAAC;AALD,oDAKC"}
+{"version":3,"file":"MarkdownPreviewLight.js","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":";;;;;;AAAA,mCAA8B;AAC9B,kDAA0B;AAO1B,SAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,cAAc,GAAG,EAAE,EAAE,SAAS,EAAS;IAEnF,MAAM,mBAAmB,GAAG,CAAC,KAAa,EAAE,EAAE;QAC5C,MAAM,UAAU,GAAG,eAAe,CAAC;QACnC,IAAI,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChD,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACtC,IAAI,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,IAAI,CAAC;QAC1C,MAAM,WAAW,GAAG,oBAAoB,CAAC;QACzC,IAAI,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,OAAO;YAAE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAA;IAED,sBAAsB;IACtB,oBAAoB;IACpB,oCAAoC;IACpC,6CAA6C;IAC7C,MAAM,eAAe,GAAG,CAAC,cAAsB,EAAE,EAAE;QACjD,MAAM,KAAK,GAAG,sCAAsC,CAAC;QACrD,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;YAC9E,IAAI,CAAC,KAAK;gBAAE,OAAO,EAAE,CAAC;YACtB,IAAI,MAAM,GAAG,YAAY,GAAG,GAAG,GAAG,IAAI,CAAC;YACvC,MAAM,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,IAAI,GAAG,GAAG,IAAI,GAAG,MAAM,CAAC;YAC9B,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,OAAO,aAAa,CAAA;IACtB,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,eAAM,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC,CAAA;IAC9C,MAAM,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAC,SAAS,EAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC5C,OAAO,uCAAK,KAAK,EAAE,KAAK,EAAE,uBAAuB,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,GAAQ,CAAA;AAC3E,CAAC;AAjCD,oDAiCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@churchapps/apphelper",
-  "version": "0.2.57",
+  "version": "0.2.58",
   "description": "Library of helper functions for React and NextJS ChurchApps",
   "main": "dist/index.js",
   "scripts": {

package/src/components/markdownEditor/MarkdownPreviewLight.tsx

@@ -7,8 +7,36 @@ interface Props {
 }
 
 export function MarkdownPreviewLight({ value: markdownString = "", textAlign }: Props) {
-  const html = marked.parse(markdownString || "")
+
+  const getTargetAndClasses = (extra: string) => {
+    const classRegex = /\.[^( |\})]+/g;
+    let classes = extra.match(classRegex).join(" ");
+    classes = classes.replaceAll(".", "");
+    let result = " class=\"" + classes + "\"";
+    const targetRegex = /:target="([^"]+)"/g;
+    let targets = targetRegex.exec(extra);
+    if (targets) result += " " + targets[0].replace(":", "");
+    return result;
+  }
+
+  // \[([^\]]+)\] - text
+  // \(([^)]+)\) - url
+  // \{([^\}]+)\} - target and classes
+  // \[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\} - full
+  const getSpecialLinks = (markdownString: string) => {
+    const regex = /\[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\}/g;
+    const convertedText = markdownString.replace(regex, (match, text, url, extra) => {
+      if (!match) return "";
+      let result = "<a href=\"" + url + "\"";
+      result += getTargetAndClasses(extra);
+      result += ">" + text + "</a>";
+      return result;
+    });
+    return convertedText
+  }
+
+  const convertedText = getSpecialLinks(markdownString);
+  const html = marked.parse(convertedText || "")
   const style = (textAlign) ? {textAlign} : {}
   return <div style={style} dangerouslySetInnerHTML={{__html: html}}></div>
-
 }