@cdx-ui/components 0.0.1-beta.8 → 0.0.1-beta.80

package/src/components/BottomSheet/index.tsx

@@ -1,6 +1,7 @@
-import React, { forwardRef, useCallback, useRef, type ReactNode } from 'react';
-import { Dimensions, Pressable, View, ViewStyle } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import React, { forwardRef, useCallback, useContext, useRef, type ReactNode } from 'react';
+import { Dimensions, View, ViewStyle } from 'react-native';
+import { SafeAreaInsetsContext, type EdgeInsets } from 'react-native-safe-area-context';
+import { useResolveClassNames } from 'uniwind';
 import {
   BottomSheetModal,
   BottomSheetModalProvider,
@@ -12,23 +13,23 @@ import {
   type BottomSheetFooterProps as GorhomBottomSheetFooterProps,
 } 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';
 
+const ZERO_INSETS: EdgeInsets = { top: 0, bottom: 0, left: 0, right: 0 };
+
+function useSafeInsets(): EdgeInsets {
+  return useContext(SafeAreaInsetsContext) ?? ZERO_INSETS;
+}
+
 /** Ref type for BottomSheet; forwards the @gorhom modal ref (present, dismiss, snapToIndex, minimize, restore, etc.). */
 export type BottomSheetModalRef = React.ComponentRef<typeof BottomSheetModal>;
 
@@ -61,36 +62,35 @@ function BottomSheetHeaderComponent(
   const computedClassName = cn(bottomSheetHeaderVariants({ hasTitle: hasContent }), className);
   return (
     <View ref={ref} className={computedClassName}>
-      {onBack && (
-        <Pressable
-          onPress={onBack}
-          hitSlop={12}
-          accessibilityRole="button"
-          accessibilityLabel={backAccessibilityLabel}
-          className={cn(bottomSheetBackButtonVariants())}
-        >
-          <Icon as={ArrowBackIosNew} className={bottomSheetBackIconVariants()} />
-        </Pressable>
-      )}
+      <BottomSheetBackButton
+        className={cn(!onBack && 'opacity-0')}
+        onPress={onBack}
+        {...(backAccessibilityLabel !== undefined && {
+          accessibilityLabel: backAccessibilityLabel,
+        })}
+      />
       <View className="flex-1">
         {children ??
           (hasTitle ? (
             <View>
-              <Heading size="xs" className="text-lg">
+              <Heading size="md" className="text-center">
                 {title}
               </Heading>
-              {subtitle ? <Text className={bottomSheetSubtitleVariants()}>{subtitle}</Text> : null}
+              {subtitle ? (
+                <Text size="sm" className="text-center text-content-secondary">
+                  {subtitle}
+                </Text>
+              ) : null}
             </View>
           ) : null)}
       </View>
-      {onClose && (
-        <BottomSheetCloseButton
-          onPress={onClose}
-          {...(closeAccessibilityLabel !== undefined && {
-            accessibilityLabel: closeAccessibilityLabel,
-          })}
-        />
-      )}
+      <BottomSheetCloseButton
+        className={cn(!onClose && 'opacity-0')}
+        onPress={onClose}
+        {...(closeAccessibilityLabel !== undefined && {
+          accessibilityLabel: closeAccessibilityLabel,
+        })}
+      />
     </View>
   );
 }
@@ -100,11 +100,41 @@ BottomSheetHeaderComponent.displayName = 'BottomSheet.Header';
 const BottomSheetHeader = forwardRef<View, BottomSheetHeaderProps>(BottomSheetHeaderComponent);
 BottomSheetHeader.displayName = 'BottomSheet.Header';
 
+// =============================================================================
+// BACKBUTTON
+// =============================================================================
+interface BottomSheetBackButtonProps {
+  onPress?: () => void;
+  className?: string;
+  accessibilityLabel?: string;
+}
+
+function BottomSheetBackButton({
+  onPress,
+  className,
+  accessibilityLabel = 'Go back',
+}: Readonly<BottomSheetBackButtonProps>) {
+  return (
+    <IconButton
+      as={ArrowBack}
+      variant="solid"
+      color="neutral"
+      size="default"
+      onPress={onPress}
+      hitSlop={12}
+      accessibilityLabel={accessibilityLabel}
+      className={className}
+    />
+  );
+}
+
+BottomSheetBackButton.displayName = 'BottomSheet.BackButton';
+
 // =============================================================================
 // CLOSEBUTTON
 // =============================================================================
 interface BottomSheetCloseButtonProps {
-  onPress: () => void;
+  onPress?: () => void;
   className?: string;
   accessibilityLabel?: string;
 }
@@ -113,17 +143,18 @@ function BottomSheetCloseButton({
   onPress,
   className,
   accessibilityLabel = 'Close',
-}: BottomSheetCloseButtonProps) {
+}: Readonly<BottomSheetCloseButtonProps>) {
   return (
-    <Pressable
+    <IconButton
+      as={Close}
+      variant="solid"
+      color="neutral"
+      size="default"
       onPress={onPress}
       hitSlop={12}
-      accessibilityRole="button"
       accessibilityLabel={accessibilityLabel}
-      className={cn(bottomSheetCloseButtonVariants(), className)}
-    >
-      <Icon as={Close} className={bottomSheetCloseIconVariants()} />
-    </Pressable>
+      className={className}
+    />
   );
 }
 
@@ -142,7 +173,7 @@ export interface BottomSheetContentProps {
 
 const BottomSheetContent = forwardRef<View, BottomSheetContentProps>(
   ({ children, className, hasSafeAreaInset, style }, ref) => {
-    const insets = useSafeAreaInsets();
+    const insets = useSafeInsets();
     const computedClassName = cn(bottomSheetContentVariants(), className);
     return (
       <View
@@ -170,7 +201,7 @@ export interface BottomSheetFooterProps {
 
 const BottomSheetFooter = forwardRef<View, BottomSheetFooterProps>(
   ({ children, className, style }, ref) => {
-    const insets = useSafeAreaInsets();
+    const insets = useSafeInsets();
     const computedClassName = cn(bottomSheetFooterVariants(), className);
     return (
       <View
@@ -202,6 +233,13 @@ export interface BottomSheetModalProps extends React.ComponentPropsWithoutRef<
 
 const MAX_DYNAMIC_CONTENT_SIZE = Dimensions.get('window').height * 0.9;
 
+const SHEET_BORDER_RADIUS = 24;
+const sheetContainerStyle: ViewStyle = {
+  overflow: 'hidden',
+  borderTopLeftRadius: SHEET_BORDER_RADIUS,
+  borderTopRightRadius: SHEET_BORDER_RADIUS,
+};
+
 const CustomBackdrop = (props: BottomSheetBackdropProps) => {
   return (
     <BottomSheetBackdrop
@@ -214,10 +252,14 @@ const CustomBackdrop = (props: BottomSheetBackdropProps) => {
   );
 };
 
+const CustomBackground = (props: React.ComponentPropsWithoutRef<typeof View>) => (
+  <View {...props} className={cn(bottomSheetContainerVariants())} />
+);
+
 const BottomSheetModalStyled = forwardRef<
   React.ComponentRef<typeof BottomSheetModal>,
   BottomSheetModalProps
->(({ handleVisible = true, footer, ...rest }, ref) => {
+>(({ handleVisible = true, footer, onDismiss, onChange, ...rest }, ref) => {
   const renderFooter = useCallback(
     (props: GorhomBottomSheetFooterProps) => (
       <GorhomBottomSheetFooter {...props}>{footer}</GorhomBottomSheetFooter>
@@ -225,18 +267,39 @@ const BottomSheetModalStyled = forwardRef<
     [footer],
   );
 
+  const dismissedRef = useRef(false);
+
+  const handleDismiss = useCallback(() => {
+    if (dismissedRef.current) return;
+    dismissedRef.current = true;
+    onDismiss?.();
+  }, [onDismiss]);
+
+  const handleChange = useCallback(
+    (...args: Parameters<NonNullable<BottomSheetModalProps['onChange']>>) => {
+      dismissedRef.current = false;
+      onChange?.(...args);
+    },
+    [onChange],
+  );
+
+  const handleIndicatorStyle = useResolveClassNames(
+    'bg-surface-neutral-subtle w-9 h-1 rounded-full',
+  );
+
   return (
     <BottomSheetModal
       ref={ref}
       enableDynamicSizing
       maxDynamicContentSize={MAX_DYNAMIC_CONTENT_SIZE}
+      style={sheetContainerStyle}
       handleComponent={handleVisible ? undefined : null}
       handleIndicatorStyle={handleVisible ? handleIndicatorStyle : undefined}
       backdropComponent={CustomBackdrop}
-      backgroundComponent={(backgroundProps) => (
-        <View {...backgroundProps} className={cn(bottomSheetContainerVariants())} />
-      )}
+      backgroundComponent={CustomBackground}
       {...rest}
+      onDismiss={handleDismiss}
+      onChange={handleChange}
       {...(footer != null && { footerComponent: renderFooter })}
     />
   );

package/src/components/BottomSheet/styles.ts

@@ -1,27 +1,15 @@
-import { type ViewStyle } from 'react-native';
 import { cva, type VariantProps } from 'class-variance-authority';
-import {
-  COLOR_BG_PRIMARY,
-  COLOR_BORDER_DEFAULT,
-  COLOR_TEXT_PRIMARY,
-  COLOR_TEXT_SECONDARY,
-} from '../../styles/primitives';
-
-// ── Container ──────────────────────────────────────────────
 
 export const bottomSheetContainerVariants = cva([
-  'rounded-t-3xl border-t border-x overflow-hidden',
-  COLOR_BG_PRIMARY,
-  COLOR_BORDER_DEFAULT,
+  'rounded-t-3xl overflow-hidden',
+  'bg-surface-primary',
 ]);
 
-// ── Header ─────────────────────────────────────────────────
-
 export const bottomSheetHeaderVariants = cva(
   [
     'flex-row items-center justify-between min-h-12 px-4 pt-3 pb-2',
-    COLOR_BG_PRIMARY,
-    COLOR_TEXT_PRIMARY,
+    'bg-surface-primary',
+    'text-content-primary',
   ],
   {
     variants: {
@@ -36,44 +24,12 @@ export const bottomSheetHeaderVariants = cva(
   },
 );
 
-// ── Content ────────────────────────────────────────────────
-
-export const bottomSheetContentVariants = cva([COLOR_BG_PRIMARY, 'px-4 pb-6']);
-
-// ── Footer ─────────────────────────────────────────────────
-
-export const bottomSheetFooterVariants = cva([
-  'px-4 pt-3 pb-4 border-t',
-  COLOR_BG_PRIMARY,
-  COLOR_BORDER_DEFAULT,
-]);
-
-// ── Subtitle ────────────────────────────────────────────────
+export const bottomSheetContentVariants = cva(['bg-surface-primary', 'p-5 pb-6']);
 
-export const bottomSheetSubtitleVariants = cva(['text-sm', COLOR_TEXT_SECONDARY]);
-
-// ── Back Button ─────────────────────────────────────────────
-
-export const bottomSheetBackButtonVariants = cva(['p-1 -m-1 mr-2 rounded-full active:opacity-70']);
+export const bottomSheetFooterVariants = cva(['px-5 pb-5', 'bg-surface-primary']);
 
 export const bottomSheetBackIconVariants = cva(['size-5 text-slate-500']);
 
-// ── Close Button ───────────────────────────────────────────
-
-export const bottomSheetCloseButtonVariants = cva(['p-1 -m-1 rounded-full active:opacity-70']);
-
-// ── Close Icon ─────────────────────────────────────────────
-
 export const bottomSheetCloseIconVariants = cva(['size-5 text-slate-500']);
 
-// ── Handle indicator ────────────────────────────────────────
-// Plain ViewStyle — gorhom's handleIndicatorStyle doesn't accept classNames.
-// slate-300 (#cbd5e1) maps to COLOR_BORDER_STRONG; update when raw token palette is available (TODO).
-export const handleIndicatorStyle: ViewStyle = {
-  backgroundColor: '#cbd5e1',
-  width: 36,
-  height: 4,
-  borderRadius: 2,
-};
-
 export type BottomSheetHeaderVariants = VariantProps<typeof bottomSheetHeaderVariants>;