react-native-marked 1.1.4 → 1.1.5

package/dist/commonjs/lib/Parser.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _htmlEntities = require("html-entities");
+
 var _Renderer = _interopRequireDefault(require("./Renderer"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,16 +27,23 @@ class Parser {
       tokens.forEach(t => {
         /**
          * To avoid inlining images
+         * Currently supports images, link images
          * Note: to be extend for other token types
          */
-        if (t.type === 'image') {
+        if (t.type === 'image' || t.type === 'link' && t.tokens && t.tokens[0] && t.tokens[0].type === 'image') {
           const parsed = this.parseInline(tempTokens);
 
           if (parsed.length > 0) {
-            siblingNodes.push(this.renderer.getTextNode(this.parseInline(tempTokens), textStyle));
+            siblingNodes.push(this.renderer.getTextNode(parsed, textStyle));
+          }
+
+          if (t.type === 'image') {
+            siblingNodes.push(this.parseInline([t]));
+          } else if (t.type === 'link') {
+            const imageToken = t.tokens[0];
+            siblingNodes.push(this.renderer.getImageLinkNode(t.href, imageToken.href));
           }
 
-          siblingNodes.push(this.parseInline([t]));
           tempTokens = [];
           return;
         }
@@ -104,10 +113,8 @@ class Parser {
               const children = item.tokens.map(cItem => {
                 if (cItem.type === 'text') {
                   /* getViewNode since tokens could contain a block like elements (i.e. img) */
-                  const listChildren = this.getNormalizedSiblingNodesForBlockAndInlineTokens( // Note: Upstream types aren't available for this specific use-case
-                  // @types/marked (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/marked/index.d.ts)
-                  // @ts-ignore
-                  cItem.tokens, this.styles.li);
+                  const childTokens = cItem.tokens || [];
+                  const listChildren = this.getNormalizedSiblingNodesForBlockAndInlineTokens(childTokens, this.styles.li);
                   return this.renderer.getViewNode(listChildren, this.styles.li);
                 }
                 /* Parse the nested token */
@@ -141,11 +148,17 @@ class Parser {
 
         case 'link':
           {
+            if (token.tokens && token.tokens[0] && token.tokens[0].type === 'image') {
+              var _token$tokens$;
+
+              return this.renderer.getImageLinkNode(token.href, (_token$tokens$ = token.tokens[0]) === null || _token$tokens$ === void 0 ? void 0 : _token$tokens$.href);
+            }
+
             const linkStyle = { ...styles,
               ...this.styles.link // To override color property
 
             };
-            return this.renderer.getLinkNode(this.parseInline(token.tokens, linkStyle), token.href, linkStyle);
+            return this.renderer.getTextLinkNode(this.parseInline(token.tokens, linkStyle), token.href, linkStyle);
           }
 
         case 'image':
@@ -193,7 +206,7 @@ class Parser {
               return null;
             }
 
-            return this.renderer.getTextNode(token.raw, { ...this.styles.text,
+            return this.renderer.getTextNode((0, _htmlEntities.decode)(token.raw), { ...this.styles.text,
               ...styles
             });
           }

package/dist/commonjs/lib/Parser.js.map

@@ -1 +1 @@
-{"version":3,"names":["Parser","constructor","options","tokens","textStyle","tempTokens","siblingNodes","forEach","t","type","parsed","parseInline","length","push","renderer","getTextNode","styles","Renderer","headingStylesMap","h1","h2","h3","h4","h5","h6","parse","elements","map","token","paragraphChildren","getNormalizedSiblingNodesForBlockAndInlineTokens","text","getViewNode","paragraph","getBlockquoteNode","blockquote","depth","getCodeBlockNode","code","em","hr","li","items","item","children","cItem","listChildren","getListNode","ordered","list","filter","element","linkStyle","link","getLinkNode","href","getImageNode","boldStyle","strong","italicStyle","codespan","raw","trim","console","warn"],"sources":["Parser.tsx"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { marked } from 'marked';\nimport Renderer from './Renderer';\nimport type { MarkedStyles } from '../theme/types';\nimport type { CustomStyleProp, ParserOptions, TextStyleProp } from './types';\n\nclass Parser {\n  private renderer;\n  private styles: MarkedStyles;\n  private headingStylesMap: Record<number, TextStyleProp>;\n  constructor(options: ParserOptions) {\n    this.styles = { ...options.styles };\n    this.renderer = new Renderer();\n    this.headingStylesMap = {\n      1: this.styles.h1,\n      2: this.styles.h2,\n      3: this.styles.h3,\n      4: this.styles.h4,\n      5: this.styles.h5,\n      6: this.styles.h6,\n    };\n  }\n\n  parse(tokens: marked.Token[]) {\n    const elements: ReactNode[] = tokens.map((token) => {\n      switch (token.type) {\n        case 'space': {\n          return null;\n        }\n        case 'paragraph': {\n          const paragraphChildren =\n            this.getNormalizedSiblingNodesForBlockAndInlineTokens(\n              token.tokens,\n              this.styles.text\n            );\n\n          return this.renderer.getViewNode(\n            paragraphChildren,\n            this.styles.paragraph\n          );\n        }\n        case 'blockquote': {\n          return this.renderer.getBlockquoteNode(\n            this.parse(token.tokens),\n            this.styles.blockquote\n          );\n        }\n        case 'heading': {\n          const styles = this.headingStylesMap[token.depth] ?? this.styles.text;\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, styles),\n            styles\n          );\n        }\n        case 'code': {\n          return this.renderer.getCodeBlockNode(\n            token.text,\n            this.styles.code,\n            this.styles.em\n          );\n        }\n        case 'hr': {\n          return this.renderer.getViewNode(null, this.styles.hr);\n        }\n        case 'list': {\n          const li = token.items.map((item) => {\n            const children = item.tokens.map((cItem) => {\n              if (cItem.type === 'text') {\n                /* getViewNode since tokens could contain a block like elements (i.e. img) */\n                const listChildren =\n                  this.getNormalizedSiblingNodesForBlockAndInlineTokens(\n                    // Note: Upstream types aren't available for this specific use-case\n                    // @types/marked (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/marked/index.d.ts)\n                    // @ts-ignore\n                    cItem.tokens,\n                    this.styles.li\n                  );\n                return this.renderer.getViewNode(listChildren, this.styles.li);\n              }\n\n              /* Parse the nested token */\n              return this.parse([cItem]);\n            });\n            return this.renderer.getViewNode(children, this.styles.li);\n          });\n          return this.renderer.getListNode(\n            token.ordered,\n            li,\n            this.styles.list,\n            this.styles.li\n          );\n        }\n        default:\n          return this.parseInline([token]);\n      }\n    });\n    return elements.filter((element) => element !== null);\n  }\n\n  parseInline(tokens: marked.Token[], styles?: CustomStyleProp) {\n    const elements: ReactNode[] = tokens.map((token) => {\n      if (!token) return null;\n\n      switch (token.type) {\n        case 'escape': {\n          return this.renderer.getTextNode(token.text, {\n            ...this.styles.text,\n            ...styles,\n          });\n        }\n        case 'link': {\n          const linkStyle = {\n            ...styles,\n            ...this.styles.link, // To override color property\n          };\n          return this.renderer.getLinkNode(\n            this.parseInline(token.tokens, linkStyle),\n            token.href,\n            linkStyle\n          );\n        }\n        case 'image': {\n          return this.renderer.getImageNode(token.href);\n        }\n        case 'strong': {\n          const boldStyle = {\n            ...this.styles.strong,\n            ...styles,\n          };\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, boldStyle),\n            boldStyle\n          );\n        }\n        case 'em': {\n          const italicStyle = {\n            ...this.styles.em,\n            ...styles,\n          };\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, italicStyle),\n            italicStyle\n          );\n        }\n        case 'codespan': {\n          return this.renderer.getTextNode(token.text, {\n            ...this.styles.codespan,\n            ...styles,\n          });\n        }\n        case 'br': {\n          return this.renderer.getTextNode('\\n', {});\n        }\n        case 'del': {\n          return null;\n        }\n        case 'text':\n        case 'html': {\n          if (token.raw.trim().length < 1) {\n            return null;\n          }\n\n          return this.renderer.getTextNode(token.raw, {\n            ...this.styles.text,\n            ...styles,\n          });\n        }\n        default: {\n          console.warn(`Token with '${token.type}' type was not found.`);\n          return null;\n        }\n      }\n    });\n    return elements.filter((element) => element !== null);\n  }\n\n  private getNormalizedSiblingNodesForBlockAndInlineTokens = (\n    tokens: marked.Token[],\n    textStyle: TextStyleProp\n  ): ReactNode[] => {\n    let tempTokens: marked.Token[] = [];\n    const siblingNodes: ReactNode[] = [];\n    tokens.forEach((t) => {\n      /**\n       * To avoid inlining images\n       * Note: to be extend for other token types\n       */\n      if (t.type === 'image') {\n        const parsed = this.parseInline(tempTokens);\n        if (parsed.length > 0) {\n          siblingNodes.push(\n            this.renderer.getTextNode(this.parseInline(tempTokens), textStyle)\n          );\n        }\n        siblingNodes.push(this.parseInline([t]));\n        tempTokens = [];\n        return;\n      }\n      tempTokens = [...tempTokens, t];\n    });\n\n    /* Remaining temp tokens if any */\n    if (tempTokens.length > 0) {\n      siblingNodes.push(\n        this.renderer.getTextNode(this.parseInline(tempTokens), {})\n      );\n    }\n    return siblingNodes;\n  };\n}\n\nexport default Parser;\n"],"mappings":"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"}
+{"version":3,"names":["Parser","constructor","options","tokens","textStyle","tempTokens","siblingNodes","forEach","t","type","parsed","parseInline","length","push","renderer","getTextNode","imageToken","getImageLinkNode","href","styles","Renderer","headingStylesMap","h1","h2","h3","h4","h5","h6","parse","elements","map","token","paragraphChildren","getNormalizedSiblingNodesForBlockAndInlineTokens","text","getViewNode","paragraph","getBlockquoteNode","blockquote","depth","getCodeBlockNode","code","em","hr","li","items","item","children","cItem","childTokens","listChildren","getListNode","ordered","list","filter","element","linkStyle","link","getTextLinkNode","getImageNode","boldStyle","strong","italicStyle","codespan","raw","trim","decode","console","warn"],"sources":["Parser.tsx"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { marked } from 'marked';\nimport { decode } from 'html-entities';\nimport Renderer from './Renderer';\nimport type { MarkedStyles } from '../theme/types';\nimport type { CustomStyleProp, ParserOptions, TextStyleProp } from './types';\n\nclass Parser {\n  private renderer;\n  private styles: MarkedStyles;\n  private headingStylesMap: Record<number, TextStyleProp>;\n  constructor(options: ParserOptions) {\n    this.styles = { ...options.styles };\n    this.renderer = new Renderer();\n    this.headingStylesMap = {\n      1: this.styles.h1,\n      2: this.styles.h2,\n      3: this.styles.h3,\n      4: this.styles.h4,\n      5: this.styles.h5,\n      6: this.styles.h6,\n    };\n  }\n\n  parse(tokens: marked.Token[]) {\n    const elements: ReactNode[] = tokens.map((token) => {\n      switch (token.type) {\n        case 'space': {\n          return null;\n        }\n        case 'paragraph': {\n          const paragraphChildren =\n            this.getNormalizedSiblingNodesForBlockAndInlineTokens(\n              token.tokens,\n              this.styles.text\n            );\n\n          return this.renderer.getViewNode(\n            paragraphChildren,\n            this.styles.paragraph\n          );\n        }\n        case 'blockquote': {\n          return this.renderer.getBlockquoteNode(\n            this.parse(token.tokens),\n            this.styles.blockquote\n          );\n        }\n        case 'heading': {\n          const styles = this.headingStylesMap[token.depth] ?? this.styles.text;\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, styles),\n            styles\n          );\n        }\n        case 'code': {\n          return this.renderer.getCodeBlockNode(\n            token.text,\n            this.styles.code,\n            this.styles.em\n          );\n        }\n        case 'hr': {\n          return this.renderer.getViewNode(null, this.styles.hr);\n        }\n        case 'list': {\n          const li = token.items.map((item) => {\n            const children = item.tokens.map((cItem) => {\n              if (cItem.type === 'text') {\n                /* getViewNode since tokens could contain a block like elements (i.e. img) */\n                const childTokens = (cItem as marked.Tokens.Text).tokens || [];\n                const listChildren =\n                  this.getNormalizedSiblingNodesForBlockAndInlineTokens(\n                    childTokens,\n                    this.styles.li\n                  );\n                return this.renderer.getViewNode(listChildren, this.styles.li);\n              }\n\n              /* Parse the nested token */\n              return this.parse([cItem]);\n            });\n            return this.renderer.getViewNode(children, this.styles.li);\n          });\n          return this.renderer.getListNode(\n            token.ordered,\n            li,\n            this.styles.list,\n            this.styles.li\n          );\n        }\n        default:\n          return this.parseInline([token]);\n      }\n    });\n    return elements.filter((element) => element !== null);\n  }\n\n  parseInline(tokens: marked.Token[], styles?: CustomStyleProp) {\n    const elements: ReactNode[] = tokens.map((token) => {\n      if (!token) return null;\n\n      switch (token.type) {\n        case 'escape': {\n          return this.renderer.getTextNode(token.text, {\n            ...this.styles.text,\n            ...styles,\n          });\n        }\n        case 'link': {\n          if (\n            token.tokens &&\n            token.tokens[0] &&\n            token.tokens[0].type === 'image'\n          ) {\n            return this.renderer.getImageLinkNode(\n              token.href,\n              token.tokens[0]?.href\n            );\n          }\n\n          const linkStyle = {\n            ...styles,\n            ...this.styles.link, // To override color property\n          };\n          return this.renderer.getTextLinkNode(\n            this.parseInline(token.tokens, linkStyle),\n            token.href,\n            linkStyle\n          );\n        }\n        case 'image': {\n          return this.renderer.getImageNode(token.href);\n        }\n        case 'strong': {\n          const boldStyle = {\n            ...this.styles.strong,\n            ...styles,\n          };\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, boldStyle),\n            boldStyle\n          );\n        }\n        case 'em': {\n          const italicStyle = {\n            ...this.styles.em,\n            ...styles,\n          };\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, italicStyle),\n            italicStyle\n          );\n        }\n        case 'codespan': {\n          return this.renderer.getTextNode(token.text, {\n            ...this.styles.codespan,\n            ...styles,\n          });\n        }\n        case 'br': {\n          return this.renderer.getTextNode('\\n', {});\n        }\n        case 'del': {\n          return null;\n        }\n        case 'text':\n        case 'html': {\n          if (token.raw.trim().length < 1) {\n            return null;\n          }\n\n          return this.renderer.getTextNode(decode(token.raw), {\n            ...this.styles.text,\n            ...styles,\n          });\n        }\n        default: {\n          console.warn(`Token with '${token.type}' type was not found.`);\n          return null;\n        }\n      }\n    });\n    return elements.filter((element) => element !== null);\n  }\n\n  private getNormalizedSiblingNodesForBlockAndInlineTokens = (\n    tokens: marked.Token[],\n    textStyle: TextStyleProp\n  ): ReactNode[] => {\n    let tempTokens: marked.Token[] = [];\n    const siblingNodes: ReactNode[] = [];\n    tokens.forEach((t) => {\n      /**\n       * To avoid inlining images\n       * Currently supports images, link images\n       * Note: to be extend for other token types\n       */\n      if (\n        t.type === 'image' ||\n        (t.type === 'link' &&\n          t.tokens &&\n          t.tokens[0] &&\n          t.tokens[0].type === 'image')\n      ) {\n        const parsed = this.parseInline(tempTokens);\n        if (parsed.length > 0) {\n          siblingNodes.push(this.renderer.getTextNode(parsed, textStyle));\n        }\n\n        if (t.type === 'image') {\n          siblingNodes.push(this.parseInline([t]));\n        } else if (t.type === 'link') {\n          const imageToken = t.tokens[0] as marked.Tokens.Image;\n          siblingNodes.push(\n            this.renderer.getImageLinkNode(t.href, imageToken.href)\n          );\n        }\n\n        tempTokens = [];\n        return;\n      }\n      tempTokens = [...tempTokens, t];\n    });\n\n    /* Remaining temp tokens if any */\n    if (tempTokens.length > 0) {\n      siblingNodes.push(\n        this.renderer.getTextNode(this.parseInline(tempTokens), {})\n      );\n    }\n\n    return siblingNodes;\n  };\n}\n\nexport default Parser;\n"],"mappings":"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"}

package/dist/commonjs/lib/Renderer.js

@@ -34,13 +34,22 @@ class Renderer {
       }, children);
     });
 
-    _defineProperty(this, "getLinkNode", (children, href, styles) => {
+    _defineProperty(this, "getTextLinkNode", (children, href, styles) => {
       return /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
         key: (0, _string.generateRandomString)(),
         onPress: (0, _handlers.onLinkPress)(href),
         style: styles
       }, children);
     });
+
+    _defineProperty(this, "getImageLinkNode", (href, imageUrl) => {
+      return /*#__PURE__*/_react.default.createElement(_reactNative.TouchableHighlight, {
+        onPress: (0, _handlers.onLinkPress)(href),
+        key: (0, _string.generateRandomString)()
+      }, /*#__PURE__*/_react.default.createElement(_MDImage.default, {
+        uri: imageUrl
+      }));
+    });
   }
 
   getViewNode(children, styles) {

package/dist/commonjs/lib/Renderer.js.map

@@ -1 +1 @@
-{"version":3,"names":["Renderer","children","styles","generateRandomString","href","onLinkPress","getViewNode","getCodeBlockNode","text","containerStyle","textStyle","getBlockquoteNode","getImageNode","uri","getListNode","ordered","li","listStyle","Decimal","Disc","map","node"],"sources":["Renderer.tsx"],"sourcesContent":["import React, { ReactNode } from 'react';\nimport { ScrollView, View, Text } from 'react-native';\nimport MarkedList from '@jsamr/react-native-li';\nimport Disc from '@jsamr/counter-style/presets/disc';\nimport Decimal from '@jsamr/counter-style/presets/decimal';\nimport MDImage from './../components/MDImage';\nimport { generateRandomString } from '../utils/string';\nimport type { TextStyleProp, ViewStyleProp } from './types';\nimport { onLinkPress } from '../utils/handlers';\n\nclass Renderer {\n  getTextNode = (children: string | ReactNode[], styles: TextStyleProp) => {\n    return (\n      <Text key={generateRandomString()} style={styles}>\n        {children}\n      </Text>\n    );\n  };\n\n  getLinkNode = (\n    children: string | ReactNode[],\n    href: string,\n    styles: TextStyleProp\n  ) => {\n    return (\n      <Text\n        key={generateRandomString()}\n        onPress={onLinkPress(href)}\n        style={styles}\n      >\n        {children}\n      </Text>\n    );\n  };\n\n  getViewNode(children: ReactNode[] | null, styles: ViewStyleProp) {\n    return (\n      <View key={generateRandomString()} style={styles}>\n        {children}\n      </View>\n    );\n  }\n\n  getCodeBlockNode(\n    text: string,\n    containerStyle: ViewStyleProp,\n    textStyle: TextStyleProp\n  ) {\n    return (\n      <ScrollView\n        key={generateRandomString()}\n        contentContainerStyle={containerStyle}\n        horizontal\n      >\n        <Text style={textStyle}>{text}</Text>\n      </ScrollView>\n    );\n  }\n\n  getBlockquoteNode(children: ReactNode[], styles: ViewStyleProp) {\n    return (\n      <View key={generateRandomString()} style={styles}>\n        {children}\n      </View>\n    );\n  }\n\n  getImageNode(uri: string) {\n    return <MDImage key={generateRandomString()} uri={uri} />;\n  }\n\n  getListNode(\n    ordered: boolean,\n    li: ReactNode[],\n    listStyle: ViewStyleProp,\n    textStyle: TextStyleProp\n  ) {\n    return (\n      <MarkedList\n        counterRenderer={ordered ? Decimal : Disc}\n        markerTextStyle={textStyle}\n        markerBoxStyle={listStyle}\n        key={generateRandomString()}\n      >\n        {li.map((node) => node)}\n      </MarkedList>\n    );\n  }\n}\n\nexport default Renderer;\n"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA;;;;;;AAEA,MAAMA,QAAN,CAAe;EAAA;IAAA,qCACC,CAACC,QAAD,EAAiCC,MAAjC,KAA2D;MACvE,oBACE,6BAAC,iBAAD;QAAM,GAAG,EAAE,IAAAC,4BAAA,GAAX;QAAmC,KAAK,EAAED;MAA1C,GACGD,QADH,CADF;IAKD,CAPY;;IAAA,qCASC,CACZA,QADY,EAEZG,IAFY,EAGZF,MAHY,KAIT;MACH,oBACE,6BAAC,iBAAD;QACE,GAAG,EAAE,IAAAC,4BAAA,GADP;QAEE,OAAO,EAAE,IAAAE,qBAAA,EAAYD,IAAZ,CAFX;QAGE,KAAK,EAAEF;MAHT,GAKGD,QALH,CADF;IASD,CAvBY;EAAA;;EAyBbK,WAAW,CAACL,QAAD,EAA+BC,MAA/B,EAAsD;IAC/D,oBACE,6BAAC,iBAAD;MAAM,GAAG,EAAE,IAAAC,4BAAA,GAAX;MAAmC,KAAK,EAAED;IAA1C,GACGD,QADH,CADF;EAKD;;EAEDM,gBAAgB,CACdC,IADc,EAEdC,cAFc,EAGdC,SAHc,EAId;IACA,oBACE,6BAAC,uBAAD;MACE,GAAG,EAAE,IAAAP,4BAAA,GADP;MAEE,qBAAqB,EAAEM,cAFzB;MAGE,UAAU;IAHZ,gBAKE,6BAAC,iBAAD;MAAM,KAAK,EAAEC;IAAb,GAAyBF,IAAzB,CALF,CADF;EASD;;EAEDG,iBAAiB,CAACV,QAAD,EAAwBC,MAAxB,EAA+C;IAC9D,oBACE,6BAAC,iBAAD;MAAM,GAAG,EAAE,IAAAC,4BAAA,GAAX;MAAmC,KAAK,EAAED;IAA1C,GACGD,QADH,CADF;EAKD;;EAEDW,YAAY,CAACC,GAAD,EAAc;IACxB,oBAAO,6BAAC,gBAAD;MAAS,GAAG,EAAE,IAAAV,4BAAA,GAAd;MAAsC,GAAG,EAAEU;IAA3C,EAAP;EACD;;EAEDC,WAAW,CACTC,OADS,EAETC,EAFS,EAGTC,SAHS,EAITP,SAJS,EAKT;IACA,oBACE,6BAAC,sBAAD;MACE,eAAe,EAAEK,OAAO,GAAGG,gBAAH,GAAaC,aADvC;MAEE,eAAe,EAAET,SAFnB;MAGE,cAAc,EAAEO,SAHlB;MAIE,GAAG,EAAE,IAAAd,4BAAA;IAJP,GAMGa,EAAE,CAACI,GAAH,CAAQC,IAAD,IAAUA,IAAjB,CANH,CADF;EAUD;;AA7EY;;eAgFArB,Q"}
+{"version":3,"names":["Renderer","children","styles","generateRandomString","href","onLinkPress","imageUrl","getViewNode","getCodeBlockNode","text","containerStyle","textStyle","getBlockquoteNode","getImageNode","uri","getListNode","ordered","li","listStyle","Decimal","Disc","map","node"],"sources":["Renderer.tsx"],"sourcesContent":["import React, { ReactNode } from 'react';\nimport { ScrollView, View, Text, TouchableHighlight } from 'react-native';\nimport MarkedList from '@jsamr/react-native-li';\nimport Disc from '@jsamr/counter-style/presets/disc';\nimport Decimal from '@jsamr/counter-style/presets/decimal';\nimport MDImage from './../components/MDImage';\nimport { generateRandomString } from '../utils/string';\nimport type { TextStyleProp, ViewStyleProp } from './types';\nimport { onLinkPress } from '../utils/handlers';\n\nclass Renderer {\n  getTextNode = (children: string | ReactNode[], styles: TextStyleProp) => {\n    return (\n      <Text key={generateRandomString()} style={styles}>\n        {children}\n      </Text>\n    );\n  };\n\n  getTextLinkNode = (\n    children: string | ReactNode[],\n    href: string,\n    styles: TextStyleProp\n  ) => {\n    return (\n      <Text\n        key={generateRandomString()}\n        onPress={onLinkPress(href)}\n        style={styles}\n      >\n        {children}\n      </Text>\n    );\n  };\n\n  getImageLinkNode = (href: string, imageUrl: string) => {\n    return (\n      <TouchableHighlight\n        onPress={onLinkPress(href)}\n        key={generateRandomString()}\n      >\n        <MDImage uri={imageUrl} />\n      </TouchableHighlight>\n    );\n  };\n\n  getViewNode(children: ReactNode[] | null, styles: ViewStyleProp) {\n    return (\n      <View key={generateRandomString()} style={styles}>\n        {children}\n      </View>\n    );\n  }\n\n  getCodeBlockNode(\n    text: string,\n    containerStyle: ViewStyleProp,\n    textStyle: TextStyleProp\n  ) {\n    return (\n      <ScrollView\n        key={generateRandomString()}\n        contentContainerStyle={containerStyle}\n        horizontal\n      >\n        <Text style={textStyle}>{text}</Text>\n      </ScrollView>\n    );\n  }\n\n  getBlockquoteNode(children: ReactNode[], styles: ViewStyleProp) {\n    return (\n      <View key={generateRandomString()} style={styles}>\n        {children}\n      </View>\n    );\n  }\n\n  getImageNode(uri: string) {\n    return <MDImage key={generateRandomString()} uri={uri} />;\n  }\n\n  getListNode(\n    ordered: boolean,\n    li: ReactNode[],\n    listStyle: ViewStyleProp,\n    textStyle: TextStyleProp\n  ) {\n    return (\n      <MarkedList\n        counterRenderer={ordered ? Decimal : Disc}\n        markerTextStyle={textStyle}\n        markerBoxStyle={listStyle}\n        key={generateRandomString()}\n      >\n        {li.map((node) => node)}\n      </MarkedList>\n    );\n  }\n}\n\nexport default Renderer;\n"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA;;;;;;AAEA,MAAMA,QAAN,CAAe;EAAA;IAAA,qCACC,CAACC,QAAD,EAAiCC,MAAjC,KAA2D;MACvE,oBACE,6BAAC,iBAAD;QAAM,GAAG,EAAE,IAAAC,4BAAA,GAAX;QAAmC,KAAK,EAAED;MAA1C,GACGD,QADH,CADF;IAKD,CAPY;;IAAA,yCASK,CAChBA,QADgB,EAEhBG,IAFgB,EAGhBF,MAHgB,KAIb;MACH,oBACE,6BAAC,iBAAD;QACE,GAAG,EAAE,IAAAC,4BAAA,GADP;QAEE,OAAO,EAAE,IAAAE,qBAAA,EAAYD,IAAZ,CAFX;QAGE,KAAK,EAAEF;MAHT,GAKGD,QALH,CADF;IASD,CAvBY;;IAAA,0CAyBM,CAACG,IAAD,EAAeE,QAAf,KAAoC;MACrD,oBACE,6BAAC,+BAAD;QACE,OAAO,EAAE,IAAAD,qBAAA,EAAYD,IAAZ,CADX;QAEE,GAAG,EAAE,IAAAD,4BAAA;MAFP,gBAIE,6BAAC,gBAAD;QAAS,GAAG,EAAEG;MAAd,EAJF,CADF;IAQD,CAlCY;EAAA;;EAoCbC,WAAW,CAACN,QAAD,EAA+BC,MAA/B,EAAsD;IAC/D,oBACE,6BAAC,iBAAD;MAAM,GAAG,EAAE,IAAAC,4BAAA,GAAX;MAAmC,KAAK,EAAED;IAA1C,GACGD,QADH,CADF;EAKD;;EAEDO,gBAAgB,CACdC,IADc,EAEdC,cAFc,EAGdC,SAHc,EAId;IACA,oBACE,6BAAC,uBAAD;MACE,GAAG,EAAE,IAAAR,4BAAA,GADP;MAEE,qBAAqB,EAAEO,cAFzB;MAGE,UAAU;IAHZ,gBAKE,6BAAC,iBAAD;MAAM,KAAK,EAAEC;IAAb,GAAyBF,IAAzB,CALF,CADF;EASD;;EAEDG,iBAAiB,CAACX,QAAD,EAAwBC,MAAxB,EAA+C;IAC9D,oBACE,6BAAC,iBAAD;MAAM,GAAG,EAAE,IAAAC,4BAAA,GAAX;MAAmC,KAAK,EAAED;IAA1C,GACGD,QADH,CADF;EAKD;;EAEDY,YAAY,CAACC,GAAD,EAAc;IACxB,oBAAO,6BAAC,gBAAD;MAAS,GAAG,EAAE,IAAAX,4BAAA,GAAd;MAAsC,GAAG,EAAEW;IAA3C,EAAP;EACD;;EAEDC,WAAW,CACTC,OADS,EAETC,EAFS,EAGTC,SAHS,EAITP,SAJS,EAKT;IACA,oBACE,6BAAC,sBAAD;MACE,eAAe,EAAEK,OAAO,GAAGG,gBAAH,GAAaC,aADvC;MAEE,eAAe,EAAET,SAFnB;MAGE,cAAc,EAAEO,SAHlB;MAIE,GAAG,EAAE,IAAAf,4BAAA;IAJP,GAMGc,EAAE,CAACI,GAAH,CAAQC,IAAD,IAAUA,IAAjB,CANH,CADF;EAUD;;AAxFY;;eA2FAtB,Q"}

package/dist/module/lib/Parser.js

@@ -1,5 +1,6 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+import { decode } from 'html-entities';
 import Renderer from './Renderer';
 
 class Parser {
@@ -16,16 +17,23 @@ class Parser {
       tokens.forEach(t => {
         /**
          * To avoid inlining images
+         * Currently supports images, link images
          * Note: to be extend for other token types
          */
-        if (t.type === 'image') {
+        if (t.type === 'image' || t.type === 'link' && t.tokens && t.tokens[0] && t.tokens[0].type === 'image') {
           const parsed = this.parseInline(tempTokens);
 
           if (parsed.length > 0) {
-            siblingNodes.push(this.renderer.getTextNode(this.parseInline(tempTokens), textStyle));
+            siblingNodes.push(this.renderer.getTextNode(parsed, textStyle));
+          }
+
+          if (t.type === 'image') {
+            siblingNodes.push(this.parseInline([t]));
+          } else if (t.type === 'link') {
+            const imageToken = t.tokens[0];
+            siblingNodes.push(this.renderer.getImageLinkNode(t.href, imageToken.href));
           }
 
-          siblingNodes.push(this.parseInline([t]));
           tempTokens = [];
           return;
         }
@@ -95,10 +103,8 @@ class Parser {
               const children = item.tokens.map(cItem => {
                 if (cItem.type === 'text') {
                   /* getViewNode since tokens could contain a block like elements (i.e. img) */
-                  const listChildren = this.getNormalizedSiblingNodesForBlockAndInlineTokens( // Note: Upstream types aren't available for this specific use-case
-                  // @types/marked (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/marked/index.d.ts)
-                  // @ts-ignore
-                  cItem.tokens, this.styles.li);
+                  const childTokens = cItem.tokens || [];
+                  const listChildren = this.getNormalizedSiblingNodesForBlockAndInlineTokens(childTokens, this.styles.li);
                   return this.renderer.getViewNode(listChildren, this.styles.li);
                 }
                 /* Parse the nested token */
@@ -132,11 +138,17 @@ class Parser {
 
         case 'link':
           {
+            if (token.tokens && token.tokens[0] && token.tokens[0].type === 'image') {
+              var _token$tokens$;
+
+              return this.renderer.getImageLinkNode(token.href, (_token$tokens$ = token.tokens[0]) === null || _token$tokens$ === void 0 ? void 0 : _token$tokens$.href);
+            }
+
             const linkStyle = { ...styles,
               ...this.styles.link // To override color property
 
             };
-            return this.renderer.getLinkNode(this.parseInline(token.tokens, linkStyle), token.href, linkStyle);
+            return this.renderer.getTextLinkNode(this.parseInline(token.tokens, linkStyle), token.href, linkStyle);
           }
 
         case 'image':
@@ -184,7 +196,7 @@ class Parser {
               return null;
             }
 
-            return this.renderer.getTextNode(token.raw, { ...this.styles.text,
+            return this.renderer.getTextNode(decode(token.raw), { ...this.styles.text,
               ...styles
             });
           }

package/dist/module/lib/Parser.js.map

@@ -1 +1 @@
-{"version":3,"names":["Renderer","Parser","constructor","options","tokens","textStyle","tempTokens","siblingNodes","forEach","t","type","parsed","parseInline","length","push","renderer","getTextNode","styles","headingStylesMap","h1","h2","h3","h4","h5","h6","parse","elements","map","token","paragraphChildren","getNormalizedSiblingNodesForBlockAndInlineTokens","text","getViewNode","paragraph","getBlockquoteNode","blockquote","depth","getCodeBlockNode","code","em","hr","li","items","item","children","cItem","listChildren","getListNode","ordered","list","filter","element","linkStyle","link","getLinkNode","href","getImageNode","boldStyle","strong","italicStyle","codespan","raw","trim","console","warn"],"sources":["Parser.tsx"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { marked } from 'marked';\nimport Renderer from './Renderer';\nimport type { MarkedStyles } from '../theme/types';\nimport type { CustomStyleProp, ParserOptions, TextStyleProp } from './types';\n\nclass Parser {\n  private renderer;\n  private styles: MarkedStyles;\n  private headingStylesMap: Record<number, TextStyleProp>;\n  constructor(options: ParserOptions) {\n    this.styles = { ...options.styles };\n    this.renderer = new Renderer();\n    this.headingStylesMap = {\n      1: this.styles.h1,\n      2: this.styles.h2,\n      3: this.styles.h3,\n      4: this.styles.h4,\n      5: this.styles.h5,\n      6: this.styles.h6,\n    };\n  }\n\n  parse(tokens: marked.Token[]) {\n    const elements: ReactNode[] = tokens.map((token) => {\n      switch (token.type) {\n        case 'space': {\n          return null;\n        }\n        case 'paragraph': {\n          const paragraphChildren =\n            this.getNormalizedSiblingNodesForBlockAndInlineTokens(\n              token.tokens,\n              this.styles.text\n            );\n\n          return this.renderer.getViewNode(\n            paragraphChildren,\n            this.styles.paragraph\n          );\n        }\n        case 'blockquote': {\n          return this.renderer.getBlockquoteNode(\n            this.parse(token.tokens),\n            this.styles.blockquote\n          );\n        }\n        case 'heading': {\n          const styles = this.headingStylesMap[token.depth] ?? this.styles.text;\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, styles),\n            styles\n          );\n        }\n        case 'code': {\n          return this.renderer.getCodeBlockNode(\n            token.text,\n            this.styles.code,\n            this.styles.em\n          );\n        }\n        case 'hr': {\n          return this.renderer.getViewNode(null, this.styles.hr);\n        }\n        case 'list': {\n          const li = token.items.map((item) => {\n            const children = item.tokens.map((cItem) => {\n              if (cItem.type === 'text') {\n                /* getViewNode since tokens could contain a block like elements (i.e. img) */\n                const listChildren =\n                  this.getNormalizedSiblingNodesForBlockAndInlineTokens(\n                    // Note: Upstream types aren't available for this specific use-case\n                    // @types/marked (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/marked/index.d.ts)\n                    // @ts-ignore\n                    cItem.tokens,\n                    this.styles.li\n                  );\n                return this.renderer.getViewNode(listChildren, this.styles.li);\n              }\n\n              /* Parse the nested token */\n              return this.parse([cItem]);\n            });\n            return this.renderer.getViewNode(children, this.styles.li);\n          });\n          return this.renderer.getListNode(\n            token.ordered,\n            li,\n            this.styles.list,\n            this.styles.li\n          );\n        }\n        default:\n          return this.parseInline([token]);\n      }\n    });\n    return elements.filter((element) => element !== null);\n  }\n\n  parseInline(tokens: marked.Token[], styles?: CustomStyleProp) {\n    const elements: ReactNode[] = tokens.map((token) => {\n      if (!token) return null;\n\n      switch (token.type) {\n        case 'escape': {\n          return this.renderer.getTextNode(token.text, {\n            ...this.styles.text,\n            ...styles,\n          });\n        }\n        case 'link': {\n          const linkStyle = {\n            ...styles,\n            ...this.styles.link, // To override color property\n          };\n          return this.renderer.getLinkNode(\n            this.parseInline(token.tokens, linkStyle),\n            token.href,\n            linkStyle\n          );\n        }\n        case 'image': {\n          return this.renderer.getImageNode(token.href);\n        }\n        case 'strong': {\n          const boldStyle = {\n            ...this.styles.strong,\n            ...styles,\n          };\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, boldStyle),\n            boldStyle\n          );\n        }\n        case 'em': {\n          const italicStyle = {\n            ...this.styles.em,\n            ...styles,\n          };\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, italicStyle),\n            italicStyle\n          );\n        }\n        case 'codespan': {\n          return this.renderer.getTextNode(token.text, {\n            ...this.styles.codespan,\n            ...styles,\n          });\n        }\n        case 'br': {\n          return this.renderer.getTextNode('\\n', {});\n        }\n        case 'del': {\n          return null;\n        }\n        case 'text':\n        case 'html': {\n          if (token.raw.trim().length < 1) {\n            return null;\n          }\n\n          return this.renderer.getTextNode(token.raw, {\n            ...this.styles.text,\n            ...styles,\n          });\n        }\n        default: {\n          console.warn(`Token with '${token.type}' type was not found.`);\n          return null;\n        }\n      }\n    });\n    return elements.filter((element) => element !== null);\n  }\n\n  private getNormalizedSiblingNodesForBlockAndInlineTokens = (\n    tokens: marked.Token[],\n    textStyle: TextStyleProp\n  ): ReactNode[] => {\n    let tempTokens: marked.Token[] = [];\n    const siblingNodes: ReactNode[] = [];\n    tokens.forEach((t) => {\n      /**\n       * To avoid inlining images\n       * Note: to be extend for other token types\n       */\n      if (t.type === 'image') {\n        const parsed = this.parseInline(tempTokens);\n        if (parsed.length > 0) {\n          siblingNodes.push(\n            this.renderer.getTextNode(this.parseInline(tempTokens), textStyle)\n          );\n        }\n        siblingNodes.push(this.parseInline([t]));\n        tempTokens = [];\n        return;\n      }\n      tempTokens = [...tempTokens, t];\n    });\n\n    /* Remaining temp tokens if any */\n    if (tempTokens.length > 0) {\n      siblingNodes.push(\n        this.renderer.getTextNode(this.parseInline(tempTokens), {})\n      );\n    }\n    return siblingNodes;\n  };\n}\n\nexport default Parser;\n"],"mappings":"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"}
+{"version":3,"names":["decode","Renderer","Parser","constructor","options","tokens","textStyle","tempTokens","siblingNodes","forEach","t","type","parsed","parseInline","length","push","renderer","getTextNode","imageToken","getImageLinkNode","href","styles","headingStylesMap","h1","h2","h3","h4","h5","h6","parse","elements","map","token","paragraphChildren","getNormalizedSiblingNodesForBlockAndInlineTokens","text","getViewNode","paragraph","getBlockquoteNode","blockquote","depth","getCodeBlockNode","code","em","hr","li","items","item","children","cItem","childTokens","listChildren","getListNode","ordered","list","filter","element","linkStyle","link","getTextLinkNode","getImageNode","boldStyle","strong","italicStyle","codespan","raw","trim","console","warn"],"sources":["Parser.tsx"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { marked } from 'marked';\nimport { decode } from 'html-entities';\nimport Renderer from './Renderer';\nimport type { MarkedStyles } from '../theme/types';\nimport type { CustomStyleProp, ParserOptions, TextStyleProp } from './types';\n\nclass Parser {\n  private renderer;\n  private styles: MarkedStyles;\n  private headingStylesMap: Record<number, TextStyleProp>;\n  constructor(options: ParserOptions) {\n    this.styles = { ...options.styles };\n    this.renderer = new Renderer();\n    this.headingStylesMap = {\n      1: this.styles.h1,\n      2: this.styles.h2,\n      3: this.styles.h3,\n      4: this.styles.h4,\n      5: this.styles.h5,\n      6: this.styles.h6,\n    };\n  }\n\n  parse(tokens: marked.Token[]) {\n    const elements: ReactNode[] = tokens.map((token) => {\n      switch (token.type) {\n        case 'space': {\n          return null;\n        }\n        case 'paragraph': {\n          const paragraphChildren =\n            this.getNormalizedSiblingNodesForBlockAndInlineTokens(\n              token.tokens,\n              this.styles.text\n            );\n\n          return this.renderer.getViewNode(\n            paragraphChildren,\n            this.styles.paragraph\n          );\n        }\n        case 'blockquote': {\n          return this.renderer.getBlockquoteNode(\n            this.parse(token.tokens),\n            this.styles.blockquote\n          );\n        }\n        case 'heading': {\n          const styles = this.headingStylesMap[token.depth] ?? this.styles.text;\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, styles),\n            styles\n          );\n        }\n        case 'code': {\n          return this.renderer.getCodeBlockNode(\n            token.text,\n            this.styles.code,\n            this.styles.em\n          );\n        }\n        case 'hr': {\n          return this.renderer.getViewNode(null, this.styles.hr);\n        }\n        case 'list': {\n          const li = token.items.map((item) => {\n            const children = item.tokens.map((cItem) => {\n              if (cItem.type === 'text') {\n                /* getViewNode since tokens could contain a block like elements (i.e. img) */\n                const childTokens = (cItem as marked.Tokens.Text).tokens || [];\n                const listChildren =\n                  this.getNormalizedSiblingNodesForBlockAndInlineTokens(\n                    childTokens,\n                    this.styles.li\n                  );\n                return this.renderer.getViewNode(listChildren, this.styles.li);\n              }\n\n              /* Parse the nested token */\n              return this.parse([cItem]);\n            });\n            return this.renderer.getViewNode(children, this.styles.li);\n          });\n          return this.renderer.getListNode(\n            token.ordered,\n            li,\n            this.styles.list,\n            this.styles.li\n          );\n        }\n        default:\n          return this.parseInline([token]);\n      }\n    });\n    return elements.filter((element) => element !== null);\n  }\n\n  parseInline(tokens: marked.Token[], styles?: CustomStyleProp) {\n    const elements: ReactNode[] = tokens.map((token) => {\n      if (!token) return null;\n\n      switch (token.type) {\n        case 'escape': {\n          return this.renderer.getTextNode(token.text, {\n            ...this.styles.text,\n            ...styles,\n          });\n        }\n        case 'link': {\n          if (\n            token.tokens &&\n            token.tokens[0] &&\n            token.tokens[0].type === 'image'\n          ) {\n            return this.renderer.getImageLinkNode(\n              token.href,\n              token.tokens[0]?.href\n            );\n          }\n\n          const linkStyle = {\n            ...styles,\n            ...this.styles.link, // To override color property\n          };\n          return this.renderer.getTextLinkNode(\n            this.parseInline(token.tokens, linkStyle),\n            token.href,\n            linkStyle\n          );\n        }\n        case 'image': {\n          return this.renderer.getImageNode(token.href);\n        }\n        case 'strong': {\n          const boldStyle = {\n            ...this.styles.strong,\n            ...styles,\n          };\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, boldStyle),\n            boldStyle\n          );\n        }\n        case 'em': {\n          const italicStyle = {\n            ...this.styles.em,\n            ...styles,\n          };\n          return this.renderer.getTextNode(\n            this.parseInline(token.tokens, italicStyle),\n            italicStyle\n          );\n        }\n        case 'codespan': {\n          return this.renderer.getTextNode(token.text, {\n            ...this.styles.codespan,\n            ...styles,\n          });\n        }\n        case 'br': {\n          return this.renderer.getTextNode('\\n', {});\n        }\n        case 'del': {\n          return null;\n        }\n        case 'text':\n        case 'html': {\n          if (token.raw.trim().length < 1) {\n            return null;\n          }\n\n          return this.renderer.getTextNode(decode(token.raw), {\n            ...this.styles.text,\n            ...styles,\n          });\n        }\n        default: {\n          console.warn(`Token with '${token.type}' type was not found.`);\n          return null;\n        }\n      }\n    });\n    return elements.filter((element) => element !== null);\n  }\n\n  private getNormalizedSiblingNodesForBlockAndInlineTokens = (\n    tokens: marked.Token[],\n    textStyle: TextStyleProp\n  ): ReactNode[] => {\n    let tempTokens: marked.Token[] = [];\n    const siblingNodes: ReactNode[] = [];\n    tokens.forEach((t) => {\n      /**\n       * To avoid inlining images\n       * Currently supports images, link images\n       * Note: to be extend for other token types\n       */\n      if (\n        t.type === 'image' ||\n        (t.type === 'link' &&\n          t.tokens &&\n          t.tokens[0] &&\n          t.tokens[0].type === 'image')\n      ) {\n        const parsed = this.parseInline(tempTokens);\n        if (parsed.length > 0) {\n          siblingNodes.push(this.renderer.getTextNode(parsed, textStyle));\n        }\n\n        if (t.type === 'image') {\n          siblingNodes.push(this.parseInline([t]));\n        } else if (t.type === 'link') {\n          const imageToken = t.tokens[0] as marked.Tokens.Image;\n          siblingNodes.push(\n            this.renderer.getImageLinkNode(t.href, imageToken.href)\n          );\n        }\n\n        tempTokens = [];\n        return;\n      }\n      tempTokens = [...tempTokens, t];\n    });\n\n    /* Remaining temp tokens if any */\n    if (tempTokens.length > 0) {\n      siblingNodes.push(\n        this.renderer.getTextNode(this.parseInline(tempTokens), {})\n      );\n    }\n\n    return siblingNodes;\n  };\n}\n\nexport default Parser;\n"],"mappings":"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"}

package/dist/module/lib/Renderer.js

@@ -1,7 +1,7 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import React from 'react';
-import { ScrollView, View, Text } from 'react-native';
+import { ScrollView, View, Text, TouchableHighlight } from 'react-native';
 import MarkedList from '@jsamr/react-native-li';
 import Disc from '@jsamr/counter-style/presets/disc';
 import Decimal from '@jsamr/counter-style/presets/decimal';
@@ -18,13 +18,22 @@ class Renderer {
       }, children);
     });
 
-    _defineProperty(this, "getLinkNode", (children, href, styles) => {
+    _defineProperty(this, "getTextLinkNode", (children, href, styles) => {
       return /*#__PURE__*/React.createElement(Text, {
         key: generateRandomString(),
         onPress: onLinkPress(href),
         style: styles
       }, children);
     });
+
+    _defineProperty(this, "getImageLinkNode", (href, imageUrl) => {
+      return /*#__PURE__*/React.createElement(TouchableHighlight, {
+        onPress: onLinkPress(href),
+        key: generateRandomString()
+      }, /*#__PURE__*/React.createElement(MDImage, {
+        uri: imageUrl
+      }));
+    });
   }
 
   getViewNode(children, styles) {

package/dist/module/lib/Renderer.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","ScrollView","View","Text","MarkedList","Disc","Decimal","MDImage","generateRandomString","onLinkPress","Renderer","children","styles","href","getViewNode","getCodeBlockNode","text","containerStyle","textStyle","getBlockquoteNode","getImageNode","uri","getListNode","ordered","li","listStyle","map","node"],"sources":["Renderer.tsx"],"sourcesContent":["import React, { ReactNode } from 'react';\nimport { ScrollView, View, Text } from 'react-native';\nimport MarkedList from '@jsamr/react-native-li';\nimport Disc from '@jsamr/counter-style/presets/disc';\nimport Decimal from '@jsamr/counter-style/presets/decimal';\nimport MDImage from './../components/MDImage';\nimport { generateRandomString } from '../utils/string';\nimport type { TextStyleProp, ViewStyleProp } from './types';\nimport { onLinkPress } from '../utils/handlers';\n\nclass Renderer {\n  getTextNode = (children: string | ReactNode[], styles: TextStyleProp) => {\n    return (\n      <Text key={generateRandomString()} style={styles}>\n        {children}\n      </Text>\n    );\n  };\n\n  getLinkNode = (\n    children: string | ReactNode[],\n    href: string,\n    styles: TextStyleProp\n  ) => {\n    return (\n      <Text\n        key={generateRandomString()}\n        onPress={onLinkPress(href)}\n        style={styles}\n      >\n        {children}\n      </Text>\n    );\n  };\n\n  getViewNode(children: ReactNode[] | null, styles: ViewStyleProp) {\n    return (\n      <View key={generateRandomString()} style={styles}>\n        {children}\n      </View>\n    );\n  }\n\n  getCodeBlockNode(\n    text: string,\n    containerStyle: ViewStyleProp,\n    textStyle: TextStyleProp\n  ) {\n    return (\n      <ScrollView\n        key={generateRandomString()}\n        contentContainerStyle={containerStyle}\n        horizontal\n      >\n        <Text style={textStyle}>{text}</Text>\n      </ScrollView>\n    );\n  }\n\n  getBlockquoteNode(children: ReactNode[], styles: ViewStyleProp) {\n    return (\n      <View key={generateRandomString()} style={styles}>\n        {children}\n      </View>\n    );\n  }\n\n  getImageNode(uri: string) {\n    return <MDImage key={generateRandomString()} uri={uri} />;\n  }\n\n  getListNode(\n    ordered: boolean,\n    li: ReactNode[],\n    listStyle: ViewStyleProp,\n    textStyle: TextStyleProp\n  ) {\n    return (\n      <MarkedList\n        counterRenderer={ordered ? Decimal : Disc}\n        markerTextStyle={textStyle}\n        markerBoxStyle={listStyle}\n        key={generateRandomString()}\n      >\n        {li.map((node) => node)}\n      </MarkedList>\n    );\n  }\n}\n\nexport default Renderer;\n"],"mappings":";;AAAA,OAAOA,KAAP,MAAiC,OAAjC;AACA,SAASC,UAAT,EAAqBC,IAArB,EAA2BC,IAA3B,QAAuC,cAAvC;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AACA,OAAOC,IAAP,MAAiB,mCAAjB;AACA,OAAOC,OAAP,MAAoB,sCAApB;AACA,OAAOC,OAAP,MAAoB,yBAApB;AACA,SAASC,oBAAT,QAAqC,iBAArC;AAEA,SAASC,WAAT,QAA4B,mBAA5B;;AAEA,MAAMC,QAAN,CAAe;EAAA;IAAA,qCACC,CAACC,QAAD,EAAiCC,MAAjC,KAA2D;MACvE,oBACE,oBAAC,IAAD;QAAM,GAAG,EAAEJ,oBAAoB,EAA/B;QAAmC,KAAK,EAAEI;MAA1C,GACGD,QADH,CADF;IAKD,CAPY;;IAAA,qCASC,CACZA,QADY,EAEZE,IAFY,EAGZD,MAHY,KAIT;MACH,oBACE,oBAAC,IAAD;QACE,GAAG,EAAEJ,oBAAoB,EAD3B;QAEE,OAAO,EAAEC,WAAW,CAACI,IAAD,CAFtB;QAGE,KAAK,EAAED;MAHT,GAKGD,QALH,CADF;IASD,CAvBY;EAAA;;EAyBbG,WAAW,CAACH,QAAD,EAA+BC,MAA/B,EAAsD;IAC/D,oBACE,oBAAC,IAAD;MAAM,GAAG,EAAEJ,oBAAoB,EAA/B;MAAmC,KAAK,EAAEI;IAA1C,GACGD,QADH,CADF;EAKD;;EAEDI,gBAAgB,CACdC,IADc,EAEdC,cAFc,EAGdC,SAHc,EAId;IACA,oBACE,oBAAC,UAAD;MACE,GAAG,EAAEV,oBAAoB,EAD3B;MAEE,qBAAqB,EAAES,cAFzB;MAGE,UAAU;IAHZ,gBAKE,oBAAC,IAAD;MAAM,KAAK,EAAEC;IAAb,GAAyBF,IAAzB,CALF,CADF;EASD;;EAEDG,iBAAiB,CAACR,QAAD,EAAwBC,MAAxB,EAA+C;IAC9D,oBACE,oBAAC,IAAD;MAAM,GAAG,EAAEJ,oBAAoB,EAA/B;MAAmC,KAAK,EAAEI;IAA1C,GACGD,QADH,CADF;EAKD;;EAEDS,YAAY,CAACC,GAAD,EAAc;IACxB,oBAAO,oBAAC,OAAD;MAAS,GAAG,EAAEb,oBAAoB,EAAlC;MAAsC,GAAG,EAAEa;IAA3C,EAAP;EACD;;EAEDC,WAAW,CACTC,OADS,EAETC,EAFS,EAGTC,SAHS,EAITP,SAJS,EAKT;IACA,oBACE,oBAAC,UAAD;MACE,eAAe,EAAEK,OAAO,GAAGjB,OAAH,GAAaD,IADvC;MAEE,eAAe,EAAEa,SAFnB;MAGE,cAAc,EAAEO,SAHlB;MAIE,GAAG,EAAEjB,oBAAoB;IAJ3B,GAMGgB,EAAE,CAACE,GAAH,CAAQC,IAAD,IAAUA,IAAjB,CANH,CADF;EAUD;;AA7EY;;AAgFf,eAAejB,QAAf"}
+{"version":3,"names":["React","ScrollView","View","Text","TouchableHighlight","MarkedList","Disc","Decimal","MDImage","generateRandomString","onLinkPress","Renderer","children","styles","href","imageUrl","getViewNode","getCodeBlockNode","text","containerStyle","textStyle","getBlockquoteNode","getImageNode","uri","getListNode","ordered","li","listStyle","map","node"],"sources":["Renderer.tsx"],"sourcesContent":["import React, { ReactNode } from 'react';\nimport { ScrollView, View, Text, TouchableHighlight } from 'react-native';\nimport MarkedList from '@jsamr/react-native-li';\nimport Disc from '@jsamr/counter-style/presets/disc';\nimport Decimal from '@jsamr/counter-style/presets/decimal';\nimport MDImage from './../components/MDImage';\nimport { generateRandomString } from '../utils/string';\nimport type { TextStyleProp, ViewStyleProp } from './types';\nimport { onLinkPress } from '../utils/handlers';\n\nclass Renderer {\n  getTextNode = (children: string | ReactNode[], styles: TextStyleProp) => {\n    return (\n      <Text key={generateRandomString()} style={styles}>\n        {children}\n      </Text>\n    );\n  };\n\n  getTextLinkNode = (\n    children: string | ReactNode[],\n    href: string,\n    styles: TextStyleProp\n  ) => {\n    return (\n      <Text\n        key={generateRandomString()}\n        onPress={onLinkPress(href)}\n        style={styles}\n      >\n        {children}\n      </Text>\n    );\n  };\n\n  getImageLinkNode = (href: string, imageUrl: string) => {\n    return (\n      <TouchableHighlight\n        onPress={onLinkPress(href)}\n        key={generateRandomString()}\n      >\n        <MDImage uri={imageUrl} />\n      </TouchableHighlight>\n    );\n  };\n\n  getViewNode(children: ReactNode[] | null, styles: ViewStyleProp) {\n    return (\n      <View key={generateRandomString()} style={styles}>\n        {children}\n      </View>\n    );\n  }\n\n  getCodeBlockNode(\n    text: string,\n    containerStyle: ViewStyleProp,\n    textStyle: TextStyleProp\n  ) {\n    return (\n      <ScrollView\n        key={generateRandomString()}\n        contentContainerStyle={containerStyle}\n        horizontal\n      >\n        <Text style={textStyle}>{text}</Text>\n      </ScrollView>\n    );\n  }\n\n  getBlockquoteNode(children: ReactNode[], styles: ViewStyleProp) {\n    return (\n      <View key={generateRandomString()} style={styles}>\n        {children}\n      </View>\n    );\n  }\n\n  getImageNode(uri: string) {\n    return <MDImage key={generateRandomString()} uri={uri} />;\n  }\n\n  getListNode(\n    ordered: boolean,\n    li: ReactNode[],\n    listStyle: ViewStyleProp,\n    textStyle: TextStyleProp\n  ) {\n    return (\n      <MarkedList\n        counterRenderer={ordered ? Decimal : Disc}\n        markerTextStyle={textStyle}\n        markerBoxStyle={listStyle}\n        key={generateRandomString()}\n      >\n        {li.map((node) => node)}\n      </MarkedList>\n    );\n  }\n}\n\nexport default Renderer;\n"],"mappings":";;AAAA,OAAOA,KAAP,MAAiC,OAAjC;AACA,SAASC,UAAT,EAAqBC,IAArB,EAA2BC,IAA3B,EAAiCC,kBAAjC,QAA2D,cAA3D;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AACA,OAAOC,IAAP,MAAiB,mCAAjB;AACA,OAAOC,OAAP,MAAoB,sCAApB;AACA,OAAOC,OAAP,MAAoB,yBAApB;AACA,SAASC,oBAAT,QAAqC,iBAArC;AAEA,SAASC,WAAT,QAA4B,mBAA5B;;AAEA,MAAMC,QAAN,CAAe;EAAA;IAAA,qCACC,CAACC,QAAD,EAAiCC,MAAjC,KAA2D;MACvE,oBACE,oBAAC,IAAD;QAAM,GAAG,EAAEJ,oBAAoB,EAA/B;QAAmC,KAAK,EAAEI;MAA1C,GACGD,QADH,CADF;IAKD,CAPY;;IAAA,yCASK,CAChBA,QADgB,EAEhBE,IAFgB,EAGhBD,MAHgB,KAIb;MACH,oBACE,oBAAC,IAAD;QACE,GAAG,EAAEJ,oBAAoB,EAD3B;QAEE,OAAO,EAAEC,WAAW,CAACI,IAAD,CAFtB;QAGE,KAAK,EAAED;MAHT,GAKGD,QALH,CADF;IASD,CAvBY;;IAAA,0CAyBM,CAACE,IAAD,EAAeC,QAAf,KAAoC;MACrD,oBACE,oBAAC,kBAAD;QACE,OAAO,EAAEL,WAAW,CAACI,IAAD,CADtB;QAEE,GAAG,EAAEL,oBAAoB;MAF3B,gBAIE,oBAAC,OAAD;QAAS,GAAG,EAAEM;MAAd,EAJF,CADF;IAQD,CAlCY;EAAA;;EAoCbC,WAAW,CAACJ,QAAD,EAA+BC,MAA/B,EAAsD;IAC/D,oBACE,oBAAC,IAAD;MAAM,GAAG,EAAEJ,oBAAoB,EAA/B;MAAmC,KAAK,EAAEI;IAA1C,GACGD,QADH,CADF;EAKD;;EAEDK,gBAAgB,CACdC,IADc,EAEdC,cAFc,EAGdC,SAHc,EAId;IACA,oBACE,oBAAC,UAAD;MACE,GAAG,EAAEX,oBAAoB,EAD3B;MAEE,qBAAqB,EAAEU,cAFzB;MAGE,UAAU;IAHZ,gBAKE,oBAAC,IAAD;MAAM,KAAK,EAAEC;IAAb,GAAyBF,IAAzB,CALF,CADF;EASD;;EAEDG,iBAAiB,CAACT,QAAD,EAAwBC,MAAxB,EAA+C;IAC9D,oBACE,oBAAC,IAAD;MAAM,GAAG,EAAEJ,oBAAoB,EAA/B;MAAmC,KAAK,EAAEI;IAA1C,GACGD,QADH,CADF;EAKD;;EAEDU,YAAY,CAACC,GAAD,EAAc;IACxB,oBAAO,oBAAC,OAAD;MAAS,GAAG,EAAEd,oBAAoB,EAAlC;MAAsC,GAAG,EAAEc;IAA3C,EAAP;EACD;;EAEDC,WAAW,CACTC,OADS,EAETC,EAFS,EAGTC,SAHS,EAITP,SAJS,EAKT;IACA,oBACE,oBAAC,UAAD;MACE,eAAe,EAAEK,OAAO,GAAGlB,OAAH,GAAaD,IADvC;MAEE,eAAe,EAAEc,SAFnB;MAGE,cAAc,EAAEO,SAHlB;MAIE,GAAG,EAAElB,oBAAoB;IAJ3B,GAMGiB,EAAE,CAACE,GAAH,CAAQC,IAAD,IAAUA,IAAjB,CANH,CADF;EAUD;;AAxFY;;AA2Ff,eAAelB,QAAf"}

package/dist/typescript/lib/Renderer.d.ts

@@ -2,7 +2,8 @@ import { ReactNode } from 'react';
 import type { TextStyleProp, ViewStyleProp } from './types';
 declare class Renderer {
     getTextNode: (children: string | ReactNode[], styles: TextStyleProp) => JSX.Element;
-    getLinkNode: (children: string | ReactNode[], href: string, styles: TextStyleProp) => JSX.Element;
+    getTextLinkNode: (children: string | ReactNode[], href: string, styles: TextStyleProp) => JSX.Element;
+    getImageLinkNode: (href: string, imageUrl: string) => JSX.Element;
     getViewNode(children: ReactNode[] | null, styles: ViewStyleProp): JSX.Element;
     getCodeBlockNode(text: string, containerStyle: ViewStyleProp, textStyle: TextStyleProp): JSX.Element;
     getBlockquoteNode(children: ReactNode[], styles: ViewStyleProp): JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-marked",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Markdown renderer for React Native powered by marked.js",
   "main": "dist/commonjs/index",
   "module": "dist/module/index",
@@ -22,12 +22,13 @@
     "!**/__mocks__"
   ],
   "scripts": {
-    "test": "jest",
     "typescript": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "build": "bob build",
     "prepare": "yarn build",
-    "release": "yarn build && release-it"
+    "release": "yarn build && release-it",
+    "test": "jest --passWithNoTests",
+    "test:updateSnapshot": "jest --updateSnapshot"
   },
   "keywords": [
     "react-native",
@@ -52,7 +53,9 @@
     "@evilmartians/lefthook": "^1.1.1",
     "@react-native-community/eslint-config": "^3.0.2",
     "@release-it/conventional-changelog": "^5.0.0",
-    "@types/jest": "^28.1.2",
+    "@testing-library/jest-native": "^5.0.0",
+    "@testing-library/react-native": "^11.2.0",
+    "@types/jest": "^29.1.1",
     "@types/marked": "^4.0.3",
     "@types/react": "~17.0.21",
     "@types/react-native": "0.68.0",
@@ -63,12 +66,14 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-jest": "^27.0.4",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^28.1.1",
+    "jest": "^29.1.2",
+    "jest-environment-jsdom": "^29.1.2",
     "pod-install": "^0.1.0",
     "prettier": "^2.0.5",
     "react": "17.0.2",
     "react-native": "0.68.2",
     "react-native-builder-bob": "^0.18.3",
+    "react-test-renderer": "^17.0.2",
     "release-it": "^15.4.1",
     "typescript": "^4.5.2"
   },
@@ -81,9 +86,13 @@
   },
   "jest": {
     "preset": "react-native",
+    "testEnvironment": "jsdom",
     "modulePathIgnorePatterns": [
       "<rootDir>/examples/*/node_modules",
       "<rootDir>/dist/"
+    ],
+    "setupFilesAfterEnv": [
+      "@testing-library/jest-native/extend-expect"
     ]
   },
   "commitlint": {
@@ -186,6 +195,7 @@
   "dependencies": {
     "@jsamr/counter-style": "^2.0.2",
     "@jsamr/react-native-li": "^2.3.1",
+    "html-entities": "^2.3.3",
     "marked": "^4.0.18",
     "react-native-fit-image": "^1.5.5"
   }

package/src/lib/Parser.tsx

@@ -1,5 +1,6 @@
 import type { ReactNode } from 'react';
 import type { marked } from 'marked';
+import { decode } from 'html-entities';
 import Renderer from './Renderer';
 import type { MarkedStyles } from '../theme/types';
 import type { CustomStyleProp, ParserOptions, TextStyleProp } from './types';
@@ -67,12 +68,10 @@ class Parser {
             const children = item.tokens.map((cItem) => {
               if (cItem.type === 'text') {
                 /* getViewNode since tokens could contain a block like elements (i.e. img) */
+                const childTokens = (cItem as marked.Tokens.Text).tokens || [];
                 const listChildren =
                   this.getNormalizedSiblingNodesForBlockAndInlineTokens(
-                    // Note: Upstream types aren't available for this specific use-case
-                    // @types/marked (https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/marked/index.d.ts)
-                    // @ts-ignore
-                    cItem.tokens,
+                    childTokens,
                     this.styles.li
                   );
                 return this.renderer.getViewNode(listChildren, this.styles.li);
@@ -109,11 +108,22 @@ class Parser {
           });
         }
         case 'link': {
+          if (
+            token.tokens &&
+            token.tokens[0] &&
+            token.tokens[0].type === 'image'
+          ) {
+            return this.renderer.getImageLinkNode(
+              token.href,
+              token.tokens[0]?.href
+            );
+          }
+
           const linkStyle = {
             ...styles,
             ...this.styles.link, // To override color property
           };
-          return this.renderer.getLinkNode(
+          return this.renderer.getTextLinkNode(
             this.parseInline(token.tokens, linkStyle),
             token.href,
             linkStyle
@@ -160,7 +170,7 @@ class Parser {
             return null;
           }
 
-          return this.renderer.getTextNode(token.raw, {
+          return this.renderer.getTextNode(decode(token.raw), {
             ...this.styles.text,
             ...styles,
           });
@@ -183,16 +193,30 @@ class Parser {
     tokens.forEach((t) => {
       /**
        * To avoid inlining images
+       * Currently supports images, link images
        * Note: to be extend for other token types
        */
-      if (t.type === 'image') {
+      if (
+        t.type === 'image' ||
+        (t.type === 'link' &&
+          t.tokens &&
+          t.tokens[0] &&
+          t.tokens[0].type === 'image')
+      ) {
         const parsed = this.parseInline(tempTokens);
         if (parsed.length > 0) {
+          siblingNodes.push(this.renderer.getTextNode(parsed, textStyle));
+        }
+
+        if (t.type === 'image') {
+          siblingNodes.push(this.parseInline([t]));
+        } else if (t.type === 'link') {
+          const imageToken = t.tokens[0] as marked.Tokens.Image;
           siblingNodes.push(
-            this.renderer.getTextNode(this.parseInline(tempTokens), textStyle)
+            this.renderer.getImageLinkNode(t.href, imageToken.href)
           );
         }
-        siblingNodes.push(this.parseInline([t]));
+
         tempTokens = [];
         return;
       }
@@ -205,6 +229,7 @@ class Parser {
         this.renderer.getTextNode(this.parseInline(tempTokens), {})
       );
     }
+
     return siblingNodes;
   };
 }

package/src/lib/Renderer.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { ScrollView, View, Text } from 'react-native';
+import { ScrollView, View, Text, TouchableHighlight } from 'react-native';
 import MarkedList from '@jsamr/react-native-li';
 import Disc from '@jsamr/counter-style/presets/disc';
 import Decimal from '@jsamr/counter-style/presets/decimal';
@@ -17,7 +17,7 @@ class Renderer {
     );
   };
 
-  getLinkNode = (
+  getTextLinkNode = (
     children: string | ReactNode[],
     href: string,
     styles: TextStyleProp
@@ -33,6 +33,17 @@ class Renderer {
     );
   };
 
+  getImageLinkNode = (href: string, imageUrl: string) => {
+    return (
+      <TouchableHighlight
+        onPress={onLinkPress(href)}
+        key={generateRandomString()}
+      >
+        <MDImage uri={imageUrl} />
+      </TouchableHighlight>
+    );
+  };
+
   getViewNode(children: ReactNode[] | null, styles: ViewStyleProp) {
     return (
       <View key={generateRandomString()} style={styles}>