feat(table): support react-native-render-html@6.0.0-beta.0

jsamr · jsamr · commit 6de42c860fcd · 2021-06-08T16:17:01.000-03:00
diff --git a/packages/table-plugin/package.json b/packages/table-plugin/package.json
@@ -73,7 +73,7 @@
   "peerDependencies": {
     "react": ">= 16.8.0",
     "react-native": ">= 0.63.0",
-    "react-native-render-html": ">= 6.0.0-alpha.25 || >= 6.0.0-beta.0 || 6.x"
+    "react-native-render-html": ">= 6.0.0-beta.0 || 6.x"
   },
   "author": "Jules Sam. Randolph <jules.sam.randolph@gmail.com> (https://github.com/jsamr)",
   "homepage": "https://github.com/native-html/plugins/tree/master/packages/table-plugin#readme",
diff --git a/packages/table-plugin/src/extractHtmlAndStatsFromTableDomNode.ts b/packages/table-plugin/src/extractHtmlAndStatsFromTableDomNode.ts
@@ -1,5 +1,5 @@
 import { domNodeToHTMLString } from 'react-native-render-html';
-import { isDOMElement, isDOMText } from '@native-html/transient-render-engine';
+import { isDomElement, isDomText } from '@native-html/transient-render-engine';
 import { HTMLTableStats } from './types';
 import type { Node } from 'domhandler';
 
@@ -12,7 +12,7 @@ export default function extractHtmlAndStatsFromTableDomNode(
     numOfRows: 0
   };
   const innerHTML = domNodeToHTMLString(domNode, (node, _depth, html) => {
-    if (isDOMElement(node)) {
+    if (isDomElement(node)) {
       if (node.tagName === 'tr') {
         stats.numOfRows += 1;
       } else if (
@@ -21,7 +21,7 @@ export default function extractHtmlAndStatsFromTableDomNode(
       ) {
         stats.numOfColumns += 1;
       }
-    } else if (isDOMText(node)) {
+    } else if (isDomText(node)) {
       stats.numOfChars += html.length;
     }
   });
diff --git a/packages/table-plugin/src/index.ts b/packages/table-plugin/src/index.ts
@@ -1,3 +1,4 @@
+import type { TableConfig } from './types';
 export type {
   HTMLTableBaseProps,
   HTMLTableProps,
@@ -12,3 +13,12 @@ export { defaultTableStylesSpecs, cssRulesFromSpecs } from './css-rules';
 export { HTMLTable } from './HTMLTable';
 export { default as useHtmlTableProps } from './useHtmlTableProps';
 export { default, tableModel } from './TableRenderer';
+
+declare module 'react-native-render-html' {
+  interface RenderersProps {
+    /**
+     * Configuration for `@native-html/table-plugin` table renderer.
+     */
+    table?: TableConfig;
+  }
+}
diff --git a/packages/table-plugin/src/types.ts b/packages/table-plugin/src/types.ts
@@ -1,6 +1,6 @@
 import { ComponentType } from 'react';
 import { StyleProp, ViewStyle } from 'react-native';
-import { RenderersPropsBase } from 'react-native-render-html';
+import { RenderersProps } from 'react-native-render-html';
 
 /**
  * An object describing how to generate styles. See {@link cssRulesFromSpecs}.
@@ -321,7 +321,7 @@ export interface HTMLTableBaseProps extends HTMLTableStats {
   /**
    * Intercept links press.
    */
-  onLinkPress?: RenderersPropsBase['a']['onPress'];
+  onLinkPress?: RenderersProps['a']['onPress'];
 
   /**
    * Html attributes for this table node.
diff --git a/packages/table-plugin/src/useHtmlTableProps.ts b/packages/table-plugin/src/useHtmlTableProps.ts
@@ -1,6 +1,6 @@
 import { Dimensions } from 'react-native';
 import {
-  CustomTagRendererProps,
+  CustomRendererProps,
   useSharedProps,
   useDocumentMetadata,
   useRendererProps,
@@ -20,7 +20,7 @@ import type { TBlock } from '@native-html/transient-render-engine';
  * @public
  */
 export default function useHtmlTableProps(
-  { key, style, tnode }: CustomTagRendererProps<TBlock>,
+  { key, style, tnode }: CustomRendererProps<TBlock>,
   tableConfig?: TableConfig
 ): (HTMLTableProps & { key?: string | number }) | null {
   const {
