@utilitywarehouse/hearth-react-native 0.11.0 → 0.12.0

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @utilitywarehouse/hearth-react-native@0.11.0 build /home/runner/work/hearth/hearth/packages/react-native
+> @utilitywarehouse/hearth-react-native@0.12.0 build /home/runner/work/hearth/hearth/packages/react-native
 > tsc
 

package/.turbo/turbo-lint.log

@@ -1,5 +1,5 @@
 
-> @utilitywarehouse/hearth-react-native@0.11.0 lint /home/runner/work/hearth/hearth/packages/react-native
+> @utilitywarehouse/hearth-react-native@0.12.0 lint /home/runner/work/hearth/hearth/packages/react-native
 > TIMING=1 eslint --max-warnings 0
 
 Rule | Time (ms) | Relative

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @utilitywarehouse/hearth-react-native
 
+## 0.12.0
+
+### Minor Changes
+
+- [#685](https://github.com/utilitywarehouse/hearth/pull/685) [`10f5209`](https://github.com/utilitywarehouse/hearth/commit/10f52095e5f36e58f9821e3fec3fdf43f4578fbb) Thanks [@jordmccord](https://github.com/jordmccord)! - [BREAKING] Component props moved from objects to React Nodes
+
+### Patch Changes
+
+- [#687](https://github.com/utilitywarehouse/hearth/pull/687) [`11e8176`](https://github.com/utilitywarehouse/hearth/commit/11e8176ced40b0a8b2d27e07c482ed10a7b7ce7a) Thanks [@jordmccord](https://github.com/jordmccord)! - Fixes `Input` refs
+
 ## 0.11.0
 
 ### Minor Changes

package/build/components/Banner/Banner.context.d.ts

@@ -0,0 +1,7 @@
+declare const BannerContext: import("react").Context<{
+    direction: "horizontal" | "vertical";
+}>;
+export declare const useBannerContext: () => {
+    direction: "horizontal" | "vertical";
+};
+export default BannerContext;

package/build/components/Banner/Banner.context.js

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

package/build/components/Banner/Banner.js

@@ -1,34 +1,29 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { ChevronRightSmallIcon, CloseSmallIcon } from '@utilitywarehouse/hearth-react-native-icons';
-import { Image, Pressable, View } from 'react-native';
+import { useMemo } from 'react';
+import { Pressable, View } from 'react-native';
 import { StyleSheet } from 'react-native-unistyles';
 import { BodyText } from '../BodyText';
 import { Card } from '../Card';
 import { Heading } from '../Heading';
 import { IconContainer } from '../IconContainer';
-import { ThemedImage } from '../ThemedImage';
 import { UnstyledIconButton } from '../UnstyledIconButton';
-const isThemedImageProps = (props) => {
-    return 'light' in props && 'dark' in props;
-};
+import BannerContext from './Banner.context';
 const Banner = ({ icon, iconContainerVariant = 'subtle', iconContainerSize = 'md', iconContainerColor = 'pig', illustration, image, heading, description, direction = 'horizontal', link, button, onPress, onClose, variant = 'subtle', colorScheme = 'pig', style, ...props }) => {
     const hasIllustration = Boolean(illustration);
     styles.useVariants({ direction, hasIllustration });
+    const context = useMemo(() => ({
+        direction,
+    }), [direction]);
     const renderIconOrImage = () => {
         if (icon) {
             return (_jsx(IconContainer, { icon: icon, variant: iconContainerVariant, size: iconContainerSize, color: iconContainerColor, style: styles.media }));
         }
         if (illustration) {
-            if (isThemedImageProps(illustration)) {
-                return (_jsx(ThemedImage, { ...illustration, resizeMode: "cover", style: [styles.media, styles.imageWrapper, illustration.style] }));
-            }
-            return (_jsx(Image, { ...illustration, resizeMode: "cover", style: [styles.media, styles.imageWrapper, illustration.style] }));
+            return illustration;
         }
         if (image) {
-            if (isThemedImageProps(image)) {
-                return (_jsx(View, { style: [styles.media, styles.imageWrapper], children: _jsx(ThemedImage, { ...image, style: [styles.image, image.style] }) }));
-            }
-            return (_jsx(View, { style: [styles.media, styles.imageWrapper], children: _jsx(Image, { ...image, style: [styles.image, image.style] }) }));
+            return image;
         }
         return null;
     };
@@ -43,9 +38,9 @@ const Banner = ({ icon, iconContainerVariant = 'subtle', iconContainerSize = 'md
     };
     const content = (_jsxs(View, { style: styles.container, children: [onClose && direction === 'vertical' && (_jsx(UnstyledIconButton, { icon: CloseSmallIcon, size: "sm", onPress: onClose, style: styles.closeButton, accessibilityLabel: "Close banner" })), renderIconOrImage(), _jsxs(View, { style: styles.contentContainer, children: [_jsxs(View, { style: styles.contentTextContainer, children: [_jsxs(View, { style: styles.textContainer, children: [_jsx(Heading, { size: "sm", style: styles.heading, textAlign: hasIllustration && direction === 'vertical' ? 'center' : 'left', children: heading }), _jsx(BodyText, { size: "md", style: styles.description, textAlign: hasIllustration && direction === 'vertical' ? 'center' : 'left', children: description })] }), renderAction()] }), onPress && (_jsx(UnstyledIconButton, { icon: ChevronRightSmallIcon, size: "sm", onPress: onPress, style: styles.chevron })), onClose && direction === 'horizontal' && (_jsx(UnstyledIconButton, { icon: CloseSmallIcon, size: "sm", onPress: onClose, style: styles.closeButton, accessibilityLabel: "Close banner" }))] })] }));
     if (onPress) {
-        return (_jsx(Card, { variant: variant, style: [styles.card, style], ...props, children: _jsx(Pressable, { onPress: onPress, accessibilityRole: "button", style: styles.pressable, children: content }) }));
+        return (_jsx(BannerContext.Provider, { value: context, children: _jsx(Card, { variant: variant, style: [styles.card, style], ...props, children: _jsx(Pressable, { onPress: onPress, accessibilityRole: "button", style: styles.pressable, children: content }) }) }));
     }
-    return (_jsx(Card, { variant: variant, style: [styles.card, style], ...props, children: content }));
+    return (_jsx(BannerContext.Provider, { value: context, children: _jsx(Card, { variant: variant, style: [styles.card, style], ...props, children: content }) }));
 };
 Banner.displayName = 'Banner';
 const styles = StyleSheet.create(theme => ({
@@ -100,31 +95,6 @@ const styles = StyleSheet.create(theme => ({
             },
         },
     },
-    imageWrapper: {
-        flexDirection: 'row',
-        variants: {
-            direction: {
-                horizontal: {},
-                vertical: {
-                    width: '100%',
-                },
-            },
-        },
-    },
-    image: {
-        borderRadius: theme.borderRadius.md,
-        borderColor: theme.color.border.strong,
-        borderWidth: theme.borderWidth[1],
-        variants: {
-            direction: {
-                horizontal: { width: 160, height: 95 },
-                vertical: {
-                    width: '100%',
-                    height: 160,
-                },
-            },
-        },
-    },
     contentContainer: {
         alignItems: 'flex-start',
         justifyContent: 'space-between',

package/build/components/Banner/Banner.props.d.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';
 export interface BannerProps extends Omit<CardProps, 'noPadding' | 'variant' | 'colorScheme' | 'space' | 'gap' | 'rowGap' | 'columnGap' | 'flexDirection' | 'flexWrap' | 'alignItems' | 'justifyContent'> {
     /**
@@ -28,12 +26,12 @@ export interface BannerProps extends Omit<CardProps, 'noPadding' | 'variant' | '
      * 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
      */

package/build/components/Banner/BannerIllustration.d.ts

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

package/build/components/Banner/BannerIllustration.js

@@ -0,0 +1,53 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Image, View } from 'react-native';
+import { StyleSheet } from 'react-native-unistyles';
+import { isThemedImageProps } from '../../utils';
+import { ThemedImage } from '../ThemedImage';
+import { useBannerContext } from './Banner.context';
+const BannerIllustration = (props) => {
+    const { direction } = useBannerContext();
+    styles.useVariants({ direction });
+    if (isThemedImageProps(props)) {
+        return (_jsx(View, { style: [styles.media, styles.imageWrapper], children: _jsx(ThemedImage, { ...props, style: [styles.image, props.style] }) }));
+    }
+    return (_jsx(View, { style: [styles.media, styles.imageWrapper], children: _jsx(Image, { ...props, style: [styles.image, props.style] }) }));
+};
+const styles = StyleSheet.create(theme => ({
+    media: {
+        flexShrink: 0,
+        variants: {
+            direction: {
+                horizontal: {},
+                vertical: {
+                    alignSelf: 'flex-start',
+                },
+            },
+        },
+    },
+    imageWrapper: {
+        flexDirection: 'row',
+        variants: {
+            direction: {
+                horizontal: {},
+                vertical: {
+                    width: '100%',
+                },
+            },
+        },
+    },
+    image: {
+        borderRadius: theme.borderRadius.md,
+        borderColor: theme.color.border.strong,
+        borderWidth: theme.borderWidth[1],
+        variants: {
+            direction: {
+                horizontal: { width: 160, height: 95 },
+                vertical: {
+                    width: '100%',
+                    height: 160,
+                },
+            },
+        },
+    },
+}));
+export default BannerIllustration;

package/build/components/Banner/BannerImage.d.ts

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

package/build/components/Banner/BannerImage.js

@@ -0,0 +1,53 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Image, View } from 'react-native';
+import { StyleSheet } from 'react-native-unistyles';
+import { isThemedImageProps } from '../../utils';
+import { ThemedImage } from '../ThemedImage';
+import { useBannerContext } from './Banner.context';
+const BannerImage = (props) => {
+    const { direction } = useBannerContext();
+    styles.useVariants({ direction });
+    if (isThemedImageProps(props)) {
+        return (_jsx(View, { style: [styles.media, styles.imageWrapper], children: _jsx(ThemedImage, { ...props, style: [styles.image, props.style] }) }));
+    }
+    return (_jsx(View, { style: [styles.media, styles.imageWrapper], children: _jsx(Image, { ...props, style: [styles.image, props.style] }) }));
+};
+const styles = StyleSheet.create(theme => ({
+    media: {
+        flexShrink: 0,
+        variants: {
+            direction: {
+                horizontal: {},
+                vertical: {
+                    alignSelf: 'flex-start',
+                },
+            },
+        },
+    },
+    imageWrapper: {
+        flexDirection: 'row',
+        variants: {
+            direction: {
+                horizontal: {},
+                vertical: {
+                    width: '100%',
+                },
+            },
+        },
+    },
+    image: {
+        borderRadius: theme.borderRadius.md,
+        borderColor: theme.color.border.strong,
+        borderWidth: theme.borderWidth[1],
+        variants: {
+            direction: {
+                horizontal: { width: 160, height: 95 },
+                vertical: {
+                    width: '100%',
+                    height: 160,
+                },
+            },
+        },
+    },
+}));
+export default BannerImage;

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

@@ -1,2 +1,4 @@
 export { default as Banner } from './Banner';
 export type { default as BannerProps } from './Banner.props';
+export { default as BannerIllustration } from './BannerIllustration';
+export { default as BannerImage } from './BannerImage';

package/build/components/Banner/index.js

@@ -1 +1,3 @@
 export { default as Banner } from './Banner';
+export { default as BannerIllustration } from './BannerIllustration';
+export { default as BannerImage } from './BannerImage';

package/build/components/Card/CardAction/CardAction.props.d.ts

@@ -1,6 +1,5 @@
-import { ComponentType } from 'react';
+import { ComponentType, ReactNode } from 'react';
 import type { PressableProps, ViewProps } from 'react-native';
-import BadgeProps from '../../Badge/Badge.props';
 import { IconContainerProps } from '../../IconContainer';
 interface CardActionBaseProps extends Omit<PressableProps, 'children'> {
     loading?: boolean;
@@ -10,7 +9,7 @@ interface CardActionBaseProps extends Omit<PressableProps, 'children'> {
 interface CardActionContentProps {
     heading: string;
     helperText?: string;
-    badge?: BadgeProps;
+    badge?: ReactNode;
     badgePosition?: 'bottom' | 'middle' | 'right' | 'top';
     iconContainer?: boolean;
     iconContainerVariant?: IconContainerProps['variant'];

package/build/components/Card/CardAction/CardActionRoot.js

@@ -3,7 +3,6 @@ import { ChevronRightSmallIcon } from '@utilitywarehouse/hearth-react-native-ico
 import { useMemo } from 'react';
 import { Pressable, View } from 'react-native';
 import { StyleSheet } from 'react-native-unistyles';
-import { Badge } from '../../Badge';
 import { IconContainer } from '../../IconContainer';
 import { Skeleton } from '../../Skeleton';
 import { useCardContext } from '../Card.context';
@@ -46,7 +45,7 @@ const CardActionRoot = ({ heading, helperText, leadingContent, trailingContent,
     if (loading) {
         return (_jsxs(Pressable, { ...props, testID: loadingTestID, style: [styles.container, styles.alignCenter, props.style], disabled: isDisabled, children: [leadingContent || leadingIcon ? (_jsx(Skeleton, { width: 24, height: 24, style: styles.alignCenter })) : null, _jsxs(CardActionContent, { children: [_jsx(Skeleton, { width: "80%", height: 24, borderRadius: "xs" }), _jsx(Skeleton, { width: "100%", height: 24, borderRadius: "xs" })] }), trailingIcon || trailingContent ? (_jsx(Skeleton, { width: 24, height: 24, borderRadius: "xs", style: styles.alignCenter })) : null] }));
     }
-    return (_jsx(CardActionContext.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: [leadingIcon && iconContainer ? (_jsx(View, { style: styles.iconContainerWrap, children: _jsx(IconContainer, { style: styles.iconContainer, icon: leadingIcon, variant: iconContainerVariant, color: iconContainerColor, radiusNone: true }) })) : null, _jsxs(View, { style: styles.withIconContainer, children: [leadingContent ? (_jsx(CardActionLeadingContent, { children: leadingContent })) : null, leadingIcon && !iconContainer && !leadingContent ? (_jsx(CardActionLeadingContent, { children: _jsx(CardActionIcon, { as: leadingIcon }) })) : null, _jsxs(CardActionContent, { children: [badgePosition === 'top' && badge ? _jsx(Badge, { ...badge }) : null, _jsx(CardActionText, { children: heading }), badgePosition === 'middle' && badge ? _jsx(Badge, { ...badge }) : null, helperText ? _jsx(CardActionHelperText, { children: helperText }) : null, badgePosition === 'bottom' && badge ? _jsx(Badge, { ...badge }) : null] }), badgePosition === 'right' && badge ? (_jsx(Badge, { ...badge, style: [badge.style, styles.alignCenter] })) : null, trailingContent ? (_jsx(CardActionTrailingContent, { children: trailingContent })) : null, trailingIcon && !trailingContent ? (_jsx(CardActionTrailingContent, { children: _jsx(CardActionTrailingIcon, { as: trailingIcon }) })) : null] })] })) }) }));
+    return (_jsx(CardActionContext.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: [leadingIcon && iconContainer ? (_jsx(View, { style: styles.iconContainerWrap, children: _jsx(IconContainer, { style: styles.iconContainer, icon: leadingIcon, variant: iconContainerVariant, color: iconContainerColor, radiusNone: true }) })) : null, _jsxs(View, { style: styles.withIconContainer, children: [leadingContent ? (_jsx(CardActionLeadingContent, { children: leadingContent })) : null, leadingIcon && !iconContainer && !leadingContent ? (_jsx(CardActionLeadingContent, { children: _jsx(CardActionIcon, { as: leadingIcon }) })) : null, _jsxs(CardActionContent, { children: [badgePosition === 'top' && badge ? badge : null, _jsx(CardActionText, { children: heading }), badgePosition === 'middle' && badge ? badge : null, helperText ? _jsx(CardActionHelperText, { children: helperText }) : null, badgePosition === 'bottom' && badge ? badge : null] }), badgePosition === 'right' && badge ? (_jsx(View, { style: styles.alignCenter, children: badge })) : null, trailingContent ? (_jsx(CardActionTrailingContent, { children: trailingContent })) : null, trailingIcon && !trailingContent ? (_jsx(CardActionTrailingContent, { children: _jsx(CardActionTrailingIcon, { as: trailingIcon }) })) : null] })] })) }) }));
 };
 CardActionRoot.displayName = 'CardActionRoot';
 const styles = StyleSheet.create(theme => ({

package/build/components/Checkbox/Checkbox.js

@@ -5,7 +5,6 @@ import { Helper } from '../Helper';
 import { useCheckboxGroupContext } from './CheckboxGroup.context';
 import StyledCheckboxGroup from './CheckboxGroupRoot';
 import StyledCheckboxIcon from './CheckboxIcon';
-import CheckboxImage from './CheckboxImage';
 import StyledCheckboxIndicator from './CheckboxIndicator';
 import StyledCheckboxLabel from './CheckboxLabel';
 import StyledCheckbox from './CheckboxRoot';
@@ -31,7 +30,7 @@ const Checkbox = ({ children, label, disabled, checked, helperIcon, helperText,
     const { validationStatus: groupValidationStatus, type: groupType } = useCheckboxGroupContext();
     const validationStatus = fieldValidationStatus ?? groupValidationStatus ?? validation ?? 'initial';
     const checkboxType = groupType ?? type;
-    const checkboxChildren = children ? (children) : (_jsxs(_Fragment, { children: [_jsx(CheckboxIndicator, { children: _jsx(CheckboxIcon, {}) }), image ? _jsx(CheckboxImage, { ...image }) : null, _jsxs(CheckboxTextContent, { children: [!!label && _jsx(CheckboxLabel, { 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 checkboxChildren = children ? (children) : (_jsxs(_Fragment, { children: [_jsx(CheckboxIndicator, { children: _jsx(CheckboxIcon, {}) }), image ? image : null, _jsxs(CheckboxTextContent, { children: [!!label && _jsx(CheckboxLabel, { 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 (
     // @ts-expect-error - type
     _jsx(CheckboxComponent, { ...props, isDisabled: disabled, isChecked: checked, children: checkboxType === 'tile' ? (_jsx(CheckboxTileRoot, { children: checkboxChildren })) : (checkboxChildren) }));

package/build/components/Checkbox/Checkbox.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';
 type CheckboxBaseProps = {
     onChange?: (isSelected: boolean) => void;
     disabled?: boolean;
@@ -30,7 +30,7 @@ type CheckboxWithoutChildrenProps = {
     invalidText?: string;
     validText?: string;
     showValidationIcon?: boolean;
-    image?: ImageProps;
+    image?: ReactNode;
 } & CheckboxBaseProps;
 type CheckboxProps = CheckboxWithChildrenProps | CheckboxWithoutChildrenProps;
 export default CheckboxProps;

package/build/components/Checkbox/CheckboxImage.d.ts

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

package/build/components/Checkbox/CheckboxImage.js

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

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

@@ -1,5 +1,4 @@
 import type { ComponentType, ReactNode } from 'react';
-import type BadgeProps from '../Badge/Badge.props';
 import type CardProps from '../Card/Card.props';
 export interface ExpandableCardProps extends Omit<CardProps, 'children'> {
     /**
@@ -29,7 +28,7 @@ export interface ExpandableCardProps extends Omit<CardProps, 'children'> {
     /**
      * Badge to display
      */
-    badge?: BadgeProps;
+    badge?: ReactNode;
     /**
      * Badge position
      * @default 'bottom'

package/build/components/ExpandableCard/ExpandableCardTrigger.props.d.ts

@@ -1,6 +1,5 @@
-import type { ComponentType } from 'react';
+import type { ComponentType, ReactNode } from 'react';
 import type { PressableProps } from 'react-native';
-import type BadgeProps from '../Badge/Badge.props';
 export interface ExpandableCardTriggerProps extends Omit<PressableProps, 'children'> {
     /**
      * The main heading text
@@ -17,11 +16,11 @@ export interface ExpandableCardTriggerProps extends Omit<PressableProps, 'childr
     /**
      * Content to display on the left side (e.g., icon, avatar)
      */
-    leadingContent?: React.ReactNode;
+    leadingContent?: ReactNode;
     /**
      * Optional badge to display
      */
-    badge?: BadgeProps;
+    badge?: ReactNode;
     /**
      * Position of the badge relative to the heading
      * @default 'bottom'
@@ -39,6 +38,6 @@ export interface ExpandableCardTriggerProps extends Omit<PressableProps, 'childr
      * Whether the trigger is disabled
      */
     disabled?: boolean;
-    children?: React.ReactNode;
+    children?: ReactNode;
 }
 export default ExpandableCardTriggerProps;

package/build/components/ExpandableCard/ExpandableCardTriggerRoot.js

@@ -2,7 +2,6 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { ChevronDownSmallIcon, ChevronUpSmallIcon, } from '@utilitywarehouse/hearth-react-native-icons';
 import { Pressable } from 'react-native';
 import { StyleSheet } from 'react-native-unistyles';
-import { Badge } from '../Badge';
 import { DetailText } from '../DetailText';
 import ExpandableCardContent from './ExpandableCardContent';
 import ExpandableCardHelperText from './ExpandableCardHelperText';
@@ -27,19 +26,7 @@ const ExpandableCardTriggerRoot = ({ heading, helperText, leadingIcon, leadingCo
         }
         return null;
     };
-    const renderTopBadge = () => {
-        if (badgePosition === 'top' && badge) {
-            return _jsx(Badge, { ...badge });
-        }
-        return null;
-    };
-    const renderBottomBadge = () => {
-        if (badgePosition === 'bottom' && badge) {
-            return _jsx(Badge, { ...badge });
-        }
-        return null;
-    };
-    const renderDefaultContent = () => (_jsxs(_Fragment, { children: [renderLeadingContent(), _jsxs(ExpandableCardContent, { children: [renderTopBadge(), _jsx(ExpandableCardText, { children: heading }), helperText && _jsx(ExpandableCardHelperText, { children: helperText }), renderBottomBadge()] }), numericValue && (_jsx(DetailText, { size: "lg", style: styles.numericValue, children: numericValue })), _jsx(ExpandableCardTrailingContent, { style: styles.chevron, children: _jsx(ExpandableCardTrailingIcon, { as: isExpanded ? ChevronUpSmallIcon : ChevronDownSmallIcon }) })] }));
+    const renderDefaultContent = () => (_jsxs(_Fragment, { children: [renderLeadingContent(), _jsxs(ExpandableCardContent, { children: [badgePosition === 'top' ? badge : null, _jsx(ExpandableCardText, { children: heading }), helperText && _jsx(ExpandableCardHelperText, { children: helperText }), badgePosition === 'bottom' ? badge : null] }), numericValue && (_jsx(DetailText, { size: "lg", style: styles.numericValue, children: numericValue })), _jsx(ExpandableCardTrailingContent, { style: styles.chevron, children: _jsx(ExpandableCardTrailingIcon, { as: isExpanded ? ChevronUpSmallIcon : ChevronDownSmallIcon }) })] }));
     return (_jsx(Pressable, { ...props, testID: testID, style: [styles.container, props.style], disabled: disabled, accessibilityRole: "button", accessibilityState: { expanded: isExpanded, disabled }, accessibilityLabel: `${heading}${helperText ? `, ${helperText}` : ''}`, children: children || renderDefaultContent() }));
 };
 ExpandableCardTriggerRoot.displayName = 'ExpandableCardTriggerRoot';

package/build/components/HighlightBanner/HighlightBanner.js

@@ -1,11 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Image, View } from 'react-native';
+import { View } from 'react-native';
 import { StyleSheet } from 'react-native-unistyles';
 import { BodyText } from '../BodyText';
 import { Card } from '../Card';
 const HighlightBanner = ({ heading, headingColor, image, imageContainerHeight, description, link, button, variant = 'emphasis', style, ...props }) => {
     styles.useVariants({ headingColor, variant, hasImage: Boolean(image) });
-    return (_jsx(Card, { variant: variant, noPadding: true, style: style, ...props, children: _jsxs(View, { style: [styles.container], children: [_jsx(View, { style: [styles.header], children: _jsx(BodyText, { size: "md", textAlign: "center", weight: "semibold", children: heading }) }), !!image && (_jsx(View, { style: styles.imageContainer(imageContainerHeight), children: _jsx(Image, { resizeMode: "cover", ...image, style: [styles.image, image?.style] }) })), _jsxs(View, { style: styles.footer, children: [_jsx(BodyText, { size: "md", textAlign: "center", children: description }), link && _jsx(View, { style: styles.linkContainer, children: link }), button && _jsx(View, { style: styles.buttonContainer, children: button })] })] }) }));
+    return (_jsx(Card, { variant: variant, noPadding: true, style: style, ...props, children: _jsxs(View, { style: [styles.container], children: [_jsx(View, { style: [styles.header], children: _jsx(BodyText, { size: "md", textAlign: "center", weight: "semibold", children: heading }) }), !!image && _jsx(View, { style: styles.imageContainer(imageContainerHeight), children: image }), _jsxs(View, { style: styles.footer, children: [_jsx(BodyText, { size: "md", textAlign: "center", children: description }), link && _jsx(View, { style: styles.linkContainer, children: link }), button && _jsx(View, { style: styles.buttonContainer, children: button })] })] }) }));
 };
 HighlightBanner.displayName = 'HighlightBanner';
 const styles = StyleSheet.create(theme => ({
@@ -62,10 +62,6 @@ const styles = StyleSheet.create(theme => ({
         width: '100%',
         height,
     }),
-    image: {
-        width: '100%',
-        height: '100%',
-    },
     footer: {
         padding: theme.components.banner.highlight.padding,
         gap: theme.components.banner.highlight.content.gap,

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

@@ -1,11 +1,10 @@
-import { ReactElement } from 'react';
-import { ImageProps } from 'react-native';
+import { ReactElement, ReactNode } from 'react';
 import CardProps from '../Card/Card.props';
 interface HighlightBannerProps extends Omit<CardProps, 'noPadding' | 'variant' | 'space' | 'gap' | 'rowGap' | 'columnGap' | 'flexDirection' | 'flexWrap' | 'alignItems' | 'justifyContent' | 'colorScheme'> {
     heading?: string;
     headingColor?: 'pig' | 'energy' | 'broadband' | 'mobile' | 'insurance' | 'cashback' | 'highlight';
     variant?: 'emphasis' | 'subtle';
-    image?: ImageProps;
+    image?: ReactNode;
     imageContainerHeight?: number;
     description?: string;
     link?: ReactElement;

package/build/components/HighlightBanner/HighlightBannerImage.d.ts

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

package/build/components/HighlightBanner/HighlightBannerImage.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 HighlightBannerImage = (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: '100%',
+        height: '100%',
+    },
+});
+export default HighlightBannerImage;

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

@@ -1,2 +1,3 @@
 export { default as HighlightBanner } from './HighlightBanner';
 export type { default as HighlightBannerProps } from './HighlightBanner.props';
+export { default as HighlightBannerImage } from './HighlightBannerImage';

package/build/components/HighlightBanner/index.js

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

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

@@ -1,4 +1,5 @@
 import { ComponentType } from 'react';
+import { TextInput } from 'react-native';
 import type InputProps from './Input.props';
 export declare const InputComponent: import("@gluestack-ui/input/lib/typescript/types").IInputComponentType<InputProps & {
     states?: {
@@ -10,20 +11,17 @@ export declare const InputComponent: import("@gluestack-ui/input/lib/typescript/
     as?: ComponentType;
 }, import("react-native").ViewProps, import("react-native").TextInputProps & {
     inBottomSheet?: boolean;
-}>;
+} & import("react").RefAttributes<TextInput>>;
 export declare const InputSlot: import("react").ForwardRefExoticComponent<import("react").RefAttributes<import("react-native").ViewProps> & import("react-native").ViewProps & import("@gluestack-ui/input/lib/typescript/types").IInputSlotProps>;
 export declare const InputField: import("react").ForwardRefExoticComponent<import("react").RefAttributes<import("react-native").TextInputProps & {
     inBottomSheet?: boolean;
-}> & import("react-native").TextInputProps & {
+} & import("react").RefAttributes<TextInput>> & Omit<import("react-native").TextInputProps & {
     inBottomSheet?: boolean;
-} & import("@gluestack-ui/input/lib/typescript/types").IInputProps>;
+} & import("react").RefAttributes<TextInput>, "ref"> & import("@gluestack-ui/input/lib/typescript/types").IInputProps>;
 export declare const InputIcon: import("react").ForwardRefExoticComponent<import("react").RefAttributes<import("..").IconProps & {
     as?: ComponentType;
 }> & import("..").IconProps & {
     as?: ComponentType;
 }>;
-declare const Input: {
-    ({ validationStatus, children, disabled, focused, readonly, leadingIcon, trailingIcon, type, showPasswordToggle, onClear, format, loading, clearable, required, inBottomSheet, ...props }: InputProps): import("react/jsx-runtime").JSX.Element;
-    displayName: string;
-};
+declare const Input: import("react").ForwardRefExoticComponent<InputProps & import("react").RefAttributes<TextInput>>;
 export default Input;

package/build/components/Input/Input.js

@@ -1,6 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createInput } from '@gluestack-ui/input';
-import { useState } from 'react';
+import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import { CloseSmallIcon, EyeOffSmallIcon, EyeSmallIcon, SearchMediumIcon, } from '@utilitywarehouse/hearth-react-native-icons';
 import { useTheme } from '../../hooks';
 import { useFormFieldContext } from '../FormField';
@@ -19,13 +19,16 @@ export const InputComponent = createInput({
 export const InputSlot = InputComponent.Slot;
 export const InputField = InputComponent.Input;
 export const InputIcon = InputComponent.Icon;
-const Input = ({ validationStatus = 'initial', children, disabled, focused, readonly, leadingIcon, trailingIcon, type, showPasswordToggle = true, onClear, format, loading, clearable = false, required, inBottomSheet = false, ...props }) => {
+const Input = forwardRef(({ validationStatus = 'initial', children, disabled, focused, readonly, leadingIcon, trailingIcon, type, showPasswordToggle = true, onClear, format, loading, clearable = false, required, inBottomSheet = false, ...props }, ref) => {
     const formFieldContext = useFormFieldContext();
     const { disabled: formFieldDisabled } = formFieldContext;
     const validationStatusFromContext = formFieldContext?.validationStatus ?? validationStatus;
     const isRequired = formFieldContext?.required ?? required;
     const [fieldType, setFieldType] = useState(type === 'password' ? 'password' : 'text');
     const { color } = useTheme();
+    const inputRef = useRef(null);
+    // Expose TextInput methods to parent components
+    useImperativeHandle(ref, () => inputRef.current, []);
     const shouldShowPasswordToggle = type === 'password' && showPasswordToggle;
     const shouldShowClear = clearable && !!props?.value;
     const toggleFieldType = () => {
@@ -43,7 +46,11 @@ const Input = ({ validationStatus = 'initial', children, disabled, focused, read
         }
         return undefined;
     })();
-    return (_jsx(InputComponent, { ...(children ? props : {}), validationStatus: validationStatusFromContext, isInvalid: validationStatusFromContext === 'invalid', isReadOnly: readonly, isDisabled: formFieldDisabled ?? disabled, isFocused: focused, type: type, isRequired: isRequired, children: children ? (_jsx(_Fragment, { children: children })) : (_jsxs(_Fragment, { children: [!!leadingIconComponent && (_jsx(InputSlot, { children: _jsx(InputIcon, { as: leadingIconComponent }) })), _jsx(InputField, { type: fieldType, inputMode: getInputMode, inBottomSheet: inBottomSheet, ...props }), shouldShowClear && (_jsx(InputSlot, { children: _jsx(UnstyledIconButton, { onPress: onClear, icon: CloseSmallIcon }) })), loading && (_jsx(InputSlot, { children: _jsx(Spinner, { size: "xs", color: color.icon.primary }) })), shouldShowPasswordToggle && (_jsx(InputSlot, { children: _jsx(UnstyledIconButton, { onPress: toggleFieldType, icon: fieldType === 'password' ? EyeSmallIcon : EyeOffSmallIcon }) })), !!trailingIcon && (_jsx(InputSlot, { children: _jsx(InputIcon, { as: trailingIcon }) }))] })) }));
-};
+    return (_jsx(InputComponent, { ...(children ? props : {}), validationStatus: validationStatusFromContext, isInvalid: validationStatusFromContext === 'invalid', isReadOnly: readonly, isDisabled: formFieldDisabled ?? disabled, isFocused: focused, type: type, isRequired: isRequired, children: children ? (_jsx(_Fragment, { children: children })) : (_jsxs(_Fragment, { children: [!!leadingIconComponent && (_jsx(InputSlot, { children: _jsx(InputIcon, { as: leadingIconComponent }) })), _jsx(InputField
+                // @ts-expect-error - ref forwarding issue
+                , { 
+                    // @ts-expect-error - ref forwarding issue
+                    ref: inputRef, type: fieldType, inputMode: getInputMode, inBottomSheet: inBottomSheet, ...props }), shouldShowClear && (_jsx(InputSlot, { children: _jsx(UnstyledIconButton, { onPress: onClear, icon: CloseSmallIcon }) })), loading && (_jsx(InputSlot, { children: _jsx(Spinner, { size: "xs", color: color.icon.primary }) })), shouldShowPasswordToggle && (_jsx(InputSlot, { children: _jsx(UnstyledIconButton, { onPress: toggleFieldType, icon: fieldType === 'password' ? EyeSmallIcon : EyeOffSmallIcon }) })), !!trailingIcon && (_jsx(InputSlot, { children: _jsx(InputIcon, { as: trailingIcon }) }))] })) }));
+});
 Input.displayName = 'Input';
 export default Input;