@ornikar/kitt-universal 27.4.0 → 27.5.1-canary.3a59d4ae3422049417956fa37f27d2e8f5f84aba.0

package/dist/index.es.js

@@ -755,9 +755,19 @@ var card = {
 };
 
 var webAnimationContentDuration$2 = 400;
-var webAnimationContentEasing$2 = [0.77, 0, 0.175, 1];
+var webAnimationContentEasing$2 = {
+  x1: 0.77,
+  y1: 0,
+  x2: 0.175,
+  y2: 1
+};
 var webAnimationOverlayDuration$2 = 250;
-var webAnimationOverlayEasing$2 = [0.42, 0, 1, 1];
+var webAnimationOverlayEasing$2 = {
+  x1: 0.42,
+  y1: 0,
+  x2: 1,
+  y2: 1
+};
 var maxWidth = 540;
 var overlayHorizontalPadding = 24;
 var cardModal = {
@@ -849,9 +859,19 @@ var choices = {
 };
 
 var webAnimationContentDuration$1 = 400;
-var webAnimationContentEasing$1 = [0.77, 0, 0.175, 1];
+var webAnimationContentEasing$1 = {
+  x1: 0.77,
+  y1: 0,
+  x2: 0.175,
+  y2: 1
+};
 var webAnimationOverlayDuration$1 = 250;
-var webAnimationOverlayEasing$1 = [0.42, 0, 1, 1];
+var webAnimationOverlayEasing$1 = {
+  x1: 0.42,
+  y1: 0,
+  x2: 1,
+  y2: 1
+};
 var dialogModal = {
   borderRadius: spacing * 2,
   maxWidth: 540,
@@ -1783,9 +1803,19 @@ var forms = {
 };
 
 var webAnimationContentDuration = 600;
-var webAnimationContentEasing = [0.77, 0, 0.175, 1];
+var webAnimationContentEasing = {
+  x1: 0.77,
+  y1: 0,
+  x2: 0.175,
+  y2: 1
+};
 var webAnimationOverlayDuration = 250;
-var webAnimationOverlayEasing = [0.42, 0, 1, 1];
+var webAnimationOverlayEasing = {
+  x1: 0.42,
+  y1: 0,
+  x2: 1,
+  y2: 1
+};
 var fullscreenModal = {
   header: {
     height: 56
@@ -1878,43 +1908,8 @@ var highlight = {
   }
 };
 
-var getIconSizeFromFontSize = function (fontSize) {
-  if (fontSize <= 14) return 16;
-  if (fontSize <= 16) return 20;
-  return 24;
-};
-var createTypographyIconSizeConfig = function (baseAndSmallFontSize, mediumAndWideFontSize) {
-  var baseAndSmallIconSize = getIconSizeFromFontSize(baseAndSmallFontSize);
-  var mediumAndWideIconSize = getIconSizeFromFontSize(mediumAndWideFontSize);
-  return {
-    baseAndSmall: {
-      iconSize: baseAndSmallIconSize
-    },
-    mediumAndWide: {
-      iconSize: mediumAndWideIconSize
-    }
-  };
-};
 var icon = {
-  defaultSize: 20,
-  // Note: this is based on typography updated sizes, not current https://github.com/ornikar/kitt/pull/2130
-  typographySize: {
-    // also known as xxlarge
-    header1: createTypographyIconSizeConfig(40, 56),
-    // also known as xlarge
-    header2: createTypographyIconSizeConfig(32, 48),
-    // also known as medium
-    header3: createTypographyIconSizeConfig(24, 40),
-    // also known as xsmall
-    header4: createTypographyIconSizeConfig(18, 24),
-    // also known as xxsmall
-    header5: createTypographyIconSizeConfig(18, 18),
-    'body-large': createTypographyIconSizeConfig(18, 24),
-    'body-medium': createTypographyIconSizeConfig(18, 18),
-    body: createTypographyIconSizeConfig(16, 16),
-    'body-small': createTypographyIconSizeConfig(14, 14),
-    'body-xsmall': createTypographyIconSizeConfig(12, 12)
-  }
+  defaultSize: 20
 };
 
 var iconButton = {
@@ -1933,8 +1928,8 @@ var listItem = {
 
 var mapMarker = {
   home: {
-    "default": colors.primaryLight,
-    selected: colors.primary,
+    "default": deepPurpleColorPalette['grey.9'],
+    selected: deepPurpleColorPalette['grey.7'],
     svg: {
       height: 36
     },
@@ -1944,8 +1939,8 @@ var mapMarker = {
     }
   },
   meetingPoint: {
-    "default": colors.black,
-    selected: colors.blackAnthracite,
+    "default": deepPurpleColorPalette['deepPurple.8'],
+    selected: deepPurpleColorPalette['deepPurple.6'],
     svg: {
       width: 40,
       height: 43
@@ -2341,6 +2336,183 @@ var skeleton = {
   }
 };
 
+var tabBar = {
+  underline: {
+    "default": {
+      active: {
+        color: {
+          "default": deepPurpleColorPalette['deepPurple.8'],
+          focused: deepPurpleColorPalette['deepPurple.8'],
+          hovered: deepPurpleColorPalette['deepPurple.8'],
+          pressed: deepPurpleColorPalette['deepPurple.8']
+        },
+        indicator: {
+          backgroundColor: deepPurpleColorPalette['deepPurple.8']
+        }
+      },
+      inactive: {
+        color: {
+          "default": deepPurpleColorPalette['grey.5'],
+          focused: deepPurpleColorPalette['grey.5'],
+          hovered: deepPurpleColorPalette['deepPurple.8'],
+          pressed: deepPurpleColorPalette['deepPurple.8']
+        },
+        indicator: {
+          backgroundColor: undefined
+        }
+      },
+      disabled: {
+        color: {
+          "default": deepPurpleColorPalette['grey.3'],
+          focused: deepPurpleColorPalette['grey.3'],
+          hovered: deepPurpleColorPalette['grey.3'],
+          pressed: deepPurpleColorPalette['grey.3']
+        },
+        indicator: {
+          backgroundColor: undefined
+        }
+      },
+      borderBottomColor: deepPurpleColorPalette['beige.3']
+    },
+    revert: {
+      active: {
+        color: {
+          "default": deepPurpleColorPalette['grey.0'],
+          focused: deepPurpleColorPalette['grey.0'],
+          hovered: deepPurpleColorPalette['grey.0'],
+          pressed: deepPurpleColorPalette['grey.0']
+        },
+        indicator: {
+          backgroundColor: deepPurpleColorPalette['grey.0']
+        }
+      },
+      inactive: {
+        color: {
+          "default": deepPurpleColorPalette['white-alpha.80'],
+          focused: deepPurpleColorPalette['white-alpha.80'],
+          hovered: deepPurpleColorPalette['grey.0'],
+          pressed: deepPurpleColorPalette['grey.0']
+        },
+        indicator: {
+          backgroundColor: undefined
+        }
+      },
+      disabled: {
+        color: {
+          "default": deepPurpleColorPalette['white-alpha.20'],
+          focused: deepPurpleColorPalette['white-alpha.20'],
+          hovered: deepPurpleColorPalette['white-alpha.20'],
+          pressed: deepPurpleColorPalette['white-alpha.20']
+        },
+        indicator: {
+          backgroundColor: undefined
+        }
+      },
+      borderBottomColor: deepPurpleColorPalette['white-alpha.20']
+    }
+  },
+  solid: {
+    "default": {
+      active: {
+        color: {
+          "default": deepPurpleColorPalette['grey.0'],
+          focused: deepPurpleColorPalette['grey.0'],
+          hovered: deepPurpleColorPalette['grey.0'],
+          pressed: deepPurpleColorPalette['grey.0']
+        },
+        backgroundColor: {
+          "default": deepPurpleColorPalette['deepPurple.8'],
+          focused: deepPurpleColorPalette['deepPurple.8'],
+          hovered: deepPurpleColorPalette['deepPurple.8'],
+          pressed: deepPurpleColorPalette['deepPurple.8']
+        },
+        borderRadius: 4,
+        indicator: {
+          backgroundColor: undefined
+        }
+      },
+      inactive: {
+        color: {
+          "default": deepPurpleColorPalette['grey.5'],
+          focused: deepPurpleColorPalette['grey.5'],
+          hovered: deepPurpleColorPalette['grey.5'],
+          pressed: deepPurpleColorPalette['grey.5']
+        },
+        backgroundColor: {
+          "default": undefined,
+          focused: undefined,
+          hovered: deepPurpleColorPalette['beige.1'],
+          pressed: deepPurpleColorPalette['beige.1']
+        },
+        borderRadius: 4,
+        indicator: {
+          backgroundColor: undefined
+        }
+      },
+      disabled: {
+        color: {
+          "default": deepPurpleColorPalette['grey.3'],
+          focused: deepPurpleColorPalette['grey.3'],
+          hovered: deepPurpleColorPalette['grey.3'],
+          pressed: deepPurpleColorPalette['grey.3']
+        },
+        indicator: {
+          backgroundColor: undefined
+        }
+      }
+    },
+    revert: {
+      active: {
+        color: {
+          "default": deepPurpleColorPalette['deepPurple.8'],
+          focused: deepPurpleColorPalette['deepPurple.8'],
+          hovered: deepPurpleColorPalette['deepPurple.8'],
+          pressed: deepPurpleColorPalette['deepPurple.8']
+        },
+        backgroundColor: {
+          "default": deepPurpleColorPalette['grey.0'],
+          focused: deepPurpleColorPalette['grey.0'],
+          hovered: deepPurpleColorPalette['grey.0'],
+          pressed: deepPurpleColorPalette['grey.0']
+        },
+        borderRadius: 4,
+        indicator: {
+          backgroundColor: undefined
+        }
+      },
+      inactive: {
+        color: {
+          "default": deepPurpleColorPalette['white-alpha.80'],
+          focused: deepPurpleColorPalette['white-alpha.80'],
+          hovered: deepPurpleColorPalette['white-alpha.80'],
+          pressed: deepPurpleColorPalette['white-alpha.80']
+        },
+        backgroundColor: {
+          "default": undefined,
+          focused: undefined,
+          hovered: deepPurpleColorPalette['white-alpha.10'],
+          pressed: deepPurpleColorPalette['white-alpha.10']
+        },
+        borderRadius: 4,
+        indicator: {
+          backgroundColor: undefined
+        }
+      },
+      disabled: {
+        color: {
+          "default": deepPurpleColorPalette['white-alpha.20'],
+          focused: deepPurpleColorPalette['white-alpha.20'],
+          hovered: deepPurpleColorPalette['white-alpha.20'],
+          pressed: deepPurpleColorPalette['white-alpha.20']
+        },
+        indicator: {
+          backgroundColor: undefined
+        }
+      }
+    }
+  }
+};
+
 var tag = {
   borderRadius: 16,
   icon: {
@@ -2482,6 +2654,7 @@ var theme = {
   picker: picker,
   shadows: shadows,
   skeleton: skeleton,
+  tabBar: tabBar,
   tag: tag,
   tooltip: tooltip,
   typography: typography,
@@ -2582,7 +2755,7 @@ function ActionCardDisabled(_ref) {
   });
 }
 
-var _excluded$T = ["children", "variant", "borderVariant", "borderRadius", "disabled", "isHovered", "isPressed", "isFocused"];
+var _excluded$S = ["children", "variant", "borderVariant", "borderRadius", "disabled", "isHovered", "isPressed", "isFocused"];
 function ActionCard(_ref) {
   var children = _ref.children,
     _ref$variant = _ref.variant,
@@ -2595,7 +2768,7 @@ function ActionCard(_ref) {
     isHovered = _ref.isHovered,
     isPressed = _ref.isPressed,
     isFocused = _ref.isFocused,
-    props = _objectWithoutProperties(_ref, _excluded$T);
+    props = _objectWithoutProperties(_ref, _excluded$S);
   return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({}, props), {}, {
     children: disabled ? /*#__PURE__*/jsx(ActionCardDisabled, {
       borderRadius: borderRadius,
@@ -2909,17 +3082,23 @@ var getTypographyFamilyWithAncestorValue = function (type, typographyFamilyInCon
   if (typographyFamilyInContext != null) return typographyFamilyInContext;
   throw new Error('You must set a "base" prop or wrap this Typography in one that does.');
 };
+var getTypographyTypeWithAncestorValue = function (type, typographyTypeInContext) {
+  // check if all values are not undefined
+  var isAllValuesUndefined = Object.values(type).every(function (value) {
+    return value === undefined;
+  });
+
+  // if every values are undefined and we hgave a typographyTypeInContext, we use the parent typography type (typographyTypeInContext)
+  return !!isAllValuesUndefined && !!typographyTypeInContext ? typographyTypeInContext : type;
+};
 
-var _excluded$S = ["accessibilityRole", "base", "small", "medium", "large", "wide", "type", "variant", "color"];
+var _excluded$R = ["accessibilityRole", "base", "small", "medium", "large", "wide", "type", "variant", "color"];
 var TypographyFamilyContext = /*#__PURE__*/createContext(null);
 var TypographyTypeContext = /*#__PURE__*/createContext(null);
 var TypographyColorContext = /*#__PURE__*/createContext('black');
 function useTypographyColor() {
   return useContext(TypographyColorContext);
 }
-function useTypographyAncestorType() {
-  return useContext(TypographyTypeContext);
-}
 var TypographyDefaultColorContext = /*#__PURE__*/createContext(undefined);
 function useTypographyDefaultColor() {
   return useContext(TypographyDefaultColorContext);
@@ -3020,7 +3199,7 @@ function getUniversalFontWeight(type, variant, typographyFamily) {
   };
 }
 function Typography(_ref2) {
-  var _type$base;
+  var _typographyType$base;
   var accessibilityRole = _ref2.accessibilityRole,
     legacyBase = _ref2.base,
     legacySmall = _ref2.small,
@@ -3037,12 +3216,14 @@ function Typography(_ref2) {
     } : _ref2$type,
     variant = _ref2.variant,
     color = _ref2.color,
-    otherProps = _objectWithoutProperties(_ref2, _excluded$S);
+    otherProps = _objectWithoutProperties(_ref2, _excluded$R);
   var sx = useSx();
   var typographyFamilyInContext = useContext(TypographyFamilyContext);
+  var typographyTypeInContext = useContext(TypographyTypeContext);
   var defaultColor = useTypographyDefaultColor();
   var hasTypographyAncestor = typographyFamilyInContext !== null;
-  var baseOrDefaultToBody = hasTypographyAncestor ? type.base : (_type$base = type.base) !== null && _type$base !== void 0 ? _type$base : 'body-m';
+  var typographyType = getTypographyTypeWithAncestorValue(type, typographyTypeInContext);
+  var baseOrDefaultToBody = (_typographyType$base = typographyType.base) !== null && _typographyType$base !== void 0 ? _typographyType$base : 'body-m';
   var typographyFamily = getTypographyFamilyWithAncestorValue(baseOrDefaultToBody, typographyFamilyInContext);
   var fontSizeForNativeBase = createNativeBaseFontSize(_objectSpread(_objectSpread({}, type), {}, {
     base: baseOrDefaultToBody
@@ -3079,7 +3260,7 @@ function Typography(_ref2) {
   var content = baseOrDefaultToBody ? /*#__PURE__*/jsx(TypographyFamilyContext.Provider, {
     value: typographyFamily,
     children: /*#__PURE__*/jsx(TypographyTypeContext.Provider, {
-      value: type,
+      value: typographyType,
       children: text
     })
   }) : text;
@@ -3177,30 +3358,12 @@ function Icon(_ref) {
   });
 }
 
-var _excluded$R = ["color", "size"],
+var _excluded$Q = ["color", "size"],
   _excluded2$5 = ["color"];
-function getIconSizeConfigKeyFromTypeName(breakpointName) {
-  return breakpointName === KittBreakpointNameEnum.BASE || breakpointName === KittBreakpointNameEnum.SMALL ? 'baseAndSmall' : 'mediumAndWide';
-}
-function createNativeBaseIconSize(type) {
-  var typeWithMediumForced = _objectSpread(_objectSpread({}, type), {}, {
-    medium: type.medium || type.small || type.base
-  });
-  var iconSizeForNativeBase = {};
-  [KittBreakpointNameEnum.BASE, KittBreakpointNameEnum.SMALL, KittBreakpointNameEnum.MEDIUM, KittBreakpointNameEnum.LARGE, KittBreakpointNameEnum.WIDE].forEach(function (typeName) {
-    var value = typeWithMediumForced[typeName];
-    if (value) {
-      iconSizeForNativeBase[typeName] = "kitt.icon.typographySize.".concat(value, ".").concat(getIconSizeConfigKeyFromTypeName(typeName), ".iconSize");
-    }
-  });
-  return iconSizeForNativeBase;
-}
 function TypographyIconSpecifiedColor(_ref) {
   var color = _ref.color,
     size = _ref.size,
-    props = _objectWithoutProperties(_ref, _excluded$R);
-  var ancestorType = useTypographyAncestorType();
-  var iconSize = size || (ancestorType ? createNativeBaseIconSize(ancestorType) : undefined);
+    props = _objectWithoutProperties(_ref, _excluded$Q);
   var colorValue = getTypographyColorValue(color);
   var sx = useSx();
   var _sx = sx({
@@ -3208,7 +3371,7 @@ function TypographyIconSpecifiedColor(_ref) {
     }),
     colorStyleValue = _sx.color;
   return /*#__PURE__*/jsx(Icon, _objectSpread(_objectSpread({}, props), {}, {
-    size: iconSize,
+    size: size,
     color: colorStyleValue
   }));
 }
@@ -3240,7 +3403,7 @@ var getButtonTextColorByType = function (type, variant, isHovered, isPressed, is
   return "".concat(baseKey, ".default");
 };
 
-var _excluded$Q = ["type", "variant", "isDisabled", "icon", "children", "isHovered", "isPressed", "isFocused", "innerSpacing", "size"];
+var _excluded$P = ["type", "variant", "isDisabled", "icon", "children", "isHovered", "isPressed", "isFocused", "innerSpacing", "size"];
 function ButtonContentChildren(_ref) {
   var type = _ref.type,
     icon = _ref.icon,
@@ -3340,7 +3503,7 @@ function ButtonContent(_ref2) {
     _ref2.isFocused;
     var innerSpacing = _ref2.innerSpacing,
     size = _ref2.size,
-    props = _objectWithoutProperties(_ref2, _excluded$Q);
+    props = _objectWithoutProperties(_ref2, _excluded$P);
   var color = getButtonTextColorByType(type, variant, isHovered, isPressed, isDisabled);
   return /*#__PURE__*/jsx(View, {
     _web: {
@@ -3585,7 +3748,7 @@ function LoaderIcon(_ref) {
   });
 }
 
-var _excluded$P = ["as", "onPress", "disabled", "icon", "stretch"];
+var _excluded$O = ["as", "onPress", "disabled", "icon", "stretch"];
 var ActionsItem = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var as = _ref.as,
     onPress = _ref.onPress,
@@ -3596,7 +3759,7 @@ var ActionsItem = /*#__PURE__*/forwardRef(function (_ref, ref) {
       base: true,
       medium: false
     } : _ref$stretch,
-    props = _objectWithoutProperties(_ref, _excluded$P);
+    props = _objectWithoutProperties(_ref, _excluded$O);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isLoading = _useState2[0],
@@ -3674,7 +3837,7 @@ function ActionsButton(_ref) {
   }, props));
 }
 
-var _excluded$O = ["children", "layout", "reversed"];
+var _excluded$N = ["children", "layout", "reversed"];
 function getCurrentLayout(layout) {
   if (!layout) return {
     base: 'stretch',
@@ -3706,7 +3869,7 @@ function Actions(_ref) {
     reversed = _ref$reversed === void 0 ? {
       base: false
     } : _ref$reversed,
-    props = _objectWithoutProperties(_ref, _excluded$O);
+    props = _objectWithoutProperties(_ref, _excluded$N);
   var shouldReverse = typeof reversed === 'boolean' ? {
     base: !!reversed
   } : createResponsiveStyleFromProp(reversed, true, false);
@@ -3759,7 +3922,7 @@ function getInitials(firstname, lastname) {
   return "".concat(firstname[0]).concat(lastname[0]).toUpperCase();
 }
 
-var _excluded$N = ["size", "round", "light", "sizeVariant", "width", "height", "dark", "disabled"];
+var _excluded$M = ["size", "round", "light", "sizeVariant", "width", "height", "dark", "disabled"];
 function AvatarContent(_ref) {
   var size = _ref.size,
     src = _ref.src,
@@ -3822,7 +3985,7 @@ function Avatar(_ref2) {
     height = _ref2.height,
     dark = _ref2.dark,
     disabled = _ref2.disabled,
-    props = _objectWithoutProperties(_ref2, _excluded$N);
+    props = _objectWithoutProperties(_ref2, _excluded$M);
   var currentSize = getCurrentSize({
     size: size,
     sizeVariant: sizeVariant
@@ -3860,7 +4023,7 @@ function Avatar(_ref2) {
   });
 }
 
-var _excluded$M = ["children", "hasScrollView", "hasBackdrop", "hasHandle", "enableDynamicSizing", "snapPoints"];
+var _excluded$L = ["children", "hasScrollView", "hasBackdrop", "hasHandle", "enableDynamicSizing", "snapPoints"];
 function BottomSheetComp(_ref, ref) {
   var Content = _ref.children,
     _ref$hasScrollView = _ref.hasScrollView,
@@ -3873,7 +4036,7 @@ function BottomSheetComp(_ref, ref) {
     enableDynamicSizing = _ref$enableDynamicSiz === void 0 ? true : _ref$enableDynamicSiz,
     _ref$snapPoints = _ref.snapPoints,
     snapPoints = _ref$snapPoints === void 0 ? ['100%'] : _ref$snapPoints,
-    rest = _objectWithoutProperties(_ref, _excluded$M);
+    rest = _objectWithoutProperties(_ref, _excluded$L);
   var _useSafeAreaInsets = useSafeAreaInsets(),
     top = _useSafeAreaInsets.top;
   var Wrapper = useMemo(function () {
@@ -4054,11 +4217,10 @@ function NativeOpacityAnimation$2(_ref) {
     var _theme$kitt$cardModal = theme.kitt.cardModal.animation.overlay,
       duration = _theme$kitt$cardModal.duration,
       easing = _theme$kitt$cardModal.easing;
-    var _easing = _slicedToArray(easing, 4),
-      x1 = _easing[0],
-      y1 = _easing[1],
-      x2 = _easing[2],
-      y2 = _easing[3];
+    var x1 = easing.x1,
+      y1 = easing.y1,
+      x2 = easing.x2,
+      y2 = easing.y2;
     return {
       opacity: withTiming(visible ? 1 : 0, {
         duration: duration,
@@ -4094,11 +4256,10 @@ function NativeRotationAnimation$1(_ref) {
     var _theme$kitt$cardModal = theme.kitt.cardModal.animation.content,
       duration = _theme$kitt$cardModal.duration,
       easing = _theme$kitt$cardModal.easing;
-    var _easing = _slicedToArray(easing, 4),
-      x1 = _easing[0],
-      y1 = _easing[1],
-      x2 = _easing[2],
-      y2 = _easing[3];
+    var x1 = easing.x1,
+      y1 = easing.y1,
+      x2 = easing.x2,
+      y2 = easing.y2;
     rotation.value = withTiming(visible ? 0 : 5, {
       duration: duration,
       easing: Easing$1.bezier(x1, y1, x2, y2)
@@ -4187,13 +4348,13 @@ function CardModalAnimation(_ref) {
   });
 }
 
-var _excluded$L = ["children", "visible", "onClose", "onExited"];
+var _excluded$K = ["children", "visible", "onClose", "onExited"];
 function CardModalBehaviour(_ref) {
   var children = _ref.children,
     visible = _ref.visible,
     onClose = _ref.onClose,
     onExited = _ref.onExited,
-    props = _objectWithoutProperties(_ref, _excluded$L);
+    props = _objectWithoutProperties(_ref, _excluded$K);
   var _useState = useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     isModalBehaviourVisible = _useState2[0],
@@ -4218,7 +4379,7 @@ function CardModalBehaviour(_ref) {
   });
 }
 
-var _excluded$K = ["children", "paddingX", "paddingY"];
+var _excluded$J = ["children", "paddingX", "paddingY"];
 function CardModalBody(_ref) {
   var children = _ref.children,
     _ref$paddingX = _ref.paddingX,
@@ -4231,7 +4392,7 @@ function CardModalBody(_ref) {
       base: 'kitt.4',
       medium: 'kitt.6'
     } : _ref$paddingY,
-    props = _objectWithoutProperties(_ref, _excluded$K);
+    props = _objectWithoutProperties(_ref, _excluded$J);
   return /*#__PURE__*/jsx(ScrollView, _objectSpread(_objectSpread({
     showsVerticalScrollIndicator: false,
     _contentContainerStyle: {
@@ -4243,7 +4404,7 @@ function CardModalBody(_ref) {
   }));
 }
 
-var _excluded$J = ["children", "padding", "hasSeparator"];
+var _excluded$I = ["children", "padding", "hasSeparator"];
 function CardModalFooter(_ref) {
   var children = _ref.children,
     _ref$padding = _ref.padding,
@@ -4253,7 +4414,7 @@ function CardModalFooter(_ref) {
     } : _ref$padding,
     _ref$hasSeparator = _ref.hasSeparator,
     hasSeparator = _ref$hasSeparator === void 0 ? true : _ref$hasSeparator,
-    props = _objectWithoutProperties(_ref, _excluded$J);
+    props = _objectWithoutProperties(_ref, _excluded$I);
   return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({}, props), {}, {
     marginTop: "kitt.2",
     padding: padding,
@@ -4267,7 +4428,7 @@ function CardModalFooter(_ref) {
   }));
 }
 
-var _excluded$I = ["children", "title", "paddingBottom", "hasSeparator", "right", "left"];
+var _excluded$H = ["children", "title", "paddingBottom", "hasSeparator", "right", "left"];
 function CardModalHeader(_ref) {
   var children = _ref.children,
     title = _ref.title,
@@ -4280,7 +4441,7 @@ function CardModalHeader(_ref) {
     hasSeparator = _ref$hasSeparator === void 0 ? true : _ref$hasSeparator,
     right = _ref.right,
     left = _ref.left,
-    props = _objectWithoutProperties(_ref, _excluded$I);
+    props = _objectWithoutProperties(_ref, _excluded$H);
   var defaultContainerPadding = {
     base: 'kitt.4',
     medium: 'kitt.6'
@@ -4318,7 +4479,7 @@ function CardModalHeader(_ref) {
   }));
 }
 
-var _excluded$H = ["backgroundColor", "maxWidth", "withoutShadow", "children", "header", "body", "footer"];
+var _excluded$G = ["backgroundColor", "maxWidth", "withoutShadow", "children", "header", "body", "footer"];
 function CardModal(_ref) {
   var _ref$backgroundColor = _ref.backgroundColor,
     backgroundColor = _ref$backgroundColor === void 0 ? 'kitt.uiBackgroundLight' : _ref$backgroundColor,
@@ -4329,7 +4490,7 @@ function CardModal(_ref) {
     header = _ref.header,
     body = _ref.body,
     footer = _ref.footer,
-    props = _objectWithoutProperties(_ref, _excluded$H);
+    props = _objectWithoutProperties(_ref, _excluded$G);
   return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({}, props), {}, {
     overflow: "hidden",
     backgroundColor: backgroundColor,
@@ -4575,11 +4736,11 @@ function ChoiceItemContainer(_ref) {
   }));
 }
 
-var _excluded$G = ["direction", "contentContainerStyle"];
+var _excluded$F = ["direction", "contentContainerStyle"];
 function ChoicesContainer(_ref) {
   var direction = _ref.direction,
     contentContainerStyle = _ref.contentContainerStyle,
-    props = _objectWithoutProperties(_ref, _excluded$G);
+    props = _objectWithoutProperties(_ref, _excluded$F);
   if (direction === 'row') {
     return /*#__PURE__*/jsx(ScrollView$2, _objectSpread({
       horizontal: true,
@@ -4672,11 +4833,10 @@ function NativeOpacityAnimation$1(_ref) {
     var _theme$kitt$dialogMod = theme.kitt.dialogModal.animation.overlay,
       duration = _theme$kitt$dialogMod.duration,
       easing = _theme$kitt$dialogMod.easing;
-    var _easing = _slicedToArray(easing, 4),
-      x1 = _easing[0],
-      y1 = _easing[1],
-      x2 = _easing[2],
-      y2 = _easing[3];
+    var x1 = easing.x1,
+      y1 = easing.y1,
+      x2 = easing.x2,
+      y2 = easing.y2;
     return {
       opacity: withTiming(visible ? 1 : 0, {
         duration: duration,
@@ -4712,11 +4872,10 @@ function NativeRotationAnimation(_ref) {
     var _theme$kitt$dialogMod = theme.kitt.dialogModal.animation.content,
       duration = _theme$kitt$dialogMod.duration,
       easing = _theme$kitt$dialogMod.easing;
-    var _easing = _slicedToArray(easing, 4),
-      x1 = _easing[0],
-      y1 = _easing[1],
-      x2 = _easing[2],
-      y2 = _easing[3];
+    var x1 = easing.x1,
+      y1 = easing.y1,
+      x2 = easing.x2,
+      y2 = easing.y2;
     rotation.value = withTiming(visible ? 0 : 5, {
       duration: duration,
       easing: Easing$1.bezier(x1, y1, x2, y2)
@@ -4807,13 +4966,13 @@ function DialogModalAnimation(_ref) {
   });
 }
 
-var _excluded$F = ["children", "visible", "onClose", "onExited"];
+var _excluded$E = ["children", "visible", "onClose", "onExited"];
 function DialogModalBehaviour(_ref) {
   var children = _ref.children,
     visible = _ref.visible,
     onClose = _ref.onClose,
     onExited = _ref.onExited,
-    props = _objectWithoutProperties(_ref, _excluded$F);
+    props = _objectWithoutProperties(_ref, _excluded$E);
   var _useState = useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     isModalBehaviourVisible = _useState2[0],
@@ -4844,7 +5003,7 @@ function DialogModalBehaviour(_ref) {
   });
 }
 
-var _excluded$E = ["stretch"];
+var _excluded$D = ["stretch"];
 function DialogModal(_ref) {
   var illustration = _ref.illustration,
     title = _ref.title,
@@ -4884,7 +5043,7 @@ DialogModal.ModalBehaviour = DialogModalBehaviour;
 function DialogModalButton(_ref2) {
   var _ref2$stretch = _ref2.stretch,
     stretch = _ref2$stretch === void 0 ? true : _ref2$stretch,
-    props = _objectWithoutProperties(_ref2, _excluded$E);
+    props = _objectWithoutProperties(_ref2, _excluded$D);
   return /*#__PURE__*/jsx(Actions.Button, _objectSpread({
     stretch: stretch
   }, props));
@@ -4921,7 +5080,7 @@ function Emoji(_ref) {
   });
 }
 
-var _excluded$D = ["as", "appScheme", "appValue", "onPress", "onOpenAppError"],
+var _excluded$C = ["as", "appScheme", "appValue", "onPress", "onOpenAppError"],
   _excluded2$4 = ["phoneNumber", "children"],
   _excluded3$3 = ["phoneNumber", "children"],
   _excluded4$3 = ["emailAddress", "children"];
@@ -4931,7 +5090,7 @@ function ExternalAppLink(_ref) {
     appValue = _ref.appValue,
     onPress = _ref.onPress,
     onOpenAppError = _ref.onOpenAppError,
-    rest = _objectWithoutProperties(_ref, _excluded$D);
+    rest = _objectWithoutProperties(_ref, _excluded$C);
   var href = "".concat(appScheme, ":").concat(appValue);
   var handleOnPress = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
@@ -5083,7 +5242,7 @@ function useOpenExternalLink(errorHandler) {
   }();
 }
 
-var _excluded$C = ["as", "href", "openLinkBehavior", "onPress", "onOpenLinkError"];
+var _excluded$B = ["as", "href", "openLinkBehavior", "onPress", "onOpenLinkError"];
 function ExternalLink(_ref) {
   var Component = _ref.as,
     href = _ref.href,
@@ -5092,7 +5251,7 @@ function ExternalLink(_ref) {
     onPress = _ref.onPress,
     _ref$onOpenLinkError = _ref.onOpenLinkError,
     onOpenLinkError = _ref$onOpenLinkError === void 0 ? console.error : _ref$onOpenLinkError,
-    rest = _objectWithoutProperties(_ref, _excluded$C);
+    rest = _objectWithoutProperties(_ref, _excluded$B);
   var openExternalLink = useOpenExternalLink();
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return /*#__PURE__*/jsx(Component, _objectSpread(_objectSpread({}, rest), {}, {
@@ -5149,7 +5308,7 @@ function InputTextContainer(_ref) {
   });
 }
 
-var _excluded$B = ["id", "right", "state", "variant", "internalForceState", "disabled", "autoCorrect", "textContentType", "autoComplete", "inputMode", "multiline", "height", "onSubmitEditing"];
+var _excluded$A = ["id", "right", "state", "variant", "internalForceState", "disabled", "autoCorrect", "textContentType", "autoComplete", "inputMode", "multiline", "height", "onSubmitEditing"];
 var InputText = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var id = _ref.id,
     right = _ref.right;
@@ -5170,7 +5329,7 @@ var InputText = /*#__PURE__*/forwardRef(function (_ref, ref) {
     multiline = _ref.multiline,
     height = _ref.height,
     onSubmitEditing = _ref.onSubmitEditing,
-    props = _objectWithoutProperties(_ref, _excluded$B);
+    props = _objectWithoutProperties(_ref, _excluded$A);
   var theme = useTheme();
   var fontSizeForNativeBase = createNativeBaseFontSize({
     base: 'body-m'
@@ -5295,12 +5454,12 @@ function AutocompleteItemsListContainer(_ref) {
   });
 }
 
-var _excluded$A = ["children", "testID"];
+var _excluded$z = ["children", "testID"];
 function AutocompleteOption(_ref) {
   var children = _ref.children,
     _ref$testID = _ref.testID,
     testID = _ref$testID === void 0 ? 'kitt.Autocomplete.option' : _ref$testID,
-    props = _objectWithoutProperties(_ref, _excluded$A);
+    props = _objectWithoutProperties(_ref, _excluded$z);
   return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({
     paddingX: {
       base: 'kitt.2',
@@ -5313,7 +5472,7 @@ function AutocompleteOption(_ref) {
   }));
 }
 
-var _excluded$z = ["children", "name", "disabled", "placeholder", "isInitialOpen", "initialValue", "containerProps", "filterItemBasedOnCurrentInputValue", "checkSelectedItem", "itemToString", "right", "onChange", "onFocus", "onBlur", "onInputChange", "onSelectItem", "onOuterPress", "errorElement", "emptyResultsElement", "inputTestID", "listContainerTestID", "zIndex", "maxItemContainerHeight"],
+var _excluded$y = ["children", "name", "disabled", "placeholder", "isInitialOpen", "initialValue", "containerProps", "filterItemBasedOnCurrentInputValue", "checkSelectedItem", "itemToString", "right", "onChange", "onFocus", "onBlur", "onInputChange", "onSelectItem", "onOuterPress", "errorElement", "emptyResultsElement", "inputTestID", "listContainerTestID", "zIndex", "maxItemContainerHeight"],
   _excluded2$3 = ["onClick", "onPress"],
   _excluded3$2 = ["onKeyDown", "onFocus", "onBlur", "onChange"],
   _excluded4$2 = ["onClick", "onPress", "role", "aria-selected"];
@@ -5353,7 +5512,7 @@ function Autocomplete(_ref) {
     _ref$zIndex = _ref.zIndex,
     zIndex = _ref$zIndex === void 0 ? 1000 : _ref$zIndex,
     maxItemContainerHeight = _ref.maxItemContainerHeight,
-    props = _objectWithoutProperties(_ref, _excluded$z);
+    props = _objectWithoutProperties(_ref, _excluded$y);
   var childrenArray = Children.toArray(_children);
   var items = childrenArray.filter(isReactElement).map(function (child) {
     return {
@@ -5568,7 +5727,7 @@ function getBorderColor$1(_ref) {
   return 'kitt.forms.checkbox.default.borderColor';
 }
 
-var _excluded$y = ["checked", "hitSlop", "children", "disabled", "onChange", "onBlur", "onFocus"];
+var _excluded$x = ["checked", "hitSlop", "children", "disabled", "onChange", "onBlur", "onFocus"];
 var Checkbox = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var checked = _ref.checked,
     _ref$hitSlop = _ref.hitSlop,
@@ -5578,7 +5737,7 @@ var Checkbox = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onChange = _ref.onChange,
     onBlur = _ref.onBlur,
     onFocus = _ref.onFocus,
-    props = _objectWithoutProperties(_ref, _excluded$y);
+    props = _objectWithoutProperties(_ref, _excluded$x);
   var theme = useTheme();
   return /*#__PURE__*/jsx(Pressable, _objectSpread(_objectSpread({
     hitSlop: hitSlop
@@ -5896,7 +6055,7 @@ function PartContainer(_ref) {
   });
 }
 
-var _excluded$x = ["id", "value", "testID", "stretch", "placeholder", "minDate", "maxDate", "disabled", "isFocusedInternal", "isHoveredInternal", "isPressedInternal", "enterKeyHint", "onChange", "onBlur", "onFocus", "onSubmitEditing"];
+var _excluded$w = ["id", "value", "testID", "stretch", "placeholder", "minDate", "maxDate", "disabled", "isFocusedInternal", "isHoveredInternal", "isPressedInternal", "enterKeyHint", "onChange", "onBlur", "onFocus", "onSubmitEditing"];
 var KeyboardDatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var id = _ref.id,
     value = _ref.value,
@@ -5914,7 +6073,7 @@ var KeyboardDatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onBlur = _ref.onBlur,
     onFocus = _ref.onFocus,
     onSubmitEditing = _ref.onSubmitEditing;
-    _objectWithoutProperties(_ref, _excluded$x);
+    _objectWithoutProperties(_ref, _excluded$w);
   var monthRef = useRef(null);
   var yearRef = useRef(null);
   var defaultValue = value;
@@ -6123,7 +6282,7 @@ var PressableDateInputs = /*#__PURE__*/forwardRef(function (_ref, ref) {
   });
 });
 
-var _excluded$w = ["onBlur", "onFocus", "pickerDefaultDate", "pickerUITestID", "isDefaultVisible", "value", "onChange"];
+var _excluded$v = ["onBlur", "onFocus", "pickerDefaultDate", "pickerUITestID", "isDefaultVisible", "value", "onChange"];
 var DatePickerAndroid = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var onBlur = _ref.onBlur,
     onFocus = _ref.onFocus,
@@ -6132,7 +6291,7 @@ var DatePickerAndroid = /*#__PURE__*/forwardRef(function (_ref, ref) {
     isDefaultVisible = _ref.isDefaultVisible,
     value = _ref.value,
     _onChange = _ref.onChange,
-    props = _objectWithoutProperties(_ref, _excluded$w);
+    props = _objectWithoutProperties(_ref, _excluded$v);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isFocused = _useState2[0],
@@ -6208,7 +6367,7 @@ function PlatformDateTimePicker(_ref) {
   }));
 }
 
-var _excluded$v = ["title", "isVisible", "value", "validateButtonLabel", "onClose", "onChange"];
+var _excluded$u = ["title", "isVisible", "value", "validateButtonLabel", "onClose", "onChange"];
 function ModalTitle(_ref) {
   var children = _ref.children;
   return /*#__PURE__*/jsx(CardModal.Header, {
@@ -6226,7 +6385,7 @@ function ModalPlatformDateTimePicker(_ref2) {
     validateButtonLabel = _ref2.validateButtonLabel,
     onClose = _ref2.onClose,
     onChange = _ref2.onChange,
-    props = _objectWithoutProperties(_ref2, _excluded$v);
+    props = _objectWithoutProperties(_ref2, _excluded$u);
   var _useState = useState(value),
     _useState2 = _slicedToArray(_useState, 2),
     currentValue = _useState2[0],
@@ -6272,7 +6431,7 @@ function ModalPlatformDateTimePicker(_ref2) {
   });
 }
 
-var _excluded$u = ["value", "pickerUITestID", "pickerUITitle", "pickerUIValidateButtonLabel", "isDefaultVisible", "pickerDefaultDate", "isFocusedInternal", "isHoveredInternal", "isPressedInternal", "onChange", "onFocus", "onBlur"];
+var _excluded$t = ["value", "pickerUITestID", "pickerUITitle", "pickerUIValidateButtonLabel", "isDefaultVisible", "pickerDefaultDate", "isFocusedInternal", "isHoveredInternal", "isPressedInternal", "onChange", "onFocus", "onBlur"];
 var DefaultNativeUIDatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var value = _ref.value,
     pickerUITestID = _ref.pickerUITestID,
@@ -6286,7 +6445,7 @@ var DefaultNativeUIDatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onChange = _ref.onChange,
     onFocus = _ref.onFocus,
     onBlur = _ref.onBlur,
-    props = _objectWithoutProperties(_ref, _excluded$u);
+    props = _objectWithoutProperties(_ref, _excluded$t);
   var _useState = useState(isDefaultVisible),
     _useState2 = _slicedToArray(_useState, 2),
     isPickerUIVisible = _useState2[0],
@@ -6333,7 +6492,7 @@ var DefaultNativeUIDatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
   });
 });
 
-var _excluded$t = ["value", "pickerUITestID", "isDefaultVisible", "pickerDefaultDate", "onChange", "onBlur"];
+var _excluded$s = ["value", "pickerUITestID", "isDefaultVisible", "pickerDefaultDate", "onChange", "onBlur"];
 var NativeUIDatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var value = _ref.value,
     pickerUITestID = _ref.pickerUITestID,
@@ -6341,7 +6500,7 @@ var NativeUIDatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
     pickerDefaultDate = _ref.pickerDefaultDate,
     onChange = _ref.onChange,
     onBlur = _ref.onBlur,
-    props = _objectWithoutProperties(_ref, _excluded$t);
+    props = _objectWithoutProperties(_ref, _excluded$s);
   if (Platform.OS === 'android') {
     return /*#__PURE__*/jsx(DatePickerAndroid, _objectSpread({
       ref: ref,
@@ -6363,14 +6522,14 @@ var NativeUIDatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, props));
 });
 
-var _excluded$s = ["fillMode", "enterKeyHint", "value", "onSubmitEditing"];
+var _excluded$r = ["fillMode", "enterKeyHint", "value", "onSubmitEditing"];
 var DatePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _ref$fillMode = _ref.fillMode,
     fillMode = _ref$fillMode === void 0 ? 'native' : _ref$fillMode,
     enterKeyHint = _ref.enterKeyHint,
     value = _ref.value,
     onSubmitEditing = _ref.onSubmitEditing,
-    props = _objectWithoutProperties(_ref, _excluded$s);
+    props = _objectWithoutProperties(_ref, _excluded$r);
   // in apps, final-form can give a string value that will break the component
   var currentValue = value || undefined;
   if (fillMode === 'keyboard') {
@@ -6397,7 +6556,7 @@ function DocumentPicker(_ref) {
   var childElement = Children.only(children);
   var handlePickDocument = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _childElement$props$o, _childElement$props;
+      var _childElement$props$o, _childElement$props, _result$assets$;
       var result;
       return _regeneratorRuntime().wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -6415,7 +6574,7 @@ function DocumentPicker(_ref) {
             }));
           case 5:
             result = _context.sent;
-            if (!result.canceled && result.assets[0].file) {
+            if (!result.canceled && (_result$assets$ = result.assets[0]) !== null && _result$assets$ !== void 0 && _result$assets$.file) {
               onDocumentUpload(result.assets[0].file);
             }
           case 7:
@@ -6464,7 +6623,7 @@ function ImagePicker(_ref) {
             }));
           case 5:
             result = _context.sent;
-            if (!result.canceled) {
+            if (!result.canceled && result.assets[0]) {
               onImageSelected(result.assets[0]);
             }
           case 7:
@@ -6486,10 +6645,10 @@ function ImagePicker(_ref) {
   });
 }
 
-var _excluded$r = ["children"];
+var _excluded$q = ["children"];
 function ListItemContent(_ref) {
   var children = _ref.children,
-    rest = _objectWithoutProperties(_ref, _excluded$r);
+    rest = _objectWithoutProperties(_ref, _excluded$q);
   return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({
     alignSelf: "center",
     flexBasis: "0%",
@@ -6500,14 +6659,14 @@ function ListItemContent(_ref) {
   }));
 }
 
-var _excluded$q = ["children", "side"],
+var _excluded$p = ["children", "side"],
   _excluded2$2 = ["children", "align"];
 // Handles the vertical alignment of the side elements of the list item
 function ListItemSideContainer(_ref) {
   var children = _ref.children,
     _ref$side = _ref.side,
     side = _ref$side === void 0 ? 'left' : _ref$side,
-    rest = _objectWithoutProperties(_ref, _excluded$q);
+    rest = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({
     flexDirection: "row",
     marginLeft: side === 'right' ? 'kitt.2' : undefined,
@@ -6528,7 +6687,7 @@ function ListItemSideContent(_ref2) {
   }));
 }
 
-var _excluded$p = ["children", "withPadding", "borders", "left", "right", "onPress"];
+var _excluded$o = ["children", "withPadding", "borders", "left", "right", "onPress"];
 function ListItem(_ref) {
   var children = _ref.children,
     withPadding = _ref.withPadding,
@@ -6536,7 +6695,7 @@ function ListItem(_ref) {
     left = _ref.left,
     right = _ref.right,
     onPress = _ref.onPress,
-    rest = _objectWithoutProperties(_ref, _excluded$p);
+    rest = _objectWithoutProperties(_ref, _excluded$o);
   var Wrapper = onPress ? Pressable$2 : Fragment$1;
   var wrapperProps = onPress ? _objectSpread({
     accessibilityRole: 'button',
@@ -6569,10 +6728,10 @@ ListItem.Content = ListItemContent;
 ListItem.SideContent = ListItemSideContent;
 ListItem.SideContainer = ListItemSideContainer;
 
-var _excluded$o = ["title"];
+var _excluded$n = ["title"];
 function BottomSheetActionsItem(_ref) {
   var title = _ref.title,
-    props = _objectWithoutProperties(_ref, _excluded$o);
+    props = _objectWithoutProperties(_ref, _excluded$n);
   return /*#__PURE__*/jsx(Pressable$2, _objectSpread(_objectSpread({}, props), {}, {
     children: /*#__PURE__*/jsx(ListItem, {
       withPadding: true,
@@ -6990,36 +7149,34 @@ function GoogleMapsAutocompleteProvider(_ref) {
             _yield$predictionsPro = _context.sent;
             results = _yield$predictionsPro.results;
             status = _yield$predictionsPro.status;
-            if (!(status !== 'OK')) {
-              _context.next = 13;
-              break;
+            if (status !== 'OK') {
+              dispatch({
+                type: 'search-error'
+              });
             }
-            dispatch({
-              type: 'search-error'
-            });
-            return _context.abrupt("return");
-          case 13:
-            // We cache the results to avoid calling the API again if the user types the same value
-            searchResultsCache.current[value] = results;
-            dispatch({
-              type: 'search-success',
-              payload: {
-                results: results
-              }
-            });
-            _context.next = 20;
+            if (results) {
+              // We cache the results to avoid calling the API again if the user types the same value
+              searchResultsCache.current[value] = results;
+              dispatch({
+                type: 'search-success',
+                payload: {
+                  results: results
+                }
+              });
+            }
+            _context.next = 17;
             break;
-          case 17:
-            _context.prev = 17;
+          case 14:
+            _context.prev = 14;
             _context.t0 = _context["catch"](4);
             dispatch({
               type: 'search-error'
             });
-          case 20:
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 17]]);
+      }, _callee, null, [[4, 14]]);
     }));
     return function () {
       return _ref2.apply(this, arguments);
@@ -7178,7 +7335,7 @@ function formatInitialValueToAutocompletePrediction(address, placeId) {
   };
 }
 
-var _excluded$n = ["initialValue", "itemToString", "errorElement", "emptyResultsElement", "onChange"];
+var _excluded$m = ["initialValue", "itemToString", "errorElement", "emptyResultsElement", "onChange"];
 function InputAddress(_ref) {
   var initialValue = _ref.initialValue,
     _ref$itemToString = _ref.itemToString,
@@ -7186,7 +7343,7 @@ function InputAddress(_ref) {
     errorElement = _ref.errorElement,
     emptyResultsElement = _ref.emptyResultsElement,
     _onChange = _ref.onChange,
-    props = _objectWithoutProperties(_ref, _excluded$n);
+    props = _objectWithoutProperties(_ref, _excluded$m);
   var _useGoogleMapsAutocom = useGoogleMapsAutocomplete(),
     state = _useGoogleMapsAutocom.state,
     _onInputChange = _useGoogleMapsAutocom.onInputChange,
@@ -7283,10 +7440,10 @@ var InputIban = /*#__PURE__*/forwardRef(function (props, ref) {
   }, props));
 });
 
-var _excluded$m = ["onChange"];
+var _excluded$l = ["onChange"];
 var InputNumber = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var onChange = _ref.onChange,
-    props = _objectWithoutProperties(_ref, _excluded$m);
+    props = _objectWithoutProperties(_ref, _excluded$l);
   return /*#__PURE__*/jsx(InputText, _objectSpread(_objectSpread({
     ref: ref
   }, props), {}, {
@@ -7303,11 +7460,11 @@ var InputNumber = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }));
 });
 
-var _excluded$l = ["isPasswordDefaultVisible", "right"];
+var _excluded$k = ["isPasswordDefaultVisible", "right"];
 var InputPassword = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var isPasswordDefaultVisible = _ref.isPasswordDefaultVisible,
     right = _ref.right,
-    props = _objectWithoutProperties(_ref, _excluded$l);
+    props = _objectWithoutProperties(_ref, _excluded$k);
   var _useState = useState(Boolean(isPasswordDefaultVisible)),
     _useState2 = _slicedToArray(_useState, 2),
     isVisible = _useState2[0],
@@ -7335,7 +7492,7 @@ var InputPassword = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }));
 });
 
-var _excluded$k = ["enterKeyHint", "autoComplete", "phoneNumberLength", "onChange"];
+var _excluded$j = ["enterKeyHint", "autoComplete", "phoneNumberLength", "onChange"];
 function isPhoneNumberValid(number) {
   return isValidNumber(number);
 }
@@ -7349,7 +7506,7 @@ var InputPhone = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _ref$phoneNumberLengt = _ref.phoneNumberLength,
     phoneNumberLength = _ref$phoneNumberLengt === void 0 ? 10 : _ref$phoneNumberLengt,
     onChange = _ref.onChange,
-    props = _objectWithoutProperties(_ref, _excluded$k);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   var currentEnterKeyHint = enterKeyHint ? getEnterKeyHintForNumericInput(enterKeyHint) : undefined;
   return /*#__PURE__*/jsx(InputText, _objectSpread(_objectSpread({
     ref: ref
@@ -7786,7 +7943,7 @@ function RadioButton(_ref) {
   });
 }
 
-var _excluded$j = ["children", "stretch", "value", "disabled", "onFocus", "onBlur", "onChange"];
+var _excluded$i = ["children", "stretch", "value", "disabled", "onFocus", "onBlur", "onChange"];
 function RadioButtonGroupItem(_ref) {
   var props = _extends({}, (_objectDestructuringEmpty(_ref), _ref));
   return /*#__PURE__*/jsx(RadioButton, _objectSpread({}, props));
@@ -7799,7 +7956,7 @@ function RadioButtonGroup(_ref2) {
     onFocus = _ref2.onFocus,
     onBlur = _ref2.onBlur,
     onChange = _ref2.onChange,
-    props = _objectWithoutProperties(_ref2, _excluded$j);
+    props = _objectWithoutProperties(_ref2, _excluded$i);
   var _useState = useState(value),
     _useState2 = _slicedToArray(_useState, 2),
     currentValue = _useState2[0],
@@ -7831,12 +7988,12 @@ function RadioButtonGroup(_ref2) {
 }
 RadioButtonGroup.RadioButton = RadioButtonGroupItem;
 
-var _excluded$i = ["helper", "limit"];
+var _excluded$h = ["helper", "limit"];
 var TextArea = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _props$value, _props$value2;
   var helper = _ref.helper,
     limit = _ref.limit,
-    props = _objectWithoutProperties(_ref, _excluded$i);
+    props = _objectWithoutProperties(_ref, _excluded$h);
   var shouldDisplayLimit = limit && limit > 0;
   var isLimitReached = ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.length) === limit;
   var limitContainerAnimatedStyle = useAnimatedStyle(function () {
@@ -7995,7 +8152,7 @@ function ToggleAnimated(_ref) {
   });
 }
 
-var _excluded$h = ["isDisabled", "isHoveredInternal", "isFocusedInternal", "isPressedInternal", "label", "variant", "size", "value", "onChange"];
+var _excluded$g = ["isDisabled", "isHoveredInternal", "isFocusedInternal", "isPressedInternal", "label", "variant", "size", "value", "onChange"];
 var getLabelTypographyType = function (size) {
   return size === 'medium' ? 'body-m' : 'body-l';
 };
@@ -8017,7 +8174,7 @@ function Toggle(_ref) {
     value = _ref$value === void 0 ? false : _ref$value,
     _ref$onChange = _ref.onChange,
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
-    props = _objectWithoutProperties(_ref, _excluded$h);
+    props = _objectWithoutProperties(_ref, _excluded$g);
   var theme = useKittTheme();
   return /*#__PURE__*/jsxs(HStack, _objectSpread(_objectSpread({
     alignItems: "center"
@@ -8056,13 +8213,13 @@ function Toggle(_ref) {
   }));
 }
 
-var _excluded$g = ["children", "shouldHandleBottomNotch", "style", "shouldHandleTopNotch"];
+var _excluded$f = ["children", "shouldHandleBottomNotch", "style", "shouldHandleTopNotch"];
 function FullscreenModalBody(_ref) {
   var children = _ref.children,
     shouldHandleBottomNotch = _ref.shouldHandleBottomNotch,
     style = _ref.style,
     shouldHandleTopNotch = _ref.shouldHandleTopNotch,
-    props = _objectWithoutProperties(_ref, _excluded$g);
+    props = _objectWithoutProperties(_ref, _excluded$f);
   var _useSafeAreaInsets = useSafeAreaInsets(),
     bottom = _useSafeAreaInsets.bottom,
     top = _useSafeAreaInsets.top;
@@ -8082,14 +8239,14 @@ function FullscreenModalBody(_ref) {
   }));
 }
 
-var _excluded$f = ["shouldHandleBottomNotch", "hasSeparator", "children"];
+var _excluded$e = ["shouldHandleBottomNotch", "hasSeparator", "children"];
 function FullscreenModalFooter(_ref) {
   var _ref$shouldHandleBott = _ref.shouldHandleBottomNotch,
     shouldHandleBottomNotch = _ref$shouldHandleBott === void 0 ? true : _ref$shouldHandleBott,
     _ref$hasSeparator = _ref.hasSeparator,
     hasSeparator = _ref$hasSeparator === void 0 ? true : _ref$hasSeparator,
     children = _ref.children,
-    props = _objectWithoutProperties(_ref, _excluded$f);
+    props = _objectWithoutProperties(_ref, _excluded$e);
   var _useSafeAreaInsets = useSafeAreaInsets(),
     bottom = _useSafeAreaInsets.bottom;
   return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({
@@ -8114,11 +8271,10 @@ function NativeOpacityAnimation(_ref) {
     var _theme$kitt$fullscree = theme.kitt.fullscreenModal.animation.overlay,
       duration = _theme$kitt$fullscree.duration,
       easing = _theme$kitt$fullscree.easing;
-    var _easing = _slicedToArray(easing, 4),
-      x1 = _easing[0],
-      y1 = _easing[1],
-      x2 = _easing[2],
-      y2 = _easing[3];
+    var x1 = easing.x1,
+      y1 = easing.y1,
+      x2 = easing.x2,
+      y2 = easing.y2;
     return {
       opacity: withTiming(visible ? 1 : 0, {
         duration: duration,
@@ -8154,11 +8310,10 @@ function NativeSlideInAnimation(_ref) {
     var _theme$kitt$fullscree = theme.kitt.fullscreenModal.animation.content,
       duration = _theme$kitt$fullscree.duration,
       easing = _theme$kitt$fullscree.easing;
-    var _easing = _slicedToArray(easing, 4),
-      x1 = _easing[0],
-      y1 = _easing[1],
-      x2 = _easing[2],
-      y2 = _easing[3];
+    var x1 = easing.x1,
+      y1 = easing.y1,
+      x2 = easing.x2,
+      y2 = easing.y2;
     return {
       transform: [{
         translateY: withTiming(visible ? 0 : wHeight, {
@@ -8247,13 +8402,13 @@ function FullscreenModalAnimation(_ref) {
   });
 }
 
-var _excluded$e = ["children", "visible", "onClose", "onExited"];
+var _excluded$d = ["children", "visible", "onClose", "onExited"];
 function FullscreenModalBehaviour(_ref) {
   var children = _ref.children,
     visible = _ref.visible,
     onClose = _ref.onClose,
     onExited = _ref.onExited,
-    props = _objectWithoutProperties(_ref, _excluded$e);
+    props = _objectWithoutProperties(_ref, _excluded$d);
   var _useState = useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     isModalBehaviourVisible = _useState2[0],
@@ -8300,7 +8455,7 @@ function FullscreenModalContainer(_ref) {
   });
 }
 
-var _excluded$d = ["hasSeparator", "isTransparent", "title", "children", "right", "left", "shouldHandleTopNotch"];
+var _excluded$c = ["hasSeparator", "isTransparent", "title", "children", "right", "left", "shouldHandleTopNotch"];
 function FullscreenModalHeader(_ref) {
   var _ref$hasSeparator = _ref.hasSeparator,
     hasSeparator = _ref$hasSeparator === void 0 ? true : _ref$hasSeparator,
@@ -8311,7 +8466,7 @@ function FullscreenModalHeader(_ref) {
     left = _ref.left,
     _ref$shouldHandleTopN = _ref.shouldHandleTopNotch,
     shouldHandleTopNotch = _ref$shouldHandleTopN === void 0 ? true : _ref$shouldHandleTopN,
-    props = _objectWithoutProperties(_ref, _excluded$d);
+    props = _objectWithoutProperties(_ref, _excluded$c);
   var _useSafeAreaInsets = useSafeAreaInsets(),
     top = _useSafeAreaInsets.top;
   var hasRight = Boolean(right);
@@ -8686,7 +8841,7 @@ var getButtonTypeAndVariant = function (iconColor) {
   }
 };
 
-var _excluded$c = ["color", "ariaLabel"];
+var _excluded$b = ["color", "ariaLabel"];
 /**
  * @deprecated IconButton should only be used as a navigation button
  * Other use cases should use a <Button> component with an icon
@@ -8695,7 +8850,7 @@ function IconButton(_ref) {
   var _ref$color = _ref.color,
     color = _ref$color === void 0 ? 'black' : _ref$color;
     _ref.ariaLabel;
-    var props = _objectWithoutProperties(_ref, _excluded$c);
+    var props = _objectWithoutProperties(_ref, _excluded$b);
   var _getButtonTypeAndVari = getButtonTypeAndVariant(color),
     legacyColorToType = _getButtonTypeAndVari.type,
     legacyColorToVariant = _getButtonTypeAndVari.variant;
@@ -8832,12 +8987,11 @@ var SvgPinMarkerinline = function SvgPinMarkerinline(props) {
     width: 34,
     height: 36,
     viewBox: "0 0 34 36",
-    fill: "none",
+    fill: "currentColor",
     xmlns: "http://www.w3.org/2000/svg"
   }, props), {}, {
     children: [/*#__PURE__*/jsx("path", {
       d: "M17 .5C26.113.5 33.5 7.887 33.5 17c0 8.272-6.087 15.121-14.025 16.315-.05.008-.157.054-.337.211-.173.151-.351.345-.56.57a5.972 5.972 0 0 1-.662.637c-.232.181-.545.367-.916.367-.37 0-.684-.186-.916-.367a5.972 5.972 0 0 1-.662-.637c-.209-.224-.387-.419-.56-.57-.18-.157-.287-.203-.337-.21C6.586 32.12.5 25.271.5 17 .5 7.887 7.887.5 17 .5Z",
-      fill: "#7B66FF",
       stroke: "#fff"
     }), /*#__PURE__*/jsx("path", {
       d: "M17 10a5.506 5.506 0 0 0-5.5 5.5c0 4.706 5 8.26 5.213 8.41a.5.5 0 0 0 .574 0c.213-.15 5.213-3.704 5.213-8.41A5.506 5.506 0 0 0 17 10Zm0 3.5a2 2 0 1 1 0 4 2 2 0 0 1 0-4Z",
@@ -8865,6 +9019,13 @@ var SvgShadowinline = function SvgShadowinline(props) {
   }));
 };
 
+var MapMarkerVariantEnum = /*#__PURE__*/function (MapMarkerVariantEnum) {
+  MapMarkerVariantEnum["HOME"] = "home";
+  MapMarkerVariantEnum["MEETING_POINT"] = "meetingPoint";
+  MapMarkerVariantEnum["CLOSE_MEETING_POINT"] = "closeMeetingPoint";
+  return MapMarkerVariantEnum;
+}({});
+
 var SCALE_DURATION = 300;
 var TRANSLATE_Y_DURATION = 150;
 var useNativeAnimation = function (_ref) {
@@ -8919,19 +9080,13 @@ var getBackgroundColor = function (_ref) {
   var isHovered = _ref.isHovered,
     isSelected = _ref.isSelected,
     variant = _ref.variant;
-  if (variant === 'home') {
+  if (variant === MapMarkerVariantEnum.HOME || variant === MapMarkerVariantEnum.CLOSE_MEETING_POINT) {
     return isSelected || isHovered ? theme.mapMarker.home.selected : theme.mapMarker.home["default"];
   }
   return isSelected || isHovered ? theme.mapMarker.meetingPoint.selected : theme.mapMarker.meetingPoint["default"];
 };
 
-var _excluded$b = ["onPress", "testID"];
-var MapMarkerVariantEnum = /*#__PURE__*/function (MapMarkerVariantEnum) {
-  MapMarkerVariantEnum["HOME"] = "home";
-  MapMarkerVariantEnum["MEETING_POINT"] = "meetingPoint";
-  MapMarkerVariantEnum["CLOSE_MEETING_POINT"] = "closeMeetingPoint";
-  return MapMarkerVariantEnum;
-}({});
+var _excluded$a = ["onPress", "testID"];
 function StaticMapMarker$1(_ref) {
   var variant = _ref.variant,
     isHovered = _ref.isHovered,
@@ -8990,7 +9145,7 @@ function StaticMapMarker$1(_ref) {
 function MapMarker(_ref2) {
   var onPress = _ref2.onPress,
     testID = _ref2.testID,
-    props = _objectWithoutProperties(_ref2, _excluded$b);
+    props = _objectWithoutProperties(_ref2, _excluded$a);
   return /*#__PURE__*/jsx(Pressable$1, {
     testID: testID,
     onPress: onPress,
@@ -9139,6 +9294,7 @@ var overridenNativeBaseSizeandSpaceScale = Object.fromEntries([1, 2, 3, 4, 5, 6,
 }));
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/explicit-function-return-type -- let typescript infer types
 function createKittNativeBaseCustomTheme(theme, appTheme) {
+  var _theme$tabBar$solid$d, _theme$tabBar$solid$d2, _theme$tabBar$solid$d3, _theme$tabBar$solid$d4, _theme$tabBar$solid$d5, _theme$tabBar$solid$d6, _theme$tabBar$solid$d7, _theme$tabBar$solid$d8, _theme$tabBar$solid$r, _theme$tabBar$solid$r2, _theme$tabBar$solid$r3, _theme$tabBar$solid$r4, _theme$tabBar$solid$r5, _theme$tabBar$solid$r6, _theme$tabBar$solid$r7, _theme$tabBar$solid$r8;
   var spaces = createKittSpaces(theme);
   var appBreakpoints = (appTheme === null || appTheme === void 0 ? void 0 : appTheme.breakpoints) || {};
   var extendedTheme = extendTheme({
@@ -9841,6 +9997,148 @@ function createKittNativeBaseCustomTheme(theme, appTheme) {
               backgroundColor: theme.picker.web.optionsContainer.backgroundColor
             }
           }
+        },
+        tabBar: {
+          underline: {
+            "default": {
+              active: {
+                color: {
+                  "default": theme.tabBar.underline["default"].active.color["default"],
+                  focused: theme.tabBar.underline["default"].active.color.focused,
+                  hovered: theme.tabBar.underline["default"].active.color.hovered,
+                  pressed: theme.tabBar.underline["default"].active.color.pressed
+                },
+                indicator: {
+                  backgroundColor: theme.tabBar.underline["default"].active.indicator.backgroundColor
+                }
+              },
+              inactive: {
+                color: {
+                  "default": theme.tabBar.underline["default"].inactive.color["default"],
+                  focused: theme.tabBar.underline["default"].inactive.color.focused,
+                  hovered: theme.tabBar.underline["default"].inactive.color.hovered,
+                  pressed: theme.tabBar.underline["default"].inactive.color.pressed
+                }
+              },
+              disabled: {
+                color: {
+                  "default": theme.tabBar.underline["default"].disabled.color["default"],
+                  focused: theme.tabBar.underline["default"].disabled.color.focused,
+                  hovered: theme.tabBar.underline["default"].disabled.color.hovered,
+                  pressed: theme.tabBar.underline["default"].disabled.color.pressed
+                }
+              },
+              borderBottomColor: theme.tabBar.underline["default"].borderBottomColor
+            },
+            revert: {
+              active: {
+                color: {
+                  "default": theme.tabBar.underline.revert.active.color["default"],
+                  focused: theme.tabBar.underline.revert.active.color.focused,
+                  hovered: theme.tabBar.underline.revert.active.color.hovered,
+                  pressed: theme.tabBar.underline.revert.active.color.pressed
+                },
+                indicator: {
+                  backgroundColor: theme.tabBar.underline.revert.active.indicator.backgroundColor
+                }
+              },
+              inactive: {
+                color: {
+                  "default": theme.tabBar.underline.revert.inactive.color["default"],
+                  focused: theme.tabBar.underline.revert.inactive.color.focused,
+                  hovered: theme.tabBar.underline.revert.inactive.color.hovered,
+                  pressed: theme.tabBar.underline.revert.inactive.color.pressed
+                }
+              },
+              disabled: {
+                color: {
+                  "default": theme.tabBar.underline.revert.disabled.color["default"],
+                  focused: theme.tabBar.underline.revert.disabled.color.focused,
+                  hovered: theme.tabBar.underline.revert.disabled.color.hovered,
+                  pressed: theme.tabBar.underline.revert.disabled.color.pressed
+                }
+              },
+              borderBottomColor: theme.tabBar.underline.revert.borderBottomColor
+            }
+          },
+          solid: {
+            "default": {
+              active: {
+                color: {
+                  "default": theme.tabBar.solid["default"].active.color["default"],
+                  focused: theme.tabBar.solid["default"].active.color.focused,
+                  hovered: theme.tabBar.solid["default"].active.color.hovered,
+                  pressed: theme.tabBar.solid["default"].active.color.pressed
+                },
+                backgroundColor: {
+                  "default": (_theme$tabBar$solid$d = theme.tabBar.solid["default"].active.backgroundColor) === null || _theme$tabBar$solid$d === void 0 ? void 0 : _theme$tabBar$solid$d["default"],
+                  focused: (_theme$tabBar$solid$d2 = theme.tabBar.solid["default"].active.backgroundColor) === null || _theme$tabBar$solid$d2 === void 0 ? void 0 : _theme$tabBar$solid$d2.focused,
+                  hovered: (_theme$tabBar$solid$d3 = theme.tabBar.solid["default"].active.backgroundColor) === null || _theme$tabBar$solid$d3 === void 0 ? void 0 : _theme$tabBar$solid$d3.hovered,
+                  pressed: (_theme$tabBar$solid$d4 = theme.tabBar.solid["default"].active.backgroundColor) === null || _theme$tabBar$solid$d4 === void 0 ? void 0 : _theme$tabBar$solid$d4.pressed
+                }
+              },
+              inactive: {
+                color: {
+                  "default": theme.tabBar.solid["default"].inactive.color["default"],
+                  focused: theme.tabBar.solid["default"].inactive.color.focused,
+                  hovered: theme.tabBar.solid["default"].inactive.color.hovered,
+                  pressed: theme.tabBar.solid["default"].inactive.color.pressed
+                },
+                backgroundColor: {
+                  "default": (_theme$tabBar$solid$d5 = theme.tabBar.solid["default"].inactive.backgroundColor) === null || _theme$tabBar$solid$d5 === void 0 ? void 0 : _theme$tabBar$solid$d5["default"],
+                  focused: (_theme$tabBar$solid$d6 = theme.tabBar.solid["default"].inactive.backgroundColor) === null || _theme$tabBar$solid$d6 === void 0 ? void 0 : _theme$tabBar$solid$d6.focused,
+                  hovered: (_theme$tabBar$solid$d7 = theme.tabBar.solid["default"].inactive.backgroundColor) === null || _theme$tabBar$solid$d7 === void 0 ? void 0 : _theme$tabBar$solid$d7.hovered,
+                  pressed: (_theme$tabBar$solid$d8 = theme.tabBar.solid["default"].inactive.backgroundColor) === null || _theme$tabBar$solid$d8 === void 0 ? void 0 : _theme$tabBar$solid$d8.pressed
+                }
+              },
+              disabled: {
+                color: {
+                  "default": theme.tabBar.solid["default"].disabled.color["default"],
+                  focused: theme.tabBar.solid["default"].disabled.color.focused,
+                  hovered: theme.tabBar.solid["default"].disabled.color.hovered,
+                  pressed: theme.tabBar.solid["default"].disabled.color.pressed
+                }
+              }
+            },
+            revert: {
+              active: {
+                color: {
+                  "default": theme.tabBar.solid.revert.active.color["default"],
+                  focused: theme.tabBar.solid.revert.active.color.focused,
+                  hovered: theme.tabBar.solid.revert.active.color.hovered,
+                  pressed: theme.tabBar.solid.revert.active.color.pressed
+                },
+                backgroundColor: {
+                  "default": (_theme$tabBar$solid$r = theme.tabBar.solid.revert.active.backgroundColor) === null || _theme$tabBar$solid$r === void 0 ? void 0 : _theme$tabBar$solid$r["default"],
+                  focused: (_theme$tabBar$solid$r2 = theme.tabBar.solid.revert.active.backgroundColor) === null || _theme$tabBar$solid$r2 === void 0 ? void 0 : _theme$tabBar$solid$r2.focused,
+                  hovered: (_theme$tabBar$solid$r3 = theme.tabBar.solid.revert.active.backgroundColor) === null || _theme$tabBar$solid$r3 === void 0 ? void 0 : _theme$tabBar$solid$r3.hovered,
+                  pressed: (_theme$tabBar$solid$r4 = theme.tabBar.solid.revert.active.backgroundColor) === null || _theme$tabBar$solid$r4 === void 0 ? void 0 : _theme$tabBar$solid$r4.pressed
+                }
+              },
+              inactive: {
+                color: {
+                  "default": theme.tabBar.solid.revert.inactive.color["default"],
+                  focused: theme.tabBar.solid.revert.inactive.color.focused,
+                  hovered: theme.tabBar.solid.revert.inactive.color.hovered,
+                  pressed: theme.tabBar.solid.revert.inactive.color.pressed
+                },
+                backgroundColor: {
+                  "default": (_theme$tabBar$solid$r5 = theme.tabBar.solid.revert.inactive.backgroundColor) === null || _theme$tabBar$solid$r5 === void 0 ? void 0 : _theme$tabBar$solid$r5["default"],
+                  focused: (_theme$tabBar$solid$r6 = theme.tabBar.solid.revert.inactive.backgroundColor) === null || _theme$tabBar$solid$r6 === void 0 ? void 0 : _theme$tabBar$solid$r6.focused,
+                  hovered: (_theme$tabBar$solid$r7 = theme.tabBar.solid.revert.inactive.backgroundColor) === null || _theme$tabBar$solid$r7 === void 0 ? void 0 : _theme$tabBar$solid$r7.hovered,
+                  pressed: (_theme$tabBar$solid$r8 = theme.tabBar.solid.revert.inactive.backgroundColor) === null || _theme$tabBar$solid$r8 === void 0 ? void 0 : _theme$tabBar$solid$r8.pressed
+                }
+              },
+              disabled: {
+                color: {
+                  "default": theme.tabBar.solid.revert.disabled.color["default"],
+                  focused: theme.tabBar.solid.revert.disabled.color.focused,
+                  hovered: theme.tabBar.solid.revert.disabled.color.hovered,
+                  pressed: theme.tabBar.solid.revert.disabled.color.pressed
+                }
+              }
+            }
+          }
         }
       }),
       app: appTheme === null || appTheme === void 0 ? void 0 : appTheme.colors
@@ -9916,6 +10214,44 @@ function createKittNativeBaseCustomTheme(theme, appTheme) {
         highlight: {
           borderRadius: theme.highlight.borderRadius
         },
+        tabBar: {
+          underline: {
+            "default": {
+              active: {
+                borderRadius: theme.tabBar.underline["default"].active.borderRadius
+              },
+              inactive: {
+                borderRadius: theme.tabBar.underline["default"].inactive.borderRadius
+              }
+            },
+            revert: {
+              active: {
+                borderRadius: theme.tabBar.underline.revert.active.borderRadius
+              },
+              inactive: {
+                borderRadius: theme.tabBar.underline.revert.inactive.borderRadius
+              }
+            }
+          },
+          solid: {
+            "default": {
+              active: {
+                borderRadius: theme.tabBar.solid["default"].active.borderRadius
+              },
+              inactive: {
+                borderRadius: theme.tabBar.solid["default"].inactive.borderRadius
+              }
+            },
+            revert: {
+              active: {
+                borderRadius: theme.tabBar.solid.revert.active.borderRadius
+              },
+              inactive: {
+                borderRadius: theme.tabBar.solid.revert.inactive.borderRadius
+              }
+            }
+          }
+        },
         tag: {
           borderRadius: theme.tag.borderRadius
         },
@@ -11551,7 +11887,7 @@ NavigationBottomSheet.Header = NavigationBottomSheetHeader;
 NavigationBottomSheet.Body = NavigationBottomSheetBody;
 NavigationBottomSheet.Footer = NavigationBottomSheetFooter;
 
-var _excluded$a = ["children", "visible", "appear", "onExited", "onEnter", "onExit", "onClose"];
+var _excluded$9 = ["children", "visible", "appear", "onExited", "onEnter", "onExit", "onClose"];
 function NavigationModalBehaviour(_ref) {
   var children = _ref.children,
     visible = _ref.visible,
@@ -11561,7 +11897,7 @@ function NavigationModalBehaviour(_ref) {
     onEnter = _ref.onEnter,
     onExit = _ref.onExit,
     onClose = _ref.onClose,
-    props = _objectWithoutProperties(_ref, _excluded$a);
+    props = _objectWithoutProperties(_ref, _excluded$9);
   var AnimationComponent = useBreakpointValue({
     base: FullscreenModalAnimation,
     small: CardModalAnimation
@@ -12154,7 +12490,7 @@ function SkeletonContent(_ref) {
   });
 }
 
-var _excluded$9 = ["isLoading", "style"],
+var _excluded$8 = ["isLoading", "style"],
   _excluded2$1 = ["size"],
   _excluded3$1 = ["size"],
   _excluded4$1 = ["size"];
@@ -12162,7 +12498,7 @@ function Skeleton(_ref) {
   var _ref$isLoading = _ref.isLoading,
     isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading,
     style = _ref.style,
-    props = _objectWithoutProperties(_ref, _excluded$9);
+    props = _objectWithoutProperties(_ref, _excluded$8);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     width = _useState2[0],
@@ -12341,7 +12677,7 @@ function getShouldDisplay2x() {
   return currentDevicePixelRatio > 1;
 }
 
-var _excluded$8 = ["width", "height", "alt", "apiToken", "mapId", "marker", "center", "onLoaded", "onError"];
+var _excluded$7 = ["width", "height", "alt", "apiToken", "mapId", "marker", "center", "onLoaded", "onError"];
 var mapBoxMaxPictureWidth = 1280;
 
 // Mapbox requestable width for image is between 1 - 1280px
@@ -12359,7 +12695,7 @@ function StaticMap(_ref) {
     center = _ref.center,
     onLoaded = _ref.onLoaded,
     onError = _ref.onError,
-    props = _objectWithoutProperties(_ref, _excluded$8);
+    props = _objectWithoutProperties(_ref, _excluded$7);
   var _useState = useState(getPictureWidth(width)),
     _useState2 = _slicedToArray(_useState, 2),
     currentWidth = _useState2[0],
@@ -12449,12 +12785,12 @@ StaticMap.Loader = StaticMapLoader;
 StaticMap.Error = StaticMapError;
 StaticMap.Marker = StaticMapMarker;
 
-var _excluded$7 = ["direction", "wrap"];
+var _excluded$6 = ["direction", "wrap"];
 function Flex(_ref) {
   var direction = _ref.direction,
     _ref$wrap = _ref.wrap,
     wrap = _ref$wrap === void 0 ? 'wrap' : _ref$wrap,
-    props = _objectWithoutProperties(_ref, _excluded$7);
+    props = _objectWithoutProperties(_ref, _excluded$6);
   return /*#__PURE__*/jsx(View, _objectSpread(_objectSpread({}, props), {}, {
     flexDirection: direction,
     flexWrap: wrap
@@ -12592,7 +12928,7 @@ function Story(_ref) {
   });
 }
 
-var _excluded$6 = ["title", "children", "internalIsDemoSection"],
+var _excluded$5 = ["title", "children", "internalIsDemoSection"],
   _excluded2 = ["title", "children"],
   _excluded3 = ["title", "children"],
   _excluded4 = ["children"];
@@ -12600,7 +12936,7 @@ function StorySection(_ref) {
   var title = _ref.title,
     children = _ref.children,
     internalIsDemoSection = _ref.internalIsDemoSection,
-    props = _objectWithoutProperties(_ref, _excluded$6);
+    props = _objectWithoutProperties(_ref, _excluded$5);
   if (title === 'Demo' && !internalIsDemoSection) throw new Error('Use StorySection.Demo instead');
   return /*#__PURE__*/jsxs(View, _objectSpread(_objectSpread({
     marginBottom: "kitt.8"
@@ -12740,99 +13076,100 @@ var StoryGrid = {
   Col: StoryGridCol
 };
 
-function useTabBarItemColor(color, isActive) {
-  var _useKittTheme = useKittTheme(),
-    kittTheme = _useKittTheme.kitt;
-  switch (color) {
-    case 'black':
-      {
-        return isActive ? kittTheme.colors.primary : kittTheme.colors.blackLight;
-      }
-    case 'white':
-      {
-        return isActive ? kittTheme.palettes.deepPurple.white : kittTheme.palettes.deepPurple['white-alpha.80'];
-      }
-    default:
-      {
-        return isActive ? kittTheme.colors.primary : kittTheme.colors.blackLight;
-      }
-  }
-}
-function useTabBarIndicatorColor(color, isActive) {
-  var _useKittTheme2 = useKittTheme(),
-    kittTheme = _useKittTheme2.kitt;
-  switch (color) {
-    case 'black':
-      {
-        return isActive ? kittTheme.colors.primary : kittTheme.palettes.deepPurple.transparent;
-      }
-    case 'white':
-      {
-        return isActive ? kittTheme.palettes.deepPurple.white : kittTheme.palettes.deepPurple.transparent;
-      }
-    default:
-      {
-        return isActive ? kittTheme.colors.primary : kittTheme.palettes.deepPurple.transparent;
-      }
-  }
-}
+var getVariantFromColor = function (color) {
+  if (color === 'white') return 'revert';
+  return 'default';
+};
+var getTabBarItemActiveState = function (isActive, disabled) {
+  if (disabled) return 'disabled';
+  if (isActive) return 'active';
+  return 'inactive';
+};
+var getTabBarItemState = function (isHovered, isPressed, isFocused) {
+  if (isHovered) return 'hovered';
+  if (isPressed) return 'pressed';
+  if (isFocused) return 'focused';
+  return 'default';
+};
 function TabBarItem(_ref) {
   var name = _ref.name,
     icon = _ref.icon,
-    _ref$color = _ref.color,
-    color = _ref$color === void 0 ? 'black' : _ref$color,
+    _ref$variant = _ref.variant,
+    variant = _ref$variant === void 0 ? 'default' : _ref$variant,
+    _ref$type = _ref.type,
+    type = _ref$type === void 0 ? 'underline' : _ref$type,
+    color = _ref.color,
     testID = _ref.testID,
+    disabled = _ref.disabled,
     _ref$isActive = _ref.isActive,
     isActive = _ref$isActive === void 0 ? false : _ref$isActive,
+    _ref$isFocusedInterna = _ref.isFocusedInternal,
+    isFocusedInternal = _ref$isFocusedInterna === void 0 ? false : _ref$isFocusedInterna,
+    _ref$isHoveredInterna = _ref.isHoveredInternal,
+    isHoveredInternal = _ref$isHoveredInterna === void 0 ? false : _ref$isHoveredInterna,
+    _ref$isPressedInterna = _ref.isPressedInternal,
+    isPressedInternal = _ref$isPressedInterna === void 0 ? false : _ref$isPressedInterna,
     onPress = _ref.onPress;
-  var typographyColor = useTabBarItemColor(color, isActive);
-  var indicatorColor = useTabBarIndicatorColor(color, isActive);
+  // Keep backward compatibility with color property
+  var definedVariant = color ? getVariantFromColor(color) : variant;
+  var activeState = getTabBarItemActiveState(isActive, disabled);
+  var baseTheme = "kitt.tabBar.".concat(type, ".").concat(definedVariant, ".").concat(activeState);
   return /*#__PURE__*/jsx(Pressable, {
+    disabled: disabled,
     testID: testID,
     onPress: onPress,
-    children: /*#__PURE__*/jsxs(HStack, {
-      height: 56,
-      alignItems: "center",
-      position: "relative",
-      children: [icon ? /*#__PURE__*/jsx(View, {
-        marginRight: "kitt.1",
-        children: /*#__PURE__*/jsx(TypographyIcon, {
-          color: typographyColor,
-          icon: icon
-        })
-      }) : null, /*#__PURE__*/jsx(Typography.Text, {
-        numberOfLines: 1,
-        color: typographyColor,
-        variant: isActive ? 'bold' : undefined,
-        children: name
-      }), /*#__PURE__*/jsx(View, {
-        borderRadius: 100,
-        backgroundColor: indicatorColor,
-        position: "absolute",
-        bottom: -1 // in order to be over tab bar's border bottom
-        ,
-        width: "100%",
-        height: 4
-      })]
-    })
+    children: function children(_ref2) {
+      var isHovered = _ref2.isHovered,
+        isPressed = _ref2.isPressed,
+        isFocused = _ref2.isFocused;
+      var state = getTabBarItemState(isHovered || isHoveredInternal, isPressed || isPressedInternal, isFocused || isFocusedInternal);
+      return /*#__PURE__*/jsxs(HStack, {
+        alignItems: "center",
+        position: "relative",
+        paddingY: "kitt.2",
+        paddingRight: "kitt.2",
+        paddingLeft: icon ? undefined : 'kitt.2',
+        backgroundColor: "".concat(baseTheme, ".backgroundColor.").concat(state),
+        borderRadius: "".concat(baseTheme, ".borderRadius"),
+        children: [icon ? /*#__PURE__*/jsx(View, {
+          marginRight: "kitt.2",
+          children: /*#__PURE__*/jsx(TypographyIcon, {
+            color: "".concat(baseTheme, ".color.").concat(state),
+            icon: icon
+          })
+        }) : null, /*#__PURE__*/jsx(Typography.Text, {
+          base: "label-large",
+          numberOfLines: 1,
+          color: "".concat(baseTheme, ".color.").concat(state),
+          children: name
+        }), type !== 'solid' ? /*#__PURE__*/jsx(View, {
+          backgroundColor: "".concat(baseTheme, ".indicator.backgroundColor"),
+          position: "absolute",
+          bottom: -1 // in order to be over tab bar's border bottom
+          ,
+          left: 0,
+          right: 0,
+          height: 2
+        }) : null]
+      });
+    }
   });
 }
 
-var _excluded$5 = ["tabs", "color", "align", "activeTabIndex", "renderTabItem", "onChangeTab"];
 function TabBar(_ref) {
   var tabs = _ref.tabs,
-    _ref$color = _ref.color,
-    color = _ref$color === void 0 ? 'black' : _ref$color,
+    _ref$variant = _ref.variant,
+    variant = _ref$variant === void 0 ? 'default' : _ref$variant,
+    _ref$type = _ref.type,
+    type = _ref$type === void 0 ? 'underline' : _ref$type,
     _ref$align = _ref.align,
     align = _ref$align === void 0 ? 'left' : _ref$align,
+    color = _ref.color,
     _ref$activeTabIndex = _ref.activeTabIndex,
     activeTabIndex = _ref$activeTabIndex === void 0 ? 0 : _ref$activeTabIndex,
     renderTabItem = _ref.renderTabItem,
-    onChangeTab = _ref.onChangeTab,
-    props = _objectWithoutProperties(_ref, _excluded$5);
+    onChangeTab = _ref.onChangeTab;
   var sx = useSx();
-  var _useKittTheme = useKittTheme(),
-    kittTheme = _useKittTheme.kitt;
   var tabItems = tabs.map(function (tab, index) {
     return renderTabItem({
       tab: tab,
@@ -12840,29 +13177,40 @@ function TabBar(_ref) {
       isActive: activeTabIndex === index
     });
   });
-  var scrollViewStyles = sx({
+  var styles = {
     justifyContent: align,
     paddingRight: align === 'center' ? 'kitt.2' : 'kitt.12',
-    minWidth: '100%',
-    borderBottomWidth: 1,
-    borderBottomColor: kittTheme.palettes.deepPurple['beige.2']
-  });
+    minWidth: '100%'
+  };
+
+  // Keep backward compatibility with color property
+  var definedVariant = color ? getVariantFromColor(color) : variant;
+  if (type !== 'solid') {
+    styles = _objectSpread(_objectSpread({}, styles), {}, {
+      borderBottomWidth: 1,
+      borderBottomColor: "kitt.tabBar.".concat(type, ".").concat(definedVariant, ".borderBottomColor")
+    });
+  }
+  var scrollViewStyles = sx(styles);
+  var space = type === 'solid' ? 'kitt.2' : 'kitt.4';
   return /*#__PURE__*/jsx(ScrollView, {
     horizontal: true,
     showsHorizontalScrollIndicator: false,
     contentContainerStyle: scrollViewStyles,
-    children: /*#__PURE__*/jsx(HStack, _objectSpread(_objectSpread({
-      space: align === 'center' ? 'kitt.16' : 'kitt.4'
-    }, props), {}, {
+    children: /*#__PURE__*/jsx(HStack, {
+      space: align === 'center' ? 'kitt.16' : space,
       children: Children.map(tabItems, function (child, index) {
         var tab = tabs[index];
+        if (!tab) throw new Error("TabBar: tab is undefined at index ".concat(index));
         return /*#__PURE__*/jsx(View, {
           children: /*#__PURE__*/cloneElement(child, {
             color: color,
+            variant: definedVariant,
+            type: type,
             onPress: function onPress(event) {
               var _child$props$onPress, _child$props;
               onChangeTab({
-                tab: tabs[index],
+                tab: tab,
                 index: index
               });
               (_child$props$onPress = (_child$props = child.props).onPress) === null || _child$props$onPress === void 0 || _child$props$onPress.call(_child$props, event);
@@ -12870,7 +13218,7 @@ function TabBar(_ref) {
           })
         }, tab.key);
       })
-    }))
+    })
   });
 }
 TabBar.Item = TabBarItem;