@hero-design/rn 8.128.0 → 8.128.2

package/lib/index.js

@@ -5008,7 +5008,7 @@ var swagLightGlobalPalette = _objectSpread2(_objectSpread2({}, globalPalette$1),
 });
 
 var ehWorkBrandSystemPalette = {
-  primary: '#460078',
+  primary: '#7622d7',
   onPrimary: '#fdfbff',
   secondary: '#b382fd',
   onSecondary: palette$4.white,
@@ -5037,6 +5037,7 @@ var swagSystemPalette = _objectSpread2(_objectSpread2({}, ehWorkSystemPalette),
 
 var ehJobsSystemPalette = _objectSpread2(_objectSpread2({}, swagSystemPalette), {}, {
   name: 'ehJobs',
+  primary: '#7622d7',
   secondary: '#40d1ff',
   onSecondary: '#460078',
   secondaryHighlightedSurface: '#ecfaff',
@@ -6403,19 +6404,19 @@ var getErrorTheme = function getErrorTheme(theme) {
 
 var getFABTheme = function getFABTheme(theme) {
   var colors = {
-    buttonBackground: theme.colors.overlayGlobalSurface,
-    buttonPressedBackground: theme.colors.overlayGlobalSurface,
-    buttonActiveBackground: theme.colors.overlayGlobalSurface,
+    buttonBackground: theme.colors.primary,
+    buttonPressedBackground: theme.colors.primary,
+    buttonActiveBackground: theme.colors.primary,
     icon: theme.colors.onDarkGlobalSurface,
-    actionItemBackground: theme.colors.overlayGlobalSurface,
-    actionItemPressedBackground: theme.colors.overlayGlobalSurface,
+    actionItemBackground: theme.colors.defaultGlobalSurface,
+    actionItemPressedBackground: theme.colors.defaultGlobalSurface,
     backdropBackground: theme.colors.black,
     titleText: theme.colors.onDarkGlobalSurface,
-    actionItemText: theme.colors.onDarkGlobalSurface
+    actionItemText: theme.colors.onDefaultGlobalSurface
   };
   var sizes = {
-    width: theme.sizes.xxxxxlarge,
-    height: theme.sizes.xxxxxlarge,
+    width: theme.sizes.xxxlarge,
+    height: theme.sizes.xxxlarge,
     iconContainerWidth: theme.sizes.large,
     iconContainerHeight: theme.sizes.large,
     fabPairHeight: theme.sizes.xxxlarge,
@@ -6423,11 +6424,11 @@ var getFABTheme = function getFABTheme(theme) {
   };
   var fonts = {
     actionItemText: theme.fonts.neutral.regular,
-    title: theme.fonts.neutral.semiBold
+    title: theme.fonts.neutral.regular
   };
   var fontSizes = {
     actionItemText: theme.fontSizes.large,
-    title: theme.fontSizes.large
+    title: theme.fontSizes.medium
   };
   var lineHeights = {
     actionItemText: theme.lineHeights.medium,
@@ -6444,7 +6445,7 @@ var getFABTheme = function getFABTheme(theme) {
     actionItemTextPaddingLeft: theme.space.xsmall,
     buttonMarginTop: theme.space.large,
     buttonMarginRight: theme.space.large,
-    containerPadding: theme.space.large - theme.space.xsmall,
+    containerPadding: theme.space.smallMedium,
     titleMarginHorizontal: theme.space.small,
     fabPairMarginRight: theme.space.small
   };
@@ -8214,7 +8215,7 @@ var StyledText$4 = index$c(reactNative.Text)(function (_ref) {
   });
 });
 
-var _excluded$Q = ["children", "fontSize", "fontWeight", "intent", "typeface", "allowFontScaling"];
+var _excluded$O = ["children", "fontSize", "fontWeight", "intent", "typeface", "allowFontScaling"];
 /**
  * @deprecated Typography.Text is deprecated and will be removed in the next major release, please refer to https://design.employmenthero.com/mobile/Components/typography for the appropriate alternatives.
  */
@@ -8230,7 +8231,7 @@ var Text = function Text(_ref) {
     typeface = _ref$typeface === void 0 ? 'neutral' : _ref$typeface,
     _ref$allowFontScaling = _ref.allowFontScaling,
     allowFontScaling = _ref$allowFontScaling === void 0 ? false : _ref$allowFontScaling,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$Q);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$O);
   useDeprecation('Typography.Text is deprecated and will be removed in the next major release, please refer to https://design.employmenthero.com/mobile/Components/typography for the appropriate alternatives.');
   return /*#__PURE__*/React__namespace.default.createElement(StyledText$4, _extends$1({}, nativeProps, {
     themeFontSize: fontSize,
@@ -8283,10 +8284,10 @@ var pickAccessibilityProps = function pickAccessibilityProps(props) {
   }, {});
 };
 
-var _excluded$P = ["children"];
+var _excluded$N = ["children"];
 var GradientText = function GradientText(_ref) {
   var children = _ref.children,
-    accessibilityProps = _objectWithoutProperties(_ref, _excluded$P);
+    accessibilityProps = _objectWithoutProperties(_ref, _excluded$N);
   var theme = useTheme();
   var gradient = theme.colors.gradients.aiDiagonal;
   var _useState = React.useState(null),
@@ -8342,7 +8343,7 @@ var GradientText = function GradientText(_ref) {
   }, children));
 };
 
-var _excluded$O = ["children", "fontWeight", "intent", "allowFontScaling", "fontStyle", "style", "testID"];
+var _excluded$M = ["children", "fontWeight", "intent", "allowFontScaling", "fontStyle", "style", "testID"];
 var Caption = function Caption(_ref) {
   var children = _ref.children,
     _ref$fontWeight = _ref.fontWeight,
@@ -8355,7 +8356,7 @@ var Caption = function Caption(_ref) {
     fontStyle = _ref$fontStyle === void 0 ? 'normal' : _ref$fontStyle,
     style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$O);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$M);
   var isAi = intent === 'ai';
   var styledText = /*#__PURE__*/React__namespace.default.createElement(StyledCaption, _extends$1({}, nativeProps, {
     themeFontWeight: fontWeight,
@@ -8387,7 +8388,7 @@ var StyledLabel$1 = index$c(reactNative.Text)(function (_ref) {
   };
 });
 
-var _excluded$N = ["children", "intent", "allowFontScaling", "fontStyle", "fontWeight", "style", "testID"];
+var _excluded$L = ["children", "intent", "allowFontScaling", "fontStyle", "fontWeight", "style", "testID"];
 var Label = function Label(_ref) {
   var children = _ref.children,
     _ref$intent = _ref.intent,
@@ -8400,7 +8401,7 @@ var Label = function Label(_ref) {
     fontWeight = _ref$fontWeight === void 0 ? 'regular' : _ref$fontWeight,
     style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$N);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$L);
   var isAi = intent === 'ai';
   var styledText = /*#__PURE__*/React__namespace.default.createElement(StyledLabel$1, _extends$1({}, nativeProps, {
     themeIntent: isAi ? 'body' : intent,
@@ -8431,7 +8432,7 @@ var StyledTitle$1 = index$c(reactNative.Text)(function (_ref) {
   };
 });
 
-var _excluded$M = ["children", "intent", "allowFontScaling", "level", "typeface", "fontStyle", "style", "testID"];
+var _excluded$K = ["children", "intent", "allowFontScaling", "level", "typeface", "fontStyle", "style", "testID"];
 var Title = function Title(_ref) {
   var children = _ref.children,
     _ref$intent = _ref.intent,
@@ -8446,7 +8447,7 @@ var Title = function Title(_ref) {
     fontStyle = _ref$fontStyle === void 0 ? 'normal' : _ref$fontStyle,
     style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$M);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$K);
   var isAi = intent === 'ai';
   var styledText = /*#__PURE__*/React__namespace.default.createElement(StyledTitle$1, _extends$1({}, nativeProps, {
     themeLevel: level,
@@ -8496,7 +8497,7 @@ var StyledBody$2 = index$c(reactNative.Text)(function (_ref) {
   };
 });
 
-var _excluded$L = ["children", "intent", "allowFontScaling", "typeface", "variant", "fontStyle", "style", "testID"];
+var _excluded$J = ["children", "intent", "allowFontScaling", "typeface", "variant", "fontStyle", "style", "testID"];
 var Body = function Body(_ref) {
   var children = _ref.children,
     _ref$intent = _ref.intent,
@@ -8511,7 +8512,7 @@ var Body = function Body(_ref) {
     fontStyle = _ref$fontStyle === void 0 ? 'normal' : _ref$fontStyle,
     style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$L);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$J);
   var isAi = intent === 'ai';
   var styledText = /*#__PURE__*/React__namespace.default.createElement(StyledBody$2, _extends$1({}, nativeProps, {
     themeTypeface: typeface,
@@ -9175,22 +9176,22 @@ var SpinWrapper = function SpinWrapper(_ref) {
   }, children);
 };
 
-var _excluded$K = ["style"];
+var _excluded$I = ["style"];
 var AnimatedIcon = function AnimatedIcon(_ref) {
   var style = _ref.style,
-    otherProps = _objectWithoutProperties(_ref, _excluded$K);
+    otherProps = _objectWithoutProperties(_ref, _excluded$I);
   return /*#__PURE__*/React__namespace.default.createElement(SpinWrapper, {
     style: style
   }, /*#__PURE__*/React__namespace.default.createElement(StyledHeroIcon, otherProps));
 };
 
-var _excluded$J = ["name", "themeSize", "testID", "style"];
+var _excluded$H = ["name", "themeSize", "testID", "style"];
 var GradientIcon = function GradientIcon(_ref) {
   var name = _ref.name,
     themeSize = _ref.themeSize,
     testID = _ref.testID,
     style = _ref.style,
-    accessibilityProps = _objectWithoutProperties(_ref, _excluded$J);
+    accessibilityProps = _objectWithoutProperties(_ref, _excluded$H);
   var theme = useTheme();
   var gradient = theme.colors.gradients.aiDiagonal;
   var size = theme.__hd__.icon.sizes[themeSize];
@@ -9318,7 +9319,7 @@ var AccordionItem = function AccordionItem(_ref) {
   }, content));
 };
 
-var _excluded$I = ["key"];
+var _excluded$G = ["key"];
 var Accordion = function Accordion(_ref) {
   var items = _ref.items,
     activeItemKey = _ref.activeItemKey,
@@ -9341,7 +9342,7 @@ var Accordion = function Accordion(_ref) {
     accessible: accessible
   }, items.map(function (_ref2, index) {
     var key = _ref2.key,
-      props = _objectWithoutProperties(_ref2, _excluded$I);
+      props = _objectWithoutProperties(_ref2, _excluded$G);
     var open = _activeItemKey === key;
     return /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, {
       key: key
@@ -10177,7 +10178,7 @@ var borderWidths = {
 var config = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, colors), space), radii), borderWidths);
 var flexPropsKey = ['alignContent', 'alignItems', 'alignSelf', 'display', 'flex', 'flexBasis', 'flexDirection', 'flexGrow', 'flexShrink', 'flexWrap', 'justifyContent'];
 
-var _excluded$H = ["theme"];
+var _excluded$F = ["theme"];
 var getThemeValue = function getThemeValue(theme, key, props) {
   var propConfig = config[key];
   var propValue = props[key];
@@ -10204,18 +10205,18 @@ var mapStylePropToThemeValue = function mapStylePropToThemeValue(theme, props) {
 var configKeys = Object.keys(config);
 var StyledBox = index$c(reactNative.View)(function (_ref5) {
   var theme = _ref5.theme,
-    otherProps = _objectWithoutProperties(_ref5, _excluded$H);
+    otherProps = _objectWithoutProperties(_ref5, _excluded$F);
   var styleProps = pick(configKeys, otherProps);
   var flexProps = pick(_toConsumableArray(flexPropsKey), otherProps);
   return _objectSpread2(_objectSpread2({}, mapStylePropToThemeValue(theme, styleProps)), flexProps);
 });
 
-var _excluded$G = ["children", "style", "testID"];
+var _excluded$E = ["children", "style", "testID"];
 var Box = function Box(_ref) {
   var children = _ref.children,
     style = _ref.style,
     testID = _ref.testID,
-    otherProps = _objectWithoutProperties(_ref, _excluded$G);
+    otherProps = _objectWithoutProperties(_ref, _excluded$E);
   return /*#__PURE__*/React__namespace.default.createElement(StyledBox, _extends$1({}, otherProps, {
     style: style,
     testID: testID
@@ -10486,7 +10487,7 @@ var StyledIcon$4 = index$c(Icon)(function (_ref6) {
   };
 });
 
-var _excluded$F = ["children", "visible", "intent", "style", "testID"];
+var _excluded$D = ["children", "visible", "intent", "style", "testID"];
 var Status$1 = function Status(_ref) {
   var children = _ref.children,
     _ref$visible = _ref.visible,
@@ -10495,7 +10496,7 @@ var Status$1 = function Status(_ref) {
     intent = _ref$intent === void 0 ? 'danger' : _ref$intent,
     style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$F);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$D);
   var _React$useRef = React__namespace.default.useRef(new reactNative.Animated.Value(visible ? 1 : 0)),
     opacity = _React$useRef.current;
   var isFirstRendering = React__namespace.default.useRef(true);
@@ -10531,7 +10532,7 @@ var Status$1 = function Status(_ref) {
 
 var DEFAULT_MAX_NUMBER = 99;
 
-var _excluded$E = ["children", "visible", "style", "max", "testID", "content"];
+var _excluded$C = ["children", "visible", "style", "max", "testID", "content"];
 var Status = function Status(_ref) {
   var children = _ref.children,
     _ref$visible = _ref.visible,
@@ -10541,7 +10542,7 @@ var Status = function Status(_ref) {
     max = _ref$max === void 0 ? DEFAULT_MAX_NUMBER : _ref$max,
     testID = _ref.testID,
     originalContent = _ref.content,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$E);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$C);
   var content = React.useMemo(function () {
     return originalContent > max ? "".concat(max, "+") : String(originalContent);
   }, [originalContent, max]);
@@ -10553,7 +10554,7 @@ var Status = function Status(_ref) {
   }, /*#__PURE__*/React__namespace.default.createElement(StyledCountText, null, content)));
 };
 
-var _excluded$D = ["content", "visible", "max", "intent", "style", "testID", "size", "variant", "icon"];
+var _excluded$B = ["content", "visible", "max", "intent", "style", "testID", "size", "variant", "icon"];
 var getPaddingState = function getPaddingState(content) {
   return content.length > 1 ? 'wideContent' : 'narrowContent';
 };
@@ -10572,7 +10573,7 @@ var Badge = function Badge(_ref) {
     _ref$variant = _ref.variant,
     variant = _ref$variant === void 0 ? 'filled' : _ref$variant,
     icon = _ref.icon,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$D);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$B);
   var _React$useRef = React__namespace.default.useRef(new reactNative.Animated.Value(visible ? 1 : 0)),
     opacity = _React$useRef.current;
   var isFirstRendering = React__namespace.default.useRef(true);
@@ -10690,7 +10691,7 @@ var StyledBottomBarText = index$c(Typography.Label)(function (_ref4) {
   };
 });
 
-var _excluded$C = ["onTabPress", "renderActiveTabOnly", "selectedTabKey", "tabs"];
+var _excluded$A = ["onTabPress", "renderActiveTabOnly", "selectedTabKey", "tabs"];
 var getInactiveIcon = function getInactiveIcon(icon) {
   var inactiveIcon = "".concat(icon, "-outlined");
   return isHeroIcon(inactiveIcon) ? inactiveIcon : icon;
@@ -10701,7 +10702,7 @@ var BottomNavigation = function BottomNavigation(_ref) {
     renderActiveTabOnly = _ref$renderActiveTabO === void 0 ? false : _ref$renderActiveTabO,
     selectedTabKey = _ref.selectedTabKey,
     tabs = _ref.tabs,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$C);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$A);
   var insets = reactNativeSafeAreaContext.useSafeAreaInsets();
   /**
    * List of loaded tabs, tabs will be loaded when navigated to.
@@ -10793,13 +10794,13 @@ var StyledDivider = index$c(reactNative.View)(function (_ref) {
   }, horizontalMargin), verticalMargin);
 });
 
-var _excluded$B = ["marginHorizontal", "marginVertical", "style", "testID"];
+var _excluded$z = ["marginHorizontal", "marginVertical", "style", "testID"];
 var Divider = function Divider(_ref) {
   var marginHorizontal = _ref.marginHorizontal,
     marginVertical = _ref.marginVertical,
     style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$B);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$z);
   return /*#__PURE__*/React__namespace.default.createElement(StyledDivider, _extends$1({}, nativeProps, {
     themeMarginHorizontal: marginHorizontal,
     themeMarginVertical: marginVertical,
@@ -10930,7 +10931,7 @@ var StyledLoadingDot = index$c(reactNative.View)(function (_ref) {
   }, themeStyling());
 });
 
-var _excluded$A = ["count", "size", "testID", "themeVariant"];
+var _excluded$y = ["count", "size", "testID", "themeVariant"];
 var AnimatedLoadingIndicatorWrapper = reactNative.Animated.createAnimatedComponent(StyledLoadingIndicatorWrapper);
 var AnimatedLoadingDot = reactNative.Animated.createAnimatedComponent(StyledLoadingDot);
 var renderDotComponent = function renderDotComponent(_ref) {
@@ -10962,7 +10963,7 @@ var LoadingIndicator = function LoadingIndicator(_ref2) {
     size = _ref2$size === void 0 ? 12 : _ref2$size,
     testID = _ref2.testID,
     themeVariant = _ref2.themeVariant,
-    nativeProps = _objectWithoutProperties(_ref2, _excluded$A);
+    nativeProps = _objectWithoutProperties(_ref2, _excluded$y);
   var progressAnimation = React.useRef(new reactNative.Animated.Value(0));
   React.useEffect(function () {
     var animation = reactNative.Animated.loop(reactNative.Animated.timing(progressAnimation.current, {
@@ -11594,11 +11595,11 @@ var Header = function Header(_ref) {
   }))) : null), showDivider ? /*#__PURE__*/React__namespace.default.createElement(Divider, null) : null);
 };
 
-var _excluded$z = ["scrollEventThrottle"];
+var _excluded$x = ["scrollEventThrottle"];
 var BottomSheetScrollView = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$scrollEventThrot = _ref.scrollEventThrottle,
     scrollEventThrottle = _ref$scrollEventThrot === void 0 ? 100 : _ref$scrollEventThrot,
-    props = _objectWithoutProperties(_ref, _excluded$z);
+    props = _objectWithoutProperties(_ref, _excluded$x);
   var _useContext = React.useContext(BottomSheetContext),
     setInternalShowDivider = _useContext.setInternalShowDivider;
   var onScrollBeginDrag = React.useCallback(function (e) {
@@ -14720,12 +14721,12 @@ var Indicator = index$c(reactNative.View)(function (_ref3) {
   };
 });
 
-var _excluded$y = ["intent", "children"];
+var _excluded$w = ["intent", "children"];
 var DataCard = function DataCard(_ref) {
   var _ref$intent = _ref.intent,
     intent = _ref$intent === void 0 ? 'info' : _ref$intent,
     children = _ref.children,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$y);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$w);
   return /*#__PURE__*/React__namespace.default.createElement(StyledDataCard, nativeProps, /*#__PURE__*/React__namespace.default.createElement(Indicator, {
     themeIntent: intent,
     testID: "data-card-indicator"
@@ -14744,13 +14745,13 @@ var StyledCard$1 = index$c(reactNative.View)(function (_ref) {
   });
 });
 
-var _excluded$x = ["intent", "children", "variant"];
+var _excluded$v = ["intent", "children", "variant"];
 var Card = function Card(_ref) {
   var intent = _ref.intent,
     children = _ref.children,
     _ref$variant = _ref.variant,
     variant = _ref$variant === void 0 ? 'basic' : _ref$variant,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$x);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$v);
   return /*#__PURE__*/React__namespace.default.createElement(StyledCard$1, _extends$1({}, nativeProps, {
     themeIntent: intent,
     themeVariant: variant
@@ -15017,7 +15018,7 @@ var CardCarousel = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 });
 CardCarousel.displayName = 'CardCarousel';
 
-var _excluded$w = ["rounded", "size", "testID", "style"];
+var _excluded$u = ["rounded", "size", "testID", "style"];
 /**
  * @deprecated Image component will soon be deprecated. Please use `Image` from `react-native` instead.
  */
@@ -15028,7 +15029,7 @@ var Image = function Image(_ref) {
     size = _ref$size === void 0 ? '6xlarge' : _ref$size,
     testID = _ref.testID,
     style = _ref.style,
-    imageNativeProps = _objectWithoutProperties(_ref, _excluded$w);
+    imageNativeProps = _objectWithoutProperties(_ref, _excluded$u);
   useDeprecation('Image component will soon be deprecated. Please use `Image` from `react-native` instead.');
   var theme = useTheme();
   var imageSize = theme.__hd__.image.sizes[size];
@@ -15163,7 +15164,7 @@ var CarouselItem = function CarouselItem(_ref) {
   }, heading), !!body && /*#__PURE__*/React__namespace.default.createElement(Typography.Body, null, body)));
 };
 
-var _excluded$v = ["items", "onItemIndexChange", "renderActions", "selectedItemIndex", "style", "shouldShowPagination", "testID", "pageControlPosition"];
+var _excluded$t = ["items", "onItemIndexChange", "renderActions", "selectedItemIndex", "style", "shouldShowPagination", "testID", "pageControlPosition"];
 function useStateFromProp(initialValue) {
   var _useState = React.useState(initialValue),
     _useState2 = _slicedToArray(_useState, 2),
@@ -15190,7 +15191,7 @@ var Carousel = function Carousel(_ref) {
     testID = _ref.testID,
     _ref$pageControlPosit = _ref.pageControlPosition,
     pageControlPosition = _ref$pageControlPosit === void 0 ? 'top' : _ref$pageControlPosit,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$v);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$t);
   useDeprecation("shouldShowPagination prop has been deprecated", shouldShowPagination !== noop$1);
   useDeprecation("The use of 'pageControlPosition == bottom' has been deprecated", pageControlPosition === 'bottom');
   var theme = useTheme();
@@ -20461,7 +20462,7 @@ var StyledChipIcon = index$c(Icon)(function (_ref2) {
   };
 });
 
-var _excluded$u = ["label", "variant", "selected", "icon", "onPress", "showSelectedIcon", "accessible", "onBlur", "onFocus"];
+var _excluded$s = ["label", "variant", "selected", "icon", "onPress", "showSelectedIcon", "accessible", "onBlur", "onFocus"];
 var getChipLabel = function getChipLabel(label) {
   if (typeof label === 'string') {
     return /*#__PURE__*/React__namespace.default.createElement(Typography.Body, {
@@ -20497,7 +20498,7 @@ var Chip = function Chip(_ref) {
     accessible = _ref.accessible,
     onBlur = _ref.onBlur,
     onFocus = _ref.onFocus,
-    otherProps = _objectWithoutProperties(_ref, _excluded$u);
+    otherProps = _objectWithoutProperties(_ref, _excluded$s);
   useDeprecation('Chip variant `outlined` and `filled` are deprecated.', variant === 'outlined' || variant === 'filled');
   var renamedVariant = getChipVariant(variant);
   var shouldShowSelectedIcon = (renamedVariant === 'selection' || renamedVariant === 'compact-outlined') && selected && showSelectedIcon;
@@ -20888,7 +20889,7 @@ var StyledErrorAndMaxLengthContainer = index$c(reactNative.View)(function (_ref1
   };
 });
 
-var _excluded$t = ["label", "prefix", "suffix", "style", "textStyle", "testID", "accessibilityLabelledBy", "error", "required", "editable", "disabled", "loading", "maxLength", "hideCharacterCount", "helpText", "value", "defaultValue", "renderInputValue", "allowFontScaling", "variant"];
+var _excluded$r = ["label", "prefix", "suffix", "style", "textStyle", "testID", "accessibilityLabelledBy", "error", "required", "editable", "disabled", "loading", "maxLength", "hideCharacterCount", "helpText", "value", "defaultValue", "renderInputValue", "allowFontScaling", "variant"];
 var getState$3 = function getState(_ref) {
   var disabled = _ref.disabled,
     error = _ref.error,
@@ -21004,7 +21005,7 @@ var TextInput = /*#__PURE__*/React.forwardRef(function (_ref8, ref) {
     allowFontScaling = _ref8$allowFontScalin === void 0 ? false : _ref8$allowFontScalin,
     _ref8$variant = _ref8.variant,
     variant = _ref8$variant === void 0 ? 'text' : _ref8$variant,
-    nativeProps = _objectWithoutProperties(_ref8, _excluded$t);
+    nativeProps = _objectWithoutProperties(_ref8, _excluded$r);
   var displayText = getDisplayText(value, defaultValue);
   var isEmptyValue = displayText.length === 0;
   var _React$useState = React__namespace.default.useState(0),
@@ -21363,30 +21364,6 @@ var useFormatDate = function useFormatDate(_ref) {
   };
 };
 
-var StyledPickerWrapper$1 = index$c(reactNative.View)(function (_ref) {
-  var theme = _ref.theme;
-  return {
-    height: theme.__hd__.datePicker.sizes.height,
-    alignItems: 'center'
-  };
-});
-var getZIndexByState$2 = function getZIndexByState(_ref2) {
-  var themeHasError = _ref2.themeHasError;
-  if (themeHasError) {
-    return 1;
-  }
-  return 0;
-};
-var StyledTouchableOpacity$2 = index$c(reactNative.TouchableOpacity)(function (_ref3) {
-  var themeGroupStyleEnabled = _ref3.themeGroupStyleEnabled,
-    themeHasError = _ref3.themeHasError;
-  return _objectSpread2({}, themeGroupStyleEnabled && {
-    zIndex: getZIndexByState$2({
-      themeHasError: themeHasError
-    })
-  });
-});
-
 var DatePickerAndroid = function DatePickerAndroid(_ref) {
   var value = _ref.value,
     minDate = _ref.minDate,
@@ -21405,11 +21382,7 @@ var DatePickerAndroid = function DatePickerAndroid(_ref) {
     _ref$variant = _ref.variant,
     variant = _ref$variant === void 0 ? 'default' : _ref$variant,
     renderSelectedValue = _ref.renderSelectedValue,
-    locale = _ref.locale,
-    TextInputComponent = _ref.TextInputComponent,
-    inputProps = _ref.inputProps,
-    _ref$groupStyleEnable = _ref.groupStyleEnabled,
-    groupStyleEnabled = _ref$groupStyleEnable === void 0 ? false : _ref$groupStyleEnable;
+    locale = _ref.locale;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -21427,20 +21400,17 @@ var DatePickerAndroid = function DatePickerAndroid(_ref) {
     onChange: onChange,
     value: value
   });
-  var InputComponent = TextInputComponent || TextInput;
   var onPress = React.useCallback(function () {
     setOpen(true);
   }, []);
-  return /*#__PURE__*/React__namespace.default.createElement(StyledTouchableOpacity$2, {
+  return /*#__PURE__*/React__namespace.default.createElement(reactNative.TouchableOpacity, {
     onPress: onPress,
     disabled: disabled,
-    themeGroupStyleEnabled: groupStyleEnabled,
-    themeHasError: !!error,
     testID: "date-picker-android-touchable-opacity"
   }, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: "none",
     testID: "datePickerInputAndroid"
-  }, /*#__PURE__*/React__namespace.default.createElement(InputComponent, _extends$1({}, inputProps, {
+  }, /*#__PURE__*/React__namespace.default.createElement(TextInput, {
     label: label,
     value: displayValue,
     suffix: "calendar-dates-outlined",
@@ -21451,13 +21421,13 @@ var DatePickerAndroid = function DatePickerAndroid(_ref) {
     helpText: helpText,
     style: style,
     testID: testID,
-    renderInputValue: renderSelectedValue !== undefined && !!value ? function (props) {
+    renderInputValue: renderSelectedValue !== undefined && !!value ? function (inputProps) {
       return renderSelectedValue({
         date: value,
         formattedDateString: displayValue
-      }, props);
+      }, inputProps);
     } : undefined
-  }))), /*#__PURE__*/React__namespace.default.createElement(AndroidDatePickerDialog, {
+  })), /*#__PURE__*/React__namespace.default.createElement(AndroidDatePickerDialog, {
     open: open,
     onClose: function onClose() {
       return setOpen(false);
@@ -21535,11 +21505,7 @@ var DatePickerCalendar = function DatePickerCalendar(_ref2) {
     _ref2$supportedOrient = _ref2.supportedOrientations,
     supportedOrientations = _ref2$supportedOrient === void 0 ? ['portrait'] : _ref2$supportedOrient,
     renderSelectedValue = _ref2.renderSelectedValue,
-    locale = _ref2.locale,
-    TextInputComponent = _ref2.TextInputComponent,
-    inputProps = _ref2.inputProps,
-    _ref2$groupStyleEnabl = _ref2.groupStyleEnabled,
-    groupStyleEnabled = _ref2$groupStyleEnabl === void 0 ? false : _ref2$groupStyleEnabl;
+    locale = _ref2.locale;
   var _useState5 = React.useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
     open = _useState6[0],
@@ -21565,20 +21531,17 @@ var DatePickerCalendar = function DatePickerCalendar(_ref2) {
     onChange: onChange,
     value: value
   });
-  var InputComponent = TextInputComponent || TextInput;
   var onPress = React.useCallback(function () {
     setOpen(true);
   }, []);
-  return /*#__PURE__*/React__namespace.default.createElement(StyledTouchableOpacity$2, {
+  return /*#__PURE__*/React__namespace.default.createElement(reactNative.TouchableOpacity, {
     onPress: onPress,
     disabled: disabled,
-    themeGroupStyleEnabled: groupStyleEnabled,
-    themeHasError: !!error,
     testID: "date-picker-calendar-touchable-opacity"
   }, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: "none",
     testID: "datePickerCalendar"
-  }, /*#__PURE__*/React__namespace.default.createElement(InputComponent, _extends$1({}, inputProps, {
+  }, /*#__PURE__*/React__namespace.default.createElement(TextInput, {
     label: label,
     value: displayValue,
     suffix: "calendar-dates-outlined",
@@ -21589,13 +21552,13 @@ var DatePickerCalendar = function DatePickerCalendar(_ref2) {
     helpText: helpText,
     testID: testID,
     style: style,
-    renderInputValue: renderSelectedValue !== undefined && !!value ? function (props) {
+    renderInputValue: renderSelectedValue !== undefined && !!value ? function (inputProps) {
       return renderSelectedValue({
         date: value,
         formattedDateString: displayValue
-      }, props);
+      }, inputProps);
     } : undefined
-  }))), /*#__PURE__*/React__namespace.default.createElement(BottomSheet$1, {
+  })), /*#__PURE__*/React__namespace.default.createElement(BottomSheet$1, {
     open: open,
     onRequestClose: function onRequestClose() {
       return setOpen(false);
@@ -21625,6 +21588,14 @@ var DatePickerCalendar = function DatePickerCalendar(_ref2) {
   }))));
 };
 
+var StyledPickerWrapper$1 = index$c(reactNative.View)(function (_ref) {
+  var theme = _ref.theme;
+  return {
+    height: theme.__hd__.datePicker.sizes.height,
+    alignItems: 'center'
+  };
+});
+
 var IOSDatePickerDialog = function IOSDatePickerDialog(_ref) {
   var label = _ref.label,
     open = _ref.open,
@@ -21717,11 +21688,7 @@ var DatePickerIOS = function DatePickerIOS(_ref) {
     _ref$variant = _ref.variant,
     variant = _ref$variant === void 0 ? 'default' : _ref$variant,
     locale = _ref.locale,
-    renderSelectedValue = _ref.renderSelectedValue,
-    TextInputComponent = _ref.TextInputComponent,
-    inputProps = _ref.inputProps,
-    _ref$groupStyleEnable = _ref.groupStyleEnabled,
-    groupStyleEnabled = _ref$groupStyleEnable === void 0 ? false : _ref$groupStyleEnable;
+    renderSelectedValue = _ref.renderSelectedValue;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -21741,20 +21708,17 @@ var DatePickerIOS = function DatePickerIOS(_ref) {
     onChange: onChange,
     value: value
   });
-  var InputComponent = TextInputComponent || TextInput;
   var onPress = React.useCallback(function () {
     setOpen(true);
   }, []);
-  return /*#__PURE__*/React__namespace.default.createElement(StyledTouchableOpacity$2, {
+  return /*#__PURE__*/React__namespace.default.createElement(reactNative.TouchableOpacity, {
     onPress: onPress,
     disabled: disabled,
-    themeGroupStyleEnabled: groupStyleEnabled,
-    themeHasError: !!error,
     testID: "date-picker-ios-touchable-opacity"
   }, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: "none",
     testID: "datePickerInputIOS"
-  }, /*#__PURE__*/React__namespace.default.createElement(InputComponent, _extends$1({}, inputProps, {
+  }, /*#__PURE__*/React__namespace.default.createElement(TextInput, {
     label: label,
     value: displayValue,
     suffix: "calendar-dates-outlined",
@@ -21765,13 +21729,13 @@ var DatePickerIOS = function DatePickerIOS(_ref) {
     helpText: helpText,
     testID: testID,
     style: style,
-    renderInputValue: renderSelectedValue !== undefined && !!value ? function (props) {
+    renderInputValue: renderSelectedValue !== undefined && !!value ? function (inputProps) {
       return renderSelectedValue({
         date: value,
         formattedDateString: displayValue
-      }, props);
+      }, inputProps);
     } : undefined
-  }))), /*#__PURE__*/React__namespace.default.createElement(IOSDatePickerDialog, {
+  })), /*#__PURE__*/React__namespace.default.createElement(IOSDatePickerDialog, {
     value: value,
     onChange: onChange,
     open: open,
@@ -21788,27 +21752,21 @@ var DatePickerIOS = function DatePickerIOS(_ref) {
   }));
 };
 
-var _excluded$s = ["variant", "TextInputComponent"];
+var _excluded$q = ["variant"];
 var DatePicker = function DatePicker(_ref) {
   var _ref$variant = _ref.variant,
     variant = _ref$variant === void 0 ? 'default' : _ref$variant,
-    _ref$TextInputCompone = _ref.TextInputComponent,
-    TextInputComponent = _ref$TextInputCompone === void 0 ? TextInput : _ref$TextInputCompone,
-    props = _objectWithoutProperties(_ref, _excluded$s);
+    props = _objectWithoutProperties(_ref, _excluded$q);
   if (variant === 'calendar') {
-    return /*#__PURE__*/React__namespace.default.createElement(DatePickerCalendar, _extends$1({}, props, {
-      TextInputComponent: TextInputComponent
-    }));
+    return /*#__PURE__*/React__namespace.default.createElement(DatePickerCalendar, props);
   }
   if (reactNative.Platform.OS === 'ios') {
     return /*#__PURE__*/React__namespace.default.createElement(DatePickerIOS, _extends$1({}, props, {
-      variant: variant,
-      TextInputComponent: TextInputComponent
+      variant: variant
     }));
   }
   return /*#__PURE__*/React__namespace.default.createElement(DatePickerAndroid, _extends$1({}, props, {
-    variant: variant,
-    TextInputComponent: TextInputComponent
+    variant: variant
   }));
 };
 
@@ -23804,21 +23762,14 @@ var StyledErrorButtonContainer = index$c(reactNative.View)(function (_ref3) {
     paddingVertical: theme.__hd__.error.space.button.wrapperVerticalPadding
   };
 });
-var StyledErrorButtonPrimary = index$c(CompoundButton)(function (_ref4) {
+var StyledErrorButtonSecondary = index$c(CompoundButton)(function (_ref4) {
   var theme = _ref4.theme;
   return {
-    padding: theme.__hd__.error.space.button.padding
+    marginTop: theme.__hd__.error.space.button.margin
   };
 });
-var StyledErrorButtonSecondary = index$c(CompoundButton)(function (_ref5) {
+var StyledErrorImageContainer = index$c(reactNative.View)(function (_ref5) {
   var theme = _ref5.theme;
-  return {
-    marginTop: theme.__hd__.error.space.button.margin,
-    padding: theme.__hd__.error.space.button.padding
-  };
-});
-var StyledErrorImageContainer = index$c(reactNative.View)(function (_ref6) {
-  var theme = _ref6.theme;
   return {
     marginBottom: theme.__hd__.error.space.imageMarginBottom,
     width: theme.__hd__.error.sizes.image,
@@ -23826,8 +23777,8 @@ var StyledErrorImageContainer = index$c(reactNative.View)(function (_ref6) {
     alignItems: 'center'
   };
 });
-var StyledErrorIconContainer = index$c(reactNative.View)(function (_ref7) {
-  var theme = _ref7.theme;
+var StyledErrorIconContainer = index$c(reactNative.View)(function (_ref6) {
+  var theme = _ref6.theme;
   return {
     marginBottom: theme.__hd__.error.space.imageMarginBottom,
     width: theme.__hd__.error.sizes.icon,
@@ -23835,8 +23786,8 @@ var StyledErrorIconContainer = index$c(reactNative.View)(function (_ref7) {
     alignItems: 'center'
   };
 });
-var StyledErrorImage = index$c(Image)(function (_ref8) {
-  var theme = _ref8.theme;
+var StyledErrorImage = index$c(Image)(function (_ref7) {
+  var theme = _ref7.theme;
   return {
     marginBottom: theme.__hd__.error.space.imageMarginBottom,
     width: theme.__hd__.error.sizes.image,
@@ -23844,23 +23795,23 @@ var StyledErrorImage = index$c(Image)(function (_ref8) {
     resizeMode: 'contain'
   };
 });
-var StyledErrorTitle = index$c(Typography.Title)(function (_ref9) {
-  var theme = _ref9.theme;
+var StyledErrorTitle = index$c(Typography.Title)(function (_ref8) {
+  var theme = _ref8.theme;
   return {
     textAlign: 'center',
     marginBottom: theme.__hd__.error.space.titleMarginBottom,
     color: theme.__hd__.error.colors.title
   };
 });
-var StyledErrorDescription = index$c(Typography.Body)(function (_ref10) {
-  var theme = _ref10.theme;
+var StyledErrorDescription = index$c(Typography.Body)(function (_ref9) {
+  var theme = _ref9.theme;
   return {
     textAlign: 'center',
     color: theme.__hd__.error.colors.description
   };
 });
 
-var _excluded$r = ["variant", "title", "description", "image", "testID", "ctaText", "onCtaPress", "secondaryCtaText", "onSecondaryCtaPress", "icon"],
+var _excluded$p = ["variant", "title", "description", "image", "testID", "ctaText", "onCtaPress", "secondaryCtaText", "onSecondaryCtaPress", "icon"],
   _excluded2 = ["visible", "variant", "title", "description", "image", "testID", "ctaText", "onCtaPress", "secondaryCtaText", "onSecondaryCtaPress"];
 var renderImage$1 = function renderImage(image) {
   if (/*#__PURE__*/React.isValidElement(image)) {
@@ -23901,7 +23852,7 @@ var ErrorPage = function ErrorPage(_ref2) {
     secondaryCtaText = _ref2.secondaryCtaText,
     onSecondaryCtaPress = _ref2.onSecondaryCtaPress,
     icon = _ref2.icon,
-    nativeProps = _objectWithoutProperties(_ref2, _excluded$r);
+    nativeProps = _objectWithoutProperties(_ref2, _excluded$p);
   var showCta = ctaText && onCtaPress !== undefined;
   var showSecondaryCta = secondaryCtaText && onSecondaryCtaPress !== undefined;
   var showButtonContainer = showCta || showSecondaryCta;
@@ -23916,7 +23867,7 @@ var ErrorPage = function ErrorPage(_ref2) {
     typeface: "playful"
   }, title), description && /*#__PURE__*/React__namespace.default.createElement(StyledErrorDescription, {
     typeface: "playful"
-  }, description)), showButtonContainer && /*#__PURE__*/React__namespace.default.createElement(StyledErrorButtonContainer, null, showCta && /*#__PURE__*/React__namespace.default.createElement(StyledErrorButtonPrimary, {
+  }, description)), showButtonContainer && /*#__PURE__*/React__namespace.default.createElement(StyledErrorButtonContainer, null, showCta && /*#__PURE__*/React__namespace.default.createElement(CompoundButton, {
     variant: "filled",
     text: ctaText,
     onPress: onCtaPress
@@ -24047,8 +23998,9 @@ var StyledIcon$3 = index$c(Icon)(function (_ref3) {
 var AnimatedTouchableHighlight = reactNative.Animated.createAnimatedComponent(reactNative.TouchableOpacity);
 var StyledFAB$2 = index$c(AnimatedTouchableHighlight)(function (_ref) {
   var theme = _ref.theme,
-    themeActive = _ref.themeActive;
-  return _objectSpread2({
+    themeActive = _ref.themeActive,
+    themeIconOnly = _ref.themeIconOnly;
+  return _objectSpread2(_objectSpread2({
     backgroundColor: themeActive ? theme.__hd__.fab.colors.buttonActiveBackground : theme.__hd__.fab.colors.buttonBackground,
     borderRadius: theme.radii.rounded,
     alignItems: 'center',
@@ -24057,7 +24009,9 @@ var StyledFAB$2 = index$c(AnimatedTouchableHighlight)(function (_ref) {
     padding: theme.__hd__.fab.space.containerPadding,
     flexDirection: 'row',
     height: theme.__hd__.fab.sizes.height
-  }, theme.__hd__.fab.shadows["default"]);
+  }, themeIconOnly && {
+    width: theme.__hd__.fab.sizes.width
+  }), theme.__hd__.fab.shadows["default"]);
 });
 var StyledFABIcon = index$c(Icon)(function (_ref2) {
   var theme = _ref2.theme;
@@ -24127,13 +24081,13 @@ var ActionItem = function ActionItem(_ref) {
   })), /*#__PURE__*/React__namespace.default.createElement(StyledActionItemText, null, title))));
 };
 
-var _excluded$q = ["active"];
+var _excluded$o = ["active"];
 var AnimatedIcons = reactNative.Animated.createAnimatedComponent(/*#__PURE__*/React__namespace.default.forwardRef(function (props, _) {
   return /*#__PURE__*/React__namespace.default.createElement(StyledFABIcon, props);
 }));
 var AnimatedFABIcon = function AnimatedFABIcon(_ref) {
   var active = _ref.active,
-    iconProps = _objectWithoutProperties(_ref, _excluded$q);
+    iconProps = _objectWithoutProperties(_ref, _excluded$o);
   var rotateAnimation = React.useRef(new reactNative.Animated.Value(active ? 1 : 0));
   React.useEffect(function () {
     var animation = reactNative.Animated.spring(rotateAnimation.current, {
@@ -24185,12 +24139,15 @@ var IconOnlyContent = function IconOnlyContent(_ref) {
 };
 var IconWithTextContent = function IconWithTextContent(_ref2) {
   var icon = _ref2.icon,
-    title = _ref2.title;
+    title = _ref2.title,
+    titleStyle = _ref2.titleStyle;
   return /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(StyledIconContainer$1, null, /*#__PURE__*/React__namespace.default.createElement(StyledFABIcon, {
     size: "xsmall",
     icon: icon,
     testID: "styled-fab-icon"
-  })), /*#__PURE__*/React__namespace.default.createElement(StyledFABText, null, title));
+  })), /*#__PURE__*/React__namespace.default.createElement(StyledFABText, {
+    style: titleStyle
+  }, title));
 };
 var animateWidth = function animateWidth() {
   reactNative.LayoutAnimation.configureNext({
@@ -24201,7 +24158,9 @@ var animateWidth = function animateWidth() {
     }
   });
 };
-var FAB$1 = /*#__PURE__*/React.forwardRef(function (_ref3, ref) {
+// Full implementation — accepts InternalFABProps including titleStyle.
+// Exported as FABInternal for use by sibling HD components (e.g. FAB.Pair).
+var FABWithTitleStyle = /*#__PURE__*/React.forwardRef(function (_ref3, ref) {
   var _StyleSheet$flatten, _StyleSheet$flatten2;
   var onPress = _ref3.onPress,
     title = _ref3.title,
@@ -24209,7 +24168,8 @@ var FAB$1 = /*#__PURE__*/React.forwardRef(function (_ref3, ref) {
     iconAnimated = _ref3.animated,
     testID = _ref3.testID,
     active = _ref3.active,
-    style = _ref3.style;
+    style = _ref3.style,
+    titleStyle = _ref3.titleStyle;
   var theme = useTheme();
   var _React$useState = React__namespace.default.useState({
       hideTitle: false,
@@ -24314,6 +24274,7 @@ var FAB$1 = /*#__PURE__*/React.forwardRef(function (_ref3, ref) {
     },
     activeOpacity: 0.8,
     onPress: onPress,
+    themeIconOnly: isIconOnly,
     style: [style, {
       bottom: displayState.hideButton ? -(marginBottom + theme.__hd__.fab.sizes.height * 2) : (_StyleSheet$flatten2 = reactNative.StyleSheet.flatten(style)) === null || _StyleSheet$flatten2 === void 0 ? void 0 : _StyleSheet$flatten2.bottom,
       transform: [{
@@ -24339,9 +24300,18 @@ var FAB$1 = /*#__PURE__*/React.forwardRef(function (_ref3, ref) {
     icon: active ? 'add' : icon
   }) : /*#__PURE__*/React__namespace.default.createElement(IconWithTextContent, {
     icon: icon,
-    title: title
+    title: title,
+    titleStyle: titleStyle
   })));
 });
+FABWithTitleStyle.displayName = 'FAB';
+// Public export — clean FABProps, no internal props exposed.
+// Docgen reads this component and sees only FABProps.
+var FAB$1 = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  return /*#__PURE__*/React__namespace.default.createElement(FABWithTitleStyle, _extends$1({}, props, {
+    ref: ref
+  }));
+});
 FAB$1.displayName = 'FAB';
 
 var StyledContainer$5 = index$c(reactNative.View)({
@@ -24510,7 +24480,7 @@ var StyledFABPairWrapper = index$c(Box)({
   justifyContent: 'center',
   alignItems: 'center'
 });
-var StyledFAB = index$c(FAB$1)(function (_ref) {
+var StyledFAB = index$c(FABWithTitleStyle)(function (_ref) {
   var theme = _ref.theme,
     _ref$iconOnly = _ref.iconOnly,
     iconOnly = _ref$iconOnly === void 0 ? false : _ref$iconOnly,
@@ -24523,15 +24493,16 @@ var StyledFAB = index$c(FAB$1)(function (_ref) {
   };
 });
 
-var _excluded$p = ["fabConfig", "onCancel"];
+var _excluded$n = ["fabConfig", "onCancel"];
 var Pair = function Pair(_ref) {
   var fabConfig = _ref.fabConfig,
     onCancel = _ref.onCancel,
-    props = _objectWithoutProperties(_ref, _excluded$p);
+    props = _objectWithoutProperties(_ref, _excluded$n);
   var icon = fabConfig.icon,
     title = fabConfig.title,
     onPress = fabConfig.onPress,
     testID = fabConfig.testID;
+  var theme = useTheme();
   return /*#__PURE__*/React__namespace.default.createElement(StyledFABPairWrapper, props, /*#__PURE__*/React__namespace.default.createElement(StyledFAB, {
     icon: "cancel",
     onPress: onCancel,
@@ -24543,7 +24514,11 @@ var Pair = function Pair(_ref) {
     onPress: onPress,
     testID: testID,
     iconOnly: !title,
-    isLast: true
+    isLast: true,
+    titleStyle: {
+      fontSize: theme.fontSizes.medium,
+      fontFamily: theme.fonts.neutral.regular
+    }
   }));
 };
 
@@ -25257,11 +25232,11 @@ var StyledFocusIcon = index$c(Icon)(function (_ref7) {
   };
 });
 
-var _excluded$o = ["style", "testID"];
+var _excluded$m = ["style", "testID"];
 var MapPinFocussed = function MapPinFocussed(_ref) {
   var style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$o);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$m);
   return /*#__PURE__*/React__namespace.default.createElement(StyledContainer$4, _extends$1({}, nativeProps, {
     style: style,
     testID: testID
@@ -25271,7 +25246,7 @@ var MapPinFocussed = function MapPinFocussed(_ref) {
   }));
 };
 
-var _excluded$n = ["style", "testID", "state", "image", "icon"];
+var _excluded$l = ["style", "testID", "state", "image", "icon"];
 var getBadgeIconName = function getBadgeIconName(state) {
   var iconMap = {
     idle: undefined,
@@ -25287,7 +25262,7 @@ var MapPin = function MapPin(_ref) {
     state = _ref$state === void 0 ? 'idle' : _ref$state,
     image = _ref.image,
     icon = _ref.icon,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$n);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$l);
   var badgeIcon = getBadgeIconName(state);
   return /*#__PURE__*/React__namespace.default.createElement(StyledContainer$4, _extends$1({}, nativeProps, {
     style: style,
@@ -25608,7 +25583,7 @@ var THEME_INTENT_MAP = {
   'archived-inverted': 'archivedInverted'
 };
 
-var _excluded$m = ["value", "renderValue", "intent", "style", "testID"];
+var _excluded$k = ["value", "renderValue", "intent", "style", "testID"];
 var defaultRenderValue = function defaultRenderValue(value) {
   return "".concat(value, "%");
 };
@@ -25621,7 +25596,7 @@ var ProgressCircle = function ProgressCircle(_ref) {
     intent = _ref$intent === void 0 ? 'primary' : _ref$intent,
     style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$m);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$k);
   var theme = useTheme$1();
   var size = theme.__hd__.progress.sizes.circleDiameter;
   var strokeWidth = theme.__hd__.progress.sizes.circleCompletenessHeight;
@@ -25691,14 +25666,14 @@ var StyledInner = index$c(reactNative.Animated.View)(function (_ref2) {
   };
 });
 
-var _excluded$l = ["value", "intent", "style", "testID"];
+var _excluded$j = ["value", "intent", "style", "testID"];
 var ProgressBar = function ProgressBar(_ref) {
   var value = _ref.value,
     _ref$intent = _ref.intent,
     intent = _ref$intent === void 0 ? 'primary' : _ref$intent,
     style = _ref.style,
     testID = _ref.testID,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$l);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$j);
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     width = _useState2[0],
@@ -25788,7 +25763,7 @@ var StyledSingleStep = index$c(Box)(function (_ref3) {
   };
 });
 
-var _excluded$k = ["steps", "current", "onLayout"];
+var _excluded$i = ["steps", "current", "onLayout"];
 var getStepState = function getStepState(current, index) {
   if (index < current) {
     return 'complete';
@@ -25802,7 +25777,7 @@ var ProgressStep = function ProgressStep(_ref) {
   var steps = _ref.steps,
     current = _ref.current,
     onLayout = _ref.onLayout,
-    props = _objectWithoutProperties(_ref, _excluded$k);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   var theme = useTheme$1();
   var _React$useState = React__namespace.default.useState(0),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -26099,7 +26074,7 @@ var StyledEmptyText = index$c(Typography.Caption)(function (_ref4) {
   };
 });
 
-var _excluded$j = ["data", "headerConfig", "emptyText", "legendConfig", "styleConfig", "style", "testID", "collapsable"];
+var _excluded$h = ["data", "headerConfig", "emptyText", "legendConfig", "styleConfig", "style", "testID", "collapsable"];
 var ProgressSegmentedBar = function ProgressSegmentedBar(_ref) {
   var data = _ref.data,
     headerConfig = _ref.headerConfig,
@@ -26109,7 +26084,7 @@ var ProgressSegmentedBar = function ProgressSegmentedBar(_ref) {
     style = _ref.style,
     testID = _ref.testID,
     collapsable = _ref.collapsable,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$j);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$h);
   var values = React__namespace.default.useMemo(function () {
     return data.map(function (s) {
       return s.data;
@@ -26479,14 +26454,14 @@ var AnimatedSpinner = function AnimatedSpinner(_ref) {
   }, dotProps))));
 };
 
-var _excluded$i = ["testID", "size", "intent"];
+var _excluded$g = ["testID", "size", "intent"];
 var Spinner = function Spinner(_ref) {
   var testID = _ref.testID,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'medium' : _ref$size,
     _ref$intent = _ref.intent,
     intent = _ref$intent === void 0 ? 'primary' : _ref$intent,
-    nativeProps = _objectWithoutProperties(_ref, _excluded$i);
+    nativeProps = _objectWithoutProperties(_ref, _excluded$g);
   return /*#__PURE__*/React__namespace.default.createElement(StyledView$1, nativeProps, /*#__PURE__*/React__namespace.default.createElement(StyledSpinnerContainer, {
     testID: testID
   }, /*#__PURE__*/React__namespace.default.createElement(AnimatedSpinner, {
@@ -26519,7 +26494,7 @@ var SwipeableAction = function SwipeableAction(_ref) {
   }, children);
 };
 
-var _excluded$h = ["children", "state", "onStateChange", "leftActions", "leftActionsWidth", "rightActions", "rightActionsWidth", "variant"];
+var _excluded$f = ["children", "state", "onStateChange", "leftActions", "leftActionsWidth", "rightActions", "rightActionsWidth", "variant"];
 var renderActions = function renderActions(actions, width, progress, direction) {
   var trans = progress.interpolate({
     inputRange: [0, 1],
@@ -26548,7 +26523,7 @@ var Swipeable = function Swipeable(_ref) {
     rightActionsWidth = _ref.rightActionsWidth,
     _ref$variant = _ref.variant,
     variant = _ref$variant === void 0 ? 'card' : _ref$variant,
-    swipeableProps = _objectWithoutProperties(_ref, _excluded$h);
+    swipeableProps = _objectWithoutProperties(_ref, _excluded$f);
   var theme = useTheme();
   var _useWindowDimensions = reactNative.useWindowDimensions(),
     width = _useWindowDimensions.width;
@@ -26876,24 +26851,8 @@ var StyledSectionList = index$c(reactNative.SectionList)(function (_ref4) {
     paddingHorizontal: theme.__hd__.select.space.optionListHorizontalPadding
   };
 });
-var getZIndexByState$1 = function getZIndexByState(_ref5) {
-  var themeHasError = _ref5.themeHasError;
-  if (themeHasError) {
-    return 1;
-  }
-  return 0;
-};
-var StyledTouchableOpacity$1 = index$c(reactNative.TouchableOpacity)(function (_ref6) {
-  var themeGroupStyleEnabled = _ref6.themeGroupStyleEnabled,
-    themeHasError = _ref6.themeHasError;
-  return _objectSpread2({}, themeGroupStyleEnabled && {
-    zIndex: getZIndexByState$1({
-      themeHasError: themeHasError
-    })
-  });
-});
 
-var _excluded$g = ["keyExtractor", "loading", "onEndReached", "onQueryChange", "sections", "renderItem", "sectionListRef"];
+var _excluded$e = ["keyExtractor", "loading", "onEndReached", "onQueryChange", "sections", "renderItem", "sectionListRef"];
 var BaseOptionList = function BaseOptionList(_ref) {
   var keyExtractor = _ref.keyExtractor,
     loading = _ref.loading,
@@ -26902,7 +26861,7 @@ var BaseOptionList = function BaseOptionList(_ref) {
     sections = _ref.sections,
     renderItem = _ref.renderItem,
     sectionListRef = _ref.sectionListRef,
-    rest = _objectWithoutProperties(_ref, _excluded$g);
+    rest = _objectWithoutProperties(_ref, _excluded$e);
   var theme = useTheme$1();
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -26986,7 +26945,7 @@ var isOptionSelected = function isOptionSelected(value, option) {
   });
 };
 
-var _excluded$f = ["keyExtractor", "loading", "onEndReached", "onPress", "onQueryChange", "sections", "renderOption", "value", "sectionListRef"];
+var _excluded$d = ["keyExtractor", "loading", "onEndReached", "onPress", "onQueryChange", "sections", "renderOption", "value", "sectionListRef"];
 var OptionList$1 = function OptionList(_ref) {
   var keyExtractor = _ref.keyExtractor,
     loading = _ref.loading,
@@ -26997,7 +26956,7 @@ var OptionList$1 = function OptionList(_ref) {
     renderOption = _ref.renderOption,
     value = _ref.value,
     sectionListRef = _ref.sectionListRef,
-    rest = _objectWithoutProperties(_ref, _excluded$f);
+    rest = _objectWithoutProperties(_ref, _excluded$d);
   var renderItem = function renderItem(info) {
     var item = info.item;
     var selected = isOptionSelected(value, item);
@@ -27032,7 +26991,6 @@ var OptionList$1 = function OptionList(_ref) {
   }, rest));
 };
 
-var _excluded$e = ["footerLabel", "label", "loading", "inputProps", "onConfirm", "onDismiss", "onEndReached", "onQueryChange", "options", "renderOption", "renderSelectedValue", "query", "error", "editable", "disabled", "required", "style", "testID", "value", "supportedOrientations", "bottomSheetConfig", "groupStyleEnabled"];
 function MultiSelect(_ref) {
   var footerLabel = _ref.footerLabel,
     label = _ref.label,
@@ -27059,10 +27017,7 @@ function MultiSelect(_ref) {
     _ref$supportedOrienta = _ref.supportedOrientations,
     supportedOrientations = _ref$supportedOrienta === void 0 ? ['portrait'] : _ref$supportedOrienta,
     _ref$bottomSheetConfi = _ref.bottomSheetConfig,
-    bottomSheetConfig = _ref$bottomSheetConfi === void 0 ? {} : _ref$bottomSheetConfi,
-    _ref$groupStyleEnable = _ref.groupStyleEnabled,
-    groupStyleEnabled = _ref$groupStyleEnable === void 0 ? false : _ref$groupStyleEnable,
-    rest = _objectWithoutProperties(_ref, _excluded$e);
+    bottomSheetConfig = _ref$bottomSheetConfi === void 0 ? {} : _ref$bottomSheetConfi;
   var _useKeyboard = useKeyboard(),
     isKeyboardVisible = _useKeyboard.isKeyboardVisible,
     keyboardHeight = _useKeyboard.keyboardHeight;
@@ -27085,7 +27040,6 @@ function MultiSelect(_ref) {
   var rawValue = value.length > 0 ? value.join(', ') : '';
   var bottomSheetVariant = bottomSheetConfig.variant,
     bottomSheetHeader = bottomSheetConfig.header;
-  var TextInputComponent = rest.TextInputComponent || TextInput;
   var onPress = React.useCallback(function () {
     setOpen(true);
   }, []);
@@ -27098,14 +27052,12 @@ function MultiSelect(_ref) {
   }, [open, value]);
   return /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: !editable || disabled || inputProps !== null && inputProps !== void 0 && inputProps.loading ? 'none' : 'auto'
-  }, /*#__PURE__*/React__namespace.default.createElement(StyledTouchableOpacity$1, {
+  }, /*#__PURE__*/React__namespace.default.createElement(reactNative.TouchableOpacity, {
     onPress: onPress,
-    themeGroupStyleEnabled: groupStyleEnabled,
-    themeHasError: !!error,
     testID: "multi-select-touchable-opacity"
   }, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: "none"
-  }, /*#__PURE__*/React__namespace.default.createElement(TextInputComponent, _extends$1({}, inputProps, {
+  }, /*#__PURE__*/React__namespace.default.createElement(TextInput, _extends$1({}, inputProps, {
     label: label,
     value: renderSelectedValue ? rawValue : displayedValue,
     suffix: selectSuffix,
@@ -27117,8 +27069,8 @@ function MultiSelect(_ref) {
     pointerEvents: "none",
     style: style,
     testID: testID,
-    renderInputValue: renderSelectedValue !== undefined && (rawValue === null || rawValue === void 0 ? void 0 : rawValue.length) > 0 ? function (props) {
-      return renderSelectedValue(value, props);
+    renderInputValue: renderSelectedValue !== undefined && (rawValue === null || rawValue === void 0 ? void 0 : rawValue.length) > 0 ? function (nativeInputProps) {
+      return renderSelectedValue(value, nativeInputProps);
     } : undefined
   }))))), /*#__PURE__*/React__namespace.default.createElement(BottomSheet$1, {
     variant: bottomSheetVariant || 'fixed',
@@ -27155,7 +27107,7 @@ function MultiSelect(_ref) {
       }
     },
     supportedOrientations: supportedOrientations
-  }, onQueryChange && /*#__PURE__*/React__namespace.default.createElement(StyledSearchBar, null, /*#__PURE__*/React__namespace.default.createElement(TextInputComponent, {
+  }, onQueryChange && /*#__PURE__*/React__namespace.default.createElement(StyledSearchBar, null, /*#__PURE__*/React__namespace.default.createElement(TextInput, {
     editable: true,
     placeholder: "Search",
     suffix: "search-outlined",
@@ -27206,7 +27158,7 @@ var StyledOptionList = index$c(BaseOptionList)(function (_ref) {
   };
 });
 
-var _excluded$d = ["keyExtractor", "loading", "onEndReached", "onPress", "onQueryChange", "sections", "renderOption", "value", "sectionListRef"];
+var _excluded$c = ["keyExtractor", "loading", "onEndReached", "onPress", "onQueryChange", "sections", "renderOption", "value", "sectionListRef"];
 var OptionList = function OptionList(_ref) {
   var keyExtractor = _ref.keyExtractor,
     loading = _ref.loading,
@@ -27217,7 +27169,7 @@ var OptionList = function OptionList(_ref) {
     renderOption = _ref.renderOption,
     value = _ref.value,
     sectionListRef = _ref.sectionListRef,
-    rest = _objectWithoutProperties(_ref, _excluded$d);
+    rest = _objectWithoutProperties(_ref, _excluded$c);
   var renderItem = function renderItem(info) {
     var item = info.item;
     var selected = _deepCompareValue(item.value, value);
@@ -27253,7 +27205,6 @@ var OptionList = function OptionList(_ref) {
   }, rest));
 };
 
-var _excluded$c = ["label", "loading", "inputProps", "onConfirm", "onDismiss", "onEndReached", "onQueryChange", "options", "renderOption", "renderSelectedValue", "query", "error", "editable", "disabled", "required", "style", "testID", "value", "supportedOrientations", "bottomSheetConfig", "groupStyleEnabled"];
 var SingleSelect = function SingleSelect(_ref) {
   var _flatOptions$find;
   var label = _ref.label,
@@ -27280,10 +27231,7 @@ var SingleSelect = function SingleSelect(_ref) {
     _ref$supportedOrienta = _ref.supportedOrientations,
     supportedOrientations = _ref$supportedOrienta === void 0 ? ['portrait'] : _ref$supportedOrienta,
     _ref$bottomSheetConfi = _ref.bottomSheetConfig,
-    bottomSheetConfig = _ref$bottomSheetConfi === void 0 ? {} : _ref$bottomSheetConfi,
-    _ref$groupStyleEnable = _ref.groupStyleEnabled,
-    groupStyleEnabled = _ref$groupStyleEnable === void 0 ? false : _ref$groupStyleEnable,
-    rest = _objectWithoutProperties(_ref, _excluded$c);
+    bottomSheetConfig = _ref$bottomSheetConfi === void 0 ? {} : _ref$bottomSheetConfi;
   var _useKeyboard = useKeyboard(),
     isKeyboardVisible = _useKeyboard.isKeyboardVisible,
     keyboardHeight = _useKeyboard.keyboardHeight;
@@ -27300,7 +27248,6 @@ var SingleSelect = function SingleSelect(_ref) {
   var rawValue = value ? String(value) : undefined;
   var bottomSheetVariant = bottomSheetConfig.variant,
     bottomSheetHeader = bottomSheetConfig.header;
-  var TextInputComponent = rest.TextInputComponent || TextInput;
   var onPress = React.useCallback(function () {
     setOpen(true);
   }, []);
@@ -27312,14 +27259,12 @@ var SingleSelect = function SingleSelect(_ref) {
   }, [editable, disabled, open]);
   return /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: !editable || disabled || inputProps !== null && inputProps !== void 0 && inputProps.loading ? 'none' : 'auto'
-  }, /*#__PURE__*/React__namespace.default.createElement(StyledTouchableOpacity$1, {
+  }, /*#__PURE__*/React__namespace.default.createElement(reactNative.TouchableOpacity, {
     onPress: onPress,
-    themeGroupStyleEnabled: groupStyleEnabled,
-    themeHasError: !!error,
     testID: "single-select-touchable-opacity"
   }, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: "none"
-  }, /*#__PURE__*/React__namespace.default.createElement(TextInputComponent, _extends$1({}, inputProps, {
+  }, /*#__PURE__*/React__namespace.default.createElement(TextInput, _extends$1({}, inputProps, {
     label: label,
     value: renderSelectedValue ? rawValue : displayedValue,
     suffix: selectSuffix,
@@ -27331,8 +27276,8 @@ var SingleSelect = function SingleSelect(_ref) {
     pointerEvents: "none",
     style: style,
     testID: testID,
-    renderInputValue: renderSelectedValue !== undefined && !!rawValue ? function (props) {
-      return renderSelectedValue(value, props);
+    renderInputValue: renderSelectedValue !== undefined && !!rawValue ? function (nativeInputProps) {
+      return renderSelectedValue(value, nativeInputProps);
     } : undefined
   }))))), /*#__PURE__*/React__namespace.default.createElement(BottomSheet$1, {
     variant: bottomSheetVariant || 'fixed',
@@ -27353,7 +27298,7 @@ var SingleSelect = function SingleSelect(_ref) {
       }
     },
     supportedOrientations: supportedOrientations
-  }, onQueryChange && /*#__PURE__*/React__namespace.default.createElement(StyledSearchBar, null, /*#__PURE__*/React__namespace.default.createElement(TextInputComponent, {
+  }, onQueryChange && /*#__PURE__*/React__namespace.default.createElement(StyledSearchBar, null, /*#__PURE__*/React__namespace.default.createElement(TextInput, {
     editable: true,
     placeholder: "Search",
     suffix: "search-outlined",
@@ -27568,16 +27513,9 @@ var StyledSuccessButtonContainer = index$c(reactNative.View)(function (_ref8) {
     paddingVertical: theme.__hd__.success.space.button.wrapperVerticalPadding
   };
 });
-var StyledSuccessButtonPrimary = index$c(CompoundButton)(function (_ref9) {
+var StyledSuccessButtonSecondary = index$c(CompoundButton)(function (_ref9) {
   var theme = _ref9.theme;
   return {
-    padding: theme.__hd__.success.space.button.padding
-  };
-});
-var StyledSuccessButtonSecondary = index$c(CompoundButton)(function (_ref10) {
-  var theme = _ref10.theme;
-  return {
-    padding: theme.__hd__.success.space.button.padding,
     marginTop: theme.__hd__.success.space.button.secondaryCTAMarginTop
   };
 });
@@ -27638,7 +27576,7 @@ var SuccessPage = function SuccessPage(_ref2) {
   }), /*#__PURE__*/React__namespace.default.createElement(StyledSuccessTitle, {
     level: "h4",
     typeface: "playful"
-  }, title), typeof description === 'string' ? /*#__PURE__*/React__namespace.default.createElement(StyledSuccessDescription, null, description) : description), !!ctaText && /*#__PURE__*/React__namespace.default.createElement(StyledSuccessButtonContainer, null, /*#__PURE__*/React__namespace.default.createElement(StyledSuccessButtonPrimary, {
+  }, title), typeof description === 'string' ? /*#__PURE__*/React__namespace.default.createElement(StyledSuccessDescription, null, description) : description), !!ctaText && /*#__PURE__*/React__namespace.default.createElement(StyledSuccessButtonContainer, null, /*#__PURE__*/React__namespace.default.createElement(CompoundButton, {
     text: ctaText,
     onPress: onCtaPress
   }), !!showSecondaryButton && /*#__PURE__*/React__namespace.default.createElement(StyledSuccessButtonSecondary, {
@@ -28733,30 +28671,6 @@ var Tag = function Tag(_ref) {
   }));
 };
 
-var StyledPickerWrapper = index$c(reactNative.View)(function (_ref) {
-  var theme = _ref.theme;
-  return {
-    height: theme.__hd__.timePicker.sizes.height,
-    alignItems: 'center'
-  };
-});
-var getZIndexByState = function getZIndexByState(_ref2) {
-  var themeHasError = _ref2.themeHasError;
-  if (themeHasError) {
-    return 1;
-  }
-  return 0;
-};
-var StyledTouchableOpacity = index$c(reactNative.TouchableOpacity)(function (_ref3) {
-  var themeGroupStyleEnabled = _ref3.themeGroupStyleEnabled,
-    themeHasError = _ref3.themeHasError;
-  return _objectSpread2({}, themeGroupStyleEnabled && {
-    zIndex: getZIndexByState({
-      themeHasError: themeHasError
-    })
-  });
-});
-
 var TimePickerAndroid = function TimePickerAndroid(_ref) {
   var value = _ref.value,
     label = _ref.label,
@@ -28772,11 +28686,7 @@ var TimePickerAndroid = function TimePickerAndroid(_ref) {
     style = _ref.style,
     testID = _ref.testID,
     _ref$showSuffix = _ref.showSuffix,
-    showSuffix = _ref$showSuffix === void 0 ? true : _ref$showSuffix,
-    TextInputComponent = _ref.TextInputComponent,
-    inputProps = _ref.inputProps,
-    _ref$groupStyleEnable = _ref.groupStyleEnabled,
-    groupStyleEnabled = _ref$groupStyleEnable === void 0 ? false : _ref$groupStyleEnable;
+    showSuffix = _ref$showSuffix === void 0 ? true : _ref$showSuffix;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -28784,20 +28694,17 @@ var TimePickerAndroid = function TimePickerAndroid(_ref) {
   var is12Hour = displayFormat.includes('hh');
   var displayValue = value ? formatTime(displayFormat, value) : '';
   var pickerInitValue = value || new Date();
-  var InputComponent = TextInputComponent || TextInput;
   var onPress = React.useCallback(function () {
     setOpen(true);
   }, []);
-  return /*#__PURE__*/React__namespace.default.createElement(StyledTouchableOpacity, {
+  return /*#__PURE__*/React__namespace.default.createElement(reactNative.TouchableOpacity, {
     onPress: onPress,
     disabled: disabled,
-    themeGroupStyleEnabled: groupStyleEnabled,
-    themeHasError: !!error,
     testID: "time-picker-android-touchable-opacity"
   }, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: "none",
     testID: "timePickerInputAndroid"
-  }, /*#__PURE__*/React__namespace.default.createElement(InputComponent, _extends$1({}, inputProps, {
+  }, /*#__PURE__*/React__namespace.default.createElement(TextInput, {
     label: label,
     value: displayValue,
     suffix: showSuffix ? 'clock-3' : undefined,
@@ -28808,7 +28715,7 @@ var TimePickerAndroid = function TimePickerAndroid(_ref) {
     helpText: helpText,
     style: style,
     testID: testID
-  }))), open ? /*#__PURE__*/React__namespace.default.createElement(DateTimePicker__default.default, {
+  })), open ? /*#__PURE__*/React__namespace.default.createElement(DateTimePicker__default.default, {
     testID: "timePickerAndroid",
     mode: "time",
     value: pickerInitValue,
@@ -28823,6 +28730,14 @@ var TimePickerAndroid = function TimePickerAndroid(_ref) {
   }) : null);
 };
 
+var StyledPickerWrapper = index$c(reactNative.View)(function (_ref) {
+  var theme = _ref.theme;
+  return {
+    height: theme.__hd__.timePicker.sizes.height,
+    alignItems: 'center'
+  };
+});
+
 var TimePickerIOS = function TimePickerIOS(_ref) {
   var value = _ref.value,
     label = _ref.label,
@@ -28841,11 +28756,7 @@ var TimePickerIOS = function TimePickerIOS(_ref) {
     _ref$showSuffix = _ref.showSuffix,
     showSuffix = _ref$showSuffix === void 0 ? true : _ref$showSuffix,
     _ref$supportedOrienta = _ref.supportedOrientations,
-    supportedOrientations = _ref$supportedOrienta === void 0 ? ['portrait'] : _ref$supportedOrienta,
-    TextInputComponent = _ref.TextInputComponent,
-    inputProps = _ref.inputProps,
-    _ref$groupStyleEnable = _ref.groupStyleEnabled,
-    groupStyleEnabled = _ref$groupStyleEnable === void 0 ? false : _ref$groupStyleEnable;
+    supportedOrientations = _ref$supportedOrienta === void 0 ? ['portrait'] : _ref$supportedOrienta;
   var _useState = React.useState(value || new Date()),
     _useState2 = _slicedToArray(_useState, 2),
     selectingDate = _useState2[0],
@@ -28861,23 +28772,20 @@ var TimePickerIOS = function TimePickerIOS(_ref) {
   // For 12-hour format: use en-US locale to ensure 12-hour display regardless of device settings
   // For 24-hour format: use en-GB for consistent 24-hour display
   var pickerLocale = is12Hour ? 'en-US' : 'en-GB';
-  var InputComponent = TextInputComponent || TextInput;
   React.useEffect(function () {
     setSelectingDate(value || new Date());
   }, [value]);
   var onPress = React.useCallback(function () {
     setOpen(true);
   }, []);
-  return /*#__PURE__*/React__namespace.default.createElement(StyledTouchableOpacity, {
+  return /*#__PURE__*/React__namespace.default.createElement(reactNative.TouchableOpacity, {
     onPress: onPress,
     disabled: disabled,
-    themeGroupStyleEnabled: groupStyleEnabled,
-    themeHasError: !!error,
     testID: "time-picker-ios-touchable-opacity"
   }, /*#__PURE__*/React__namespace.default.createElement(reactNative.View, {
     pointerEvents: "none",
     testID: "timePickerInputIOS"
-  }, /*#__PURE__*/React__namespace.default.createElement(InputComponent, _extends$1({}, inputProps, {
+  }, /*#__PURE__*/React__namespace.default.createElement(TextInput, {
     label: label,
     value: displayValue,
     suffix: showSuffix ? 'clock-3' : undefined,
@@ -28888,7 +28796,7 @@ var TimePickerIOS = function TimePickerIOS(_ref) {
     helpText: helpText,
     testID: testID,
     style: style
-  }))), /*#__PURE__*/React__namespace.default.createElement(BottomSheet$1, {
+  })), /*#__PURE__*/React__namespace.default.createElement(BottomSheet$1, {
     open: open,
     onRequestClose: function onRequestClose() {
       return setOpen(false);