@streamplace/components 0.8.6 → 0.8.9

package/src/components/ui/dropdown.tsx

@@ -1,21 +1,38 @@
-import BottomSheet, { BottomSheetView } from "@gorhom/bottom-sheet";
+import BottomSheet, { BottomSheetScrollView } from "@gorhom/bottom-sheet";
 import * as DropdownMenuPrimitive from "@rn-primitives/dropdown-menu";
 import {
   Check,
   CheckCircle,
   ChevronDown,
+  ChevronLeft,
   ChevronRight,
   ChevronUp,
   Circle,
 } from "lucide-react-native";
-import React, { forwardRef, ReactNode, useMemo, useRef } from "react";
+import React, {
+  createContext,
+  forwardRef,
+  ReactNode,
+  startTransition,
+  useContext,
+  useRef,
+  useState,
+} from "react";
 import {
   Platform,
   Pressable,
+  ScrollView,
   StyleSheet,
   useWindowDimensions,
   View,
 } from "react-native";
+import Animated, {
+  runOnJS,
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming,
+} from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import {
   a,
   borderRadius,
@@ -40,12 +57,103 @@ import {
 } from "./primitives/text";
 import { Text } from "./text";
 
+// Navigation stack context for bottom sheet menus
+interface NavigationStackItem {
+  key: string;
+  title?: string;
+  content: ReactNode | ((state: { pressed: boolean }) => ReactNode);
+}
+
+interface NavigationStackContextValue {
+  stack: NavigationStackItem[];
+  push: (item: NavigationStackItem) => void;
+  pop: () => void;
+  isNested: boolean;
+}
+
+const NavigationStackContext =
+  createContext<NavigationStackContextValue | null>(null);
+
+const useNavigationStack = () => {
+  const context = useContext(NavigationStackContext);
+  return context;
+};
+
+// Context to capture submenu content for mobile navigation
+interface SubMenuContextValue {
+  title?: string;
+  renderContent: () => ReactNode;
+  setRenderContent: (renderer: () => ReactNode) => void;
+  setTitle: (title: string) => void;
+  trigger: () => void;
+  key: string | null;
+}
+
+const SubMenuContext = createContext<SubMenuContextValue | null>(null);
+
 export const DropdownMenu = DropdownMenuPrimitive.Root;
 export const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
 export const DropdownMenuPortal = DropdownMenuPrimitive.Portal;
-export const DropdownMenuSub = DropdownMenuPrimitive.Sub;
 export const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
 
+// Custom DropdownMenuSub that works with mobile navigation
+export const DropdownMenuSub = forwardRef<any, any>(
+  ({ children, ...props }, ref) => {
+    const navStack = useNavigationStack();
+    const [subMenuTitle, setSubMenuTitle] = useState<string | undefined>();
+    const renderContentRef = useRef<(() => ReactNode) | null>(null);
+    const [subMenuKey, setSubMenuKey] = useState<string | null>(null);
+
+    // If we're in a mobile navigation stack, use custom context
+    if (navStack) {
+      const trigger = () => {
+        if (renderContentRef.current) {
+          const key = `submenu-${Date.now()}`;
+          setSubMenuKey(key);
+          navStack.push({
+            key,
+            title: subMenuTitle,
+            // Store a function that always reads the latest content from the ref
+            content: (props: any) => {
+              const renderFn = renderContentRef.current;
+              return renderFn ? renderFn() : null;
+            },
+          });
+        }
+      };
+
+      const setRenderContent = (renderer: () => ReactNode) => {
+        renderContentRef.current = renderer;
+      };
+
+      const contextValue = React.useMemo(
+        () => ({
+          renderContent: () => renderContentRef.current?.(),
+          setRenderContent,
+          title: subMenuTitle,
+          setTitle: setSubMenuTitle,
+          trigger,
+          key: subMenuKey,
+        }),
+        [subMenuTitle, subMenuKey],
+      );
+
+      return (
+        <SubMenuContext.Provider value={contextValue}>
+          {children}
+        </SubMenuContext.Provider>
+      );
+    }
+
+    // Web - use primitive
+    return (
+      <DropdownMenuPrimitive.Sub ref={ref} {...props}>
+        {children}
+      </DropdownMenuPrimitive.Sub>
+    );
+  },
+);
+
 export const DropdownMenuBottomSheet = forwardRef<
   any,
   DropdownMenuPrimitive.ContentProps & {
@@ -53,61 +161,263 @@ export const DropdownMenuBottomSheet = forwardRef<
     portalHost?: string;
   }
 >(function DropdownMenuBottomSheet(
-  { overlayStyle, portalHost, children },
+  { overlayStyle, portalHost, children, ...rest },
   _ref,
 ) {
   // Use the primitives' context to know if open
-  const { open, onOpenChange } = DropdownMenuPrimitive.useRootContext();
-  const { zero: zt } = useTheme();
-  const snapPoints = useMemo(() => ["25%", "50%", "80%"], []);
+  const { onOpenChange } = DropdownMenuPrimitive.useRootContext();
+  const { zero: zt, theme } = useTheme();
   const sheetRef = useRef<BottomSheet>(null);
+  const { width } = useWindowDimensions();
+  const isWide = Platform.OS !== "web" && width >= 800;
+  const sheetWidth = isWide ? 450 : width;
+  const horizontalMargin = isWide ? (width - sheetWidth) / 2 : 0;
+
+  const insets = useSafeAreaInsets();
+
+  // Navigation stack state
+  const [stack, setStack] = useState<NavigationStackItem[]>([
+    { key: "root", content: children },
+  ]);
+
+  // Update root content when children changes
+  React.useEffect(() => {
+    setStack((prev) => {
+      if (!Array.isArray(prev) || prev.length === 0) {
+        return [{ key: "root", content: children }];
+      }
+      // Update the root item content
+      const newStack = [...prev];
+      newStack[0] = { ...newStack[0], content: children };
+      return newStack;
+    });
+  }, [children]);
+
+  const slideAnim = useSharedValue(0);
+  const fadeAnim = useSharedValue(1);
+
+  const push = (item: NavigationStackItem) => {
+    // First, update the stack
+    setStack((prev) => {
+      if (!Array.isArray(prev))
+        return [{ key: "root", content: children }, item];
+      return [...prev, item];
+    });
+
+    // Then animate from right to center with fade
+    slideAnim.value = 40;
+    fadeAnim.value = 0;
+    slideAnim.value = withTiming(0, { duration: 350 });
+    fadeAnim.value = withTiming(1, { duration: 350 });
+  };
+
+  const popStack = () => {
+    startTransition(() => {
+      setStack((prev) => {
+        if (!Array.isArray(prev) || prev.length <= 1) {
+          return [{ key: "root", content: children }];
+        }
+        return prev.slice(0, -1);
+      });
+    });
+  };
+
+  const resetAnimationValues = () => {
+    setTimeout(() => {
+      slideAnim.value = 0;
+      fadeAnim.value = 1;
+    }, 5);
+  };
+
+  const pop = () => {
+    if (stack.length <= 1) return;
+
+    // Animate out to the right with fade
+    slideAnim.value = withTiming(40, { duration: 150 });
+    fadeAnim.value = withTiming(0, { duration: 150 }, (finished) => {
+      if (finished) {
+        // Update stack first with startTransition for smoother render
+        runOnJS(popStack)();
+
+        // Then reset animation position after a brief delay to ensure component has unmounted
+        runOnJS(resetAnimationValues)();
+      }
+    });
+  };
+
+  const animatedStyle = useAnimatedStyle(() => ({
+    transform: [{ translateX: slideAnim.value }],
+    opacity: fadeAnim.value,
+  }));
+
+  const headerAnimatedStyle = useAnimatedStyle(() => ({
+    opacity: fadeAnim.value,
+  }));
+
+  const currentLevel = stack[stack.length - 1];
+  const isNested = stack.length > 1;
+
+  const onBackgroundTap = () => {
+    if (sheetRef.current) sheetRef.current?.close();
+
+    setTimeout(() => {
+      onOpenChange?.(false);
+    }, 300);
+  };
+
+  // Safety check - if no current level, don't render
+  if (!currentLevel) {
+    return null;
+  }
 
   return (
     <DropdownMenuPrimitive.Portal hostName={portalHost}>
-      <BottomSheet
-        ref={sheetRef}
-        // why the heck is this 1-indexed
-        index={open ? 3 : -1}
-        snapPoints={snapPoints}
-        enablePanDownToClose
-        enableDynamicSizing
-        enableContentPanningGesture={false}
-        backdropComponent={({ style }) => (
-          <Pressable
-            style={[style, StyleSheet.absoluteFill]}
-            onPress={() => onOpenChange?.(false)}
-          />
-        )}
-        onClose={() => onOpenChange?.(false)}
-        style={[overlayStyle]}
-        backgroundStyle={[zt.bg.popover, a.radius.all.md, a.shadows.md, p[1]]}
-        handleIndicatorStyle={[
-          a.sizes.width[12],
-          a.sizes.height[1],
-          zt.bg.mutedForeground,
-        ]}
-      >
-        <BottomSheetView style={[px[4]]}>
-          {typeof children === "function"
-            ? children({ pressed: true })
-            : children}
-        </BottomSheetView>
-      </BottomSheet>
+      <NavigationStackContext.Provider value={{ stack, push, pop, isNested }}>
+        <BottomSheet
+          ref={sheetRef}
+          enablePanDownToClose
+          enableDynamicSizing
+          detached={isWide}
+          bottomInset={isWide ? 0 : 0}
+          backdropComponent={({ style }) => (
+            <Pressable
+              style={[style, StyleSheet.absoluteFill]}
+              onPress={() => onBackgroundTap()}
+            />
+          )}
+          onClose={() => onOpenChange?.(false)}
+          style={[
+            overlayStyle,
+            StyleSheet.flatten(rest.style),
+            isWide && { marginHorizontal: horizontalMargin },
+          ]}
+          backgroundStyle={[zt.bg.popover, a.radius.all.md, a.shadows.md, p[1]]}
+          handleIndicatorStyle={[
+            a.sizes.width[12],
+            a.sizes.height[1],
+            zt.bg.mutedForeground,
+          ]}
+        >
+          {isNested && (
+            <Animated.View
+              style={[
+                headerAnimatedStyle,
+                a.layout.flex.row,
+                a.layout.flex.alignCenter,
+                px[4],
+                pb[2],
+                {
+                  borderBottomWidth: 1,
+                  borderBottomColor: theme.colors.border,
+                },
+              ]}
+            >
+              <Pressable
+                onPress={pop}
+                style={[
+                  a.layout.flex.row,
+                  a.layout.flex.alignCenter,
+                  gap.all[2],
+                ]}
+                hitSlop={80}
+              >
+                <ChevronLeft size={20} color={theme.colors.foreground} />
+                {currentLevel?.title ? (
+                  <Text size="lg">{currentLevel.title}</Text>
+                ) : null}
+              </Pressable>
+            </Animated.View>
+          )}
+          <Animated.View style={animatedStyle}>
+            <BottomSheetScrollView
+              style={[px[4]]}
+              contentContainerStyle={{
+                paddingBottom: insets.bottom + 50,
+                overflow: "hidden",
+              }}
+            >
+              {/* Render all stack levels to keep components mounted, but hide non-current ones */}
+              {stack.map((level, index) => {
+                const isCurrent = index === stack.length - 1;
+                return (
+                  <View
+                    key={level.key}
+                    style={[{ display: isCurrent ? "flex" : "none" }]}
+                  >
+                    {typeof level.content === "function"
+                      ? level.content({ pressed: true })
+                      : level.content}
+                  </View>
+                );
+              })}
+            </BottomSheetScrollView>
+          </Animated.View>
+        </BottomSheet>
+      </NavigationStackContext.Provider>
     </DropdownMenuPrimitive.Portal>
   );
 });
 
 export const DropdownMenuSubTrigger = forwardRef<
   any,
-  DropdownMenuPrimitive.SubTriggerProps & { inset?: boolean } & {
+  DropdownMenuPrimitive.SubTriggerProps & {
+    inset?: boolean;
+    subMenuTitle?: string;
+  } & {
     ref?: React.RefObject<DropdownMenuPrimitive.SubTriggerRef>;
     className?: string;
     inset?: boolean;
     children?: React.ReactNode;
   }
->(({ inset, children, ...props }, ref) => {
+>(({ inset, children, subMenuTitle, ...props }, ref) => {
+  const navStack = useNavigationStack();
+  const subMenuContext = useContext(SubMenuContext);
+  const { icons, theme } = useTheme();
+
+  // Set the title in the submenu context if provided
+  React.useEffect(() => {
+    if (subMenuContext && subMenuTitle) {
+      subMenuContext.setTitle(subMenuTitle);
+    }
+  }, [subMenuContext, subMenuTitle]);
+
+  // If we're in a navigation stack (mobile bottom sheet), handle differently
+  if (navStack && subMenuContext) {
+    return (
+      <Pressable
+        onPress={() => {
+          subMenuContext.trigger();
+        }}
+        {...props}
+      >
+        <View
+          style={[
+            inset && gap[2],
+            layout.flex.row,
+            layout.flex.alignCenter,
+            a.radius.all.sm,
+            py[1],
+            pl[2],
+            pr[2],
+          ]}
+        >
+          {typeof children === "function" ? (
+            children({ pressed: true })
+          ) : typeof children === "string" ? (
+            <Text>{children}</Text>
+          ) : (
+            children
+          )}
+          <View style={[a.layout.position.absolute, a.position.right[1]]}>
+            <ChevronRight size={18} color={icons.color.muted} />
+          </View>
+        </View>
+      </Pressable>
+    );
+  }
+
+  // Web behavior - use primitive
   const { open } = DropdownMenuPrimitive.useSubContext();
-  const { icons } = useTheme();
   const Icon =
     Platform.OS === "web" ? ChevronRight : open ? ChevronUp : ChevronDown;
   return (
@@ -140,9 +450,42 @@ export const DropdownMenuSubTrigger = forwardRef<
 
 export const DropdownMenuSubContent = forwardRef<
   any,
-  DropdownMenuPrimitive.SubContentProps
->((props, ref) => {
+  DropdownMenuPrimitive.SubContentProps & { children?: ReactNode }
+>(({ children, ...props }, ref) => {
   const { zero: zt } = useTheme();
+  const subMenuContext = useContext(SubMenuContext);
+  const navStack = useNavigationStack();
+  const prevChildrenRef = useRef<ReactNode>(null);
+
+  // Register a render function that will be called fresh each time
+  React.useEffect(() => {
+    if (subMenuContext && navStack) {
+      // Only update if children reference actually changed
+      if (prevChildrenRef.current === children) {
+        return;
+      }
+
+      prevChildrenRef.current = children;
+
+      // Pass a function that returns the current children
+      subMenuContext.setRenderContent(() => children);
+
+      // Force a stack update to trigger rerender with the actual children
+      if (subMenuContext.key) {
+        // Store the children directly so React can handle updates
+        //navStack.updateContent(subMenuContext.key, children);
+      }
+    }
+  }, [children, subMenuContext, navStack]);
+
+  // On mobile, don't render the subcontent here - it'll be rendered in the nav stack
+  // But keep the component mounted so effects run when children change
+  if (navStack && subMenuContext) {
+    // Component stays mounted to track prop changes, but renders nothing
+    return null;
+  }
+
+  // Web - use primitive
   return (
     <DropdownMenuPrimitive.SubContent
       ref={ref}
@@ -159,7 +502,9 @@ export const DropdownMenuSubContent = forwardRef<
         a.shadows.md,
       ]}
       {...props}
-    />
+    >
+      {children}
+    </DropdownMenuPrimitive.SubContent>
   );
 });
 
@@ -169,8 +514,11 @@ export const DropdownMenuContent = forwardRef<
     overlayStyle?: any;
     portalHost?: string;
   }
->(({ overlayStyle, portalHost, ...props }, ref) => {
+>(({ overlayStyle, portalHost, style, children, ...props }, ref) => {
   const { zero: zt } = useTheme();
+  const { height } = useWindowDimensions();
+  const maxHeight = height * 0.8;
+
   return (
     <DropdownMenuPrimitive.Portal hostName={portalHost}>
       <DropdownMenuPrimitive.Overlay
@@ -193,10 +541,17 @@ export const DropdownMenuContent = forwardRef<
               zt.bg.popover,
               p[2],
               a.shadows.md,
+              style,
             ] as any
           }
           {...props}
-        />
+        >
+          <ScrollView style={{ maxHeight }} showsVerticalScrollIndicator={true}>
+            {typeof children === "function"
+              ? children({ pressed: false })
+              : children}
+          </ScrollView>
+        </DropdownMenuPrimitive.Content>
       </DropdownMenuPrimitive.Overlay>
     </DropdownMenuPrimitive.Portal>
   );
@@ -206,37 +561,52 @@ export const DropdownMenuContentWithoutPortal = forwardRef<
   any,
   DropdownMenuPrimitive.ContentProps & {
     overlayStyle?: any;
+    maxHeightPercentage?: number;
   }
->(({ overlayStyle, ...props }, ref) => {
-  const { theme } = useTheme();
-  return (
-    <DropdownMenuPrimitive.Overlay
-      style={[
-        Platform.OS !== "web" ? StyleSheet.absoluteFill : undefined,
-        overlayStyle,
-      ]}
-    >
-      <DropdownMenuPrimitive.Content
-        ref={ref}
-        style={
-          [
-            { zIndex: 999999 },
-            a.sizes.minWidth[32],
-            a.sizes.maxWidth[64],
-            a.overflow.hidden,
-            a.radius.all.md,
-            a.borders.width.thin,
-            { borderColor: theme.colors.border },
-            { backgroundColor: theme.colors.popover },
-            p[2],
-            a.shadows.md,
-          ] as any
-        }
-        {...props}
-      />
-    </DropdownMenuPrimitive.Overlay>
-  );
-});
+>(
+  (
+    { overlayStyle, maxHeightPercentage = 0.8, children, style, ...props },
+    ref,
+  ) => {
+    const { theme } = useTheme();
+    const { height } = useWindowDimensions();
+    const maxHeight = height * maxHeightPercentage;
+
+    return (
+      <DropdownMenuPrimitive.Overlay
+        style={[
+          Platform.OS !== "web" ? StyleSheet.absoluteFill : undefined,
+          overlayStyle,
+        ]}
+      >
+        <DropdownMenuPrimitive.Content
+          ref={ref}
+          style={
+            [
+              { zIndex: 999999 },
+              a.sizes.minWidth[32],
+              a.sizes.maxWidth[64],
+              a.radius.all.md,
+              a.borders.width.thin,
+              { borderColor: theme.colors.border },
+              { backgroundColor: theme.colors.popover },
+              p[2],
+              a.shadows.md,
+              style,
+            ] as any
+          }
+          {...props}
+        >
+          <ScrollView style={{ maxHeight }} showsVerticalScrollIndicator={true}>
+            {typeof children === "function"
+              ? children({ pressed: false })
+              : children}
+          </ScrollView>
+        </DropdownMenuPrimitive.Content>
+      </DropdownMenuPrimitive.Overlay>
+    );
+  },
+);
 
 /// Responsive Dropdown Menu Content. On mobile this will render a *bottom sheet* that is **portaled to the root of the app**.
 /// Prefer passing scoped content in as **otherwise it may crash the app**.
@@ -245,7 +615,7 @@ export const ResponsiveDropdownMenuContent = forwardRef<any, any>(
     const { width } = useWindowDimensions();
 
     // On web, you might want to always use the normal dropdown
-    const isBottomSheet = Platform.OS !== "web" && width < 800;
+    const isBottomSheet = Platform.OS !== "web";
 
     if (isBottomSheet) {
       return (

package/src/components/ui/primitives/text.tsx

@@ -277,6 +277,22 @@ export const TextRoot = forwardRef<RNText, TextPrimitiveProps>(
     const inheritedContext =
       inherit && !reset && parentContext ? parentContext : {};
 
+    // Calculate fontSize first for line height calculation
+    let calculatedFontSize = inheritedContext.fontSize;
+
+    // Apply variant font size
+    if (variant && variantStyles[variant]?.fontSize) {
+      calculatedFontSize = variantStyles[variant].fontSize as number;
+    }
+
+    // Apply size-based font size
+    if (size) {
+      calculatedFontSize = typeof size === "number" ? size : sizeMap[size];
+    }
+
+    // Use default if still undefined
+    calculatedFontSize = calculatedFontSize || 16;
+
     // Calculate final styles
     const finalStyles: TextStyle = {
       // Start with inherited values
@@ -344,7 +360,10 @@ export const TextRoot = forwardRef<RNText, TextPrimitiveProps>(
 
       // Apply line height
       ...(leading && {
-        lineHeight: typeof leading === "number" ? leading : leadingMap[leading],
+        lineHeight:
+          typeof leading === "number"
+            ? leading
+            : leadingMap[leading] * calculatedFontSize,
       }),
 
       // Apply letter spacing
@@ -389,7 +408,7 @@ export const TextRoot = forwardRef<RNText, TextPrimitiveProps>(
         if (typeof fontSize === "number" && !styleObj.lineHeight && !leading) {
           return {
             ...styleObj,
-            lineHeight: fontSize * 1.2,
+            lineHeight: fontSize,
           };
         }
       }
@@ -478,7 +497,7 @@ export function createTextStyle(
     if (props.leading === undefined) {
       style.lineHeight =
         typeof props.size === "number"
-          ? props.size * 1.2 // Auto line height for numeric sizes
+          ? props.size
           : sizeLineHeightMap[props.size];
     }
   }
@@ -492,10 +511,11 @@ export function createTextStyle(
   }
 
   if (props.leading) {
+    const fontSize = style.fontSize || 16; // default font size
     style.lineHeight =
       typeof props.leading === "number"
         ? props.leading
-        : leadingMap[props.leading];
+        : leadingMap[props.leading] * fontSize;
   }
 
   if (props.tracking) {