panelui-native 0.9.0 → 0.12.0

package/src/components/frame/index.tsx

@@ -15,28 +15,67 @@
  *   </Frame.Header>
  *   <Frame.Panel>
  *     <Frame.Row>…</Frame.Row>
- *     <Frame.Row divided>…</Frame.Row>
+ *     <Frame.Row>…</Frame.Row>
  *   </Frame.Panel>
  *   <Frame.Footer>Updated 2 minutes ago</Frame.Footer>
  * </Frame>
  * ```
+ *
+ * The panel draws the hairlines between its own rows. React Native has no
+ * `:first-child`, so the alternative is every caller writing
+ * `divided={index > 0}` on every row and getting it wrong once.
  */
-import { forwardRef, type ReactNode } from 'react';
-import { View, type Text as RNText, type ViewProps } from 'react-native';
+import { Children, cloneElement, forwardRef, isValidElement, type ReactNode } from 'react';
+import {
+  Pressable,
+  View,
+  type PressableProps,
+  type Text as RNText,
+  type ViewProps,
+} from 'react-native';
+import { tv } from 'tailwind-variants';
+import { ChevronRightIcon } from '../../icons';
 import { Text, type TextProps } from '../../primitives/text';
 import { cn } from '../../utils/cn';
 
+const frameVariants = tv({
+  slots: {
+    root: '',
+    panel: 'overflow-hidden rounded-xl border border-border bg-card',
+  },
+  variants: {
+    variant: {
+      default: { root: 'rounded-2xl border border-border bg-surface p-1.5' },
+      // No shell: the panel is the whole widget. For a Frame nested inside a
+      // card that already draws a border, where the shell's own edge sitting
+      // just inside it reads as a double line.
+      plain: { root: '', panel: 'rounded-2xl' },
+    },
+  },
+  defaultVariants: {
+    variant: 'default',
+  },
+});
+
+export type FrameVariant = 'default' | 'plain';
+
 export interface FrameProps extends ViewProps {
   className?: string;
 }
 
-const FrameRoot = forwardRef<View, FrameProps>(({ className, ...props }, ref) => (
-  <View
-    ref={ref}
-    className={cn('rounded-2xl border border-border bg-surface p-1.5', className)}
-    {...props}
-  />
-));
+export interface FrameRootProps extends FrameProps {
+  /**
+   * `plain` drops the outer shell so the panel is the widget — for a Frame
+   * inside a container that already draws its own border.
+   */
+  variant?: FrameVariant;
+}
+
+const FrameRoot = forwardRef<View, FrameRootProps>(
+  ({ className, variant, ...props }, ref) => (
+    <View ref={ref} className={frameVariants({ variant }).root({ className })} {...props} />
+  )
+);
 FrameRoot.displayName = 'Frame';
 
 export interface FrameHeaderProps extends FrameProps {
@@ -103,41 +142,147 @@ const FrameDescription = forwardRef<RNText, TextProps>(
 );
 FrameDescription.displayName = 'Frame.Description';
 
+/**
+ * Marks the parts that take part in the panel's own divider bookkeeping —
+ * a Row draws a line above itself, a Section draws one above its heading.
+ * Anything else the panel is given is left alone.
+ */
+interface Dividable {
+  divided?: boolean;
+}
+
+/**
+ * Draws the hairline above every child but the first. An explicit `divided`
+ * on a child wins, so a row can still opt out or force one.
+ */
+function divideChildren(children: ReactNode) {
+  let seen = 0;
+  return Children.map(children, (child) => {
+    if (!isValidElement<Dividable>(child)) return child;
+    if (!DIVIDABLE.has(child.type)) return child;
+
+    const index = seen++;
+    if (child.props.divided !== undefined) return child;
+    return cloneElement(child, { divided: index > 0 });
+  });
+}
+
+export interface FramePanelProps extends FrameProps {
+  /**
+   * Set false to place the hairlines by hand instead — for a panel whose rows
+   * are generated somewhere the divider order is not obvious.
+   */
+  dividers?: boolean;
+  children?: ReactNode;
+}
+
 /**
  * The inset card holding the frame's content — the raised surface sitting in
  * from the shell's edges, with its own smaller radius.
  */
-const FramePanel = forwardRef<View, FrameProps>(({ className, ...props }, ref) => (
-  <View
-    ref={ref}
-    className={cn('overflow-hidden rounded-xl border border-border bg-card', className)}
-    {...props}
-  />
-));
+const FramePanel = forwardRef<View, FramePanelProps>(
+  ({ className, dividers = true, children, ...props }, ref) => (
+    <View ref={ref} className={frameVariants().panel({ className })} {...props}>
+      {dividers ? divideChildren(children) : children}
+    </View>
+  )
+);
 FramePanel.displayName = 'Frame.Panel';
 
+export interface FrameRowProps extends Omit<PressableProps, 'children'>, Dividable {
+  className?: string;
+  /**
+   * Draw a hairline above this row. `Frame.Panel` sets it for you; pass it
+   * explicitly to override the panel's decision either way.
+   */
+  divided?: boolean;
+  /** Trailing chevron marking the row as leading somewhere. */
+  chevron?: boolean;
+  children?: ReactNode;
+}
+
 /**
- * A row inside a Frame.Panel. Pass `divided` on every row after the first to
- * draw a hairline separator above it (React Native has no :first-child).
+ * A row inside a Frame.Panel. Give it an `onPress` and it becomes a real
+ * pressable — press feedback, a button role — rather than a View with a
+ * handler bolted on.
  */
-export interface FrameRowProps extends FrameProps {
+const FrameRow = forwardRef<View, FrameRowProps>(
+  ({ className, divided, chevron, children, onPress, ...props }, ref) => {
+    const classes = cn(
+      'flex-row items-center gap-3 px-4 py-3.5',
+      divided && 'border-t border-border',
+      onPress && 'active:bg-muted',
+      className
+    );
+
+    const body = (
+      <>
+        {children}
+        {chevron ? <ChevronRightIcon size={16} /> : null}
+      </>
+    );
+
+    if (!onPress) {
+      return (
+        <View ref={ref} className={classes} {...(props as ViewProps)}>
+          {body}
+        </View>
+      );
+    }
+
+    return (
+      <Pressable
+        ref={ref}
+        accessibilityRole="button"
+        onPress={onPress}
+        className={classes}
+        {...props}
+      >
+        {body}
+      </Pressable>
+    );
+  }
+);
+FrameRow.displayName = 'Frame.Row';
+
+export interface FrameSectionProps extends FrameProps, Dividable {
+  /** Heading above the rows. Strings are wrapped for you. */
+  title?: ReactNode;
   divided?: boolean;
+  children?: ReactNode;
 }
 
-const FrameRow = forwardRef<View, FrameRowProps>(
-  ({ className, divided, ...props }, ref) => (
+/**
+ * A labelled cluster of rows inside a Panel, for a widget holding more than
+ * one group. It divides its own rows the way the panel does, so the two nest
+ * without either having to know about the other.
+ */
+const FrameSection = forwardRef<View, FrameSectionProps>(
+  ({ className, title, divided, children, ...props }, ref) => (
     <View
       ref={ref}
-      className={cn(
-        'flex-row items-center gap-3 px-4 py-3.5',
-        divided && 'border-t border-border',
-        className
-      )}
+      className={cn(divided && 'border-t border-border', className)}
       {...props}
-    />
+    >
+      {title ? (
+        <View className="bg-muted/40 px-4 pb-1.5 pt-2.5">
+          {typeof title === 'string' ? (
+            <Text size="xs" weight="medium" muted className="uppercase tracking-wider">
+              {title}
+            </Text>
+          ) : (
+            title
+          )}
+        </View>
+      ) : null}
+      {divideChildren(children)}
+    </View>
   )
 );
-FrameRow.displayName = 'Frame.Row';
+FrameSection.displayName = 'Frame.Section';
+
+/** Parts the panel divides. Declared after them, since it holds references. */
+const DIVIDABLE = new Set<unknown>([FrameRow, FrameSection]);
 
 export interface FrameFooterProps extends FrameProps {
   children?: ReactNode;
@@ -169,6 +314,7 @@ export const Frame = Object.assign(FrameRoot, {
   Action: FrameAction,
   Description: FrameDescription,
   Panel: FramePanel,
+  Section: FrameSection,
   Row: FrameRow,
   Footer: FrameFooter,
 });

package/src/components/input/index.tsx

@@ -1,44 +1,93 @@
-import { forwardRef, useCallback, useState } from 'react';
+/**
+ * Input — a text field with a label, a description and an error line.
+ *
+ * The field's focus state is animated rather than switched. A border that
+ * snaps between two colours reads as a redraw; one that crosses over in
+ * 150ms reads as the field responding to you. The interpolation runs on the
+ * UI thread, so it costs nothing and keeps up with a fast tab through a form.
+ *
+ * Two backgrounds, because a field's job changes with what surrounds it:
+ * `outline` sits on the page and draws its own edge; `filled` sits inside a
+ * card or a sheet, where a second border next to the container's own reads as
+ * a seam.
+ *
+ * ```tsx
+ * <Input label="Email" placeholder="you@example.com" />
+ * <Input variant="filled" size="lg" label="Name" isRequired />
+ * ```
+ *
+ * For a field with an icon or a button attached, reach for `InputGroup` — it
+ * measures its decorators and pads this field around them.
+ */
+import { forwardRef, useCallback, useEffect, useState } from 'react';
 import { TextInput, View, type TextInputProps } from 'react-native';
-import { tv } from 'tailwind-variants';
+import Animated, {
+  interpolateColor,
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming,
+} from 'react-native-reanimated';
+import { tv, type VariantProps } from 'tailwind-variants';
 import { useCSSVariable } from 'uniwind';
 import { KeyboardAvoider } from '../../primitives/keyboard-avoider';
 import { Text } from '../../primitives/text';
+import { Label } from '../label';
+
+/** Long enough to read as a transition, short enough not to lag a fast tab. */
+const FOCUS_DURATION = 150;
 
 const inputVariants = tv({
   slots: {
     container: 'w-full gap-1.5',
-    field:
-      'h-11 w-full rounded-lg border border-input bg-background px-3 text-base text-foreground',
-    label: 'text-sm font-medium text-foreground',
+    field: 'w-full rounded-lg border text-foreground',
     description: 'text-sm text-muted-foreground',
     error: 'text-sm text-destructive',
   },
   variants: {
-    focused: {
-      true: { field: 'border-ring' },
+    variant: {
+      // The border colour is animated, so it is deliberately not set here —
+      // only the background and the resting border width belong to the class.
+      outline: { field: 'bg-background' },
+      filled: { field: 'bg-muted' },
+    },
+    size: {
+      sm: { field: 'h-10 px-3 text-sm' },
+      md: { field: 'h-12 px-3.5 text-base' },
+      lg: { field: 'h-14 px-4 text-base' },
     },
-    invalid: {
-      true: { field: 'border-destructive/40' },
+    multiline: {
+      // A multiline field grows, so a fixed height would crop it. Text starts
+      // at the top rather than floating in the middle of an empty box.
+      true: { field: 'h-auto min-h-24 py-3' },
     },
     disabled: {
       true: { field: 'opacity-[0.64]' },
     },
   },
+  defaultVariants: {
+    variant: 'outline',
+    size: 'md',
+  },
 });
 
-export interface InputProps extends TextInputProps {
+type InputVariantProps = VariantProps<typeof inputVariants>;
+
+export interface InputProps
+  extends TextInputProps,
+    Omit<InputVariantProps, 'disabled' | 'multiline'> {
   className?: string;
   containerClassName?: string;
   label?: string;
   description?: string;
   /** Error message. When set, the field renders in its invalid state. */
   errorMessage?: string;
+  /** Marks the field required — an asterisk on the label, and the a11y state. */
+  isRequired?: boolean;
   disabled?: boolean;
   /**
    * Lift the field above the software keyboard when it would otherwise be
    * covered. Moves by exactly the overlap, and not at all when the field is
-   * already clear.
+   * already clear — or when the keyboard belongs to a different field.
    *
    * Install `react-native-keyboard-controller` for this to behave on Android.
    *
@@ -50,6 +99,8 @@ export interface InputProps extends TextInputProps {
   keyboardOffset?: number;
 }
 
+const AnimatedTextInput = Animated.createAnimatedComponent(TextInput);
+
 export const Input = forwardRef<TextInput, InputProps>(
   (
     {
@@ -58,23 +109,61 @@ export const Input = forwardRef<TextInput, InputProps>(
       label,
       description,
       errorMessage,
+      isRequired,
       disabled,
+      variant,
+      size,
       avoidKeyboard = false,
       keyboardOffset = 16,
       onFocus,
       onBlur,
+      style,
       ...props
     },
     ref
   ) => {
     const [focused, setFocused] = useState(false);
+    const invalid = !!errorMessage;
+
     const placeholderColor = useCSSVariable('--color-muted-foreground');
+    const restColor = useCSSVariable('--color-input');
+    const focusColor = useCSSVariable('--color-ring');
+    const errorColor = useCSSVariable('--color-destructive');
+
     const slots = inputVariants({
-      focused,
-      invalid: !!errorMessage,
+      variant,
+      size,
+      multiline: !!props.multiline,
       disabled: !!disabled,
     });
 
+    /*
+     * Border colour is driven by one 0..1 value rather than by a class per
+     * state. Uniwind can only swap a class wholesale, which is the snap this
+     * is here to avoid, and a shared value crosses between the two colours on
+     * the UI thread without a re-render.
+     */
+    const focus = useSharedValue(0);
+    useEffect(() => {
+      focus.value = withTiming(focused ? 1 : 0, { duration: FOCUS_DURATION });
+    }, [focused, focus]);
+
+    const resting = typeof restColor === 'string' ? restColor : '#e5e5e5';
+    const active = invalid
+      ? typeof errorColor === 'string'
+        ? errorColor
+        : '#ef4444'
+      : typeof focusColor === 'string'
+        ? focusColor
+        : '#a3a3a3';
+    // An invalid field is tinted even at rest — the error is a fact about the
+    // value, not about whether the field happens to be focused.
+    const idle = invalid ? active : resting;
+
+    const borderStyle = useAnimatedStyle(() => ({
+      borderColor: interpolateColor(focus.value, [0, 1], [idle, active]),
+    }));
+
     const handleFocus = useCallback<NonNullable<TextInputProps['onFocus']>>(
       (event) => {
         setFocused(true);
@@ -93,15 +182,24 @@ export const Input = forwardRef<TextInput, InputProps>(
 
     const body = (
       <>
-        {label ? <Text className={slots.label()}>{label}</Text> : null}
-        <TextInput
+        {label ? (
+          <Label isRequired={isRequired} isInvalid={invalid} isDisabled={!!disabled}>
+            {label}
+          </Label>
+        ) : null}
+        <AnimatedTextInput
           ref={ref}
           editable={!disabled}
           onFocus={handleFocus}
           onBlur={handleBlur}
           accessibilityLabel={label}
           accessibilityState={{ disabled: !!disabled }}
+          aria-required={isRequired}
+          aria-invalid={invalid}
           className={slots.field({ className })}
+          // Caller styles come last so InputGroup can pad the field around its
+          // decorators, but never last enough to drop the animated border.
+          style={[borderStyle, style]}
           placeholderTextColor={
             typeof placeholderColor === 'string' ? placeholderColor : undefined
           }
@@ -127,7 +225,15 @@ export const Input = forwardRef<TextInput, InputProps>(
      */
     if (avoidKeyboard) {
       return (
-        <KeyboardAvoider offset={keyboardOffset} className={containerClasses}>
+        <KeyboardAvoider
+          // Only while *this* field is the one being typed into. Without it
+          // every avoiding field on the screen lifts the moment any field
+          // anywhere is tapped, and since they all aim at the same gap above
+          // the keyboard, they arrive stacked on top of one another.
+          active={focused}
+          offset={keyboardOffset}
+          className={containerClasses}
+        >
           {body}
         </KeyboardAvoider>
       );

package/src/components/popover/index.tsx

@@ -221,6 +221,12 @@ export interface PopoverContentProps extends ViewProps {
    * `full` spans the safe area, and a number is that many pixels.
    */
   width?: number | 'trigger' | 'full' | 'content-fit';
+  /**
+   * Floor for the panel's width, in pixels. Worth setting with
+   * `width="trigger"`, where a narrow trigger would otherwise squeeze the
+   * content into a column.
+   */
+  minWidth?: number;
   /** Tap outside the panel closes it. Default true. */
   dismissible?: boolean;
   /**
@@ -239,9 +245,12 @@ function PopoverContent({
   offset = DEFAULT_OFFSET,
   alignOffset = 0,
   width = 'content-fit',
+  minWidth,
   dismissible = true,
   blur = false,
   children,
+  onLayout: onLayoutProp,
+  style,
   ...props
 }: PopoverContentProps) {
   const context = usePopover('Popover.Content');
@@ -259,7 +268,7 @@ function PopoverContent({
         ? current
         : { width: w, height: h }
     );
-    props.onLayout?.(event);
+    onLayoutProp?.(event);
   };
 
   const bounds = {
@@ -269,15 +278,23 @@ function PopoverContent({
     bottom: screenHeight - insets.bottom - SCREEN_MARGIN,
   };
 
-  const resolvedWidth =
+  const available = bounds.right - bounds.left;
+  const requestedWidth =
     width === 'content-fit'
       ? undefined
       : width === 'trigger'
         ? trigger?.width
         : width === 'full'
-          ? bounds.right - bounds.left
+          ? available
           : width;
 
+  // The floor never wins past the space there actually is — a panel wider than
+  // the screen is worse than a cramped one.
+  const resolvedWidth =
+    minWidth !== undefined && requestedWidth !== undefined
+      ? Math.min(Math.max(requestedWidth, minWidth), available)
+      : requestedWidth;
+
   const position =
     trigger && size
       ? place({ trigger, size, placement, align, offset, alignOffset, bounds })
@@ -362,31 +379,39 @@ function PopoverContent({
             className="absolute inset-0"
             onPress={dismissible ? () => setOpen(false) : undefined}
           />
+          {/*
+            Two views, not one, and the reason is a Reanimated rule: a layout
+            animation and an animated style may not drive the same property on
+            the same component, or the layout animation silently wins. The exit
+            fade and `panelStyle`'s opacity both want it — so the outer view
+            owns the position and the exit, and the inner one owns the entrance
+            and the panel's own surface.
+          */}
           <Animated.View
             exiting={FadeOut.duration(120)}
             onLayout={onLayout}
-            accessibilityViewIsModal
-            style={[
-              {
-                position: 'absolute',
-                // Until it has measured itself the panel has no honest
-                // position, so it is laid out off-screen rather than at the
-                // origin — an invisible view at 0,0 still catches taps.
-                top: position?.top ?? -9999,
-                left: position?.left ?? -9999,
-                maxWidth: bounds.right - bounds.left,
-                width: resolvedWidth,
-              },
-              panelStyle,
-              props.style,
-            ]}
-            className={cn(
-              'gap-1.5 rounded-2xl border border-border bg-popover p-4 shadow-lg',
-              className
-            )}
-            {...props}
+            style={{
+              position: 'absolute',
+              // Until it has measured itself the panel has no honest position,
+              // so it is laid out off-screen rather than at the origin — an
+              // invisible view at 0,0 still catches taps.
+              top: position?.top ?? -9999,
+              left: position?.left ?? -9999,
+              maxWidth: bounds.right - bounds.left,
+              width: resolvedWidth,
+            }}
           >
-            {children}
+            <Animated.View
+              accessibilityViewIsModal
+              style={[panelStyle, style]}
+              className={cn(
+                'gap-1.5 rounded-2xl border border-border bg-popover p-4 shadow-lg',
+                className
+              )}
+              {...props}
+            >
+              {children}
+            </Animated.View>
           </Animated.View>
         </View>
       </PopoverContext.Provider>