@cdx-ui/components 0.0.1-beta.9 → 0.0.1-beta.90

package/lib/module/components/Avatar/index.js

@@ -1,29 +1,41 @@
 "use strict";
 
-import { forwardRef } from 'react';
+import { forwardRef, useEffect, useMemo } from 'react';
 import { Image, Text, View } from 'react-native';
-import { createAvatar } from '@cdx-ui/primitives';
-import { cn, useStyleContext, withStyleContext } from '@cdx-ui/utils';
+import { AvatarRoot as AvatarRootPrimitive, Slot, dataAttributes, mergeDataAttributes, useAvatarContext } from '@cdx-ui/primitives';
+import { cn, ParentContext, useParentContext, useStyleContext } from '@cdx-ui/utils';
 import { Icon as IconComponent } from '../Icon';
 import { avatarBadgeVariants, avatarIconVariants, avatarTextVariants, avatarImageVariants, avatarRootVariants } from './styles';
 import { jsx as _jsx } from "react/jsx-runtime";
 const SCOPE = 'AVATAR';
-const Root = withStyleContext(View, SCOPE);
 const useAvatarStyleContext = () => useStyleContext(SCOPE);
-const AvatarPrimitive = createAvatar({
-  Root,
-  Image,
-  Text,
-  Icon: IconComponent,
-  Badge: View
-});
+
+// =============================================================================
+// UTILITIES
+// =============================================================================
+
+function getInitials(name) {
+  const trimmed = name.trim();
+  const words = trimmed.split(/\s+/);
+  if (words.length === 1 && trimmed.length <= 2) {
+    return trimmed.toUpperCase();
+  }
+  let result = '';
+  for (const word of words) {
+    if (word.length > 0) {
+      result += word.charAt(0);
+    }
+    if (result.length >= 2) break;
+  }
+  return result.toUpperCase();
+}
 
 // =============================================================================
 // AVATAR ROOT
 // =============================================================================
 
 const AvatarRoot = /*#__PURE__*/forwardRef(({
-  size = 'lg',
+  size = 'md',
   className,
   children,
   style,
@@ -32,15 +44,25 @@ const AvatarRoot = /*#__PURE__*/forwardRef(({
   const computedClassName = cn(avatarRootVariants({
     size
   }), className);
-  return /*#__PURE__*/_jsx(AvatarPrimitive, {
-    ref: ref,
-    className: computedClassName,
-    style: style,
-    context: {
+  const parent = useParentContext();
+  const ctx = useMemo(() => ({
+    ...parent,
+    [SCOPE]: {
       size
-    },
-    ...props,
-    children: children
+    }
+  }), [parent, size]);
+  return /*#__PURE__*/_jsx(ParentContext.Provider, {
+    value: ctx,
+    children: /*#__PURE__*/_jsx(AvatarRootPrimitive, {
+      ref: ref,
+      className: computedClassName,
+      style: style,
+      ...props,
+      ...mergeDataAttributes(props, dataAttributes({
+        slot: 'avatar'
+      })),
+      children: children
+    })
   });
 });
 AvatarRoot.displayName = 'Avatar';
@@ -50,16 +72,53 @@ AvatarRoot.displayName = 'Avatar';
 // =============================================================================
 
 const AvatarImage = /*#__PURE__*/forwardRef(({
+  asChild,
   className,
   style,
+  src,
+  source,
+  onLoad,
+  onError,
   ...props
 }, ref) => {
+  const {
+    imageError,
+    setImageLoaded,
+    setImageError
+  } = useAvatarContext();
   const computedClassName = cn(avatarImageVariants(), className);
-  return /*#__PURE__*/_jsx(AvatarPrimitive.Image, {
+  const resolvedSource = useMemo(() => src ? {
+    uri: src
+  } : source, [src, source]);
+  useEffect(() => {
+    if (!resolvedSource) {
+      setImageError(true);
+    } else {
+      setImageError(false);
+      setImageLoaded(false);
+    }
+  }, [resolvedSource, setImageError, setImageLoaded]);
+  if (!resolvedSource || imageError) {
+    return null;
+  }
+  const Comp = asChild ? Slot : Image;
+  return /*#__PURE__*/_jsx(Comp, {
     ref: ref,
+    source: resolvedSource,
     className: computedClassName,
     style: style,
-    ...props
+    onLoad: e => {
+      setImageLoaded(true);
+      if (onLoad) onLoad(e);
+    },
+    onError: e => {
+      setImageError(true);
+      if (onError) onError(e);
+    },
+    ...props,
+    ...mergeDataAttributes(props, dataAttributes({
+      slot: 'avatar-image'
+    }))
   });
 });
 AvatarImage.displayName = 'Avatar.Image';
@@ -69,6 +128,7 @@ AvatarImage.displayName = 'Avatar.Image';
 // =============================================================================
 
 const AvatarText = /*#__PURE__*/forwardRef(({
+  asChild,
   className,
   children,
   style,
@@ -77,15 +137,27 @@ const AvatarText = /*#__PURE__*/forwardRef(({
   const {
     size
   } = useAvatarStyleContext();
+  const {
+    imageLoaded,
+    imageError
+  } = useAvatarContext();
+  const visible = !imageLoaded || imageError;
   const computedClassName = cn(avatarTextVariants({
     size
   }), className);
-  return /*#__PURE__*/_jsx(AvatarPrimitive.Text, {
+  const text = typeof children === 'string' ? getInitials(children) : children;
+  const Comp = asChild ? Slot : Text;
+  return /*#__PURE__*/_jsx(Comp, {
     ref: ref,
     className: computedClassName,
-    style: style,
+    style: [style, !visible && {
+      opacity: 0
+    }],
     ...props,
-    children: children
+    ...mergeDataAttributes(props, dataAttributes({
+      slot: 'avatar-text'
+    })),
+    children: text
   });
 });
 AvatarText.displayName = 'Avatar.Text';
@@ -95,6 +167,7 @@ AvatarText.displayName = 'Avatar.Text';
 // =============================================================================
 
 const AvatarIcon = ({
+  asChild,
   className,
   style,
   ...props
@@ -102,13 +175,35 @@ const AvatarIcon = ({
   const {
     size
   } = useAvatarStyleContext();
+  const {
+    imageLoaded,
+    imageError
+  } = useAvatarContext();
+  const visible = !imageLoaded || imageError;
   const computedClassName = cn(avatarIconVariants({
     size
   }), className);
-  return /*#__PURE__*/_jsx(AvatarPrimitive.Icon, {
+  if (asChild) {
+    return /*#__PURE__*/_jsx(Slot, {
+      className: computedClassName,
+      style: [style, !visible && {
+        opacity: 0
+      }],
+      ...props,
+      ...mergeDataAttributes(props, dataAttributes({
+        slot: 'avatar-icon'
+      }))
+    });
+  }
+  return /*#__PURE__*/_jsx(IconComponent, {
     className: computedClassName,
-    style: style,
-    ...props
+    style: [style, !visible && {
+      opacity: 0
+    }],
+    ...props,
+    ...mergeDataAttributes(props, dataAttributes({
+      slot: 'avatar-icon'
+    }))
   });
 };
 AvatarIcon.displayName = 'Avatar.Icon';
@@ -118,6 +213,7 @@ AvatarIcon.displayName = 'Avatar.Icon';
 // =============================================================================
 
 const AvatarBadge = /*#__PURE__*/forwardRef(({
+  asChild,
   className,
   children,
   style,
@@ -129,11 +225,15 @@ const AvatarBadge = /*#__PURE__*/forwardRef(({
   const computedClassName = cn(avatarBadgeVariants({
     size
   }), className);
-  return /*#__PURE__*/_jsx(AvatarPrimitive.Badge, {
+  const Comp = asChild ? Slot : View;
+  return /*#__PURE__*/_jsx(Comp, {
     ref: ref,
     className: computedClassName,
     style: style,
     ...props,
+    ...mergeDataAttributes(props, dataAttributes({
+      slot: 'avatar-badge'
+    })),
     children: children
   });
 });

package/lib/module/components/Avatar/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","Image","Text","View","createAvatar","cn","useStyleContext","withStyleContext","Icon","IconComponent","avatarBadgeVariants","avatarIconVariants","avatarTextVariants","avatarImageVariants","avatarRootVariants","jsx","_jsx","SCOPE","Root","useAvatarStyleContext","AvatarPrimitive","Badge","AvatarRoot","size","className","children","style","props","ref","computedClassName","context","displayName","AvatarImage","AvatarText","AvatarIcon","AvatarBadge","Avatar","Object","assign"],"sourceRoot":"../../../../src","sources":["components/Avatar/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","useEffect","useMemo","Image","Text","View","AvatarRoot","AvatarRootPrimitive","Slot","dataAttributes","mergeDataAttributes","useAvatarContext","cn","ParentContext","useParentContext","useStyleContext","Icon","IconComponent","avatarBadgeVariants","avatarIconVariants","avatarTextVariants","avatarImageVariants","avatarRootVariants","jsx","_jsx","SCOPE","useAvatarStyleContext","getInitials","name","trimmed","trim","words","split","length","toUpperCase","result","word","charAt","size","className","children","style","props","ref","computedClassName","parent","ctx","Provider","value","slot","displayName","AvatarImage","asChild","src","source","onLoad","onError","imageError","setImageLoaded","setImageError","resolvedSource","uri","Comp","e","AvatarText","imageLoaded","visible","text","opacity","AvatarIcon","AvatarBadge","Avatar","Object","assign","Badge"],"sourceRoot":"../../../../src","sources":["components/Avatar/index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/Avatar/styles.js

@@ -1,77 +1,84 @@
 "use strict";
 
 import { cva } from 'class-variance-authority';
-import { COLOR_BG_MUTED, COLOR_TEXT_SECONDARY, RADIUS_FULL } from '../../styles/primitives';
 
 // ── Root ─────────────────────────────────────────────────
 
-export const avatarRootVariants = cva([RADIUS_FULL, 'relative items-center justify-center', COLOR_BG_MUTED], {
+export const avatarRootVariants = cva(['rounded-[var(--border-radius-round)]', 'relative items-center justify-center', 'bg-surface-tertiary'], {
   variants: {
     size: {
-      sm: 'w-8 h-8',
-      md: 'w-10 h-10',
-      lg: 'w-12 h-12',
-      xl: 'w-16 h-16',
-      '2xl': 'w-20 h-20'
+      '2xs': 'w-3 h-3',
+      xs: 'w-[18px] h-[18px]',
+      sm: 'w-6 h-6',
+      md: 'w-8 h-8',
+      lg: 'w-10 h-10',
+      xl: 'w-12 h-12',
+      '2xl': 'w-14 h-14'
     }
   },
   defaultVariants: {
-    size: 'lg'
+    size: 'md'
   }
 });
 
 // ── Image ────────────────────────────────────────────────
 
-export const avatarImageVariants = cva(['absolute top-0 left-0 w-full h-full', RADIUS_FULL, 'overflow-hidden']);
+export const avatarImageVariants = cva(['absolute top-0 left-0 w-full h-full', 'rounded-[var(--border-radius-round)]', 'overflow-hidden', 'border border-stroke-secondary']);
 
 // ── Text ─────────────────────────────────────────────────
 
-export const avatarTextVariants = cva([COLOR_TEXT_SECONDARY, 'font-semibold'], {
+export const avatarTextVariants = cva(['text-content-primary', 'font-medium'], {
   variants: {
     size: {
+      '2xs': 'text-[6px]',
+      xs: 'text-[9px]',
       sm: 'text-xs',
-      md: 'text-sm',
-      lg: 'text-base',
-      xl: 'text-xl',
-      '2xl': 'text-2xl'
+      md: 'text-base',
+      lg: 'text-xl',
+      xl: 'text-2xl',
+      '2xl': 'text-[28px]'
     }
   },
   defaultVariants: {
-    size: 'lg'
+    size: 'md'
   }
 });
 
 // ── Icon ─────────────────────────────────────────────────
 
-export const avatarIconVariants = cva([COLOR_TEXT_SECONDARY], {
+export const avatarIconVariants = cva(['text-content-primary'], {
   variants: {
     size: {
-      sm: 'size-4',
-      md: 'size-5',
-      lg: 'size-6',
-      xl: 'size-8',
-      '2xl': 'size-10'
+      '2xs': 'size-1.5',
+      xs: 'size-[9px]',
+      sm: 'size-3',
+      md: 'size-4',
+      lg: 'size-5',
+      xl: 'size-6',
+      '2xl': 'size-7'
     }
   },
   defaultVariants: {
-    size: 'lg'
+    size: 'md'
   }
 });
 
 // ── Badge ────────────────────────────────────────────────
 
-export const avatarBadgeVariants = cva(['absolute border-2 border-white', RADIUS_FULL], {
+export const avatarBadgeVariants = cva(['absolute border-white', 'rounded-[var(--border-radius-round)]', 'bottom-0 right-0'], {
   variants: {
     size: {
-      sm: 'w-2.5 h-2.5 bottom-0 right-0',
-      md: 'w-3 h-3 bottom-0 right-0',
-      lg: 'w-3.5 h-3.5 bottom-0 right-0',
-      xl: 'w-4 h-4 bottom-0.5 right-0.5',
-      '2xl': 'w-5 h-5 bottom-0.5 right-0.5'
+      '2xs': 'w-1.5 h-1.5 border translate-x-[21%] translate-y-[21%]',
+      xs: 'w-2 h-2 border translate-x-[17%] translate-y-[17%]',
+      sm: 'w-2.5 h-2.5 border-2 translate-x-[15%] translate-y-[15%]',
+      md: 'w-3 h-3 border-2 translate-x-[11%] translate-y-[11%]',
+      lg: 'w-3.5 h-3.5 border-2 translate-x-[8%] translate-y-[8%]',
+      xl: 'w-4 h-4 border-2 translate-x-[6%] translate-y-[6%]',
+      '2xl': 'w-5 h-5 border-2 translate-x-[9%] translate-y-[9%]'
     }
   },
   defaultVariants: {
-    size: 'lg'
+    size: 'md'
   }
 });
 //# sourceMappingURL=styles.js.map

package/lib/module/components/Avatar/styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["cva","COLOR_BG_MUTED","COLOR_TEXT_SECONDARY","RADIUS_FULL","avatarRootVariants","variants","size","sm","md","lg","xl","defaultVariants","avatarImageVariants","avatarTextVariants","avatarIconVariants","avatarBadgeVariants"],"sourceRoot":"../../../../src","sources":["components/Avatar/styles.ts"],"mappings":";;AAAA,SAASA,GAAG,QAA2B,0BAA0B;AACjE,SAASC,cAAc,EAAEC,oBAAoB,EAAEC,WAAW,QAAQ,yBAAyB;;AAE3F;;AAEA,OAAO,MAAMC,kBAAkB,GAAGJ,GAAG,CACnC,CAACG,WAAW,EAAE,sCAAsC,EAAEF,cAAc,CAAC,EACrE;EACEI,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,WAAW;MACf,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfL,IAAI,EAAE;EACR;AACF,CACF,CAAC;;AAED;;AAEA,OAAO,MAAMM,mBAAmB,GAAGZ,GAAG,CAAC,CACrC,qCAAqC,EACrCG,WAAW,EACX,iBAAiB,CAClB,CAAC;;AAEF;;AAEA,OAAO,MAAMU,kBAAkB,GAAGb,GAAG,CAAC,CAACE,oBAAoB,EAAE,eAAe,CAAC,EAAE;EAC7EG,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,SAAS;MACb,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfL,IAAI,EAAE;EACR;AACF,CAAC,CAAC;;AAEF;;AAEA,OAAO,MAAMQ,kBAAkB,GAAGd,GAAG,CAAC,CAACE,oBAAoB,CAAC,EAAE;EAC5DG,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZ,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfL,IAAI,EAAE;EACR;AACF,CAAC,CAAC;;AAEF;;AAEA,OAAO,MAAMS,mBAAmB,GAAGf,GAAG,CAAC,CAAC,gCAAgC,EAAEG,WAAW,CAAC,EAAE;EACtFE,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJC,EAAE,EAAE,8BAA8B;MAClCC,EAAE,EAAE,0BAA0B;MAC9BC,EAAE,EAAE,8BAA8B;MAClCC,EAAE,EAAE,8BAA8B;MAClC,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfL,IAAI,EAAE;EACR;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["cva","avatarRootVariants","variants","size","xs","sm","md","lg","xl","defaultVariants","avatarImageVariants","avatarTextVariants","avatarIconVariants","avatarBadgeVariants"],"sourceRoot":"../../../../src","sources":["components/Avatar/styles.ts"],"mappings":";;AAAA,SAASA,GAAG,QAA2B,0BAA0B;;AAEjE;;AAEA,OAAO,MAAMC,kBAAkB,GAAGD,GAAG,CACnC,CACE,sCAAsC,EACtC,sCAAsC,EACtC,qBAAqB,CACtB,EACD;EACEE,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJ,KAAK,EAAE,SAAS;MAChBC,EAAE,EAAE,mBAAmB;MACvBC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,WAAW;MACf,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfN,IAAI,EAAE;EACR;AACF,CACF,CAAC;;AAED;;AAEA,OAAO,MAAMO,mBAAmB,GAAGV,GAAG,CAAC,CACrC,qCAAqC,EACrC,sCAAsC,EACtC,iBAAiB,EACjB,gCAAgC,CACjC,CAAC;;AAEF;;AAEA,OAAO,MAAMW,kBAAkB,GAAGX,GAAG,CAAC,CAAC,sBAAsB,EAAE,aAAa,CAAC,EAAE;EAC7EE,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJ,KAAK,EAAE,YAAY;MACnBC,EAAE,EAAE,YAAY;MAChBC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,UAAU;MACd,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfN,IAAI,EAAE;EACR;AACF,CAAC,CAAC;;AAEF;;AAEA,OAAO,MAAMS,kBAAkB,GAAGZ,GAAG,CAAC,CAAC,sBAAsB,CAAC,EAAE;EAC9DE,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJ,KAAK,EAAE,UAAU;MACjBC,EAAE,EAAE,YAAY;MAChBC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZ,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfN,IAAI,EAAE;EACR;AACF,CAAC,CAAC;;AAEF;;AAEA,OAAO,MAAMU,mBAAmB,GAAGb,GAAG,CACpC,CAAC,uBAAuB,EAAE,sCAAsC,EAAE,kBAAkB,CAAC,EACrF;EACEE,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJ,KAAK,EAAE,wDAAwD;MAC/DC,EAAE,EAAE,oDAAoD;MACxDC,EAAE,EAAE,0DAA0D;MAC9DC,EAAE,EAAE,sDAAsD;MAC1DC,EAAE,EAAE,wDAAwD;MAC5DC,EAAE,EAAE,oDAAoD;MACxD,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfN,IAAI,EAAE;EACR;AACF,CACF,CAAC","ignoreList":[]}

package/lib/module/components/BottomSheet/index.js

@@ -1,18 +1,29 @@
 "use strict";
 
-import React, { forwardRef, useCallback, useRef } from 'react';
-import { Dimensions, Pressable, View } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import React, { forwardRef, useCallback, useContext, useRef } from 'react';
+import { Dimensions, View } from 'react-native';
+import { SafeAreaInsetsContext } from 'react-native-safe-area-context';
+import { useResolveClassNames } from 'uniwind';
 import { BottomSheetModal, BottomSheetModalProvider, BottomSheetScrollView, BottomSheetView, BottomSheetBackdrop, BottomSheetFooter as GorhomBottomSheetFooter } from '@gorhom/bottom-sheet';
 import { cn } from '@cdx-ui/utils';
-import { ArrowBackIosNew, Close } from '@cdx-ui/icons';
+import { ArrowBack, Close } from '@cdx-ui/icons';
 import { Heading } from '../Heading';
-import { Icon } from '../Icon';
+import { IconButton } from '../IconButton';
 import { Text } from '../Text';
-import { bottomSheetBackButtonVariants, bottomSheetBackIconVariants, bottomSheetCloseButtonVariants, bottomSheetCloseIconVariants, bottomSheetContainerVariants, bottomSheetContentVariants, bottomSheetFooterVariants, bottomSheetHeaderVariants, bottomSheetSubtitleVariants, handleIndicatorStyle } from './styles';
+import { bottomSheetContainerVariants, bottomSheetContentVariants, bottomSheetFooterVariants, bottomSheetHeaderVariants } from './styles';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const ZERO_INSETS = {
+  top: 0,
+  bottom: 0,
+  left: 0,
+  right: 0
+};
+function useSafeInsets() {
+  return useContext(SafeAreaInsetsContext) ?? ZERO_INSETS;
+}
 
 /** Ref type for BottomSheet; forwards the @gorhom modal ref (present, dismiss, snapToIndex, minimize, restore, etc.). */
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+
 function BottomSheetHeaderComponent({
   title,
   subtitle,
@@ -31,29 +42,27 @@ function BottomSheetHeaderComponent({
   return /*#__PURE__*/_jsxs(View, {
     ref: ref,
     className: computedClassName,
-    children: [onBack && /*#__PURE__*/_jsx(Pressable, {
+    children: [/*#__PURE__*/_jsx(BottomSheetBackButton, {
+      className: cn(!onBack && 'opacity-0'),
       onPress: onBack,
-      hitSlop: 12,
-      accessibilityRole: "button",
-      accessibilityLabel: backAccessibilityLabel,
-      className: cn(bottomSheetBackButtonVariants()),
-      children: /*#__PURE__*/_jsx(Icon, {
-        as: ArrowBackIosNew,
-        className: bottomSheetBackIconVariants()
+      ...(backAccessibilityLabel !== undefined && {
+        accessibilityLabel: backAccessibilityLabel
       })
     }), /*#__PURE__*/_jsx(View, {
       className: "flex-1",
       children: children ?? (hasTitle ? /*#__PURE__*/_jsxs(View, {
         children: [/*#__PURE__*/_jsx(Heading, {
-          size: "xs",
-          className: "text-lg",
+          size: "md",
+          className: "text-center",
           children: title
         }), subtitle ? /*#__PURE__*/_jsx(Text, {
-          className: bottomSheetSubtitleVariants(),
+          size: "sm",
+          className: "text-center text-content-secondary",
           children: subtitle
         }) : null]
       }) : null)
-    }), onClose && /*#__PURE__*/_jsx(BottomSheetCloseButton, {
+    }), /*#__PURE__*/_jsx(BottomSheetCloseButton, {
+      className: cn(!onClose && 'opacity-0'),
       onPress: onClose,
       ...(closeAccessibilityLabel !== undefined && {
         accessibilityLabel: closeAccessibilityLabel
@@ -65,6 +74,28 @@ BottomSheetHeaderComponent.displayName = 'BottomSheet.Header';
 const BottomSheetHeader = /*#__PURE__*/forwardRef(BottomSheetHeaderComponent);
 BottomSheetHeader.displayName = 'BottomSheet.Header';
 
+// =============================================================================
+// BACKBUTTON
+// =============================================================================
+
+function BottomSheetBackButton({
+  onPress,
+  className,
+  accessibilityLabel = 'Go back'
+}) {
+  return /*#__PURE__*/_jsx(IconButton, {
+    as: ArrowBack,
+    variant: "solid",
+    color: "neutral",
+    size: "default",
+    onPress: onPress,
+    hitSlop: 12,
+    accessibilityLabel: accessibilityLabel,
+    className: className
+  });
+}
+BottomSheetBackButton.displayName = 'BottomSheet.BackButton';
+
 // =============================================================================
 // CLOSEBUTTON
 // =============================================================================
@@ -74,16 +105,15 @@ function BottomSheetCloseButton({
   className,
   accessibilityLabel = 'Close'
 }) {
-  return /*#__PURE__*/_jsx(Pressable, {
+  return /*#__PURE__*/_jsx(IconButton, {
+    as: Close,
+    variant: "solid",
+    color: "neutral",
+    size: "default",
     onPress: onPress,
     hitSlop: 12,
-    accessibilityRole: "button",
     accessibilityLabel: accessibilityLabel,
-    className: cn(bottomSheetCloseButtonVariants(), className),
-    children: /*#__PURE__*/_jsx(Icon, {
-      as: Close,
-      className: bottomSheetCloseIconVariants()
-    })
+    className: className
   });
 }
 BottomSheetCloseButton.displayName = 'BottomSheet.CloseButton';
@@ -98,7 +128,7 @@ const BottomSheetContent = /*#__PURE__*/forwardRef(({
   hasSafeAreaInset,
   style
 }, ref) => {
-  const insets = useSafeAreaInsets();
+  const insets = useSafeInsets();
   const computedClassName = cn(bottomSheetContentVariants(), className);
   return /*#__PURE__*/_jsx(View, {
     ref: ref,
@@ -122,7 +152,7 @@ const BottomSheetFooter = /*#__PURE__*/forwardRef(({
   className,
   style
 }, ref) => {
-  const insets = useSafeAreaInsets();
+  const insets = useSafeInsets();
   const computedClassName = cn(bottomSheetFooterVariants(), className);
   return /*#__PURE__*/_jsx(View, {
     ref: ref,
@@ -142,6 +172,12 @@ BottomSheetFooter.displayName = 'BottomSheet.Footer';
 // =============================================================================
 
 const MAX_DYNAMIC_CONTENT_SIZE = Dimensions.get('window').height * 0.9;
+const SHEET_BORDER_RADIUS = 24;
+const sheetContainerStyle = {
+  overflow: 'hidden',
+  borderTopLeftRadius: SHEET_BORDER_RADIUS,
+  borderTopRightRadius: SHEET_BORDER_RADIUS
+};
 const CustomBackdrop = props => {
   return /*#__PURE__*/_jsx(BottomSheetBackdrop, {
     ...props,
@@ -151,27 +187,44 @@ const CustomBackdrop = props => {
     pressBehavior: "close"
   });
 };
+const CustomBackground = props => /*#__PURE__*/_jsx(View, {
+  ...props,
+  className: cn(bottomSheetContainerVariants())
+});
 const BottomSheetModalStyled = /*#__PURE__*/forwardRef(({
   handleVisible = true,
   footer,
+  onDismiss,
+  onChange,
   ...rest
 }, ref) => {
   const renderFooter = useCallback(props => /*#__PURE__*/_jsx(GorhomBottomSheetFooter, {
     ...props,
     children: footer
   }), [footer]);
+  const dismissedRef = useRef(false);
+  const handleDismiss = useCallback(() => {
+    if (dismissedRef.current) return;
+    dismissedRef.current = true;
+    onDismiss?.();
+  }, [onDismiss]);
+  const handleChange = useCallback((...args) => {
+    dismissedRef.current = false;
+    onChange?.(...args);
+  }, [onChange]);
+  const handleIndicatorStyle = useResolveClassNames('bg-surface-neutral-subtle w-9 h-1 rounded-full');
   return /*#__PURE__*/_jsx(BottomSheetModal, {
     ref: ref,
     enableDynamicSizing: true,
     maxDynamicContentSize: MAX_DYNAMIC_CONTENT_SIZE,
+    style: sheetContainerStyle,
     handleComponent: handleVisible ? undefined : null,
     handleIndicatorStyle: handleVisible ? handleIndicatorStyle : undefined,
     backdropComponent: CustomBackdrop,
-    backgroundComponent: backgroundProps => /*#__PURE__*/_jsx(View, {
-      ...backgroundProps,
-      className: cn(bottomSheetContainerVariants())
-    }),
+    backgroundComponent: CustomBackground,
     ...rest,
+    onDismiss: handleDismiss,
+    onChange: handleChange,
     ...(footer != null && {
       footerComponent: renderFooter
     })