jfs-components 0.0.77 → 0.0.78

package/lib/module/components/Accordion/Accordion.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { View, Text, Pressable, LayoutAnimation, Platform, UIManager } from 'react-native';
 import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
 import Icon from '../../icons/Icon';
@@ -12,34 +12,45 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 if (Platform.OS === 'android' && UIManager.setLayoutAnimationEnabledExperimental) {
   UIManager.setLayoutAnimationEnabledExperimental(true);
 }
+function resolveAccordionStateMode(disabled, isExpanded, isHovered, contained) {
+  if (disabled) return 'Disabled';
+  if (contained) {
+    return isExpanded ? 'Open Hover' : 'Hover';
+  }
+  if (isExpanded) {
+    return isHovered ? 'Open Hover' : 'Open';
+  }
+  return isHovered ? 'Hover' : 'Idle';
+}
+function toFontWeight(value, fallback) {
+  if (typeof value === 'number') return String(value);
+  if (typeof value === 'string') {
+    const normalized = value.trim().toLowerCase();
+    if (normalized === 'bold') return '700';
+    if (normalized === 'medium') return '500';
+    if (normalized === 'regular' || normalized === 'normal') return '400';
+    if (/^\d+$/.test(normalized)) return normalized;
+    return value;
+  }
+  return fallback;
+}
 /**
  * Accordion component that mirrors the Figma "Accordion" component.
  *
- * This component supports:
- *  - **Expandable/collapsible content** with smooth animation
- *  - **States**: Idle, Hover, Open, Disabled
- *  - **Slot** for custom content
- *  - **Design-token driven styling** via `getVariableByName` and `modes`
+ * Supports two visual treatments via the `contained` prop:
+ *  - **`contained={false}`** (default) — transparent header at rest; filled
+ *    background on hover / press.
+ *  - **`contained={true}`** — header always uses the filled background.
  *
- * Wherever the Figma layer name contains "Slot", this component exposes a
- * dedicated React "slot" prop:
- *  - Slot "content" → `children`
+ * Interaction states (Idle, Hover, Open, Disabled) are resolved automatically
+ * from `expanded`, `disabled`, hover, and `contained` — consumers should not
+ * pass `'Accordion States'` in `modes`.
  *
  * @component
- * @param {Object} props
- * @param {string} [props.title='Accordion title'] - The accordion header title
- * @param {boolean} [props.defaultExpanded=false] - Initial expanded state
- * @param {boolean} [props.expanded] - Controlled expanded state
- * @param {Function} [props.onExpandedChange] - Callback fired when expanded state changes
- * @param {boolean} [props.disabled=false] - Whether the accordion is disabled
- * @param {React.ReactNode} [props.children] - Content to display when expanded
- * @param {Object} [props.modes={}] - Modes object passed to `getVariableByName` for all design tokens
- * @param {Object} [props.style] - Optional container style overrides
- * @param {string} [props.accessibilityLabel] - Accessibility label for the accordion. If not provided, uses title
- * @param {string} [props.accessibilityHint] - Additional accessibility hint for screen readers
  */
 function Accordion({
   title = 'Accordion title',
+  contained = false,
   defaultExpanded = false,
   expanded: controlledExpanded,
   onExpandedChange,
@@ -53,21 +64,19 @@ function Accordion({
   webAccessibilityProps,
   ...rest
 }) {
-  // Internal state for uncontrolled mode
   const [internalExpanded, setInternalExpanded] = useState(defaultExpanded);
-
-  // Determine if controlled or uncontrolled
+  const [isHovered, setIsHovered] = useState(false);
   const isControlled = controlledExpanded !== undefined;
   const isExpanded = isControlled ? controlledExpanded : internalExpanded;
-
-  // Hover state for web
-  const [isHovered, setIsHovered] = useState(false);
-
-  // Handle toggle
+  const resolvedModes = useMemo(() => {
+    const accordionState = resolveAccordionStateMode(disabled, isExpanded, isHovered, contained);
+    return {
+      ...modes,
+      'Accordion States': accordionState
+    };
+  }, [contained, disabled, isExpanded, isHovered, modes]);
   const handleToggle = () => {
     if (disabled) return;
-
-    // Animate the layout change
     LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
     if (isControlled) {
       onExpandedChange?.(!isExpanded);
@@ -76,23 +85,20 @@ function Accordion({
       onExpandedChange?.(!isExpanded);
     }
   };
-
-  // Resolve design tokens
-  const titleColor = disabled ? '#999999' : getVariableByName('accordion/title/color', modes) || '#0d0d0d';
-  const titleFontSize = getVariableByName('accordion/title/fontSize', modes) || 18;
-  const titleLineHeight = getVariableByName('accordion/title/lineHeight', modes) || 20;
-  const titleFontFamily = getVariableByName('accordion/title/fontFamily', modes) || 'System';
-  const iconColor = getVariableByName('accordion/icon/color', modes) || '#141414';
-  const iconSize = getVariableByName('accordion/icon/size', modes) || 24;
-  const headerGap = getVariableByName('accordion/header/gap', modes) || 12;
-  const headerPaddingVertical = getVariableByName('accordion/header/padding/vertical', modes) || 24;
-  const headerBackground = isHovered && !disabled ? '#f2f2f2' : getVariableByName('accordion/header/background', modes) || 'transparent';
-  const contentGap = getVariableByName('accordion/content/gap', modes) || 12;
-  const contentPaddingTop = getVariableByName('accordion/content/padding/top', modes) || 8;
-  const contentPaddingBottom = isExpanded ? getVariableByName('accordion/content/padding/bottom', modes) ?? 24 : 8;
-  const borderColor = getVariableByName('accordion/border/color', modes) || '#e6e6e6';
-
-  // Styles
+  const titleColor = getVariableByName('accordion/title/color', resolvedModes) ?? '#0d0d0d';
+  const titleFontSize = getVariableByName('accordion/title/fontSize', resolvedModes) ?? 14;
+  const titleLineHeight = getVariableByName('accordion/title/lineHeight', resolvedModes) ?? 20;
+  const titleFontFamily = getVariableByName('accordion/title/fontFamily', resolvedModes) ?? 'System';
+  const titleFontWeight = toFontWeight(getVariableByName('accordion/title/fontWeight', resolvedModes), '700');
+  const iconColor = getVariableByName('accordion/icon/color', resolvedModes) ?? '#141414';
+  const iconSize = getVariableByName('accordion/icon/size', resolvedModes) ?? 24;
+  const headerGap = getVariableByName('accordion/header/gap', resolvedModes) ?? 12;
+  const headerPaddingVertical = getVariableByName('accordion/header/padding/vertical', resolvedModes) ?? 8;
+  const headerBackground = getVariableByName('accordion/header/background', resolvedModes) ?? 'transparent';
+  const contentGap = getVariableByName('accordion/content/gap', resolvedModes) ?? 12;
+  const contentPaddingTop = getVariableByName('accordion/content/padding/top', resolvedModes) ?? 8;
+  const contentPaddingBottom = getVariableByName('accordion/content/padding/bottom', resolvedModes) ?? 8;
+  const borderColor = getVariableByName('accordion/border/color', resolvedModes) ?? '#e6e6e6';
   const containerStyle = {
     borderBottomWidth: 1,
     borderBottomColor: borderColor
@@ -112,7 +118,7 @@ function Accordion({
     fontSize: titleFontSize,
     lineHeight: titleLineHeight,
     fontFamily: titleFontFamily,
-    fontWeight: '700'
+    fontWeight: titleFontWeight
   };
   const contentStyle = {
     backgroundColor: 'transparent',
@@ -122,11 +128,7 @@ function Accordion({
     paddingHorizontal: 0,
     overflow: 'hidden'
   };
-
-  // Generate default accessibility label
   const defaultAccessibilityLabel = accessibilityLabel || title;
-
-  // Web platform support
   const webProps = usePressableWebSupport({
     restProps: {},
     onPress: handleToggle,
@@ -134,9 +136,7 @@ function Accordion({
     accessibilityLabel: defaultAccessibilityLabel,
     webAccessibilityProps
   });
-
-  // Process children to pass modes
-  const processedChildren = children ? cloneChildrenWithModes(React.Children.toArray(children), modes) : null;
+  const processedChildren = children ? cloneChildrenWithModes(React.Children.toArray(children), resolvedModes) : null;
   return /*#__PURE__*/_jsxs(View, {
     style: [containerStyle, style],
     ...rest,
@@ -166,7 +166,7 @@ function Accordion({
       }), /*#__PURE__*/_jsx(Icon, {
         name: isExpanded ? 'ic_minus' : 'ic_add',
         size: iconSize,
-        color: disabled ? '#999999' : iconColor,
+        color: iconColor,
         accessibilityElementsHidden: true,
         importantForAccessibility: "no"
       })]

package/lib/module/components/ActionFooter/ActionFooter.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import React, { useMemo } from 'react';
-import { View, Platform } from 'react-native';
+import React, { useEffect, useMemo, useRef } from 'react';
+import { Animated, Keyboard, View, Platform } from 'react-native';
 import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
 import { EMPTY_MODES, cloneChildrenWithModes, flattenChildren } from '../../utils/react-utils';
 import IconButton from '../IconButton/IconButton';
@@ -105,6 +105,44 @@ function ActionFooter({
   style,
   accessibilityLabel
 }) {
+  // -------------------------------------------------------------------------
+  // Keep the footer locked in place behind the software keyboard (Android).
+  // -------------------------------------------------------------------------
+  //
+  // The Android activity is configured with `windowSoftInputMode="adjustResize"`,
+  // which shrinks the app window by the keyboard height when the keyboard
+  // opens. A bottom-anchored footer therefore gets lifted UP by the keyboard
+  // height — exactly the jump the design does not want.
+  //
+  // To counteract that, we translate the footer back DOWN by the same keyboard
+  // height so it visually stays exactly where it was (now sitting behind the
+  // keyboard). iOS does not resize the window for the keyboard, so the footer
+  // already stays put there; we only run this on Android to avoid pushing the
+  // footer off-screen on platforms that don't lift it in the first place.
+  const keyboardOffset = useRef(new Animated.Value(0)).current;
+  useEffect(() => {
+    if (Platform.OS !== 'android') return undefined;
+    const animateTo = (toValue, duration) => {
+      Animated.timing(keyboardOffset, {
+        toValue,
+        // Match the OS keyboard animation so the resize and our counter-shift
+        // cancel out smoothly with no visible footer movement.
+        duration: typeof duration === 'number' && duration > 0 ? duration : 150,
+        useNativeDriver: true
+      }).start();
+    };
+    const showSub = Keyboard.addListener('keyboardDidShow', e => {
+      animateTo(e?.endCoordinates?.height ?? 0, e?.duration);
+    });
+    const hideSub = Keyboard.addListener('keyboardDidHide', e => {
+      animateTo(0, e?.duration);
+    });
+    return () => {
+      showSub.remove();
+      hideSub.remove();
+    };
+  }, [keyboardOffset]);
+
   // All token reads collapsed into a single useMemo keyed on `modes`. With
   // the shared `EMPTY_MODES` default this resolves once for the common path
   // and never re-allocates the container/slot style objects between renders.
@@ -163,8 +201,16 @@ function ActionFooter({
       });
     });
   }, [children, modes]);
-  return /*#__PURE__*/_jsx(View, {
-    style: [containerStyle, WEB_SHADOW, style],
+  return /*#__PURE__*/_jsx(Animated.View, {
+    style: [containerStyle, WEB_SHADOW, style,
+    // Counter-translate by the keyboard height on Android so `adjustResize`
+    // can't lift the footer above the keyboard (no-op on iOS/web where the
+    // value stays at 0).
+    {
+      transform: [{
+        translateY: keyboardOffset
+      }]
+    }],
     accessibilityRole: "toolbar",
     accessibilityLabel: accessibilityLabel,
     children: /*#__PURE__*/_jsx(View, {

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

@@ -1,7 +1,7 @@
 "use strict";
 
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { Pressable, Platform } from 'react-native';
+import { Pressable, Platform, View } from 'react-native';
 import Svg, { Path } from 'react-native-svg';
 import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
 import { EMPTY_MODES } from '../../utils/react-utils';
@@ -46,6 +46,15 @@ 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'
+};
 /**
  * Checkbox component that maps directly to the Figma design using design tokens.
  *
@@ -171,7 +180,7 @@ function Checkbox({
   };
   const markColor = disabled && isChecked ? disabledActiveMark : selectedMarkColor;
   return /*#__PURE__*/_jsx(Pressable, {
-    style: [resolveStyle(), style],
+    style: [touchTargetStyle, style],
     onPress: handlePress,
     disabled: disabled,
     onHoverIn: () => setIsHovered(true),
@@ -183,14 +192,17 @@ function Checkbox({
       disabled
     },
     accessibilityLabel: accessibilityLabel,
-    children: isChecked && /*#__PURE__*/_jsx(Svg, {
-      width: 12,
-      height: 9,
-      viewBox: "0 0 12 9",
-      fill: "none",
-      children: /*#__PURE__*/_jsx(Path, {
-        d: "M4.00091 8.66939C3.91321 8.6699 3.82628 8.65309 3.74509 8.61991C3.6639 8.58673 3.59006 8.53785 3.52779 8.47606L0.195972 5.14273C0.0704931 5.01719 -1.86978e-09 4.84693 0 4.66939C1.86978e-09 4.49186 0.0704931 4.3216 0.195972 4.19606C0.321451 4.07053 0.491636 4 0.66909 4C0.846544 4 1.01673 4.07053 1.14221 4.19606L4.00091 7.06273L10.8578 0.196061C10.9833 0.0705253 11.1535 0 11.3309 0C11.5084 0 11.6785 0.0705253 11.804 0.196061C11.9295 0.321597 12 0.49186 12 0.669394C12 0.846929 11.9295 1.01719 11.804 1.14273L4.47403 8.47606C4.41176 8.53785 4.33792 8.58673 4.25673 8.61991C4.17554 8.65309 4.08861 8.6699 4.00091 8.66939Z",
-        fill: markColor
+    children: /*#__PURE__*/_jsx(View, {
+      style: resolveStyle(),
+      children: isChecked && /*#__PURE__*/_jsx(Svg, {
+        width: 12,
+        height: 9,
+        viewBox: "0 0 12 9",
+        fill: "none",
+        children: /*#__PURE__*/_jsx(Path, {
+          d: "M4.00091 8.66939C3.91321 8.6699 3.82628 8.65309 3.74509 8.61991C3.6639 8.58673 3.59006 8.53785 3.52779 8.47606L0.195972 5.14273C0.0704931 5.01719 -1.86978e-09 4.84693 0 4.66939C1.86978e-09 4.49186 0.0704931 4.3216 0.195972 4.19606C0.321451 4.07053 0.491636 4 0.66909 4C0.846544 4 1.01673 4.07053 1.14221 4.19606L4.00091 7.06273L10.8578 0.196061C10.9833 0.0705253 11.1535 0 11.3309 0C11.5084 0 11.6785 0.0705253 11.804 0.196061C11.9295 0.321597 12 0.49186 12 0.669394C12 0.846929 11.9295 1.01719 11.804 1.14273L4.47403 8.47606C4.41176 8.53785 4.33792 8.58673 4.25673 8.61991C4.17554 8.65309 4.08861 8.6699 4.00091 8.66939Z",
+          fill: markColor
+        })
       })
     })
   });

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

@@ -30,25 +30,36 @@ function useChevronTokens(modes) {
     };
   }, [modes]);
 }
+function toNumber(value, fallback) {
+  if (typeof value === 'number' && Number.isFinite(value)) return value;
+  if (typeof value === 'string') {
+    const parsed = parseFloat(value);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return fallback;
+}
 function useFormFieldTokens(modes) {
   return useMemo(() => {
-    const labelColor = getVariableByName('formField/label/color', modes) || '#0c0d10';
+    const labelColor = getVariableByName('formField/label/color', modes) || '#000000';
     const labelFontFamily = getVariableByName('formField/label/fontFamily', modes) || 'JioType Var';
-    const labelFontSize = parseInt(getVariableByName('formField/label/fontSize', modes), 10) || 14;
-    const labelLineHeight = parseInt(getVariableByName('formField/label/lineHeight', modes), 10) || 17;
+    const labelFontSize = toNumber(getVariableByName('formField/label/fontSize', modes), 14);
+    const labelLineHeight = toNumber(getVariableByName('formField/label/lineHeight', modes), 17);
     const labelFontWeight = getVariableByName('formField/label/fontWeight', modes) || '500';
-    const gap = parseInt(getVariableByName('formField/gap', modes), 10) || 8;
-    const inputPaddingH = parseInt(getVariableByName('formField/input/padding/horizontal', modes), 10) || 12;
-    const inputGap = parseInt(getVariableByName('formField/input/gap', modes), 10) || 8;
-    const inputRadius = parseInt(getVariableByName('formField/input/radius', modes), 10) || 8;
+    const gap = toNumber(getVariableByName('formField/gap', modes), 8);
+    const inputPaddingH = toNumber(getVariableByName('formField/input/padding/horizontal', modes), 12);
+    const inputGap = toNumber(getVariableByName('formField/input/gap', modes), 8);
+    const inputRadius = toNumber(getVariableByName('formField/input/radius', modes), 8);
     const inputBackground = getVariableByName('formField/input/background', modes) || '#ffffff';
-    const inputFontSize = parseInt(getVariableByName('formField/input/label/fontSize', modes), 10) || 16;
-    const inputLineHeight = parseInt(getVariableByName('formField/input/label/lineHeight', modes), 10) || 45;
+    const inputFontSize = toNumber(getVariableByName('formField/input/label/fontSize', modes), 16);
+    const inputLineHeight = toNumber(getVariableByName('formField/input/label/lineHeight', modes), 45);
     const inputFontFamily = getVariableByName('formField/input/label/fontFamily', modes) || 'JioType Var';
     const inputFontWeight = getVariableByName('formField/input/label/fontWeight', modes) || '400';
     const inputTextColor = getVariableByName('states/formField/input/label/color', modes) || getVariableByName('formField/input/label/color', modes) || '#24262b';
     const inputBorderColor = getVariableByName('states/formField/input/border/color', modes) || getVariableByName('formField/input/border/color', modes) || '#b5b6b7';
-    const inputBorderSize = parseInt(getVariableByName('formField/input/border/size', modes), 10) || 1;
+    // Figma spec: 1.5px. Using parseFloat (via toNumber) preserves the
+    // fractional value — parseInt was truncating it to 1, leaving the
+    // resolved row height ~1px shorter than the Figma reference.
+    const inputBorderSize = toNumber(getVariableByName('formField/input/border/size', modes), 1.5);
     return {
       labelColor,
       labelFontFamily,
@@ -128,7 +139,7 @@ function DropdownInput({
   supportText,
   errorMessage,
   menuMaxHeight = 240,
-  menuOffset = 4,
+  menuOffset = 6,
   matchTriggerWidth = true,
   closeOnBackdropPress = true,
   modes: propModes = EMPTY_MODES,
@@ -334,19 +345,23 @@ function DropdownInput({
   };
 
   // Focus ring uses the resolved input border color from FormField States so
-  // active/error look consistent with TextInput-based FormField. We also lift
-  // border weight to 2 when "Active" to read as a focus ring.
+  // active/error look consistent with TextInput-based FormField. Only the
+  // color changes between states — width stays constant to avoid layout
+  // shift when opening the menu (a shift would invalidate the measured
+  // trigger rect and visually shove the popup).
   const inputRowStyle = {
     flexDirection: 'row',
     alignItems: 'center',
     backgroundColor: tokens.inputBackground,
     borderColor: tokens.inputBorderColor,
-    borderWidth: isOpen ? Math.max(tokens.inputBorderSize, 1) : tokens.inputBorderSize,
+    borderWidth: tokens.inputBorderSize,
+    borderStyle: 'solid',
     borderRadius: tokens.inputRadius,
     paddingHorizontal: tokens.inputPaddingH,
     paddingVertical: 0,
     gap: tokens.inputGap,
-    minHeight: tokens.inputLineHeight
+    minHeight: tokens.inputLineHeight,
+    width: '100%'
   };
   const valueTextStyle = {
     flex: 1,
@@ -494,7 +509,6 @@ function DropdownInput({
       transparent: true,
       animationType: "fade",
       onRequestClose: closeMenu,
-      statusBarTranslucent: true,
       children: /*#__PURE__*/_jsx(Pressable, {
         style: StyleSheet.absoluteFill,
         onPress: closeOnBackdropPress ? closeMenu : undefined,

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

@@ -0,0 +1,161 @@
+"use strict";
+
+import React, { useCallback, useMemo, useState } from 'react';
+import { View, Text } from 'react-native';
+import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
+import { EMPTY_MODES } from '../../utils/react-utils';
+import Checkbox from '../Checkbox/Checkbox';
+import Button from '../Button/Button';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * Default modes applied to the inner toggle `Button`. These resolve the
+ * tertiary-style pill in the Figma reference (small, transparent background,
+ * brand purple foreground). Any value supplied via the consumer `modes` prop
+ * takes precedence over these defaults.
+ */
+const BUTTON_DEFAULT_MODES = {
+  'Button / Size': 'XS',
+  AppearanceBrand: 'Secondary',
+  Emphasis: 'Low'
+};
+
+/**
+ * ExpandableCheckbox composes a `Checkbox`, a long-form label and a
+ * "Read more" / "Read less" toggle. Mirrors the Figma "Expandable Checkbox"
+ * component with two states:
+ *
+ *  - **Idle (collapsed)** — checkbox + truncated label + toggle button arranged
+ *    in a horizontal row (cross-axis centered).
+ *  - **Open (expanded)** — checkbox + full multi-line label, with the toggle
+ *    button right-aligned beneath the row.
+ *
+ * The checkbox and the toggle button have independent press handlers — pressing
+ * the toggle does not affect the checked state, and toggling the checkbox does
+ * not collapse / expand the row.
+ *
+ * @component
+ * @param {ExpandableCheckboxProps} props
+ *
+ * @example
+ * ```tsx
+ * <ExpandableCheckbox
+ *   label="By checking this box, I (a) acknowledge and (b) agree to the full terms…"
+ *   defaultChecked
+ *   onValueChange={setAccepted}
+ *   modes={{ 'Color Mode': 'Light' }}
+ * />
+ * ```
+ */
+function ExpandableCheckbox({
+  label = '',
+  checked: controlledChecked,
+  defaultChecked = false,
+  onValueChange,
+  expanded: controlledExpanded,
+  defaultExpanded = false,
+  onExpandedChange,
+  disabled = false,
+  readMoreLabel = 'Read more',
+  readLessLabel = 'Read less',
+  collapsedLines = 1,
+  modes = EMPTY_MODES,
+  style,
+  labelStyle,
+  accessibilityLabel
+}) {
+  const isCheckedControlled = controlledChecked !== undefined;
+  const [internalChecked, setInternalChecked] = useState(defaultChecked);
+  const isChecked = isCheckedControlled ? controlledChecked : internalChecked;
+  const isExpandedControlled = controlledExpanded !== undefined;
+  const [internalExpanded, setInternalExpanded] = useState(defaultExpanded);
+  const isExpanded = isExpandedControlled ? controlledExpanded : internalExpanded;
+  const handleToggleChecked = useCallback(next => {
+    if (disabled) return;
+    if (!isCheckedControlled) setInternalChecked(next);
+    onValueChange?.(next);
+  }, [disabled, isCheckedControlled, onValueChange]);
+  const handleToggleExpanded = useCallback(() => {
+    if (disabled) return;
+    const next = !isExpanded;
+    if (!isExpandedControlled) setInternalExpanded(next);
+    onExpandedChange?.(next);
+  }, [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;
+  const labelLineHeight = getVariableByName('checkboxItem/label/lineHeight', modes) ?? 19;
+  const labelFontWeightRaw = getVariableByName('checkboxItem/label/fontWeight', modes) ?? 400;
+  const labelFontWeight = String(labelFontWeightRaw);
+  const containerStyle = useMemo(() => ({
+    flexDirection: isExpanded ? 'column' : 'row',
+    alignItems: isExpanded ? 'flex-end' : 'center',
+    gap,
+    width: '100%',
+    ...(disabled ? {
+      opacity: 0.6
+    } : null)
+  }), [isExpanded, gap, disabled]);
+  const rowStyle = useMemo(() => ({
+    flex: isExpanded ? undefined : 1,
+    alignSelf: isExpanded ? 'stretch' : 'auto',
+    minWidth: 0,
+    flexDirection: 'row',
+    alignItems: 'flex-start',
+    gap: rowGap,
+    paddingHorizontal: rowPaddingHorizontal,
+    paddingVertical: rowPaddingVertical
+  }), [isExpanded, rowGap, rowPaddingHorizontal, rowPaddingVertical]);
+  const resolvedLabelStyle = useMemo(() => ({
+    flex: 1,
+    minWidth: 0,
+    color: labelColor,
+    fontFamily: labelFontFamily,
+    fontSize: labelFontSize,
+    lineHeight: labelLineHeight,
+    fontWeight: labelFontWeight
+  }), [labelColor, labelFontFamily, labelFontSize, labelLineHeight, labelFontWeight]);
+  const buttonModes = useMemo(() => ({
+    ...BUTTON_DEFAULT_MODES,
+    ...modes
+  }), [modes]);
+  const a11yLabel = accessibilityLabel ?? (typeof label === 'string' ? label : undefined);
+  const buttonLabel = isExpanded ? readLessLabel : readMoreLabel;
+  const labelNumberOfLinesProps = !isExpanded && collapsedLines > 0 ? {
+    numberOfLines: collapsedLines,
+    ellipsizeMode: 'tail'
+  } : null;
+  return /*#__PURE__*/_jsxs(View, {
+    style: [containerStyle, style],
+    children: [/*#__PURE__*/_jsxs(View, {
+      style: rowStyle,
+      children: [/*#__PURE__*/_jsx(Checkbox, {
+        checked: isChecked,
+        disabled: disabled,
+        onValueChange: handleToggleChecked,
+        modes: modes,
+        ...(a11yLabel !== undefined ? {
+          accessibilityLabel: a11yLabel
+        } : {})
+      }), /*#__PURE__*/_jsx(Text, {
+        style: [resolvedLabelStyle, labelStyle],
+        selectable: false,
+        ...(labelNumberOfLinesProps ?? {}),
+        children: label
+      })]
+    }), /*#__PURE__*/_jsx(Button, {
+      label: buttonLabel,
+      onPress: handleToggleExpanded,
+      disabled: disabled,
+      modes: buttonModes,
+      accessibilityLabel: buttonLabel,
+      accessibilityState: {
+        expanded: isExpanded
+      }
+    })]
+  });
+}
+export default ExpandableCheckbox;

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

@@ -1,7 +1,7 @@
 "use strict";
 
-import React, { useCallback, useMemo, useState } from 'react';
-import { View, Text, TextInput as RNTextInput } from 'react-native';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
+import { View, Text, Pressable, 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,6 +202,16 @@ 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
@@ -334,13 +344,16 @@ function FormField({
         style: requiredIndicatorStyle,
         children: " *"
       })]
-    }), /*#__PURE__*/_jsxs(View, {
+    }), /*#__PURE__*/_jsxs(Pressable, {
       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,