Files
WooNooW/admin-spa/src/routes/Orders/components/OrderCard.tsx
dwindown ff485a889a fix: OrderCard layout and filter UX improvements
Fixed all issues from user feedback round 2.

1. OrderCard Layout - Icon Inline with 2 Lines
   Problem: Too much vertical space wasted, icon in separate column

   New Layout:
   ┌─────────────────────────────────┐
   │ ☐ [Icon] Nov 04, 2025, 11:44 PM │ ← Line 1: Date (small)
   │         #337                  →│ ← Line 2: Order# (big)
   │         Dwindi Ramadhana        │ ← Line 3: Customer
   │         1 item · Test Digital   │ ← Line 4: Items
   │         Rp64.500    Completed   │ ← Line 5: Total + Status
   └─────────────────────────────────┘

   Changes:
   - Icon inline with first 2 lines (date + order#)
   - Date: text-xs, muted, top line
   - Order#: text-lg, bold, second line
   - Better space utilization
   - Reduced padding: p-4 → p-3
   - Cleaner hierarchy

   Result: More compact, better use of horizontal space!

2. FilterBottomSheet Backdrop Margin
   Problem: Backdrop had top margin from parent space-y-4

   Fix:
   - Added !m-0 to backdrop to override parent spacing
   - Backdrop now properly covers entire screen

   Result: Clean full-screen overlay!

3. DateRange Component Fixes
   Problem:
   - Horizontal overflow when custom dates selected
   - WP forms.css overriding input styles
   - Redundant "Apply" button

   Fixes:
   a) Layout:
      - Changed from horizontal to vertical (flex-col)
      - Full width inputs (w-full)
      - Prevents overflow in bottom sheet

   b) Styling:
      - Override WP forms.css with shadcn classes
      - border-input, bg-background, ring-offset-background
      - focus-visible:ring-2 focus-visible:ring-ring
      - WebkitAppearance: none to remove browser defaults
      - Custom calendar picker cursor

   c) Instant Filtering:
      - Removed "Apply" button
      - Added start/end to useEffect deps
      - Filters apply immediately on date change

   Result: Clean vertical layout, proper styling, instant filtering!

4. Filter Bottom Sheet UX
   Problem: Apply/Cancel buttons confusing (filters already applied)

   Industry Standard: Instant filtering on mobile
   - Gmail: Filters apply instantly
   - Amazon: Filters apply instantly
   - Airbnb: Filters apply instantly

   Solution:
   - Removed "Apply" button
   - Removed "Cancel" button
   - Keep "Clear all filters" button (only when filters active)
   - Filters apply instantly on change
   - User can close sheet anytime (tap backdrop or X)

   Result: Modern, intuitive mobile filter UX!

Files Modified:
- routes/Orders/components/OrderCard.tsx
- routes/Orders/components/FilterBottomSheet.tsx
- components/filters/DateRange.tsx

Summary:
 OrderCard: Icon inline, better space usage
 Backdrop: No margin, full coverage
 DateRange: Vertical layout, no overflow, proper styling
 Filters: Instant application, industry standard UX
 Clean, modern, mobile-first! 🎯
2025-11-08 14:02:02 +07:00

105 lines
4.0 KiB
TypeScript

import React from 'react';
import { Link } from 'react-router-dom';
import { ChevronRight, Package } from 'lucide-react';
import { __ } from '@/lib/i18n';
import { formatMoney } from '@/lib/currency';
import { formatRelativeOrDate } from '@/lib/dates';
import { Checkbox } from '@/components/ui/checkbox';
const statusStyle: Record<string, string> = {
pending: 'bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300',
processing: 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300',
completed: 'bg-emerald-100 text-emerald-800 dark:bg-emerald-900/30 dark:text-emerald-300',
'on-hold': 'bg-slate-200 text-slate-800 dark:bg-slate-800 dark:text-slate-300',
cancelled: 'bg-zinc-200 text-zinc-800 dark:bg-zinc-800 dark:text-zinc-300',
refunded: 'bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-300',
failed: 'bg-rose-100 text-rose-800 dark:bg-rose-900/30 dark:text-rose-300',
};
interface OrderCardProps {
order: any;
selected?: boolean;
onSelect?: (id: number) => void;
currencyConfig: any;
}
export function OrderCard({ order, selected, onSelect, currencyConfig }: OrderCardProps) {
const statusClass = statusStyle[order.status?.toLowerCase()] || 'bg-slate-100 text-slate-800';
return (
<Link
to={`/orders/${order.id}`}
className="block bg-card border border-border rounded-xl p-3 hover:bg-accent/50 transition-colors active:scale-[0.98] active:transition-transform shadow-sm"
>
<div className="flex items-center gap-3">
{/* Checkbox */}
{onSelect && (
<div
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
onSelect(order.id);
}}
>
<Checkbox
checked={selected}
aria-label={__('Select order')}
className="w-5 h-5"
/>
</div>
)}
<div className="flex flex-1 flex-col">
{/* Icon - inline with first 2 lines */}
<div className="flex items-center gap-2">
<div className={`flex-shrink-0 p-2 rounded-xl flex items-center justify-center ${statusClass}`}>
{/* Line 2: Order Number (big) */}
<span className="font-bold text-lg leading-tight">#{order.number}</span>
</div>
<div className="flex flex-col">
{/* Line 1: Date (small) */}
<div className="text-xs text-muted-foreground leading-tight mb-0.5">
{formatRelativeOrDate(order.date_ts)}
</div>
</div>
</div>
{/* Content - 2 lines inline with icon */}
<div className="flex-1 min-w-0">
{/* Line 3: Customer */}
<div className="text-lg font-medium text-foreground mb-1">
{order.customer || __('Guest')}
</div>
{/* Line 4: Items */}
{order.items_brief && (
<div className="text-sm text-muted-foreground truncate mb-2">
{order.items_count} {order.items_count === 1 ? __('item') : __('items')} · {order.items_brief}
</div>
)}
{/* Line 5: Total & Status */}
<div className="flex items-center justify-between gap-2">
<span className="font-bold text-base tabular-nums">
{formatMoney(order.total, {
currency: order.currency || currencyConfig.currency,
symbol: order.currency_symbol || currencyConfig.symbol,
thousandSep: currencyConfig.thousand_sep,
decimalSep: currencyConfig.decimal_sep,
position: currencyConfig.position,
decimals: currencyConfig.decimals,
})}
</span>
</div>
</div>
</div>
{/* Chevron */}
<ChevronRight className="w-5 h-5 text-muted-foreground flex-shrink-0" />
</div>
</Link>
);
}