@churchapps/apphelper 0.2.97 → 0.2.99

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.
Files changed (6) hide show
  1. package/dist/components/markdownEditor/MarkdownPreviewLight.d.ts +1 -1
  2. package/dist/components/markdownEditor/MarkdownPreviewLight.d.ts.map +1 -1
  3. package/dist/components/markdownEditor/MarkdownPreviewLight.js +9 -7
  4. package/dist/components/markdownEditor/MarkdownPreviewLight.js.map +1 -1
  5. package/package.json +2 -2
  6. package/src/components/markdownEditor/MarkdownPreviewLight.tsx +8 -7
package/dist/components/markdownEditor/MarkdownPreviewLight.d.ts CHANGED
@@ -2,6 +2,6 @@ interface Props {
2
2
  value: string;
3
3
  textAlign?: "left" | "center" | "right";
4
4
  }
5
- export declare function MarkdownPreviewLight({ value: markdownString, textAlign }: Props): "" | import("react/jsx-runtime").JSX.Element;
5
+ export declare function MarkdownPreviewLight({ value: markdownString, textAlign }: Props): import("react/jsx-runtime").JSX.Element;
6
6
  export {};
7
7
  //# sourceMappingURL=MarkdownPreviewLight.d.ts.map
package/dist/components/markdownEditor/MarkdownPreviewLight.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MarkdownPreviewLight.d.ts","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":"AAGA,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,gDAsCpF"}
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,2CAwCpF"}
package/dist/components/markdownEditor/MarkdownPreviewLight.js CHANGED
@@ -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 "";
9
7
  const getTargetAndClasses = (extra) => {
10
8
  let result = "";
11
9
  const classRegex = /\.[^( |\})]+/g;
@@ -29,7 +27,7 @@ function MarkdownPreviewLight({ value: markdownString = "", textAlign }) {
29
27
  const regex = /\[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\}/g;
30
28
  const convertedText = markdownString.replace(regex, (match, text, url, extra) => {
31
29
  if (!match)
32
- return "";
30
+ return text;
33
31
  let result = "<a href=\"" + url + "\"";
34
32
  result += getTargetAndClasses(extra);
35
33
  result += ">" + text + "</a>";
@@ -37,10 +35,14 @@ function MarkdownPreviewLight({ value: markdownString = "", textAlign }) {
37
35
  });
38
36
  return convertedText;
39
37
  };
40
- const convertedText = getSpecialLinks(markdownString || "");
41
- const html = marked_1.marked.parse(convertedText || "");
42
- const style = (textAlign) ? { textAlign } : {};
43
- return (0, jsx_runtime_1.jsx)("div", { style: style, dangerouslySetInnerHTML: { __html: html } });
38
+ if (markdownString === null || markdownString === undefined || !markdownString)
39
+ return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
40
+ else {
41
+ const convertedText = getSpecialLinks(markdownString || "");
42
+ const html = marked_1.marked.parse(convertedText || "");
43
+ const style = (textAlign) ? { textAlign } : {};
44
+ return (0, jsx_runtime_1.jsx)("div", { style: style, dangerouslySetInnerHTML: { __html: html } });
45
+ }
44
46
  }
45
47
  exports.MarkdownPreviewLight = MarkdownPreviewLight;
46
48
  //# sourceMappingURL=MarkdownPreviewLight.js.map
package/dist/components/markdownEditor/MarkdownPreviewLight.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MarkdownPreviewLight.js","sourceRoot":"","sources":["../../../src/components/markdownEditor/MarkdownPreviewLight.tsx"],"names":[],"mappings":";;;;AAAA,mCAA8B;AAQ9B,SAAgB,oBAAoB,CAAC,EAAE,KAAK,EAAE,cAAc,GAAG,EAAE,EAAE,SAAS,EAAS;IACnF,IAAI,cAAc,KAAK,IAAI,IAAI,cAAc,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAEvE,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,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,IAAI,EAAE,CAAC,CAAC;IAC5D,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,gCAAK,KAAK,EAAE,KAAK,EAAE,uBAAuB,EAAE,EAAC,MAAM,EAAE,IAAc,EAAC,GAAQ,CAAA;AACrF,CAAC;AAtCD,oDAsCC"}
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,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;AAxCD,oDAwCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@churchapps/apphelper",
3
- "version": "0.2.97",
3
+ "version": "0.2.99",
4
4
  "description": "Library of helper functions for React and NextJS ChurchApps",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -37,7 +37,7 @@
37
37
  "react-router-dom": "^6.15.0"
38
38
  },
39
39
  "dependencies": {
40
- "@churchapps/helpers": "^1.0.27",
40
+ "@churchapps/helpers": "^1.0.28",
41
41
  "@emotion/cache": "^11.11.0",
42
42
  "@emotion/react": "^11.11.1",
43
43
  "@emotion/styled": "^11.11.0",
package/src/components/markdownEditor/MarkdownPreviewLight.tsx 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 = "";
@@ -31,7 +29,7 @@ export function MarkdownPreviewLight({ value: markdownString = "", textAlign }:
31
29
  const getSpecialLinks = (markdownString: string) => {
32
30
  const regex = /\[([^\]]+)\]\(([^)]+)\)\{([^\}]+)\}/g;
33
31
  const convertedText = markdownString.replace(regex, (match, text, url, extra) => {
34
- if (!match) return "";
32
+ if (!match) return text;
35
33
  let result = "<a href=\"" + url + "\"";
36
34
  result += getTargetAndClasses(extra);
37
35
  result += ">" + text + "</a>";
@@ -40,8 +38,11 @@ export function MarkdownPreviewLight({ value: markdownString = "", textAlign }:
40
38
  return convertedText
41
39
  }
42
40
 
43
- const convertedText = getSpecialLinks(markdownString || "");
44
- const html = marked.parse(convertedText || "")
45
- const style = (textAlign) ? {textAlign} : {}
46
- return <div style={style} dangerouslySetInnerHTML={{__html: html as string}}></div>
41
+ if (markdownString === null || markdownString === undefined || !markdownString) return <></>;
42
+ else {
43
+ const convertedText = getSpecialLinks(markdownString || "");
44
+ const html = marked.parse(convertedText || "")
45
+ const style = (textAlign) ? {textAlign} : {}
46
+ return <div style={style} dangerouslySetInnerHTML={{__html: html as string}}></div>
47
+ }
47
48
  }