jfs-components 0.1.19 → 0.1.25

package/src/components/CheckboxItem/CheckboxItem.tsx

@@ -21,7 +21,25 @@ export type CheckboxItemProps = {
   onValueChange?: (checked: boolean) => void
   /** Whether the row is disabled — both the checkbox and row press handler are disabled. */
   disabled?: boolean
-  /** The label text rendered next to the checkbox. */
+  /**
+   * Content rendered in the row's label slot (between the leading and trailing
+   * edges). This is the primary way to supply the label and mirrors the Figma
+   * "slot" — pass a plain string for the default token-styled label, or any
+   * custom node (e.g. a `<Text>`, a row of `<Text>` + `<Badge>`, etc.) for full
+   * control. Custom nodes receive the same `modes` as the parent.
+   *
+   * When both `children` and the legacy {@link label} prop are provided,
+   * `children` wins.
+   */
+  children?: React.ReactNode
+  /**
+   * The label content rendered next to the checkbox.
+   *
+   * @deprecated Prefer the `children` slot instead
+   * (`<CheckboxItem>Fixed deposit • 0245</CheckboxItem>`). `label` is kept for
+   * backward compatibility and behaves identically — it is used only when no
+   * `children` are provided.
+   */
   label?: React.ReactNode
   /**
    * Position of the checkbox control relative to the label.
@@ -71,13 +89,18 @@ export type CheckboxItemProps = {
  * ```tsx
  * const [checked, setChecked] = useState(false)
  *
+ * // Recommended: pass the label via the children slot.
  * <CheckboxItem
- *   label="Fixed deposit • 0245"
  *   checked={checked}
  *   onValueChange={setChecked}
  *   control="leading"
  *   modes={{ 'Color Mode': 'Light' }}
- * />
+ * >
+ *   Fixed deposit • 0245
+ * </CheckboxItem>
+ *
+ * // Still supported (deprecated): the `label` prop.
+ * <CheckboxItem label="Fixed deposit • 0245" />
  * ```
  */
 const CheckboxItem = forwardRef<View, CheckboxItemProps>(function CheckboxItem({
@@ -85,7 +108,8 @@ const CheckboxItem = forwardRef<View, CheckboxItemProps>(function CheckboxItem({
   defaultChecked = false,
   onValueChange,
   disabled = false,
-  label = 'Fixed deposit • 0245',
+  children,
+  label,
   control = 'leading',
   endSlot,
   endSlotWidth = 80,
@@ -94,6 +118,20 @@ const CheckboxItem = forwardRef<View, CheckboxItemProps>(function CheckboxItem({
   labelStyle,
   accessibilityLabel,
 }: CheckboxItemProps, ref: React.Ref<View>) {
+  // Label slot resolution — the `children` slot is the primary API; the legacy
+  // `label` prop is a backward-compatible fallback. Precedence:
+  //   1. `children`, when provided (non-null / non-false).
+  //   2. otherwise the legacy `label` prop, whenever it was passed at all —
+  //      including an explicit `null`/`false`, which (as before) hides the
+  //      label entirely.
+  //   3. otherwise the Figma placeholder, so the default story still renders
+  //      something meaningful.
+  const hasChildren = children != null && children !== false
+  const slotContent: React.ReactNode = hasChildren
+    ? children
+    : label !== undefined
+      ? label
+      : 'Fixed deposit • 0245'
   const isTrailing = control === 'trailing'
   const isControlled = controlledChecked !== undefined
   const [internalChecked, setInternalChecked] = useState(defaultChecked)
@@ -146,7 +184,7 @@ const CheckboxItem = forwardRef<View, CheckboxItemProps>(function CheckboxItem({
   }
 
   const a11yLabel =
-    accessibilityLabel ?? (typeof label === 'string' ? label : undefined)
+    accessibilityLabel ?? (typeof slotContent === 'string' ? slotContent : undefined)
 
   const checkboxNode = (
     <Checkbox
@@ -158,16 +196,23 @@ const CheckboxItem = forwardRef<View, CheckboxItemProps>(function CheckboxItem({
     />
   )
 
+  // A plain string/number renders with the token-driven label style. Any other
+  // node is treated as custom slot content: it fills the label region and
+  // receives the parent `modes` (so nested design-system components theme
+  // correctly). An explicit null/false hides the label entirely (legacy
+  // behaviour of the `label` prop).
+  const isTextSlot =
+    typeof slotContent === 'string' || typeof slotContent === 'number'
   const labelNode =
-    label != null && label !== false ? (
-      typeof label === 'string' || typeof label === 'number' ? (
-        <Text style={[resolvedLabelStyle, labelStyle]} selectable={false}>
-          {label}
-        </Text>
-      ) : (
-        <View style={{ flex: 1, minWidth: 0 }}>{label}</View>
-      )
-    ) : null
+    slotContent == null || slotContent === false ? null : isTextSlot ? (
+      <Text style={[resolvedLabelStyle, labelStyle]} selectable={false}>
+        {slotContent}
+      </Text>
+    ) : (
+      <View style={{ flex: 1, minWidth: 0 }}>
+        {cloneChildrenWithModes(slotContent, modes)}
+      </View>
+    )
 
   const endSlotNode = endSlot ? (
     <View

package/src/components/ChipSelect/ChipSelect.tsx

@@ -21,6 +21,11 @@ export type ChipSelectProps = {
      * @default "ic_calendar_week"
      */
     icon?: string;
+    /**
+     * Whether to show the close icon when active.
+     * @default true
+     */
+    showCloseIcon?: boolean;
     /**
      * Modes for design token resolution.
      */
@@ -47,6 +52,7 @@ function ChipSelect({
     label = 'Date',
     active = false,
     icon = 'ic_calendar_week',
+    showCloseIcon = true,
     modes = EMPTY_MODES,
     style,
     labelSlot,
@@ -123,7 +129,7 @@ function ChipSelect({
 
             {renderLabel()}
 
-            {active && (
+            {active && showCloseIcon && (
                 <Icon name="ic_close" size={iconSize} color={textColor} />
             )}
         </TouchableOpacity>

package/src/components/ContentSheet/ContentSheet.tsx

@@ -0,0 +1,217 @@
+import React, { useContext, useMemo } from 'react'
+import {
+  Platform,
+  View,
+  type StyleProp,
+  type ViewProps,
+  type ViewStyle,
+} from 'react-native'
+import Animated, {
+  useAnimatedKeyboard,
+  useAnimatedStyle,
+} from 'react-native-reanimated'
+import { SafeAreaInsetsContext } from 'react-native-safe-area-context'
+import { getVariableByName } from '../../design-tokens/figma-variables-resolver'
+import { EMPTY_MODES, cloneChildrenWithModes, flattenChildren } from '../../utils/react-utils'
+import type { Modes } from '../../design-tokens'
+
+const IS_WEB = Platform.OS === 'web'
+
+export type ContentSheetProps = {
+  /**
+   * Sheet content. The sheet is one big slot: whatever you place here is
+   * stacked in a column (separated by the `contentSheet/gap` token) inside the
+   * sheet's padding. The sheet has **no fixed height** — it grows and shrinks
+   * to fit these children automatically.
+   */
+  children?: React.ReactNode
+  /**
+   * Design-token modes. Cascaded to every slot child via
+   * {@link cloneChildrenWithModes} so nested `ListItem`/`Section`/etc. resolve
+   * the same theme without you wiring `modes` onto each one.
+   */
+  modes?: Modes
+  /**
+   * Keep the sheet above the on-screen keyboard. When the keyboard opens the
+   * sheet rises by exactly the keyboard height; when it closes the sheet drops
+   * back. The follow animation is driven entirely on the UI thread
+   * (`useAnimatedKeyboard`) so it never schedules a React re-render and stays
+   * in perfect sync with the keyboard on both iOS and Android.
+   *
+   * On web this is a no-op (soft keyboards there don't overlay content).
+   * Default `true`.
+   */
+  avoidKeyboard?: boolean
+  /**
+   * Extra gap (px) inserted between the top of the keyboard and the bottom of
+   * the sheet while the keyboard is open. Default `0` (sheet sits flush on the
+   * keyboard).
+   */
+  keyboardSpacing?: number
+  /**
+   * Add the device's bottom safe-area inset (home indicator) on top of the
+   * sheet's bottom padding, so content never sits under the indicator when the
+   * sheet rests at the bottom of the screen. Default `true`.
+   */
+  safeAreaBottom?: boolean
+  /**
+   * Pin the sheet to the bottom of its parent (absolute, full width). This is
+   * the default behaviour — the sheet "just stays at the bottom".
+   *
+   * Set to `false` to render the sheet in normal flow instead (e.g. when you
+   * compose it inside your own layout container). Keyboard avoidance still
+   * works in both modes.
+   */
+  pinToBottom?: boolean
+  /** Optional style override applied to the sheet container. */
+  style?: StyleProp<ViewStyle>
+} & Omit<ViewProps, 'style' | 'children'>
+
+interface ContentSheetStyle {
+  container: ViewStyle
+  paddingBottom: number
+}
+
+function resolveContentSheetStyle(modes: Modes): ContentSheetStyle {
+  const backgroundColor = getVariableByName('contentSheet/bg', modes) as string
+  const gap = getVariableByName('contentSheet/gap', modes) as number
+  const paddingHorizontal = getVariableByName('contentSheet/padding/horizontal', modes) as number
+  const paddingTop = getVariableByName('contentSheet/padding/top', modes) as number
+  const paddingBottom = getVariableByName('contentSheet/padding/bottom', modes) as number
+  const radiusTop = getVariableByName('contentSheet/padding/radius/top', modes) as number
+  const radiusBottom = getVariableByName('contentSheet/padding/radius/bottom', modes) as number
+
+  return {
+    container: {
+      backgroundColor,
+      gap,
+      paddingHorizontal,
+      paddingTop,
+      // paddingBottom is applied separately so the safe-area inset can be added.
+      borderTopLeftRadius: radiusTop,
+      borderTopRightRadius: radiusTop,
+      borderBottomLeftRadius: radiusBottom,
+      borderBottomRightRadius: radiusBottom,
+      flexDirection: 'column',
+      alignItems: 'stretch',
+      overflow: 'hidden',
+    },
+    paddingBottom,
+  }
+}
+
+const pinnedStyle: ViewStyle = {
+  position: 'absolute',
+  left: 0,
+  right: 0,
+  bottom: 0,
+}
+
+/**
+ * ContentSheet — a bottom-anchored surface that is essentially one big slot
+ * with padding and rounded top corners, mirroring the Figma "Content Sheet".
+ *
+ * Behaviour highlights:
+ *  - **Auto height (free & automatic).** The sheet never sets an explicit
+ *    height. React Native's layout engine (Yoga) sizes it to its children on
+ *    the native thread, so when the slot content grows or shrinks the sheet
+ *    follows with zero JS measurement and zero extra re-renders — the most
+ *    performant option possible.
+ *  - **Keyboard avoidance** on iOS and Android via `avoidKeyboard` (UI-thread
+ *    `useAnimatedKeyboard`, no re-renders).
+ *  - **Bottom pinned** by default; opt out with `pinToBottom={false}`.
+ *  - **Token-driven** styling via `getVariableByName` + `modes`, with `modes`
+ *    cascaded to all slot children.
+ */
+function ContentSheet({
+  children,
+  modes = EMPTY_MODES,
+  avoidKeyboard = true,
+  keyboardSpacing = 0,
+  safeAreaBottom = true,
+  pinToBottom = true,
+  style,
+  ...rest
+}: ContentSheetProps) {
+  // Read the safe-area inset directly from context (rather than
+  // `useSafeAreaInsets`, which throws when no provider is mounted). This keeps
+  // the sheet usable without a `SafeAreaProvider` — it simply falls back to 0.
+  const safeAreaInsets = useContext(SafeAreaInsetsContext)
+  const bottomInset = safeAreaInsets?.bottom ?? 0
+  const resolved = useMemo(() => resolveContentSheetStyle(modes), [modes])
+
+  const processedChildren = useMemo(
+    () => cloneChildrenWithModes(flattenChildren(children), modes),
+    [children, modes]
+  )
+
+  const paddingBottom =
+    resolved.paddingBottom + (safeAreaBottom ? bottomInset : 0)
+
+  const containerStyle = useMemo<StyleProp<ViewStyle>>(
+    () => [
+      pinToBottom ? pinnedStyle : null,
+      resolved.container,
+      { paddingBottom },
+      style,
+    ],
+    [pinToBottom, resolved.container, paddingBottom, style]
+  )
+
+  // Switching between the keyboard-aware and plain implementation is keyed off
+  // `avoidKeyboard` (and platform). Because they are distinct component types,
+  // React remounts on toggle, so the conditional `useAnimatedKeyboard` hook
+  // inside `KeyboardAwareSheet` always runs in a stable hook order.
+  if (avoidKeyboard && !IS_WEB) {
+    return (
+      <KeyboardAwareSheet
+        style={containerStyle}
+        spacing={keyboardSpacing}
+        {...rest}
+      >
+        {processedChildren}
+      </KeyboardAwareSheet>
+    )
+  }
+
+  return (
+    <View style={containerStyle} {...rest}>
+      {processedChildren}
+    </View>
+  )
+}
+
+type KeyboardAwareSheetProps = {
+  style: StyleProp<ViewStyle>
+  spacing: number
+  children: React.ReactNode
+} & Omit<ViewProps, 'style' | 'children'>
+
+/**
+ * Native-only wrapper that lifts the sheet by the live keyboard height. The
+ * translation is computed on the UI thread from `useAnimatedKeyboard`, so the
+ * sheet tracks the keyboard frame-for-frame without any JS work.
+ */
+function KeyboardAwareSheet({
+  style,
+  spacing,
+  children,
+  ...rest
+}: KeyboardAwareSheetProps) {
+  const keyboard = useAnimatedKeyboard()
+
+  const keyboardStyle = useAnimatedStyle(() => {
+    const height = keyboard.height.value
+    return {
+      transform: [{ translateY: height > 0 ? -(height + spacing) : 0 }],
+    }
+  })
+
+  return (
+    <Animated.View style={[style, keyboardStyle]} {...rest}>
+      {children}
+    </Animated.View>
+  )
+}
+
+export default ContentSheet

package/src/components/HeroSection/HeroSection.tsx

@@ -0,0 +1,231 @@
+import React, { useMemo } from 'react'
+import { View, type StyleProp, type ViewStyle } from 'react-native'
+import { getVariableByName } from '../../design-tokens/figma-variables-resolver'
+import { useTokens } from '../../design-tokens/JFSThemeProvider'
+import { EMPTY_MODES, cloneChildrenWithModes } from '../../utils/react-utils'
+import Title from '../Title/Title'
+import InputSearch from '../InputSearch/InputSearch'
+import IconButton from '../IconButton/IconButton'
+import type { Modes } from '../../design-tokens'
+
+// The filter button in the design is a tonal "secondary" variant (light-purple
+// fill, purple icon). These modes reproduce `iconButton/background = #dbcfff`
+// and `iconButton/icon/color = #5d00b5`. Applied as defaults so the button
+// matches the Figma design out of the box; consumer-provided `modes` still win.
+const FILTER_BUTTON_MODES: Modes = {
+  AppearanceBrand: 'Secondary',
+  Emphasis: 'Medium',
+}
+
+// Inside a Hero Section the Title is flush with the section padding — the
+// `title/padding/*` tokens default to 16 but resolve to 0 in the `Page Hero`
+// context (matching the Figma design). Cascaded so the title lines up with the
+// search row instead of getting a double 16px inset.
+const TITLE_MODES: Modes = {
+  context7: 'Page Hero',
+}
+
+export type HeroSectionProps = {
+  /** Headline text rendered by the internal {@link Title}. */
+  title?: string
+  /** Optional subtitle shown below the title. Omit to hide it. */
+  subtitle?: string
+  /** Horizontal alignment of the title/subtitle block. */
+  titleTextAlign?: 'Left' | 'Center'
+  /** Whether to render the title block. Ignored when `titleSlot` is provided. */
+  showTitle?: boolean
+  /**
+   * Fully replace the default title block. When provided, `title`, `subtitle`,
+   * `titleTextAlign`, and `showTitle` are ignored. `modes` cascade into the slot.
+   */
+  titleSlot?: React.ReactNode
+
+  /**
+   * Whether to render the search + filter row. Ignored when `searchSlot`
+   * is provided.
+   */
+  showSearch?: boolean
+  /** Controlled value for the search input. */
+  searchValue?: string
+  /** Change handler for the search input. */
+  onSearchChange?: (text: string) => void
+  /** Placeholder for the search input. */
+  searchPlaceholder?: string
+  /**
+   * Fully replace the search input (the flexible left part of the row). When
+   * provided, `searchValue`, `onSearchChange`, and `searchPlaceholder` are
+   * ignored. `modes` cascade into the slot.
+   */
+  searchSlot?: React.ReactNode
+
+  /** Whether to render the trailing filter icon button. */
+  showFilter?: boolean
+  /** Icon name for the filter button (from the icon registry). */
+  filterIcon?: string
+  /** Press handler for the filter button. */
+  onFilterPress?: () => void
+  /** Accessibility label for the filter button. */
+  filterAccessibilityLabel?: string
+  /**
+   * Fully replace the trailing filter control. When provided, `filterIcon`,
+   * `onFilterPress`, and `showFilter` are ignored. `modes` cascade into the slot.
+   */
+  filterSlot?: React.ReactNode
+
+  /** Content rendered in the body area below the search row. */
+  children?: React.ReactNode
+
+  /** Mode configuration for design-token theming. */
+  modes?: Modes
+  /** Style overrides applied to the outer container. */
+  style?: StyleProp<ViewStyle>
+  testID?: string
+}
+
+/**
+ * HeroSection is a page-level header block: a title (with optional subtitle),
+ * an optional search row (a flexible search input plus a trailing filter
+ * button), and a free-form content slot below.
+ *
+ * All spacing/background values resolve from the `HeroSection / Output` design
+ * token collection via `getVariableByName`. `modes` cascade to every slot and
+ * child component so downstream tokens stay in sync.
+ *
+ * @example
+ * ```tsx
+ * <HeroSection
+ *   title="Transactions"
+ *   subtitle="Last 30 days"
+ *   searchValue={query}
+ *   onSearchChange={setQuery}
+ *   onFilterPress={openFilters}
+ * >
+ *   <TransactionList data={items} />
+ * </HeroSection>
+ * ```
+ */
+function HeroSection({
+  title = 'Page Title',
+  subtitle = 'Subtitle',
+  titleTextAlign = 'Left',
+  showTitle = true,
+  titleSlot,
+  showSearch = true,
+  searchValue,
+  onSearchChange,
+  searchPlaceholder = 'Search',
+  searchSlot,
+  showFilter = true,
+  filterIcon = 'ic_filter',
+  onFilterPress,
+  filterAccessibilityLabel = 'Filter',
+  filterSlot,
+  children,
+  modes: propModes = EMPTY_MODES,
+  style,
+  testID,
+}: HeroSectionProps) {
+  const { modes: globalModes } = useTokens()
+  const modes = useMemo(
+    () => ({ ...globalModes, ...propModes }),
+    [globalModes, propModes]
+  )
+
+  const gap = Number(getVariableByName('heroSection/gap', modes))
+  const paddingHorizontal = Number(
+    getVariableByName('heroSection/padding/horizontal', modes)
+  )
+  const paddingVertical = Number(
+    getVariableByName('heroSection/padding/vertical', modes)
+  )
+
+  const containerStyle: ViewStyle = {
+    backgroundColor: '#ffffff',
+    flexDirection: 'column',
+    alignItems: 'flex-start',
+    gap,
+    paddingHorizontal,
+    paddingVertical,
+    width: '100%',
+  }
+
+  const titleContent = useMemo<React.ReactNode>(() => {
+    if (titleSlot !== undefined && titleSlot !== null) {
+      return cloneChildrenWithModes(titleSlot, modes)
+    }
+    if (!showTitle) return null
+    return (
+      <Title
+        title={title}
+        subtitle={subtitle}
+        textAlign={titleTextAlign}
+        modes={{ ...TITLE_MODES, ...modes }}
+      />
+    )
+  }, [titleSlot, showTitle, title, subtitle, titleTextAlign, modes])
+
+  const searchInput = useMemo<React.ReactNode>(() => {
+    if (searchSlot !== undefined && searchSlot !== null) {
+      return cloneChildrenWithModes(searchSlot, modes)
+    }
+    return (
+      <InputSearch
+        supportText={false}
+        placeholder={searchPlaceholder}
+        value={searchValue}
+        onChangeText={onSearchChange}
+        containerStyle={{ flex: 1 }}
+        modes={modes}
+      />
+    )
+  }, [searchSlot, searchPlaceholder, searchValue, onSearchChange, modes])
+
+  const filterControl = useMemo<React.ReactNode>(() => {
+    if (filterSlot !== undefined && filterSlot !== null) {
+      return cloneChildrenWithModes(filterSlot, modes)
+    }
+    if (!showFilter) return null
+    return (
+      <IconButton
+        iconName={filterIcon}
+        onPress={onFilterPress}
+        accessibilityLabel={filterAccessibilityLabel}
+        modes={{ ...FILTER_BUTTON_MODES, ...modes }}
+      />
+    )
+  }, [filterSlot, showFilter, filterIcon, onFilterPress, filterAccessibilityLabel, modes])
+
+  const searchRow =
+    searchSlot !== undefined && searchSlot !== null
+      ? true
+      : showSearch
+
+  const bodyContent = useMemo<React.ReactNode>(() => {
+    if (children === undefined || children === null) return null
+    return cloneChildrenWithModes(children, modes)
+  }, [children, modes])
+
+  return (
+    <View style={[containerStyle, style]} testID={testID}>
+      {titleContent}
+      {searchRow ? (
+        <View
+          style={{
+            flexDirection: 'row',
+            alignItems: 'center',
+            gap,
+            width: '100%',
+          }}
+        >
+          {searchInput}
+          {filterControl}
+        </View>
+      ) : null}
+      {bodyContent != null ? (
+        <View style={{ width: '100%' }}>{bodyContent}</View>
+      ) : null}
+    </View>
+  )
+}
+
+export default HeroSection

package/src/components/Image/Image.tsx

@@ -7,9 +7,23 @@ import {
   type StyleProp,
   type ViewStyle,
   type ImageResizeMode,
+  type ImageLoadEventData,
+  type ImageErrorEventData,
+  type NativeSyntheticEvent,
 } from 'react-native'
 
 type ImageResizeMethod = 'auto' | 'resize' | 'scale' | 'none'
+
+/**
+ * iOS URL cache control (maps to RN's `source.cache`, no-op on Android/web):
+ *  - `'default'`        — use the native platform's default caching.
+ *  - `'reload'`         — ignore any cache, always fetch from the network.
+ *  - `'force-cache'`    — use the cached response regardless of age; fetch
+ *                          only if absent.
+ *  - `'only-if-cached'` — use the cache only; never hit the network.
+ */
+type ImageCacheControl = 'default' | 'reload' | 'force-cache' | 'only-if-cached'
+
 import Skeleton from '../../skeleton/Skeleton'
 import { useSkeleton } from '../../skeleton/SkeletonGroup'
 
@@ -78,13 +92,43 @@ export type ImageProps = {
    * the group.
    */
   loading?: boolean | undefined
+  /**
+   * iOS URL cache strategy applied to remote (`{ uri }`) sources. Injected into
+   * the RN `source.cache` field so callers don't have to re-shape the source
+   * object themselves. No-op for local/required assets and on Android/web.
+   */
+  cache?: ImageCacheControl | undefined
+  /**
+   * Called when the image finishes loading successfully. Forwarded straight to
+   * RN's `<Image onLoad>`.
+   */
+  onLoad?: ((event: NativeSyntheticEvent<ImageLoadEventData>) => void) | undefined
+  /**
+   * Called when the image fails to load. Forwarded straight to RN's
+   * `<Image onError>`.
+   */
+  onError?:
+    | ((event: NativeSyntheticEvent<ImageErrorEventData>) => void)
+    | undefined
 }
 
 function normalizeSource(
-  imageSource: ImageProps['imageSource']
+  imageSource: ImageProps['imageSource'],
+  cache?: ImageCacheControl
 ): ImageSourcePropType | undefined {
   if (imageSource == null) return undefined
-  if (typeof imageSource === 'string') return { uri: imageSource }
+  if (typeof imageSource === 'string') {
+    return cache ? { uri: imageSource, cache } : { uri: imageSource }
+  }
+  // Only remote sources (single object with a `uri`) can carry a cache policy.
+  if (
+    cache &&
+    !Array.isArray(imageSource) &&
+    typeof imageSource === 'object' &&
+    'uri' in imageSource
+  ) {
+    return { ...imageSource, cache }
+  }
   return imageSource
 }
 
@@ -122,8 +166,14 @@ function Image({
   accessibilityElementsHidden,
   importantForAccessibility,
   loading,
+  cache,
+  onLoad,
+  onError,
 }: ImageProps) {
-  const source = useMemo(() => normalizeSource(imageSource), [imageSource])
+  const source = useMemo(
+    () => normalizeSource(imageSource, cache),
+    [imageSource, cache]
+  )
 
   // Explicit { width, height } means a "fill an exact box" layout — typically a
   // full-bleed hero/background where the asset is high-res and sharpness
@@ -173,6 +223,8 @@ function Image({
       accessibilityLabel={accessibilityLabel}
       accessibilityElementsHidden={accessibilityElementsHidden}
       importantForAccessibility={importantForAccessibility}
+      onLoad={onLoad}
+      onError={onError}
     />
   )
 }