diff options
Diffstat (limited to 'src/view/com/util/Html.tsx')
-rw-r--r-- | src/view/com/util/Html.tsx | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/view/com/util/Html.tsx b/src/view/com/util/Html.tsx index dbf24a83a..8d3f29fb0 100644 --- a/src/view/com/util/Html.tsx +++ b/src/view/com/util/Html.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import * as React from 'react' import {StyleSheet, View} from 'react-native' import {usePalette} from 'lib/hooks/usePalette' import {Text} from './text/Text' @@ -10,6 +10,15 @@ import {isDesktopWeb} from 'platform/detection' * DSL. See for instance /locale/en/privacy-policy.tsx */ +interface IsChildProps { + isChild?: boolean +} + +// type ReactNodeWithIsChildProp = +// | React.ReactElement<IsChildProps> +// | React.ReactElement<IsChildProps>[] +// | React.ReactNode + export function H1({children}: React.PropsWithChildren<{}>) { const pal = usePalette('default') return ( @@ -55,10 +64,7 @@ export function P({children}: React.PropsWithChildren<{}>) { ) } -export function UL({ - children, - isChild, -}: React.PropsWithChildren<{isChild: boolean}>) { +export function UL({children, isChild}: React.PropsWithChildren<IsChildProps>) { return ( <View style={[styles.ul, isChild && styles.ulChild]}> {markChildProps(children)} @@ -66,10 +72,7 @@ export function UL({ ) } -export function OL({ - children, - isChild, -}: React.PropsWithChildren<{isChild: boolean}>) { +export function OL({children, isChild}: React.PropsWithChildren<IsChildProps>) { return ( <View style={[styles.ol, isChild && styles.olChild]}> {markChildProps(children)} @@ -122,10 +125,13 @@ export function EM({children}: React.PropsWithChildren<{}>) { ) } -function markChildProps(children) { +function markChildProps(children: React.ReactNode) { return React.Children.map(children, child => { if (React.isValidElement(child)) { - return React.cloneElement(child, {isChild: true}) + return React.cloneElement<IsChildProps>( + child as React.ReactElement<IsChildProps>, + {isChild: true}, + ) } return child }) |