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

jsamr · jsamr · commit ffa4f2c17322 · 2021-06-08T16:17:10.000-03:00
diff --git a/packages/heuristic-table-plugin/package.json b/packages/heuristic-table-plugin/package.json
@@ -69,7 +69,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/heuristic-table-plugin#readme",
diff --git a/packages/heuristic-table-plugin/src/TdRenderer.tsx b/packages/heuristic-table-plugin/src/TdRenderer.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { CustomBlockRenderer } from 'react-native-render-html';
-import { TableCellPropsFromParent } from './shared-types';
 import useHtmlTableCellProps from './useHtmlTableCellProps';
 
 /**
@@ -9,9 +8,7 @@ import useHtmlTableCellProps from './useHtmlTableCellProps';
  * @param props - Component props.
  * @public
  */
-const TdRenderer: CustomBlockRenderer<TableCellPropsFromParent> = function (
-  props
-) {
+const TdRenderer: CustomBlockRenderer = function TdRenderer(props) {
   return React.createElement(
     props.TDefaultRenderer,
     useHtmlTableCellProps(props)
diff --git a/packages/heuristic-table-plugin/src/ThRenderer.ts b/packages/heuristic-table-plugin/src/ThRenderer.ts
@@ -1,6 +1,5 @@
 import React from 'react';
 import { CustomBlockRenderer } from 'react-native-render-html';
-import { TableCellPropsFromParent } from './shared-types';
 import useHtmlTableCellProps from './useHtmlTableCellProps';
 
 /**
@@ -9,9 +8,7 @@ import useHtmlTableCellProps from './useHtmlTableCellProps';
  * @param props - Component props.
  * @public
  */
-const ThRenderer: CustomBlockRenderer<TableCellPropsFromParent> = function (
-  props
-) {
+const ThRenderer: CustomBlockRenderer = function ThRenderer(props) {
   return React.createElement(
     props.TDefaultRenderer,
     useHtmlTableCellProps(props)
diff --git a/packages/heuristic-table-plugin/src/TreeRenderer.tsx b/packages/heuristic-table-plugin/src/TreeRenderer.tsx
@@ -19,7 +19,9 @@ export default function TreeRenderer({
     return (
       <View style={{ width: node.width }}>
         <TNodeRenderer
-          propsFromParent={{ cell: node, collapsedMarginTop: null, config }}
+          propsFromParent={
+            { cell: node, collapsedMarginTop: null, config } as any
+          }
           tnode={node.tnode}
         />
       </View>
diff --git a/packages/heuristic-table-plugin/src/index.ts b/packages/heuristic-table-plugin/src/index.ts
@@ -1,4 +1,5 @@
 import { CustomBlockRenderer } from 'react-native-render-html';
+import { HeuristicTablePluginConfig, Settings } from './shared-types';
 import TableRenderer from './TableRenderer';
 import TdRenderer from './TdRenderer';
 import ThRenderer from './ThRenderer';
@@ -33,4 +34,13 @@ export { default as useHtmlTableProps } from './useHtmlTableProps';
 export { default as useHtmlTableCellProps } from './useHtmlTableCellProps';
 export { default as HTMLTable } from './HTMLTable';
 
+declare module 'react-native-render-html' {
+  interface RenderersProps {
+    /**
+     * Configuration for `@native-html/heuristic-table-plugin` table renderer.
+     */
+    table?: Settings & HeuristicTablePluginConfig;
+  }
+}
+
 export default renderers;
diff --git a/packages/heuristic-table-plugin/src/shared-types.ts b/packages/heuristic-table-plugin/src/shared-types.ts
@@ -1,6 +1,6 @@
 import { ViewStyle } from 'react-native';
 import {
-  CustomTagRendererProps,
+  CustomRendererProps,
   PropsFromParent,
   TBlock,
   TNode
@@ -164,7 +164,7 @@ export interface HeuristicTablePluginConfig {
  *
  * @public
  */
-export interface HTMLTableProps extends CustomTagRendererProps<TBlock> {
+export interface HTMLTableProps extends CustomRendererProps<TBlock> {
   layout: TableLayout;
   config: HeuristicTablePluginConfig;
   settings: Settings;
diff --git a/packages/heuristic-table-plugin/src/useHtmlTableCellProps.ts b/packages/heuristic-table-plugin/src/useHtmlTableCellProps.ts
@@ -1,4 +1,4 @@
-import { DefaultTagRendererProps, TBlock } from 'react-native-render-html';
+import { TBlock, CustomRendererProps } from 'react-native-render-html';
 import { TableCellPropsFromParent } from './shared-types';
 
 /**
@@ -11,11 +11,8 @@ import { TableCellPropsFromParent } from './shared-types';
 export default function useHtmlTableCellProps({
   propsFromParent,
   ...props
-}: DefaultTagRendererProps<
-  TBlock,
-  TableCellPropsFromParent
->): DefaultTagRendererProps<TBlock, TableCellPropsFromParent> {
-  const { config, cell } = propsFromParent;
+}: CustomRendererProps<TBlock>): CustomRendererProps<TBlock> {
+  const { config, cell } = propsFromParent as TableCellPropsFromParent;
   const styleFromConfig = config?.getStyleForCell?.call(null, cell);
   let spanStyles = {};
   if (cell.lenY > 1) {
diff --git a/packages/heuristic-table-plugin/src/useHtmlTableProps.ts b/packages/heuristic-table-plugin/src/useHtmlTableProps.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import {
-  CustomTagRendererProps,
+  CustomRendererProps,
   TBlock,
   TNode,
   useContentWidth,
@@ -32,7 +32,7 @@ function useTableLayout({
  * @public
  */
 export default function useHtmlTableProps(
-  { sharedProps, tnode, ...props }: CustomTagRendererProps<TBlock>,
+  { sharedProps, tnode, ...props }: CustomRendererProps<TBlock>,
   options: {
     /**
      * If present, overrides contentWidth from shared props.
