jfs-components 0.0.79 → 0.0.84

package/lib/module/components/AppBar/AppBar.js

@@ -7,10 +7,18 @@ import { useTokens } from '../../design-tokens/JFSThemeProvider';
 import NavArrow from '../NavArrow/NavArrow';
 import { cloneChildrenWithModes, EMPTY_MODES } from '../../utils/react-utils';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+// SubPage "slot wrap" geometry, taken directly from the Figma design
+// (node 449:7876). The middle slot is an absolutely-centered box of a fixed
+// size; its inner content (node 3991:4125) is a `flex: 1 0 0; min-width: 1px`
+// item so it fills / shrinks responsively within that box.
+const SUBPAGE_MIDDLE_DEFAULT_WIDTH = 192;
+const SUBPAGE_MIDDLE_HEIGHT = 32;
+const SUBPAGE_MIDDLE_PADDING_HORIZONTAL = 21;
 export default function AppBar({
   type = 'MainPage',
   leadingSlot,
   middleSlot,
+  middleSlotWidth = SUBPAGE_MIDDLE_DEFAULT_WIDTH,
   actionsSlot,
   modes: propModes = EMPTY_MODES,
   onLeadingPress,
@@ -112,13 +120,40 @@ export default function AppBar({
     children: cloneChildrenWithModes(React.Children.toArray(actionsSlot), modes)
   }) : null;
 
-  // When there is no middleSlot we want leading & actions pinned to the
-  // outer edges, so we apply `space-between` at the wrapper. With a middle
-  // slot present, the middle (flex: 1) absorbs the remaining space, so
-  // `space-between` is a no-op.
+  // SubPage centers its middle slot via absolute positioning (see Figma
+  // "slot wrap"), so it never participates in the row flow. Only MainPage
+  // keeps the legacy in-flow middle slot.
+  const hasInFlowMiddle = isMain && !!processedMiddle;
+
+  // With an in-flow middle (MainPage) the middle (flex: 1) absorbs the
+  // remaining space, so leading & actions sit at the edges naturally. In all
+  // other cases we pin leading & actions to the outer edges with
+  // `space-between`; the SubPage middle floats above, centered.
   const wrapperStyle = {
     ...containerStyle,
-    justifyContent: processedMiddle ? 'flex-start' : 'space-between'
+    justifyContent: hasInFlowMiddle ? 'flex-start' : 'space-between'
+  };
+
+  // Absolutely-centered middle box for SubPage, mirroring the Figma geometry.
+  // `left/top: 50%` + a negative translate keeps it centered regardless of the
+  // bar width, while the fixed width clips overly-wide content (overflow:
+  // hidden) instead of letting it bleed under the leading/actions slots.
+  const subPageMiddleStyle = {
+    position: 'absolute',
+    top: '50%',
+    left: '50%',
+    width: middleSlotWidth,
+    height: SUBPAGE_MIDDLE_HEIGHT,
+    transform: [{
+      translateX: -middleSlotWidth / 2
+    }, {
+      translateY: -SUBPAGE_MIDDLE_HEIGHT / 2
+    }],
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: SUBPAGE_MIDDLE_PADDING_HORIZONTAL,
+    overflow: 'hidden'
   };
   return /*#__PURE__*/_jsxs(View, {
     style: [wrapperStyle, style],
@@ -134,7 +169,7 @@ export default function AppBar({
         alignItems: 'center'
       },
       children: processedLeading
-    }), processedMiddle && /*#__PURE__*/_jsx(View, {
+    }), hasInFlowMiddle && /*#__PURE__*/_jsx(View, {
       style: {
         flex: 1,
         minWidth: 0,
@@ -147,6 +182,21 @@ export default function AppBar({
     }), /*#__PURE__*/_jsx(View, {
       style: actionsStyle,
       children: processedActions
+    }), isSub && processedMiddle && /*#__PURE__*/_jsx(View, {
+      style: subPageMiddleStyle,
+      pointerEvents: "box-none",
+      children: /*#__PURE__*/_jsx(View, {
+        style: {
+          flex: 1,
+          minWidth: 1,
+          height: '100%',
+          flexDirection: 'row',
+          alignItems: 'center',
+          justifyContent: 'center'
+        },
+        pointerEvents: "box-none",
+        children: processedMiddle
+      })
     })]
   });
 }

package/lib/module/components/Attached/Attached.js

@@ -43,9 +43,27 @@ function resolveAnchorFractions(position) {
  * </Attached>
  * ```
  */
+/**
+ * Stretches the immediate badge child/children to fill the enforced badge box.
+ * Merges `{ width: '100%', height: '100%' }` into each top-level element's
+ * `style` so an arbitrary node (e.g. an `Image` with its own width/aspectRatio)
+ * fills the fixed `badgeSize` box instead of laying out at its intrinsic size.
+ * The wrapping box's `overflow: 'hidden'` clips anything that still overflows.
+ */
+function forceBadgeFill(children) {
+  return React.Children.map(children, child => {
+    if (! /*#__PURE__*/React.isValidElement(child)) return child;
+    const childStyle = child.props?.style;
+    return /*#__PURE__*/React.cloneElement(child, {
+      style: [FILL_STYLE, childStyle]
+    });
+  });
+}
 function Attached({
   children,
   badge,
+  badgeSize,
+  badgeRadius,
   position = 'bottom-right',
   circular = true,
   modes: propModes = EMPTY_MODES,
@@ -60,7 +78,7 @@ function Attached({
     ...propModes
   }, [globalModes, propModes]);
   const [mainSize, setMainSize] = useState(ZERO_SIZE);
-  const [badgeSize, setBadgeSize] = useState(ZERO_SIZE);
+  const [measuredBadgeSize, setMeasuredBadgeSize] = useState(ZERO_SIZE);
   const onMainLayout = useCallback(e => {
     const {
       width,
@@ -76,19 +94,31 @@ function Attached({
       width,
       height
     } = e.nativeEvent.layout;
-    setBadgeSize(prev => prev.width === width && prev.height === height ? prev : {
+    setMeasuredBadgeSize(prev => prev.width === width && prev.height === height ? prev : {
       width,
       height
     });
   }, []);
   const mainChildren = useMemo(() => children != null ? cloneChildrenWithModes(children, modes) : null, [children, modes]);
   const badgeChildren = useMemo(() => badge != null ? cloneChildrenWithModes(badge, modes) : null, [badge, modes]);
+
+  // When a fixed size is requested, the badge is wrapped in a clipped box and
+  // its content is force-stretched to fill it (see `forceBadgeFill`).
+  const badgeBoxStyle = useMemo(() => {
+    if (badgeSize == null) return null;
+    return {
+      width: badgeSize,
+      height: badgeSize,
+      borderRadius: badgeRadius ?? badgeSize / 2,
+      overflow: 'hidden'
+    };
+  }, [badgeSize, badgeRadius]);
   const badgePlacement = useMemo(() => {
     const {
       fx,
       fy
     } = resolveAnchorFractions(position);
-    const measured = mainSize.width > 0 && badgeSize.width > 0;
+    const measured = mainSize.width > 0 && measuredBadgeSize.width > 0;
     let anchorX;
     let anchorY;
     if (circular) {
@@ -108,12 +138,12 @@ function Attached({
     }
     return {
       position: 'absolute',
-      left: anchorX - badgeSize.width / 2,
-      top: anchorY - badgeSize.height / 2,
+      left: anchorX - measuredBadgeSize.width / 2,
+      top: anchorY - measuredBadgeSize.height / 2,
       // Hide until both elements are measured to avoid a one-frame flash at (0,0).
       opacity: measured ? 1 : 0
     };
-  }, [position, circular, mainSize, badgeSize]);
+  }, [position, circular, mainSize, measuredBadgeSize]);
   return /*#__PURE__*/_jsxs(View, {
     style: [styles.container, style],
     ...rest,
@@ -124,7 +154,10 @@ function Attached({
       style: badgePlacement,
       onLayout: onBadgeLayout,
       pointerEvents: "box-none",
-      children: badgeChildren
+      children: badgeBoxStyle != null ? /*#__PURE__*/_jsx(View, {
+        style: badgeBoxStyle,
+        children: forceBadgeFill(badgeChildren)
+      }) : badgeChildren
     })]
   });
 }
@@ -136,4 +169,10 @@ const styles = {
     alignSelf: 'flex-start'
   }
 };
+
+/** Fill style merged into badge content when `badgeSize` enforces a fixed box. */
+const FILL_STYLE = {
+  width: '100%',
+  height: '100%'
+};
 export default /*#__PURE__*/React.memo(Attached);

package/lib/module/components/Checkbox/Checkbox.js

@@ -50,11 +50,25 @@ function useFocusVisible() {
 /** Minimum touch target per iOS HIG / Material accessibility guidance. */
 const MIN_TOUCH_TARGET = 44;
 const touchTargetStyle = {
-  minWidth: MIN_TOUCH_TARGET,
-  minHeight: MIN_TOUCH_TARGET,
   alignItems: 'center',
   justifyContent: 'center'
 };
+
+/**
+ * Expands the tappable region to the 44pt minimum without changing layout.
+ * `hitSlop` extends the press-responder bounds beyond the visual box on both
+ * native and web (react-native-web ≥ 0.19), so the Pressable keeps its natural
+ * checkbox-sized footprint and sibling alignment stays intact.
+ */
+function invisibleTouchHitSlop(checkboxSize) {
+  const slop = Math.max(0, Math.ceil((MIN_TOUCH_TARGET - checkboxSize) / 2));
+  return {
+    top: slop,
+    bottom: slop,
+    left: slop,
+    right: slop
+  };
+}
 /**
  * Checkbox component that maps directly to the Figma design using design tokens.
  *
@@ -179,8 +193,10 @@ function Checkbox({
     };
   };
   const markColor = disabled && isChecked ? disabledActiveMark : selectedMarkColor;
+  const hitSlop = invisibleTouchHitSlop(size);
   return /*#__PURE__*/_jsx(Pressable, {
     style: [touchTargetStyle, style],
+    hitSlop: hitSlop,
     onPress: handlePress,
     disabled: disabled,
     onHoverIn: () => setIsHovered(true),

package/lib/module/components/Drawer/Drawer.js

@@ -363,7 +363,12 @@ function Drawer({
               flexDirection: 'column',
               alignItems: 'stretch'
             }, contentContainerStyle],
-            showsVerticalScrollIndicator: showsVerticalScrollIndicator,
+            showsVerticalScrollIndicator: showsVerticalScrollIndicator
+            // Let a tap on an input inside the sheet focus it on the FIRST tap
+            // even while the keyboard is already open (default 'never' would
+            // eat that tap just to dismiss the keyboard).
+            ,
+            keyboardShouldPersistTaps: "handled",
             animatedProps: animatedScrollProps,
             alwaysBounceVertical: false,
             overScrollMode: "always",

package/lib/module/components/DropdownInput/DropdownInput.js

@@ -139,7 +139,7 @@ function DropdownInput({
   supportText,
   errorMessage,
   menuMaxHeight = 240,
-  menuOffset = 6,
+  menuOffset,
   matchTriggerWidth = true,
   closeOnBackdropPress = true,
   modes: propModes = EMPTY_MODES,
@@ -202,10 +202,29 @@ function DropdownInput({
   const tokens = useFormFieldTokens(modes);
   const chevron = useChevronTokens(modes);
 
+  // Gap between the input and the popup. Falls back to the `formField/gap`
+  // token so the menu's offset matches the field's own internal spacing.
+  const effectiveMenuOffset = menuOffset ?? tokens.gap;
+
   // ---------------- Layout / measurement ----------------
   const triggerRef = useRef(null);
   const [triggerRect, setTriggerRect] = useState(null);
   const insets = useSafeAreaInsets();
+
+  // Android coordinate-space bridge.
+  //
+  // The popup lives inside a `statusBarTranslucent` Modal, whose window is
+  // laid out from the PHYSICAL top of the screen (behind the status bar).
+  // The trigger, however, is rendered inside the app's content area (Expo
+  // Router / react-native-screens under edge-to-edge), so its
+  // `measureInWindow` Y is relative to the content area — it does NOT include
+  // the status bar height. Feeding that Y straight into the Modal would place
+  // the popup one status-bar-height too high, landing it on top of the input.
+  //
+  // Adding `insets.top` converts the trigger's content-relative Y into the
+  // Modal's full-screen coordinate space. iOS/web share a single coordinate
+  // space for the Modal and the trigger, so no shift is needed there.
+  const windowTopOffset = Platform.OS === 'android' ? insets.top : 0;
   const measure = useCallback(() => {
     if (!triggerRef.current) return;
     triggerRef.current.measureInWindow((x, y, width, height) => {
@@ -271,7 +290,7 @@ function DropdownInput({
     const spaceBelow = windowHeight - (triggerRect.y + triggerRect.height) - insets.bottom;
     const spaceAbove = triggerRect.y - insets.top;
     const desiredHeight = Math.min(menuSize?.height ?? menuMaxHeight, menuMaxHeight);
-    const needed = desiredHeight + menuOffset + 8;
+    const needed = desiredHeight + effectiveMenuOffset + 8;
     if (placement === 'top') {
       return spaceAbove >= needed || spaceAbove >= spaceBelow ? 'top' : 'bottom';
     }
@@ -279,7 +298,7 @@ function DropdownInput({
       return spaceBelow >= needed || spaceBelow >= spaceAbove ? 'bottom' : 'top';
     }
     return spaceBelow >= needed || spaceBelow >= spaceAbove ? 'bottom' : 'top';
-  }, [triggerRect, placement, windowHeight, menuSize?.height, menuMaxHeight, menuOffset, insets.top, insets.bottom]);
+  }, [triggerRect, placement, windowHeight, menuSize?.height, menuMaxHeight, effectiveMenuOffset, insets.top, insets.bottom]);
   const popupStyle = useMemo(() => {
     if (!triggerRect) {
       return {
@@ -298,15 +317,18 @@ function DropdownInput({
     const minLeft = insets.left + screenPadding;
     if (leftPos > maxLeft) leftPos = maxLeft;
     if (leftPos < minLeft) leftPos = minLeft;
+
+    // Trigger top expressed in the Modal's (full-screen) coordinate space.
+    const triggerTop = triggerRect.y + windowTopOffset;
     let topPos;
     if (computedPlacement === 'top') {
       const desiredHeight = menuSize?.height ?? menuMaxHeight;
-      topPos = triggerRect.y - desiredHeight - menuOffset;
+      topPos = triggerTop - desiredHeight - effectiveMenuOffset;
       if (topPos < insets.top + screenPadding) {
         topPos = insets.top + screenPadding;
       }
     } else {
-      topPos = triggerRect.y + triggerRect.height + menuOffset;
+      topPos = triggerTop + triggerRect.height + effectiveMenuOffset;
     }
     const style = {
       position: 'absolute',
@@ -318,7 +340,7 @@ function DropdownInput({
     // the wrong place. menuSize becomes truthy after the first layout.
     if (menuSize == null) style.opacity = 0;
     return style;
-  }, [triggerRect, computedPlacement, menuSize, menuOffset, menuMaxHeight, matchTriggerWidth, windowWidth, insets.top, insets.left, insets.right]);
+  }, [triggerRect, computedPlacement, menuSize, effectiveMenuOffset, windowTopOffset, menuMaxHeight, matchTriggerWidth, windowWidth, insets.top, insets.left, insets.right]);
 
   // Reset menu size when closing so the next open re-measures (handles items
   // changing while the menu was closed).
@@ -507,6 +529,8 @@ function DropdownInput({
     }), /*#__PURE__*/_jsx(Modal, {
       visible: isOpen,
       transparent: true,
+      statusBarTranslucent: true,
+      navigationBarTranslucent: true,
       animationType: "fade",
       onRequestClose: closeMenu,
       children: /*#__PURE__*/_jsx(Pressable, {

package/lib/module/components/ExpandableCheckbox/ExpandableCheckbox.js

@@ -82,8 +82,6 @@ function ExpandableCheckbox({
   }, [disabled, isExpanded, isExpandedControlled, onExpandedChange]);
   const gap = getVariableByName('expandableCheckbox/gap', modes) ?? 8;
   const rowGap = getVariableByName('checkboxItem/gap', modes) ?? 8;
-  const rowPaddingHorizontal = getVariableByName('checkboxItem/padding/horizontal', modes) ?? 0;
-  const rowPaddingVertical = getVariableByName('checkboxItem/padding/vertical', modes) ?? 0;
   const labelColor = getVariableByName('checkboxItem/foreground', modes) ?? '#1a1c1f';
   const labelFontFamily = getVariableByName('checkboxItem/label/fontFamily', modes) ?? 'JioType Var';
   const labelFontSize = getVariableByName('checkboxItem/label/fontSize', modes) ?? 14;
@@ -104,11 +102,9 @@ function ExpandableCheckbox({
     alignSelf: isExpanded ? 'stretch' : 'auto',
     minWidth: 0,
     flexDirection: 'row',
-    alignItems: 'flex-start',
-    gap: rowGap,
-    paddingHorizontal: rowPaddingHorizontal,
-    paddingVertical: rowPaddingVertical
-  }), [isExpanded, rowGap, rowPaddingHorizontal, rowPaddingVertical]);
+    alignItems: isExpanded ? 'flex-start' : 'center',
+    gap: rowGap
+  }), [isExpanded, rowGap]);
   const resolvedLabelStyle = useMemo(() => ({
     flex: 1,
     minWidth: 0,
@@ -116,11 +112,21 @@ function ExpandableCheckbox({
     fontFamily: labelFontFamily,
     fontSize: labelFontSize,
     lineHeight: labelLineHeight,
-    fontWeight: labelFontWeight
-  }), [labelColor, labelFontFamily, labelFontSize, labelLineHeight, labelFontWeight]);
+    fontWeight: labelFontWeight,
+    // Android adds asymmetric font padding and top-aligns the glyph inside
+    // an inflated line box when `lineHeight` is set. That makes the centered
+    // checkbox look like it drops below the text. Disabling the extra
+    // padding + centering the glyph keeps the single-line label optically
+    // aligned with the checkbox. No-op on iOS / web.
+    includeFontPadding: false,
+    textAlignVertical: isExpanded ? 'top' : 'center'
+  }), [labelColor, labelFontFamily, labelFontSize, labelLineHeight, labelFontWeight, isExpanded]);
+
+  // Layer component modes first (e.g. Color Mode), then button defaults so
+  // Secondary / XS / Low always win unless a dedicated override prop is added.
   const buttonModes = useMemo(() => ({
-    ...BUTTON_DEFAULT_MODES,
-    ...modes
+    ...modes,
+    ...BUTTON_DEFAULT_MODES
   }), [modes]);
   const a11yLabel = accessibilityLabel ?? (typeof label === 'string' ? label : undefined);
   const buttonLabel = isExpanded ? readLessLabel : readMoreLabel;

package/lib/module/components/FormField/FormField.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import React, { useCallback, useMemo, useRef, useState } from 'react';
-import { View, Text, Pressable, TextInput as RNTextInput } from 'react-native';
+import React, { useCallback, useMemo, useState } from 'react';
+import { View, Text, TextInput as RNTextInput } 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';
@@ -202,16 +202,6 @@ function FormField({
   const [isFocused, setIsFocused] = useState(false);
   const interactive = !isDisabled && !isReadOnly;
 
-  // Ref to the native input so tapping anywhere in the input row (padding,
-  // leading/trailing gutters) focuses it on the FIRST tap — fixing the Android
-  // "two taps to open the keyboard" issue caused by the row intercepting the
-  // initial touch.
-  const inputRef = useRef(null);
-  const focusInput = useCallback(() => {
-    if (!interactive) return;
-    inputRef.current?.focus();
-  }, [interactive]);
-
   // FormField States cascade — error > read only/disabled > active (focused) > idle.
   // Disabled maps to "Read Only" since there is no dedicated disabled mode and
   // the visual treatment is closest. This is only the DEFAULT — an explicit
@@ -344,16 +334,13 @@ function FormField({
         style: requiredIndicatorStyle,
         children: " *"
       })]
-    }), /*#__PURE__*/_jsxs(Pressable, {
+    }), /*#__PURE__*/_jsxs(View, {
       style: [inputRowStyle, inputStyle],
-      onPress: focusInput,
-      accessible: false,
       children: [processedLeading != null && /*#__PURE__*/_jsx(View, {
         accessibilityElementsHidden: true,
         importantForAccessibility: "no",
         children: processedLeading
       }), /*#__PURE__*/_jsx(RNTextInput, {
-        ref: inputRef,
         style: [inputTextStyles, inputTextStyle],
         value: value ?? '',
         onChangeText: handleChangeText,

package/lib/module/components/FullscreenModal/FullscreenModal.js

@@ -296,7 +296,11 @@ function FullscreenModal({
       contentContainerStyle: scrollContentStyle,
       showsVerticalScrollIndicator: false,
       onScroll: onScroll,
-      scrollEventThrottle: 16,
+      scrollEventThrottle: 16
+      // Tap an input in the body and it focuses on the FIRST tap, even when
+      // the keyboard is already open (default 'never' eats that tap).
+      ,
+      keyboardShouldPersistTaps: "handled",
       children: [/*#__PURE__*/_jsx(View, {
         style: heroTextRegionStyle,
         children: /*#__PURE__*/_jsx(HeroText, {

package/lib/module/components/ListItem/ListItem.js

@@ -3,7 +3,6 @@
 import React, { useCallback, useMemo, useRef } from 'react';
 import { View, Text, Pressable, Platform } from 'react-native';
 import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
-import IconCapsule from '../IconCapsule/IconCapsule';
 import NavArrow from '../NavArrow/NavArrow';
 import { usePressableWebSupport } from '../../utils/web-platform-utils';
 import { EMPTY_MODES, cloneChildrenWithModes } from '../../utils/react-utils';
@@ -144,7 +143,7 @@ const verticalSupportTextOverride = {
  * @param {string} [props.title='Title'] - Primary title used in the horizontal layout.
  * @param {string} [props.supportText='Support Text'] - Support text used in both layouts when `supportSlot` is not provided.
  * @param {boolean} [props.showSupportText=true] - Toggles rendering of the support text in Horizontal layout.
- * @param {React.ReactNode} [props.leading] - Optional leading slot. Defaults to `IconCapsule`.
+ * @param {React.ReactNode|null} [props.leading] - Optional leading slot. Omitted or `null` renders nothing.
  * @param {React.ReactNode} [props.supportSlot] - Optional custom slot used instead of the default support text block.
  * @param {React.ReactNode} [props.trailing] - Optional trailing slot (Figma Slot "trailing"). Horizontal layout only.
  * @param {boolean} [props.navArrow=true] - Whether to show NavArrow on the far right (Horizontal layout only).
@@ -213,13 +212,9 @@ function ListItemImpl({
   // Process leading slot to pass modes to children. Memoized on
   // (leading, resolvedModes) so a parent re-render doesn't re-walk the tree.
   const leadingElement = useMemo(() => {
-    const processed = leading ? cloneChildrenWithModes(React.Children.toArray(leading), tokens.resolvedModes, SLOT_FORCED_MODES) : [];
-    if (processed.length === 0) {
-      return /*#__PURE__*/_jsx(IconCapsule, {
-        modes: tokens.resolvedModes,
-        accessibilityLabel: undefined
-      });
-    }
+    if (leading == null) return null;
+    const processed = cloneChildrenWithModes(React.Children.toArray(leading), tokens.resolvedModes, SLOT_FORCED_MODES);
+    if (processed.length === 0) return null;
     return processed.length === 1 ? processed[0] : processed;
   }, [leading, tokens.resolvedModes]);
   const processedSupportSlot = useMemo(() => {
@@ -269,7 +264,7 @@ function ListItemImpl({
   if (layout === 'Horizontal') {
     const innerContent = /*#__PURE__*/_jsxs(View, {
       style: innerContentStyleArray,
-      children: [leadingElement, /*#__PURE__*/_jsxs(View, {
+      children: [leadingElement ?? null, /*#__PURE__*/_jsxs(View, {
         style: {
           flex: 1,
           minWidth: 1,
@@ -316,7 +311,7 @@ function ListItemImpl({
   // Vertical layout — icon on top, support text/slot below
   const verticalContent = /*#__PURE__*/_jsxs(View, {
     style: verticalContentStyleArray,
-    children: [leadingElement, renderSupportContent()]
+    children: [leadingElement ?? null, renderSupportContent()]
   });
   if (onPress) {
     return /*#__PURE__*/_jsx(Pressable, {

package/lib/module/components/MessageField/MessageField.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import React, { useCallback, useMemo, useRef, useState } from 'react';
-import { View, Text, Pressable, TextInput as RNTextInput } from 'react-native';
+import React, { useCallback, useMemo, useState } from 'react';
+import { View, Text, TextInput as RNTextInput } from 'react-native';
 import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
 import { useTokens } from '../../design-tokens/JFSThemeProvider';
 import { EMPTY_MODES } from '../../utils/react-utils';
@@ -140,15 +140,6 @@ function MessageField({
   const currentValue = isControlled ? value : uncontrolledValue;
   const [isFocused, setIsFocused] = useState(false);
   const interactive = !isDisabled && !isReadOnly;
-
-  // Ref to the native textarea so tapping anywhere in the (padded) textarea
-  // container focuses it on the FIRST tap, fixing the Android "two taps to
-  // open the keyboard" issue.
-  const inputRef = useRef(null);
-  const focusInput = useCallback(() => {
-    if (!interactive) return;
-    inputRef.current?.focus();
-  }, [interactive]);
   const {
     modes: globalModes
   } = useTokens();
@@ -283,12 +274,9 @@ function MessageField({
         style: requiredIndicatorStyle,
         children: " *"
       })]
-    }), /*#__PURE__*/_jsx(Pressable, {
+    }), /*#__PURE__*/_jsx(View, {
       style: [textareaContainerStyle, textareaStyle],
-      onPress: focusInput,
-      accessible: false,
       children: /*#__PURE__*/_jsx(RNTextInput, {
-        ref: inputRef,
         multiline: true,
         value: currentValue,
         onChangeText: handleChangeText,

package/lib/module/components/PaymentFeedback/PaymentFeedback.js

@@ -1,16 +1,16 @@
 "use strict";
 
-import React, { isValidElement, cloneElement } from 'react';
+import React from 'react';
 import { View, Text } from 'react-native';
 import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
 import { useTokens } from '../../design-tokens/JFSThemeProvider';
 import IconCapsule from '../IconCapsule/IconCapsule';
-import { EMPTY_MODES } from '../../utils/react-utils';
+import { EMPTY_MODES, cloneChildrenWithModes } from '../../utils/react-utils';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function PaymentFeedback({
   title = '₹50,000',
   subtitle = 'Payment successful',
-  body = 'Your payment has been\nsuccessfully processed.',
+  body,
   details = '18 March 2025, 4:15 pm\nTransaction ID: TXN121466784',
   showDetails = true,
   iconName = 'ic_confirm',
@@ -97,17 +97,21 @@ export default function PaymentFeedback({
     fontWeight: String(detailsFontWeight),
     textAlign: 'center'
   };
-  const mediaContent = /*#__PURE__*/isValidElement(renderMedia) ? /*#__PURE__*/cloneElement(renderMedia, {
-    modes
-  }) : renderMedia;
+
+  // Cascade modes into a custom media slot (per the modes-cascade convention);
+  // any modes the consumer set on the slot child still take precedence.
+  const mediaContent = renderMedia != null ? cloneChildrenWithModes(renderMedia, modes) : null;
   const defaultMedia = /*#__PURE__*/_jsx(IconCapsule, {
-    iconName: iconName,
+    iconName: iconName
+    // `positive` is the default; consumers override the capsule color by
+    // passing `AppearanceSystem` (or any other mode) via the `modes` prop.
+    ,
     modes: {
+      AppearanceSystem: 'positive',
       ...modes,
       'Icon Capsule Size': 'L',
       Emphasis: 'High',
-      'Semantic Intent': 'System',
-      AppearanceSystem: 'positive'
+      'Semantic Intent': 'System'
     }
   });
   const detailLines = details?.split('\n') ?? [];