Dependency updates (primarily React 17 and React Native 0.64.2)

.eslintrc.js

@@ -2,8 +2,8 @@ module.exports = {
   root: true,
   extends: '@react-native-community',
   settings: {
-      react: {
-          version: require('./package.json').peerDependencies.react,
-      },
-  }
+    react: {
+      version: require('./package.json').peerDependencies.react,
+    },
+  },
 };

package.json

@@ -30,24 +30,26 @@
   "homepage": "https://github.com/iamacup/react-native-markdown-display/",
   "dependencies": {
     "css-to-react-native": "^3.0.0",
-    "markdown-it": "^10.0.0",
+    "markdown-it": "^13.0.0",
     "prop-types": "^15.7.2",
     "react-native-fit-image": "^1.5.5"
   },
   "peerDependencies": {
-    "react": "^16.2.0",
+    "react": "^17 || ^18",
     "react-native": ">=0.50.4"
   },
   "devDependencies": {
-    "@types/markdown-it": "^10.0.1",
-    "@types/react-native": ">=0.50.0",
-    "@babel/core": "^7.9.6",
-    "@babel/runtime": "^7.9.6",
-    "@react-native-community/eslint-config": "^1.1.0",
-    "@typescript-eslint/parser": "^2.32.0",
-    "eslint": "^7.0.0",
-    "json-schema": "^0.2.5",
-    "pre-commit": "1.2.2",
-    "typescript": "^3.8.3"
+    "@babel/core": "^7.15.0",
+    "@babel/runtime": "^7.15.3",
+    "@react-native-community/eslint-config": "^3.0.0",
+    "@types/markdown-it": "^12.2.1",
+    "@types/react-native": "^0.64.13",
+    "@typescript-eslint/parser": "^4.29.3",
+    "eslint": "^7.32.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "json-schema": "^0.4.0",
+    "pre-commit": "^1.2.2",
+    "prettier": "^2.6.2",
+    "typescript": "^4.4.2"
   }
 }

src/index.d.ts

@@ -62,6 +62,7 @@ export interface ASTNode {
 }
 
 export class AstRenderer {
+  // eslint-disable-next-line no-shadow
   constructor(renderRules: RenderRules, style?: any);
   getRenderFunction(type: string): RenderFunction;
   renderNode(node: any, parentNodes: ReadonlyArray<any>): ReactNode;
@@ -71,6 +72,7 @@ export class AstRenderer {
 export function parser(
   source: string,
   renderer: (node: ASTNode) => View,
+  // eslint-disable-next-line no-shadow
   parser: MarkdownParser,
 ): any;
 

src/lib/renderRules.js

@@ -13,6 +13,24 @@ import hasParents from './util/hasParents';
 
 import textStyleProps from './data/textStyleProps';
 
+function renderText(node, inheritedStyles, styles) {
+  // we trim new lines off the end of code blocks because the parser sends an extra one.
+  let {content} = node;
+
+  if (
+    typeof node.content === 'string' &&
+    node.content.charAt(node.content.length - 1) === '\n'
+  ) {
+    content = node.content.substring(0, node.content.length - 1);
+  }
+
+  return (
+    <Text key={node.key} style={[inheritedStyles, styles.code_block]}>
+      {content}
+    </Text>
+  );
+}
+
 const renderRules = {
   // when unknown elements are introduced, so it wont break
   unknown: (node, children, parent, styles) => null,
@@ -177,38 +195,10 @@ const renderRules = {
     </Text>
   ),
   code_block: (node, children, parent, styles, inheritedStyles = {}) => {
-    // we trim new lines off the end of code blocks because the parser sends an extra one.
-    let {content} = node;
-
-    if (
-      typeof node.content === 'string' &&
-      node.content.charAt(node.content.length - 1) === '\n'
-    ) {
-      content = node.content.substring(0, node.content.length - 1);
-    }
-
-    return (
-      <Text key={node.key} style={[inheritedStyles, styles.code_block]}>
-        {content}
-      </Text>
-    );
+    return renderText(node, inheritedStyles, styles);
   },
   fence: (node, children, parent, styles, inheritedStyles = {}) => {
-    // we trim new lines off the end of code blocks because the parser sends an extra one.
-    let {content} = node;
-
-    if (
-      typeof node.content === 'string' &&
-      node.content.charAt(node.content.length - 1) === '\n'
-    ) {
-      content = node.content.substring(0, node.content.length - 1);
-    }
-
-    return (
-      <Text key={node.key} style={[inheritedStyles, styles.fence]}>
-        {content}
-      </Text>
-    );
+    return renderText(node, inheritedStyles, styles);
   },
 
   // Tables

src/lib/util/cleanupTokens.js

@@ -25,7 +25,7 @@ export function cleanupTokens(tokens) {
    * nested non text tokens breaks component
    */
   const stack = [];
-  tokens = tokens.reduce((acc, token, index) => {
+  tokens = tokens.reduce((acc, token) => {
     if (token.type === 'link' && token.nesting === 1) {
       stack.push(token);
     } else if (

src/lib/util/convertAdditionalStyles.js

@@ -19,7 +19,5 @@ export default function convertAdditionalStyles(style) {
       return x != null;
     });
 
-  const conv = cssToReactNative(tuples);
-
-  return conv;
+  return cssToReactNative(tuples);
 }

src/lib/util/groupTextTokens.js

@@ -5,7 +5,7 @@ export default function groupTextTokens(tokens) {
 
   let hasGroup = false;
 
-  tokens.forEach((token, index) => {
+  tokens.forEach((token) => {
     if (!token.block && !hasGroup) {
       hasGroup = true;
       result.push(new Token('textgroup', 1));

src/lib/util/renderInlineAsText.js

@@ -1,7 +1,7 @@
 export default function renderInlineAsText(tokens) {
-  var result = '';
+  let result = '';
 
-  for (var i = 0, len = tokens.length; i < len; i++) {
+  for (let i = 0, len = tokens.length; i < len; i++) {
     if (tokens[i].type === 'text') {
       result += tokens[i].content;
     } else if (tokens[i].type === 'image') {