mirror of
https://github.com/hanzoai/calendar.git
synced 2026-10-30 14:46:43 +00:00
Dhairyashil ShindeandGitHub
60a4d3f2b4
* feat(companion): add DropdownMenu for Android event types list Replace Alert.alert with react-native-reusables DropdownMenu component for Android event type list items, providing a native-feeling menu experience that matches iOS functionality. Changes: - Install react-native-reusables dropdown-menu component and dependencies (lucide-react-native, tailwindcss-animate, class-variance-authority, clsx, tailwind-merge) - Create EventTypeListItem.android.tsx with DropdownMenu implementation - Single ellipsis button triggers dropdown menu - Menu includes: Preview, Copy link, Edit, Duplicate, Delete - Delete action marked as destructive variant - Proper safe area insets handling - Add PortalHost to app/_layout.tsx for portal rendering support - Create lib/utils.ts with cn() helper for className merging - Update global.css with theme CSS variables (popover, border, accent, destructive, etc.) for dropdown menu styling - Update tailwind.config.js with theme colors and tailwindcss-animate plugin - Update metro.config.js with inlineRem: 16 for proper rem unit handling - Remove Android Alert.alert fallback from event types index.tsx - Fix lint issues in generated dropdown-menu.tsx (remove unnecessary fragments) The Android experience now matches iOS with a single menu button that opens a dropdown containing all event type actions, replacing the previous Alert.alert dialog and separate action buttons. Refs: https://reactnativereusables.com/docs/components/dropdown-menu * adjust with of menu * feat(companion): add DropdownMenu for Android booking and availability list items - Add BookingListItem.android.tsx with DropdownMenu for booking actions - Add BookingDetailScreen.android.tsx with DropdownMenu in header - Add AvailabilityListItem.android.tsx with DropdownMenu for schedule actions Actions include: Reschedule, Edit Location, Add Guests, View Recordings, Meeting Session Details, Mark as No-Show, Report Booking, Cancel Event for bookings; Set as Default, Duplicate, Delete for availability schedules. * fix lint issues * feat(android): replace native alerts with AlertDialog and Toast in event types - Install AlertDialog and Alert components from react-native-reusables - Create Android-specific event types screen (index.android.tsx) - Replace native Alert.alert() with AlertDialog for delete confirmation - Add inline validation errors (red border + error text) in create modal - Implement Toast snackbar for success/error notifications (no layout shift) - Auto-dismiss toast after 2.5 seconds - Fix React Compiler compatibility by removing animated refs This provides a more consistent and polished UI experience on Android, matching the design system used in other parts of the app. * feat(android): add AlertDialog for availability delete and booking cancel - Add index.android.tsx for availability with AlertDialog for delete confirmation - Add index.android.tsx for bookings with AlertDialog for cancel (with reason input) - Both screens include Toast snackbar for success/error notifications - Follows the same pattern as event types Android implementation * feat(companion): add DropdownMenu and AlertDialog for Android - Replace native Alert.alert context menus with DropdownMenu component for event types, bookings, and availability lists - Replace FullScreenModal with AlertDialog for create/delete/cancel flows - Add toast notifications for success/error feedback on Android - Set consistent 380px max-width for all AlertDialogs - Fix layout headers showing "index" text on event-types and availability - Create Android-specific More screen with AlertDialog logout confirmation Uses react-native-reusables components for polished Android UI * better code * fix cubics comments * refactor(android): revert delete confirmations to native Alert.alert() - Logout: reverted to native Alert.alert() (simple yes/no) - Event Types Delete: reverted to native Alert.alert() (simple yes/no) - Availability Delete: reverted to native Alert.alert() (simple yes/no) Keep AlertDialog only where user input is needed: - Event Types Create (has TextInput for title) - Availability Create (has TextInput for name) - Bookings Cancel (has TextInput for cancellation reason) * refactor(android): remove redundant index.android.tsx files The main index.tsx files already handle Android via Platform.OS checks. Android-specific behavior for actions is in the list item components: - EventTypeListItem.android.tsx - BookingListItem.android.tsx - AvailabilityListItem.android.tsx This consolidates the code and reduces duplication. * corrected the implementation both native and alert dialog * address cubics comments * fix lint issue and address cubic comments
90 lines
2.5 KiB
TypeScript
90 lines
2.5 KiB
TypeScript
import { cn } from "@/lib/utils";
|
|
import * as Slot from "@rn-primitives/slot";
|
|
import { cva, type VariantProps } from "class-variance-authority";
|
|
import * as React from "react";
|
|
import { Platform, Text as RNText, type Role } from "react-native";
|
|
|
|
const textVariants = cva(
|
|
cn(
|
|
"text-foreground text-base",
|
|
Platform.select({
|
|
web: "select-text",
|
|
})
|
|
),
|
|
{
|
|
variants: {
|
|
variant: {
|
|
default: "",
|
|
h1: cn(
|
|
"text-center text-4xl font-extrabold tracking-tight",
|
|
Platform.select({ web: "scroll-m-20 text-balance" })
|
|
),
|
|
h2: cn(
|
|
"border-border border-b pb-2 text-3xl font-semibold tracking-tight",
|
|
Platform.select({ web: "scroll-m-20 first:mt-0" })
|
|
),
|
|
h3: cn("text-2xl font-semibold tracking-tight", Platform.select({ web: "scroll-m-20" })),
|
|
h4: cn("text-xl font-semibold tracking-tight", Platform.select({ web: "scroll-m-20" })),
|
|
p: "mt-3 leading-7 sm:mt-6",
|
|
blockquote: "mt-4 border-l-2 pl-3 italic sm:mt-6 sm:pl-6",
|
|
code: cn(
|
|
"bg-muted relative rounded px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold"
|
|
),
|
|
lead: "text-muted-foreground text-xl",
|
|
large: "text-lg font-semibold",
|
|
small: "text-sm font-medium leading-none",
|
|
muted: "text-muted-foreground text-sm",
|
|
},
|
|
},
|
|
defaultVariants: {
|
|
variant: "default",
|
|
},
|
|
}
|
|
);
|
|
|
|
type TextVariantProps = VariantProps<typeof textVariants>;
|
|
|
|
type TextVariant = NonNullable<TextVariantProps["variant"]>;
|
|
|
|
const ROLE: Partial<Record<TextVariant, Role>> = {
|
|
h1: "heading",
|
|
h2: "heading",
|
|
h3: "heading",
|
|
h4: "heading",
|
|
blockquote: Platform.select({ web: "blockquote" as Role }),
|
|
code: Platform.select({ web: "code" as Role }),
|
|
};
|
|
|
|
const ARIA_LEVEL: Partial<Record<TextVariant, string>> = {
|
|
h1: "1",
|
|
h2: "2",
|
|
h3: "3",
|
|
h4: "4",
|
|
};
|
|
|
|
const TextClassContext = React.createContext<string | undefined>(undefined);
|
|
|
|
function Text({
|
|
className,
|
|
asChild = false,
|
|
variant = "default",
|
|
...props
|
|
}: React.ComponentProps<typeof RNText> &
|
|
TextVariantProps &
|
|
React.RefAttributes<RNText> & {
|
|
asChild?: boolean;
|
|
}) {
|
|
const textClass = React.useContext(TextClassContext);
|
|
const Component = asChild ? Slot.Text : RNText;
|
|
return (
|
|
<Component
|
|
className={cn(textVariants({ variant }), textClass, className)}
|
|
role={variant ? ROLE[variant] : undefined}
|
|
aria-level={variant ? ARIA_LEVEL[variant] : undefined}
|
|
{...props}
|
|
/>
|
|
);
|
|
}
|
|
|
|
export { Text, TextClassContext };
|