@utilitywarehouse/hearth-react-native 0.11.0 → 0.12.0

package/build/components/Input/InputField.d.ts

@@ -1,8 +1,5 @@
-import { TextInputProps } from 'react-native';
-declare const InputField: {
-    ({ style, inBottomSheet, ...props }: TextInputProps & {
-        inBottomSheet?: boolean;
-    }): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
+import { TextInput as RNTextInput, TextInputProps } from 'react-native';
+declare const InputField: import("react").ForwardRefExoticComponent<TextInputProps & {
+    inBottomSheet?: boolean;
+} & import("react").RefAttributes<RNTextInput>>;
 export default InputField;

package/build/components/Input/InputField.js

@@ -1,20 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { BottomSheetTextInput } from '@gorhom/bottom-sheet';
+import { forwardRef } from 'react';
 import { TextInput as RNTextInput } from 'react-native';
 import { StyleSheet } from 'react-native-unistyles';
 import { useTheme } from '../../hooks';
 import { useInputContext } from './Input.context';
-const InputField = ({ style, inBottomSheet = false, ...props }) => {
+const InputField = forwardRef(({ style, inBottomSheet = false, ...props }, ref) => {
     const { disabled, focused = false, type } = useInputContext();
     styles.useVariants({ focused, type });
     const { color } = useTheme();
     if (inBottomSheet) {
         return (
-        // @ts-expect-error - BottomSheetTextInput type issue
-        _jsx(BottomSheetTextInput, { placeholderTextColor: color.text.secondary, selectionColor: color.purple[700], cursorColor: color.purple[700], verticalAlign: "middle", "aria-disabled": disabled, ...props, style: [styles.input, style] }));
+        // @ts-expect-error - BottomSheetTextInput has incompatible event types with TextInput
+        _jsx(BottomSheetTextInput, { ref: ref, placeholderTextColor: color.text.secondary, selectionColor: color.surface.brand.default, cursorColor: color.surface.brand.default, verticalAlign: "middle", "aria-disabled": disabled, ...props, style: [styles.input, style] }));
     }
-    return (_jsx(RNTextInput, { placeholderTextColor: color.text.secondary, selectionColor: color.purple[700], cursorColor: color.purple[700], verticalAlign: "middle", "aria-disabled": disabled, ...props, style: [styles.input, style] }));
-};
+    return (_jsx(RNTextInput, { ref: ref, placeholderTextColor: color.text.secondary, selectionColor: color.surface.brand.default, cursorColor: color.surface.brand.default, verticalAlign: "middle", "aria-disabled": disabled, ...props, style: [styles.input, style] }));
+});
 InputField.displayName = 'InputField';
 const styles = StyleSheet.create(theme => ({
     input: {

package/build/components/List/ListItem/ListItem.props.d.ts

@@ -1,5 +1,5 @@
+import { ReactNode } from 'react';
 import type { PressableProps, ViewProps } from 'react-native';
-import BadgeProps from '../../Badge/Badge.props';
 interface ListItemBaseProps extends Omit<PressableProps, 'children'> {
     loading?: boolean;
     disabled?: boolean;
@@ -23,7 +23,7 @@ export interface ListItemWithoutChildren extends ListItemBaseProps {
     leadingContent?: ViewProps['children'];
     trailingContent?: ViewProps['children'];
     numericValue?: string | number;
-    badge?: BadgeProps;
+    badge?: ReactNode;
     badgePosition?: 'top' | 'bottom';
 }
 type ListItemProps = ListItemWithChildren | ListItemWithoutChildren;

package/build/components/List/ListItem/ListItemRoot.js

@@ -3,7 +3,6 @@ import { ChevronRightSmallIcon } from '@utilitywarehouse/hearth-react-native-ico
 import { useMemo } from 'react';
 import { Pressable } from 'react-native';
 import { StyleSheet } from 'react-native-unistyles';
-import { Badge } from '../../Badge';
 import { DetailText } from '../../DetailText';
 import { Skeleton } from '../../Skeleton';
 import { useListContext } from '../List.context';
@@ -53,7 +52,7 @@ const ListItemRoot = ({ heading, helperText, leadingContent, trailingContent, di
     if (loading || listContext?.loading) {
         return (_jsxs(Pressable, { ...props, testID: loadingTestID, style: [styles.container, props.style], disabled: isDisabled, children: [leadingContent ? _jsx(Skeleton, { width: 24, height: 24 }) : null, _jsxs(ListItemContent, { children: [_jsx(Skeleton, { width: "80%", height: 20 }), _jsx(Skeleton, { width: "100%", height: 16 })] }), onPress || trailingContent ? _jsx(Skeleton, { width: 24, height: 24 }) : null] }));
     }
-    return (_jsx(ListItemContext.Provider, { value: value, children: _jsx(Pressable, { ...props, testID: testID, style: [styles.container, props.style], disabled: isDisabled, accessibilityRole: onPress ? 'button' : undefined, children: children ? (children) : (_jsxs(_Fragment, { children: [leadingContent ? (_jsx(ListItemLeadingContent, { children: leadingContent })) : null, _jsxs(ListItemContent, { children: [badgePosition === 'top' && badge ? _jsx(Badge, { ...badge }) : null, _jsx(ListItemText, { children: heading }), helperText ? _jsx(ListItemHelperText, { children: helperText }) : null, badgePosition === 'bottom' && badge ? _jsx(Badge, { ...badge }) : null] }), !!numericValue && _jsx(DetailText, { size: "lg", children: numericValue }), trailingContent ? (_jsx(ListItemTrailingContent, { children: trailingContent })) : onPress ? (_jsx(ListItemTrailingContent, { style: styles.centeredTrailingIcon, children: _jsx(ListItemTrailingIcon, { as: ChevronRightSmallIcon }) })) : null] })) }) }));
+    return (_jsx(ListItemContext.Provider, { value: value, children: _jsx(Pressable, { ...props, testID: testID, style: [styles.container, props.style], disabled: isDisabled, accessibilityRole: onPress ? 'button' : undefined, children: children ? (children) : (_jsxs(_Fragment, { children: [leadingContent ? (_jsx(ListItemLeadingContent, { children: leadingContent })) : null, _jsxs(ListItemContent, { children: [badgePosition === 'top' && badge ? badge : null, _jsx(ListItemText, { children: heading }), helperText ? _jsx(ListItemHelperText, { children: helperText }) : null, badgePosition === 'bottom' && badge ? badge : null] }), !!numericValue && _jsx(DetailText, { size: "lg", children: numericValue }), trailingContent ? (_jsx(ListItemTrailingContent, { children: trailingContent })) : onPress ? (_jsx(ListItemTrailingContent, { style: styles.centeredTrailingIcon, children: _jsx(ListItemTrailingIcon, { as: ChevronRightSmallIcon }) })) : null] })) }) }));
 };
 ListItemRoot.displayName = 'ListItemRoot';
 const styles = StyleSheet.create(theme => ({

package/build/components/Modal/Modal.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { CloseMediumIcon } from '@utilitywarehouse/hearth-react-native-icons';
 import { useCallback, useEffect, useImperativeHandle, useRef } from 'react';
-import { AccessibilityInfo, Image, Platform, View, findNodeHandle } from 'react-native';
+import { AccessibilityInfo, Platform, View, findNodeHandle } from 'react-native';
 import Animated, { Easing, useAnimatedStyle, useSharedValue, withDelay, withTiming, } from 'react-native-reanimated';
 import { StyleSheet } from 'react-native-unistyles';
 import { useTheme } from '../../hooks';
@@ -98,7 +98,7 @@ const Modal = ({ ref, children, heading, description, showCloseButton = true, pr
         }
     };
     styles.useVariants({ loading });
-    const content = (_jsx(_Fragment, { children: loading ? (_jsxs(View, { style: styles.loadingContainer, accessible: Platform.OS === 'android' ? true : undefined, accessibilityLabel: Platform.OS === 'android' ? 'Loading' : undefined, screenReaderFocusable: true, ref: viewRef, children: [_jsx(Spinner, { size: "lg" }), _jsx(Heading, { size: "lg", textAlign: "center", children: "Loading..." })] })) : (_jsxs(View, { style: styles.container, accessible: Platform.OS === 'android' ? true : undefined, accessibilityLabel: Platform.OS === 'android' ? 'Modal content' : undefined, screenReaderFocusable: true, ref: viewRef, children: [_jsxs(View, { style: styles.header, children: [_jsxs(View, { style: styles.headerTextContent, children: [heading && !image ? (_jsx(Heading, { size: "lg", accessible: true, children: heading })) : null, description && !image ? _jsx(BodyText, { accessible: true, children: description }) : null] }), showCloseButton ? (_jsx(UnstyledIconButton, { icon: CloseMediumIcon, onPress: handleCloseButtonPress, accessibilityLabel: "Close modal", ...closeButtonProps })) : null] }), image ? (_jsxs(View, { style: styles.imageContainer, children: [_jsx(Image, { style: styles.image, ...image }), _jsxs(View, { style: styles.textContent, children: [heading ? (_jsx(Heading, { size: "lg", textAlign: "center", accessible: true, children: heading })) : null, description ? (_jsx(BodyText, { textAlign: "center", accessible: true, children: description })) : null] })] })) : null, children, _jsxs(View, { style: styles.footer, children: [onPressPrimaryButton && primaryButtonText ? (_jsx(Button, { onPress: handlePrimaryButtonPress, text: primaryButtonText, ...primaryButtonProps, variant: primaryButtonProps?.variant ?? 'solid', colorScheme: primaryButtonProps?.colorScheme ?? 'highlight' })) : null, onPressSecondaryButton && secondaryButtonText ? (_jsx(Button, { onPress: handleSecondaryButtonPress, text: secondaryButtonText, ...secondaryButtonProps, variant: secondaryButtonProps?.variant ?? 'outline', colorScheme: secondaryButtonProps?.colorScheme ?? 'functional' })) : null] })] })) }));
+    const content = (_jsx(_Fragment, { children: loading ? (_jsxs(View, { style: styles.loadingContainer, accessible: Platform.OS === 'android' ? true : undefined, accessibilityLabel: Platform.OS === 'android' ? 'Loading' : undefined, screenReaderFocusable: true, ref: viewRef, children: [_jsx(Spinner, { size: "lg" }), _jsx(Heading, { size: "lg", textAlign: "center", children: "Loading..." })] })) : (_jsxs(View, { style: styles.container, accessible: Platform.OS === 'android' ? true : undefined, accessibilityLabel: Platform.OS === 'android' ? 'Modal content' : undefined, screenReaderFocusable: true, ref: viewRef, children: [_jsxs(View, { style: styles.header, children: [_jsxs(View, { style: styles.headerTextContent, children: [heading && !image ? (_jsx(Heading, { size: "lg", accessible: true, children: heading })) : null, description && !image ? _jsx(BodyText, { accessible: true, children: description }) : null] }), showCloseButton ? (_jsx(UnstyledIconButton, { icon: CloseMediumIcon, onPress: handleCloseButtonPress, accessibilityLabel: "Close modal", ...closeButtonProps })) : null] }), image ? (_jsxs(View, { style: styles.imageContainer, children: [image, _jsxs(View, { style: styles.textContent, children: [heading ? (_jsx(Heading, { size: "lg", textAlign: "center", accessible: true, children: heading })) : null, description ? (_jsx(BodyText, { textAlign: "center", accessible: true, children: description })) : null] })] })) : null, children, _jsxs(View, { style: styles.footer, children: [onPressPrimaryButton && primaryButtonText ? (_jsx(Button, { onPress: handlePrimaryButtonPress, text: primaryButtonText, ...primaryButtonProps, variant: primaryButtonProps?.variant ?? 'solid', colorScheme: primaryButtonProps?.colorScheme ?? 'highlight' })) : null, onPressSecondaryButton && secondaryButtonText ? (_jsx(Button, { onPress: handleSecondaryButtonPress, text: secondaryButtonText, ...secondaryButtonProps, variant: secondaryButtonProps?.variant ?? 'outline', colorScheme: secondaryButtonProps?.colorScheme ?? 'functional' })) : null] })] })) }));
     return inNavModal ? (_jsxs(View, { style: { flex: 1, backgroundColor: theme.color.background.primary }, children: [Platform.OS === 'android' ? (_jsx(Animated.View, { style: [styles.androidContainer, animatedBackgroundStyle], children: _jsx(Animated.View, { style: [styles.pretendContent, animatedPretendContentStyle] }) })) : null, _jsx(Animated.View, { style: [styles.inNavModalContainer, Platform.OS === 'android' && animatedInNavModalStyle], children: _jsx(View, { style: styles.inNavModalContent, children: content }) })] })) : (_jsxs(BottomSheetModal, { ref: bottomSheetModalRef, enableDynamicSizing: true, snapPoints: image || fullscreen ? ['90%'] : props.snapPoints, showHandle: typeof loading !== 'undefined' && loading ? false : props.showHandle, accessible: false, style: styles.modal, ...props, onChange: handleChange, children: [loading ? _jsx(View, { style: styles.loadingTop }) : null, _jsx(BottomSheetScrollView, { contentContainerStyle: styles.container, ref: scrollViewRef, children: content })] }));
 };
 const styles = StyleSheet.create((theme, rt) => ({
@@ -124,10 +124,6 @@ const styles = StyleSheet.create((theme, rt) => ({
         flex: 1,
         gap: theme.components.modal.content.gap,
     },
-    image: {
-        width: 260,
-        height: 260,
-    },
     imageContainer: {
         alignItems: 'center',
         flex: 1,

package/build/components/Modal/Modal.props.d.ts

@@ -1,10 +1,11 @@
-import { ImageProps, ViewProps } from 'react-native';
+import { ReactNode } from 'react';
+import { ViewProps } from 'react-native';
 import { BottomSheetProps } from '../BottomSheet';
 import { ButtonWithoutChildrenProps } from '../Button/Button.props';
 import { UnstyledIconButtonProps } from '../UnstyledIconButton';
 interface ModalProps extends Omit<BottomSheetProps, 'children'> {
     loading?: boolean;
-    image?: ImageProps;
+    image?: ReactNode;
     showCloseButton?: boolean;
     heading?: string;
     description?: string;

package/build/components/Modal/Modal.web.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { CloseMediumIcon } from '@utilitywarehouse/hearth-react-native-icons';
 import { useCallback, useEffect, useImperativeHandle, useRef } from 'react';
-import { AccessibilityInfo, Image, Platform, View, findNodeHandle } from 'react-native';
+import { AccessibilityInfo, Platform, View, findNodeHandle } from 'react-native';
 import Animated, { Easing, useAnimatedStyle, useSharedValue, withDelay, withTiming, } from 'react-native-reanimated';
 import { StyleSheet } from 'react-native-unistyles';
 import { useTheme } from '../../hooks';
@@ -97,7 +97,7 @@ const Modal = ({ ref, children, heading, description, showCloseButton = true, pr
             bottomSheetModalRef.current?.dismiss();
         }
     };
-    const content = (_jsx(_Fragment, { children: loading ? (_jsxs(View, { style: styles.loadingContainer, accessible: Platform.OS === 'android' ? true : undefined, accessibilityLabel: Platform.OS === 'android' ? 'Loading' : undefined, screenReaderFocusable: true, ref: viewRef, children: [_jsx(Spinner, { size: "lg" }), _jsx(Heading, { size: "lg", textAlign: "center", children: "Loading..." })] })) : (_jsxs(View, { style: styles.container, accessible: Platform.OS === 'android' ? true : undefined, accessibilityLabel: Platform.OS === 'android' ? 'Modal content' : undefined, screenReaderFocusable: true, ref: viewRef, children: [_jsxs(View, { style: styles.header, children: [_jsxs(View, { style: styles.headerTextContent, children: [heading && !image ? (_jsx(Heading, { size: "lg", accessible: true, children: heading })) : null, description && !image ? _jsx(BodyText, { accessible: true, children: description }) : null] }), showCloseButton ? (_jsx(UnstyledIconButton, { icon: CloseMediumIcon, onPress: handleCloseButtonPress, accessibilityLabel: "Close modal", ...closeButtonProps })) : null] }), image ? (_jsxs(View, { style: styles.imageContainer, children: [_jsx(Image, { style: styles.image, ...image }), _jsxs(View, { style: styles.textContent, children: [heading ? (_jsx(Heading, { size: "lg", textAlign: "center", accessible: true, children: heading })) : null, description ? (_jsx(BodyText, { textAlign: "center", accessible: true, children: description })) : null] })] })) : null, children, _jsxs(View, { style: styles.footer, children: [onPressPrimaryButton && primaryButtonText ? (_jsx(Button, { onPress: handlePrimaryButtonPress, text: primaryButtonText, ...primaryButtonProps, variant: primaryButtonProps?.variant ?? 'solid', colorScheme: primaryButtonProps?.colorScheme ?? 'highlight' })) : null, onPressSecondaryButton && secondaryButtonText ? (_jsx(Button, { onPress: handleSecondaryButtonPress, text: secondaryButtonText, ...secondaryButtonProps, variant: secondaryButtonProps?.variant ?? 'outline', colorScheme: secondaryButtonProps?.colorScheme ?? 'functional' })) : null] })] })) }));
+    const content = (_jsx(_Fragment, { children: loading ? (_jsxs(View, { style: styles.loadingContainer, accessible: Platform.OS === 'android' ? true : undefined, accessibilityLabel: Platform.OS === 'android' ? 'Loading' : undefined, screenReaderFocusable: true, ref: viewRef, children: [_jsx(Spinner, { size: "lg" }), _jsx(Heading, { size: "lg", textAlign: "center", children: "Loading..." })] })) : (_jsxs(View, { style: styles.container, accessible: Platform.OS === 'android' ? true : undefined, accessibilityLabel: Platform.OS === 'android' ? 'Modal content' : undefined, screenReaderFocusable: true, ref: viewRef, children: [_jsxs(View, { style: styles.header, children: [_jsxs(View, { style: styles.headerTextContent, children: [heading && !image ? (_jsx(Heading, { size: "lg", accessible: true, children: heading })) : null, description && !image ? _jsx(BodyText, { accessible: true, children: description }) : null] }), showCloseButton ? (_jsx(UnstyledIconButton, { icon: CloseMediumIcon, onPress: handleCloseButtonPress, accessibilityLabel: "Close modal", ...closeButtonProps })) : null] }), image ? (_jsxs(View, { style: styles.imageContainer, children: [image, _jsxs(View, { style: styles.textContent, children: [heading ? (_jsx(Heading, { size: "lg", textAlign: "center", accessible: true, children: heading })) : null, description ? (_jsx(BodyText, { textAlign: "center", accessible: true, children: description })) : null] })] })) : null, children, _jsxs(View, { style: styles.footer, children: [onPressPrimaryButton && primaryButtonText ? (_jsx(Button, { onPress: handlePrimaryButtonPress, text: primaryButtonText, ...primaryButtonProps, variant: primaryButtonProps?.variant ?? 'solid', colorScheme: primaryButtonProps?.colorScheme ?? 'highlight' })) : null, onPressSecondaryButton && secondaryButtonText ? (_jsx(Button, { onPress: handleSecondaryButtonPress, text: secondaryButtonText, ...secondaryButtonProps, variant: secondaryButtonProps?.variant ?? 'outline', colorScheme: secondaryButtonProps?.colorScheme ?? 'functional' })) : null] })] })) }));
     return inNavModal ? (_jsxs(View, { style: { flex: 1, backgroundColor: theme.color.background.primary }, children: [Platform.OS === 'android' ? (_jsx(Animated.View, { style: [styles.androidContainer, animatedBackgroundStyle], children: _jsx(Animated.View, { style: [styles.pretendContent, animatedPretendContentStyle] }) })) : null, _jsx(Animated.View, { style: [styles.inNavModalContainer, Platform.OS === 'android' && animatedInNavModalStyle], children: _jsx(View, { style: styles.inNavModalContent, children: content }) })] })) : (_jsx(BottomSheetModal, { ref: bottomSheetModalRef, enableDynamicSizing: true, snapPoints: image ? ['90%'] : props.snapPoints, showHandle: typeof loading !== 'undefined' && loading ? false : props.showHandle, accessible: false, ...props, onChange: handleChange, children: _jsx(BottomSheetScrollView, { contentContainerStyle: styles.container, ref: scrollViewRef, children: content }) }));
 };
 const styles = StyleSheet.create((theme, rt) => ({
@@ -113,10 +113,6 @@ const styles = StyleSheet.create((theme, rt) => ({
         flex: 1,
         gap: theme.components.modal.content.gap,
     },
-    image: {
-        width: 260,
-        height: 260,
-    },
     imageContainer: {
         alignItems: 'center',
         justifyContent: 'center',

package/build/components/Modal/ModalImage.d.ts

@@ -0,0 +1,4 @@
+import { ImageProps } from 'react-native';
+import { ThemedImageProps } from '../ThemedImage';
+declare const ModalImage: (props: ImageProps | ThemedImageProps) => import("react/jsx-runtime").JSX.Element;
+export default ModalImage;

package/build/components/Modal/ModalImage.js

@@ -0,0 +1,18 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Image } from 'react-native';
+import { StyleSheet } from 'react-native-unistyles';
+import { isThemedImageProps } from '../../utils';
+import { ThemedImage } from '../ThemedImage';
+const ModalImage = (props) => {
+    if (isThemedImageProps(props)) {
+        return _jsx(ThemedImage, { ...props, style: [styles.image, props.style] });
+    }
+    return _jsx(Image, { resizeMode: "cover", ...props, style: [styles.image, props.style] });
+};
+const styles = StyleSheet.create({
+    image: {
+        width: 260,
+        height: 260,
+    },
+});
+export default ModalImage;

package/build/components/Modal/index.d.ts

@@ -1,2 +1,3 @@
 export { default as Modal } from './Modal';
 export type { default as ModalProps } from './Modal.props';
+export { default as ModalImage } from './ModalImage';

package/build/components/Modal/index.js

@@ -1 +1,2 @@
 export { default as Modal } from './Modal';
+export { default as ModalImage } from './ModalImage';

package/build/components/Radio/Radio.js

@@ -8,7 +8,6 @@ import StyledRadio from './RadioRoot';
 import { useFormFieldContext } from '../FormField';
 import { Helper } from '../Helper';
 import { useRadioGroupContext } from './RadioGroup.context';
-import RadioImage from './RadioImage';
 import RadioTextContent from './RadioTextContent';
 import RadioTileRoot from './RadioTileRoot';
 const RadioComponent = createRadio({
@@ -31,7 +30,7 @@ const Radio = ({ children, label, disabled, helperIcon, helperText, invalidText,
     const { validationStatus: groupValidationStatus, type: groupType } = useRadioGroupContext();
     const validationStatus = fieldValidationStatus ?? groupValidationStatus ?? validation ?? 'initial';
     const radioType = groupType ?? type;
-    const radioChildren = children ? (children) : (_jsxs(_Fragment, { children: [_jsx(RadioIndicator, { children: _jsx(RadioIcon, {}) }), image ? _jsx(RadioImage, { ...image }) : null, _jsxs(RadioTextContent, { children: [!!label && _jsx(RadioLabel, { children: label }), !!helperText && _jsx(Helper, { disabled: disabled, icon: helperIcon, text: helperText }), validationStatus === 'invalid' && !!invalidText && (_jsx(Helper, { showIcon: showValidationIcon, disabled: disabled, validationStatus: "invalid", text: invalidText })), validationStatus === 'valid' && !!validText && (_jsx(Helper, { disabled: disabled, showIcon: showValidationIcon, validationStatus: "valid", text: validText }))] })] }));
+    const radioChildren = children ? (children) : (_jsxs(_Fragment, { children: [_jsx(RadioIndicator, { children: _jsx(RadioIcon, {}) }), image ? image : null, _jsxs(RadioTextContent, { children: [!!label && _jsx(RadioLabel, { children: label }), !!helperText && _jsx(Helper, { disabled: disabled, icon: helperIcon, text: helperText }), validationStatus === 'invalid' && !!invalidText && (_jsx(Helper, { showIcon: showValidationIcon, disabled: disabled, validationStatus: "invalid", text: invalidText })), validationStatus === 'valid' && !!validText && (_jsx(Helper, { disabled: disabled, showIcon: showValidationIcon, validationStatus: "valid", text: validText }))] })] }));
     return (_jsx(RadioComponent, { ...props, isDisabled: disabled, children: radioType === 'tile' ? _jsx(RadioTileRoot, { children: radioChildren }) : radioChildren }));
 };
 const RadioTile = ({ type = 'tile', ...props }) => _jsx(Radio, { ...props, type: type });

package/build/components/Radio/Radio.props.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentType } from 'react';
-import type { ImageProps, PressableProps, ViewProps } from 'react-native';
+import type { ComponentType, ReactNode } from 'react';
+import type { PressableProps, ViewProps } from 'react-native';
 interface RadioBaseProps extends Omit<PressableProps, 'children'> {
     value: string;
     onChange?: (isSelected: boolean) => void;
@@ -25,7 +25,7 @@ interface RadioWithoutChildrenProps extends RadioBaseProps {
     invalidText?: string;
     validText?: string;
     showValidationIcon?: boolean;
-    image?: ImageProps;
+    image?: ReactNode;
 }
 type RadioProps = RadioWithChildrenProps | RadioWithoutChildrenProps;
 export default RadioProps;

package/build/components/Radio/RadioImage.d.ts

@@ -1,6 +1,7 @@
 import { ImageProps } from 'react-native';
+import { ThemedImageProps } from '../ThemedImage';
 declare const RadioImage: {
-    ({ source, style, ...props }: ImageProps): import("react/jsx-runtime").JSX.Element;
+    ({ ...props }: ImageProps | ThemedImageProps): import("react/jsx-runtime").JSX.Element;
     displayName: string;
 };
 export default RadioImage;

package/build/components/Radio/RadioImage.js

@@ -1,5 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Image } from 'react-native';
-const RadioImage = ({ source, style, ...props }) => (_jsx(Image, { source: source, style: style, ...props }));
+import { isThemedImageProps } from '../../utils';
+import { ThemedImage } from '../ThemedImage';
+const RadioImage = ({ ...props }) => {
+    if (isThemedImageProps(props)) {
+        return _jsx(ThemedImage, { ...props });
+    }
+    return _jsx(Image, { ...props });
+};
 RadioImage.displayName = 'RadioImage';
 export default RadioImage;

package/build/utils/index.d.ts

@@ -1,9 +1,10 @@
 export { default as coloursAsArray, extractLightColorValues } from './coloursAsArray';
 export { default as formatThousands } from './formatThousands';
 export { default as getFlattenedColorValue } from './getFlattenedColorValue';
+export { getInitials } from './getInitials';
 export { default as getStyleValue } from './getStyleValue';
 export { default as hexWithOpacity } from './hexWithOpacity';
-export { getInitials } from './getInitials';
 export { default as isEqual } from './isEqual';
+export { default as isThemedImageProps } from './isThemedImageProps';
 export * from './styleUtils';
 export * from './themeValueHelpers';

package/build/utils/index.js

@@ -1,9 +1,10 @@
 export { default as coloursAsArray, extractLightColorValues } from './coloursAsArray';
 export { default as formatThousands } from './formatThousands';
 export { default as getFlattenedColorValue } from './getFlattenedColorValue';
+export { getInitials } from './getInitials';
 export { default as getStyleValue } from './getStyleValue';
 export { default as hexWithOpacity } from './hexWithOpacity';
-export { getInitials } from './getInitials';
 export { default as isEqual } from './isEqual';
+export { default as isThemedImageProps } from './isThemedImageProps';
 export * from './styleUtils';
 export * from './themeValueHelpers';

package/build/utils/isThemedImageProps.d.ts

@@ -0,0 +1,4 @@
+import { ImageProps } from 'react-native';
+import { ThemedImageProps } from 'src/components';
+declare const isThemedImageProps: (props: ThemedImageProps | ImageProps) => props is ThemedImageProps;
+export default isThemedImageProps;

package/build/utils/isThemedImageProps.js

@@ -0,0 +1,4 @@
+const isThemedImageProps = (props) => {
+    return 'light' in props && 'dark' in props;
+};
+export default isThemedImageProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utilitywarehouse/hearth-react-native",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Utility Warehouse React Native UI library",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -60,7 +60,7 @@
     "@utilitywarehouse/hearth-react-icons": "^0.7.4",
     "@utilitywarehouse/hearth-react-native-icons": "^0.7.4",
     "@utilitywarehouse/hearth-svg-assets": "^0.2.0",
-    "@utilitywarehouse/hearth-tokens": "^0.2.0"
+    "@utilitywarehouse/hearth-tokens": "^0.2.1"
   },
   "peerDependencies": {
     "@gorhom/bottom-sheet": "^5.0.0",

package/src/components/Banner/Banner.context.ts

@@ -0,0 +1,11 @@
+import { createContext, useContext } from 'react';
+
+const BannerContext = createContext<{ direction: 'horizontal' | 'vertical' }>({
+  direction: 'horizontal',
+});
+
+export const useBannerContext = () => {
+  return useContext(BannerContext);
+};
+
+export default BannerContext;

package/src/components/Banner/Banner.docs.mdx

@@ -63,26 +63,39 @@ const MyComponent = () => (
 
 ## Props
 
-| Property             | Type                                                                                               | Description                                                            | Default        |
-| -------------------- | -------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | -------------- |
-| icon                 | `ComponentType`                                                                                    | Icon component to display (mutually exclusive with image/illustration) | `-`            |
-| iconContainerVariant | `'subtle' \| 'emphasis'`                                                                           | Icon container visual style                                            | `'subtle'`     |
-| iconContainerSize    | `'sm' \| 'md' \| 'lg'`                                                                             | Icon container size                                                    | `'md'`         |
-| iconContainerColor   | `'pig' \| 'energy' \| 'broadband' \| 'mobile' \|` <br />`'insurance' \| 'cashback' \| 'highlight'` | Icon container color scheme                                            | `'pig'`        |
-| illustration         | `ThemedImageProps \| ImageProps`                                                                   | Themed illustration object (mutually exclusive with icon/image)        | `-`            |
-| image                | `ThemedImageProps \| ImageProps`                                                                   | Themed image object (mutually exclusive with icon/illustration)        | `-`            |
-| heading              | `string`                                                                                           | Heading text                                                           | `-` (required) |
-| description          | `string`                                                                                           | Description text                                                       | `-` (required) |
-| direction            | `'horizontal' \| 'vertical'`                                                                       | Layout direction for icon/image and content                            | `'horizontal'` |
-| link                 | `ReactNode`                                                                                        | Link element to display                                                | `-`            |
-| button               | `ReactNode`                                                                                        | Button element to display                                              | `-`            |
-| onPress              | `() => void`                                                                                       | Makes the entire banner pressable (shows chevron)                      | `-`            |
-| onClose              | `() => void`                                                                                       | Shows close button with handler                                        | `-`            |
-| variant              | `'subtle' \| 'emphasis'`                                                                           | Card visual style variant                                              | `'subtle'`     |
-| colorScheme          | `'pig' \| 'energy' \| 'broadband' \| 'mobile' \|` <br />`'insurance' \| 'cashback' \| 'highlight'` | Color scheme for buttons                                               | `'pig'`        |
+| Property             | Type                                                                                               | Description                                                             | Default        |
+| -------------------- | -------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------- | -------------- |
+| icon                 | `ComponentType`                                                                                    | Icon component to display (mutually exclusive with image/illustration)  | `-`            |
+| iconContainerVariant | `'subtle' \| 'emphasis'`                                                                           | Icon container visual style                                             | `'subtle'`     |
+| iconContainerSize    | `'sm' \| 'md' \| 'lg'`                                                                             | Icon container size                                                     | `'md'`         |
+| iconContainerColor   | `'pig' \| 'energy' \| 'broadband' \| 'mobile' \|` <br />`'insurance' \| 'cashback' \| 'highlight'` | Icon container color scheme                                             | `'pig'`        |
+| illustration         | `ReactNode`                                                                                        | The illustration element to render (mutually exclusive with icon/image) | `-`            |
+| image                | `ReactNode`                                                                                        | The image element to render (mutually exclusive with icon/illustration) | `-`            |
+| heading              | `string`                                                                                           | Heading text                                                            | `-` (required) |
+| description          | `string`                                                                                           | Description text                                                        | `-` (required) |
+| direction            | `'horizontal' \| 'vertical'`                                                                       | Layout direction for icon/image and content                             | `'horizontal'` |
+| link                 | `ReactNode`                                                                                        | Link element to display                                                 | `-`            |
+| button               | `ReactNode`                                                                                        | Button element to display                                               | `-`            |
+| onPress              | `() => void`                                                                                       | Makes the entire banner pressable (shows chevron)                       | `-`            |
+| onClose              | `() => void`                                                                                       | Shows close button with handler                                         | `-`            |
+| variant              | `'subtle' \| 'emphasis'`                                                                           | Card visual style variant                                               | `'subtle'`     |
+| colorScheme          | `'pig' \| 'energy' \| 'broadband' \| 'mobile' \|` <br />`'insurance' \| 'cashback' \| 'highlight'` | Color scheme for buttons                                                | `'pig'`        |
 
 The component also accepts all standard Card props except `noPadding`, `space`, `gap`, `rowGap`, `columnGap`, `flexDirection`, `flexWrap`, `alignItems`, and `justifyContent`.
 
+### `BannerImage` & `BannerIllustration` Props
+
+The `BannerImage` & `BannerIllustration` component can be used to display an image within the Banner. It accepts the following props:
+
+| Property  | Type                  | Description                                                              |
+| --------- | --------------------- | ------------------------------------------------------------------------ |
+| `source`  | `ImageSourcePropType` | The source of the image to display                                       |
+| `light`   | `ImageSourcePropType` | The source of the image to display in light mode (use instead of source) |
+| `dark`    | `ImageSourcePropType` | The source of the image to display in dark mode (use instead of source)  |
+| `...rest` | `ImageProps`          | Additional props to pass to the underlying Image component               |
+
+For more details about the ThemedImage component used internally, refer to the [`ThemedImage` documentation](/docs/utility-components-themed-image--docs).
+
 ## Layout Options
 
 ### Horizontal Layout (Default)
@@ -153,22 +166,28 @@ Display a themed image that automatically switches between light and dark modes:
 <Canvas of={Stories.WithImage} />
 
 ```jsx
-import { Banner } from '@utilitywarehouse/hearth-react-native';
+import { Banner, BannerImage } from '@utilitywarehouse/hearth-react-native';
 
 const MyComponent = () => (
   <>
     <Banner
-      image={{
-        source: { uri: 'https://example.com/image.jpg' },
-      }}
+      image={
+        <BannerImage
+          source={{
+            uri: 'https://example.com/image.jpg',
+          }}
+        />
+      }
       heading="Featured Content"
       description="Discover amazing content curated just for you."
     />
     <Banner
-      image={{
-        light: { uri: 'https://example.com/light-image.jpg' },
-        dark: { uri: 'https://example.com/dark-image.jpg' },
-      }}
+      image={
+        <BannerImage
+          light={{ uri: 'https://example.com/light-image.jpg' }}
+          dark={{ uri: 'https://example.com/dark-image.jpg' }}
+        />
+      }
       heading="Featured Content"
       description="Discover amazing content curated just for you."
     />
@@ -183,18 +202,15 @@ Display a themed illustration that adapts to layout changes:
 <Canvas of={Stories.WithIllustration} />
 
 ```jsx
-import { Banner } from '@utilitywarehouse/hearth-react-native';
+import { Banner, BannerIllustration } from '@utilitywarehouse/hearth-react-native';
 import SpotBillingDark from '@utilitywarehouse/hearth-svg-assets/lib/spot-billing-dark.svg';
 import SpotBillingLight from '@utilitywarehouse/hearth-svg-assets/lib/spot-billing-light.svg';
 
 const MyComponent = () => (
   <Banner
-    illustration={{
-      light: SpotBillingLight,
-      dark: SpotBillingDark,
-      width: 80,
-      height: 80,
-    }}
+    illustration={
+      <BannerIllustration light={SpotBillingLight} dark={SpotBillingDark} width={80} height={80} />
+    }
     heading="Featured Content"
     description="Discover amazing content curated just for you."
   />
@@ -358,7 +374,7 @@ Combine multiple features for rich interactive banners:
 <Canvas of={Stories.ComplexExample} />
 
 ```jsx
-import { Banner } from '@utilitywarehouse/hearth-react-native';
+import { Banner, BannerImage } from '@utilitywarehouse/hearth-react-native';
 import { InsuranceMediumIcon } from '@utilitywarehouse/hearth-react-native-icons';
 
 const MyComponent = () => (
@@ -381,10 +397,12 @@ const MyComponent = () => (
 
     {/* Dismissible banner with link */}
     <Banner
-      image={{
-        light: { uri: 'https://example.com/light.jpg' },
-        dark: { uri: 'https://example.com/dark.jpg' },
-      }}
+      image={
+        <BannerImage
+          light={{ uri: 'https://example.com/light.jpg' }}
+          dark={{ uri: 'https://example.com/dark.jpg' }}
+        />
+      }
       heading="Exclusive Member Benefit"
       description="As a valued member, you now have access to premium features at no extra cost."
       variant="emphasis"

package/src/components/Banner/Banner.props.ts

@@ -1,7 +1,5 @@
-import type { ComponentType, ReactElement } from 'react';
-import { ImageProps } from 'react-native';
+import type { ComponentType, ReactElement, ReactNode } from 'react';
 import type CardProps from '../Card/Card.props';
-import { ThemedImageProps } from '../ThemedImage';
 
 export type BannerDirection = 'horizontal' | 'vertical';
 
@@ -51,12 +49,12 @@ export interface BannerProps
    * Illustration to display in the banner
    * Mutually exclusive with icon and image
    */
-  illustration?: ThemedImageProps | ImageProps;
+  illustration?: ReactNode;
   /**
    * Image to display in the banner
    * Mutually exclusive with icon and illustration
    */
-  image?: ThemedImageProps | ImageProps;
+  image?: ReactNode;
   /**
    * Heading text
    */