@ecohouse/ui 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecohouse/ui",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "private": false,
   "description": "Cross-platform presentation-only UI components for EcoHouse (React Native + React Native Web)",

package/src/components/Avatar/Avatar.tsx

@@ -6,7 +6,6 @@ import {
   useRef,
   useState,
   type ComponentRef,
-  type ReactNode,
 } from "react";
 import {
   Image,
@@ -24,20 +23,17 @@ import { ChevronDownIcon, UserIcon } from "../../icons";
 import { avatarTypography, colors } from "../../theme";
 import { mergeRefs } from "../../utils/mergeRefs";
 import { useApplyWebClassName } from "../../utils/useApplyWebClassName";
+import { MenuItem, type MenuItemProps } from "../../primitives";
 
-export interface AvatarMenuItem {
-  /** Stable identity for React keys / hover tracking; falls back to `label`. */
+/** Data shape for an Avatar dropdown option — same fields as `MenuItem`. */
+export type AvatarMenuItem = Pick<
+  MenuItemProps,
+  "icon" | "label" | "disabled" | "backgroundColor" | "hoverColor"
+> & {
+  /** Stable identity for React keys; falls back to `label`. */
   key?: string;
-  /** Leading icon, e.g. `<CalendarIcon />` — pass it pre-colored. */
-  icon?: ReactNode;
-  label: string;
   onPress: () => void;
-  disabled?: boolean;
-  /** Row background at rest. Defaults to transparent. */
-  backgroundColor?: string;
-  /** Row background on hover/press. Defaults to `colors.grey600`. */
-  hoverColor?: string;
-}
+};
 
 export interface AvatarProps extends Omit<
   PressableProps,
@@ -58,7 +54,7 @@ export interface AvatarProps extends Omit<
   /**
    * Account-menu options, supplied entirely by the consumer (icon, label,
    * action, and per-item colors). When set, pressing the chip opens a
-   * dropdown listing them.
+   * dropdown listing them via `MenuItem`.
    */
   menuItems?: AvatarMenuItem[];
   /** Controlled open state for the menu. */
@@ -77,8 +73,6 @@ const CONTAINER_RADIUS = 71;
 const CHEVRON_SIZE = 20;
 const FALLBACK_ICON_SIZE = 20;
 const MENU_RADIUS = 16;
-const MENU_ITEM_RADIUS = 12;
-const MENU_ITEM_ICON_SIZE = 16;
 
 export const Avatar = forwardRef<ComponentRef<typeof View>, AvatarProps>(function Avatar(
   {
@@ -105,9 +99,9 @@ export const Avatar = forwardRef<ComponentRef<typeof View>, AvatarProps>(functio
   const containerRef = useRef<ComponentRef<typeof View>>(null);
   const setContainerRef = useMemo(() => mergeRefs(containerRef, forwardedRef), [forwardedRef]);
   const [imageFailed, setImageFailed] = useState(false);
-  const [hoveredKey, setHoveredKey] = useState<string | null>(null);
 
-  const hasMenu = Boolean(menuItems && menuItems.length > 0);
+  const resolvedMenuItems = menuItems ?? [];
+  const hasMenu = resolvedMenuItems.length > 0;
   const isInteractive = onPress != null || hasMenu;
   const isOpenControlled = typeof openProp === "boolean";
   const [uncontrolledOpen, setUncontrolledOpen] = useState(defaultOpen);
@@ -119,7 +113,6 @@ export const Avatar = forwardRef<ComponentRef<typeof View>, AvatarProps>(functio
     (next: boolean) => {
       if (!isOpenControlled) setUncontrolledOpen(next);
       onOpenChange?.(next);
-      if (!next) setHoveredKey(null);
     },
     [isOpenControlled, onOpenChange],
   );
@@ -237,39 +230,18 @@ export const Avatar = forwardRef<ComponentRef<typeof View>, AvatarProps>(functio
 
       {hasMenu && isOpen ? (
         <View style={[styles.menu, menuWidth != null && { right: undefined, width: menuWidth }]}>
-          {menuItems!.map((item) => {
+          {resolvedMenuItems.map((item) => {
             const itemKey = item.key ?? item.label;
-            const isHovered = hoveredKey === itemKey;
-            const backgroundColor = isHovered
-              ? (item.hoverColor ?? colors.grey600)
-              : (item.backgroundColor ?? "transparent");
-
             return (
-              <Pressable
+              <MenuItem
                 key={itemKey}
-                onPress={() => handleItemPress(item)}
+                icon={item.icon}
+                label={item.label}
                 disabled={item.disabled}
-                onHoverIn={() => setHoveredKey(itemKey)}
-                onHoverOut={() =>
-                  setHoveredKey((current) => (current === itemKey ? null : current))
-                }
-                onPressIn={() => setHoveredKey(itemKey)}
-                onPressOut={() =>
-                  setHoveredKey((current) => (current === itemKey ? null : current))
-                }
-                accessibilityRole="menuitem"
-                accessibilityState={{ disabled: item.disabled }}
-                style={[
-                  styles.menuItem,
-                  { backgroundColor },
-                  item.disabled && styles.menuItemDisabled,
-                ]}
-              >
-                {item.icon ? <View style={styles.menuItemIcon}>{item.icon}</View> : null}
-                <Text style={styles.menuItemLabel} numberOfLines={1}>
-                  {item.label}
-                </Text>
-              </Pressable>
+                backgroundColor={item.backgroundColor}
+                hoverColor={item.hoverColor}
+                onPress={() => handleItemPress(item)}
+              />
             );
           })}
         </View>
@@ -362,28 +334,4 @@ const styles = StyleSheet.create({
       },
     }),
   },
-  menuItem: {
-    minHeight: 40,
-    borderRadius: MENU_ITEM_RADIUS,
-    paddingVertical: 12,
-    paddingHorizontal: 12,
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 8,
-  },
-  menuItemDisabled: {
-    opacity: 0.5,
-  },
-  menuItemIcon: {
-    width: MENU_ITEM_ICON_SIZE,
-    height: MENU_ITEM_ICON_SIZE,
-    alignItems: "center",
-    justifyContent: "center",
-    flexShrink: 0,
-  },
-  menuItemLabel: {
-    ...avatarTypography.menuItem,
-    color: colors.white,
-    flex: 1,
-  },
 });

package/src/components/DatePicker/DatePicker.stories.tsx

@@ -0,0 +1,172 @@
+import { useState } from "react";
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { fn } from "storybook/test";
+import { View, StyleSheet, Text } from "react-native";
+import { DatePicker, type DateRange } from "./DatePicker";
+import { colors } from "../../theme";
+
+const meta = {
+  title: "Components/DatePicker",
+  component: DatePicker,
+  args: {
+    placeholder: "Select date",
+    defaultOpen: false,
+    disabled: false,
+    range: false,
+    onValueChange: fn(),
+    onOpenChange: fn(),
+  },
+  argTypes: {
+    range: { control: "boolean" },
+    onValueChange: { action: "valueChange" },
+    onOpenChange: { action: "openChange" },
+  },
+  parameters: {
+    backgrounds: { default: "black" },
+  },
+} satisfies Meta<typeof DatePicker>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+
+export const Open: Story = {
+  args: { defaultOpen: true },
+};
+
+export const WithValue: Story = {
+  args: {
+    defaultValue: new Date(2026, 8, 15),
+    defaultOpen: true,
+  },
+};
+
+export const Range: Story = {
+  args: {
+    range: true,
+    placeholder: "Select dates",
+    defaultValue: { start: new Date(2026, 8, 15), end: new Date(2026, 8, 24) },
+    defaultOpen: true,
+  },
+};
+
+export const RangeInProgress: Story = {
+  args: {
+    range: true,
+    placeholder: "Select dates",
+    defaultValue: { start: new Date(2026, 8, 15), end: null },
+    defaultOpen: true,
+  },
+};
+
+export const MinMaxDate: Story = {
+  args: {
+    defaultOpen: true,
+    minDate: new Date(2026, 8, 10),
+    maxDate: new Date(2026, 8, 20),
+    defaultVisibleMonth: new Date(2026, 8, 1),
+  },
+};
+
+export const KeepOpenOnSelect: Story = {
+  args: {
+    defaultOpen: true,
+    closeOnSelect: false,
+  },
+};
+
+export const Disabled: Story = {
+  args: { disabled: true, defaultValue: new Date(2026, 8, 15) },
+};
+
+/** Verifies that a disabled DatePicker stays non-interactive even when forced open. */
+export const DisabledOpen: Story = {
+  args: {
+    disabled: true,
+    defaultOpen: true,
+    defaultValue: new Date(2026, 8, 15),
+  },
+};
+
+function ControlledDatePicker() {
+  const [value, setValue] = useState<Date | null>(null);
+  const [open, setOpen] = useState(false);
+
+  return (
+    <View style={storyStyles.column}>
+      <DatePicker
+        placeholder="Select date"
+        value={value}
+        onValueChange={setValue}
+        open={open}
+        onOpenChange={setOpen}
+      />
+      <Text style={storyStyles.meta}>
+        value: {value ? value.toDateString() : "—"} · open: {String(open)}
+      </Text>
+    </View>
+  );
+}
+
+function ControlledRangeDatePicker() {
+  const [value, setValue] = useState<DateRange>({ start: null, end: null });
+  const [open, setOpen] = useState(true);
+
+  return (
+    <View style={storyStyles.column}>
+      <DatePicker
+        range
+        placeholder="Select dates"
+        value={value}
+        onValueChange={setValue}
+        open={open}
+        onOpenChange={setOpen}
+      />
+      <Text style={storyStyles.meta}>
+        {value.start ? value.start.toDateString() : "—"} →{" "}
+        {value.end ? value.end.toDateString() : "—"}
+      </Text>
+    </View>
+  );
+}
+
+export const Controlled: Story = {
+  render: () => <ControlledDatePicker />,
+};
+
+export const ControlledRange: Story = {
+  render: () => <ControlledRangeDatePicker />,
+};
+
+export const AllStates: Story = {
+  render: () => (
+    <View style={storyStyles.row}>
+      <DatePicker placeholder="Select date" />
+      <DatePicker placeholder="Select date" defaultOpen defaultValue={new Date(2026, 8, 15)} />
+      <DatePicker
+        range
+        placeholder="Select dates"
+        defaultValue={{ start: new Date(2026, 8, 15), end: new Date(2026, 8, 24) }}
+        defaultOpen
+      />
+    </View>
+  ),
+};
+
+const storyStyles = StyleSheet.create({
+  column: {
+    gap: 12,
+    alignItems: "flex-start",
+  },
+  row: {
+    flexDirection: "row",
+    flexWrap: "wrap",
+    gap: 24,
+    alignItems: "flex-start",
+  },
+  meta: {
+    color: colors.grey100,
+    fontSize: 12,
+  },
+});