@churchapps/apphelper 0.2.98 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/markdownEditor/MarkdownPreviewLight.d.ts.map +1 -1
- package/dist/components/markdownEditor/MarkdownPreviewLight.js +11 -7
- package/dist/components/markdownEditor/MarkdownPreviewLight.js.map +1 -1
- package/package.json +1 -1
- package/src/components/markdownEditor/MarkdownPreviewLight.tsx +9 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkdownPreviewLight.d.ts","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MarkdownPreviewLight.d.ts","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":"AAEA,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,2CAyCpF"}
|
|
@@ -4,8 +4,6 @@ exports.MarkdownPreviewLight = void 0;
|
|
|
4
4
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
5
|
const marked_1 = require("marked");
|
|
6
6
|
function MarkdownPreviewLight({ value: markdownString = "", textAlign }) {
|
|
7
|
-
if (markdownString === null || markdownString === undefined)
|
|
8
|
-
return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
|
|
9
7
|
const getTargetAndClasses = (extra) => {
|
|
10
8
|
let result = "";
|
|
11
9
|
const classRegex = /\.[^( |\})]+/g;
|
|
@@ -26,10 +24,12 @@ function MarkdownPreviewLight({ value: markdownString = "", textAlign }) {
|
|
|
26
24
|
// \{([^\}]+)\} - target and classes
|
|
27
25
|
// \[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\} - full
|
|
28
26
|
const getSpecialLinks = (markdownString) => {
|
|
27
|
+
if (!markdownString)
|
|
28
|
+
return "";
|
|
29
29
|
const regex = /\[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\}/g;
|
|
30
30
|
const convertedText = markdownString.replace(regex, (match, text, url, extra) => {
|
|
31
31
|
if (!match)
|
|
32
|
-
return
|
|
32
|
+
return text;
|
|
33
33
|
let result = "<a href=\"" + url + "\"";
|
|
34
34
|
result += getTargetAndClasses(extra);
|
|
35
35
|
result += ">" + text + "</a>";
|
|
@@ -37,10 +37,14 @@ function MarkdownPreviewLight({ value: markdownString = "", textAlign }) {
|
|
|
37
37
|
});
|
|
38
38
|
return convertedText;
|
|
39
39
|
};
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
if (markdownString === null || markdownString === undefined || !markdownString)
|
|
41
|
+
return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
|
|
42
|
+
else {
|
|
43
|
+
const convertedText = getSpecialLinks(markdownString || "");
|
|
44
|
+
const html = marked_1.marked.parse(convertedText || "");
|
|
45
|
+
const style = (textAlign) ? { textAlign } : {};
|
|
46
|
+
return (0, jsx_runtime_1.jsx)("div", { style: style, dangerouslySetInnerHTML: { __html: html } });
|
|
47
|
+
}
|
|
44
48
|
}
|
|
45
49
|
exports.MarkdownPreviewLight = MarkdownPreviewLight;
|
|
46
50
|
//# sourceMappingURL=MarkdownPreviewLight.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkdownPreviewLight.js","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":";;;;AAAA,mCAA8B;
|
|
1
|
+
{"version":3,"file":"MarkdownPreviewLight.js","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":";;;;AAAA,mCAA8B;AAO9B,SAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,cAAc,GAAG,EAAE,EAAE,SAAS,EAAS;IAEnF,MAAM,mBAAmB,GAAG,CAAC,KAAa,EAAE,EAAE;QAC5C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,UAAU,GAAG,eAAe,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACvC,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,IAAI,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACtC,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,IAAI,CAAC;SACvC;QACD,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,IAAI,CAAC,cAAc;YAAE,OAAO,EAAE,CAAC;QAC/B,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,IAAI,CAAC;YACxB,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,IAAI,cAAc,KAAK,IAAI,IAAI,cAAc,KAAK,SAAS,IAAI,CAAC,cAAc;QAAE,OAAO,kDAAK,CAAC;SACxF;QACH,MAAM,aAAa,GAAG,eAAe,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,eAAM,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC,CAAA;QAC9C,MAAM,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAC,SAAS,EAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC5C,OAAO,gCAAK,KAAK,EAAE,KAAK,EAAE,uBAAuB,EAAE,EAAC,MAAM,EAAE,IAAc,EAAC,GAAQ,CAAA;KACpF;AACH,CAAC;AAzCD,oDAyCC"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {marked} from "marked";
|
|
2
|
-
import React from "react";
|
|
3
2
|
|
|
4
3
|
interface Props {
|
|
5
4
|
value: string;
|
|
@@ -7,7 +6,6 @@ interface Props {
|
|
|
7
6
|
}
|
|
8
7
|
|
|
9
8
|
export function MarkdownPreviewLight({ value: markdownString = "", textAlign }: Props) {
|
|
10
|
-
if (markdownString === null || markdownString === undefined) return <></>;
|
|
11
9
|
|
|
12
10
|
const getTargetAndClasses = (extra: string) => {
|
|
13
11
|
let result = "";
|
|
@@ -29,9 +27,10 @@ export function MarkdownPreviewLight({ value: markdownString = "", textAlign }:
|
|
|
29
27
|
// \{([^\}]+)\} - target and classes
|
|
30
28
|
// \[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\} - full
|
|
31
29
|
const getSpecialLinks = (markdownString: string) => {
|
|
30
|
+
if (!markdownString) return "";
|
|
32
31
|
const regex = /\[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\}/g;
|
|
33
32
|
const convertedText = markdownString.replace(regex, (match, text, url, extra) => {
|
|
34
|
-
if (!match) return
|
|
33
|
+
if (!match) return text;
|
|
35
34
|
let result = "<a href=\"" + url + "\"";
|
|
36
35
|
result += getTargetAndClasses(extra);
|
|
37
36
|
result += ">" + text + "</a>";
|
|
@@ -40,8 +39,11 @@ export function MarkdownPreviewLight({ value: markdownString = "", textAlign }:
|
|
|
40
39
|
return convertedText
|
|
41
40
|
}
|
|
42
41
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
42
|
+
if (markdownString === null || markdownString === undefined || !markdownString) return <></>;
|
|
43
|
+
else {
|
|
44
|
+
const convertedText = getSpecialLinks(markdownString || "");
|
|
45
|
+
const html = marked.parse(convertedText || "")
|
|
46
|
+
const style = (textAlign) ? {textAlign} : {}
|
|
47
|
+
return <div style={style} dangerouslySetInnerHTML={{__html: html as string}}></div>
|
|
48
|
+
}
|
|
47
49
|
}
|