@trycompai/design-system 1.0.17 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycompai/design-system",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "Design system for Comp AI - shadcn-style components with Tailwind CSS",
   "type": "module",
   "main": "./src/index.ts",
@@ -97,7 +97,6 @@
     "tailwindcss": "^4.0.0"
   },
   "devDependencies": {
-    "@repo/typescript-config": "workspace:*",
     "@tailwindcss/postcss": "^4.1.10",
     "@types/node": "^22.18.0",
     "@types/react": "^19.2.7",

package/src/components/molecules/select.tsx

@@ -136,6 +136,16 @@ function SelectSeparator({ ...props }: Omit<SelectPrimitive.Separator.Props, 'cl
   );
 }
 
+function SelectEmpty({ ...props }: Omit<React.ComponentProps<'div'>, 'className'>) {
+  return (
+    <div
+      data-slot="select-empty"
+      className="text-muted-foreground py-6 text-center text-sm"
+      {...props}
+    />
+  );
+}
+
 function SelectScrollUpButton({
   ...props
 }: Omit<React.ComponentProps<typeof SelectPrimitive.ScrollUpArrow>, 'className'>) {
@@ -167,6 +177,7 @@ function SelectScrollDownButton({
 export {
   Select,
   SelectContent,
+  SelectEmpty,
   SelectGroup,
   SelectItem,
   SelectLabel,

package/src/components/organisms/organization-selector.tsx

@@ -1,5 +1,7 @@
 'use client';
 
+import { Command as CommandPrimitive } from 'cmdk';
+import { Dialog as DialogPrimitive } from '@base-ui/react/dialog';
 import { Combobox as ComboboxPrimitive } from '@base-ui/react';
 import { Checkmark, ChevronDown, Search } from '@carbon/icons-react';
 import * as React from 'react';
@@ -33,39 +35,70 @@ export interface OrganizationSelectorProps {
   /** Search input placeholder */
   searchPlaceholder?: string;
   /** Text shown when no results match search */
-  emptyText?: string;
+  emptySearchText?: string;
+  /** Text shown when organizations list is empty */
+  emptyListText?: string;
   /** Whether the selector is disabled */
   disabled?: boolean;
+  /** Whether organizations are being loaded */
+  loading?: boolean;
+  /** Text shown while loading */
+  loadingText?: string;
+  /** Error message to display */
+  error?: string;
   /** Size variant for the trigger */
   size?: 'sm' | 'default';
+  /** Max width for the organization name in trigger (e.g., '150px') */
+  maxWidth?: string;
+  /** Keyboard shortcut to open (e.g., 'o' for Cmd+O). Set to null to disable. */
+  hotkey?: string | null;
+  /** Whether to open as a full-screen modal (like Cmd+K) instead of dropdown */
+  modal?: boolean;
 }
 
 // ============================================================================
 // Internal Components
 // ============================================================================
 
-function OrganizationColorDot({ color }: { color?: string }) {
-  if (!color) return null;
-
-  // Support both hex colors and Tailwind classes
-  const isTailwindClass = color.startsWith('bg-');
-  const style = isTailwindClass ? undefined : { backgroundColor: color };
-  const className = isTailwindClass
-    ? `size-2 shrink-0 rounded-full ${color}`
-    : 'size-2 shrink-0 rounded-full';
+function LoadingSpinner() {
+  return (
+    <svg
+      className="size-4 animate-spin text-muted-foreground"
+      xmlns="http://www.w3.org/2000/svg"
+      fill="none"
+      viewBox="0 0 24 24"
+    >
+      <circle
+        className="opacity-25"
+        cx="12"
+        cy="12"
+        r="10"
+        stroke="currentColor"
+        strokeWidth="4"
+      />
+      <path
+        className="opacity-75"
+        fill="currentColor"
+        d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+      />
+    </svg>
+  );
+}
 
-  return <span className={className} style={style} />;
+function EmptyState({ icon, text }: { icon?: React.ReactNode; text: string }) {
+  return (
+    <div className="flex flex-col items-center justify-center gap-2 py-6 text-center">
+      {icon && <span className="text-muted-foreground">{icon}</span>}
+      <span className="text-muted-foreground text-sm">{text}</span>
+    </div>
+  );
 }
 
-function OrganizationItemContent({ org }: { org: Organization }) {
+function OrganizationItemContent({ org, maxWidth }: { org: Organization; maxWidth?: string }) {
   return (
     <>
-      {org.icon ? (
-        <span className="shrink-0">{org.icon}</span>
-      ) : (
-        <OrganizationColorDot color={org.color} />
-      )}
-      <span className="truncate">{org.name}</span>
+      {org.icon && <span className="shrink-0">{org.icon}</span>}
+      <span className="truncate" style={maxWidth ? { maxWidth } : undefined}>{org.name}</span>
     </>
   );
 }
@@ -81,16 +114,44 @@ function OrganizationSelector({
   onValueChange,
   placeholder = 'Select organization',
   searchPlaceholder = 'Search by name or ID...',
-  emptyText = 'No organizations found',
+  emptySearchText = 'No organizations found',
+  emptyListText = 'No organizations available',
   disabled = false,
+  loading = false,
+  loadingText = 'Loading organizations...',
+  error,
   size = 'default',
+  maxWidth = '150px',
+  hotkey = 'o',
+  modal = false,
 }: OrganizationSelectorProps) {
   const [internalValue, setInternalValue] = React.useState(defaultValue ?? '');
   const [searchQuery, setSearchQuery] = React.useState('');
+  const [open, setOpen] = React.useState(false);
+  const triggerRef = React.useRef<HTMLButtonElement>(null);
 
   const selectedValue = value ?? internalValue;
   const selectedOrg = organizations.find((org) => org.id === selectedValue);
 
+  // Keyboard shortcut to open (Cmd/Ctrl + hotkey)
+  React.useEffect(() => {
+    if (!hotkey || disabled || loading) return;
+
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key.toLowerCase() === hotkey.toLowerCase() && (event.metaKey || event.ctrlKey)) {
+        event.preventDefault();
+        if (modal) {
+          setOpen(true);
+        } else {
+          triggerRef.current?.click();
+        }
+      }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    return () => window.removeEventListener('keydown', handleKeyDown);
+  }, [hotkey, disabled, loading, modal]);
+
   // Filter organizations by ID or name (case-insensitive)
   const filteredOrganizations = React.useMemo(() => {
     if (!searchQuery.trim()) return organizations;
@@ -110,28 +171,154 @@ function OrganizationSelector({
       }
       onValueChange?.(orgId);
       setSearchQuery(''); // Clear search on selection
+      setOpen(false); // Close modal on selection
     },
     [value, onValueChange]
   );
 
   const triggerSizeClass = size === 'sm' ? 'h-7' : 'h-8';
 
+  // Determine content state
+  const hasError = Boolean(error);
+  const isEmpty = organizations.length === 0;
+  const hasNoResults = filteredOrganizations.length === 0 && !isEmpty;
+
+  const triggerButton = (
+    <button
+      ref={triggerRef}
+      type="button"
+      data-slot="organization-selector-trigger"
+      data-size={size}
+      disabled={disabled || loading}
+      onClick={modal ? () => setOpen(true) : undefined}
+      className={`gap-1.5 rounded-lg border border-transparent bg-transparent py-2 pr-2.5 pl-2.5 text-sm transition-colors select-none hover:bg-accent [&_svg:not([class*='size-'])]:size-4 flex w-fit items-center whitespace-nowrap outline-none disabled:cursor-not-allowed disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 ${triggerSizeClass}`}
+    >
+      {loading ? (
+        <>
+          <LoadingSpinner />
+          <span className="text-muted-foreground">Loading...</span>
+        </>
+      ) : selectedOrg ? (
+        <OrganizationItemContent org={selectedOrg} maxWidth={maxWidth} />
+      ) : (
+        <span className="text-muted-foreground">{placeholder}</span>
+      )}
+      {!loading && <ChevronDown className="text-muted-foreground size-3.5 shrink-0" />}
+    </button>
+  );
+
+  // Modal mode: full-screen dialog like Cmd+K
+  if (modal) {
+    return (
+      <>
+        {triggerButton}
+        <DialogPrimitive.Root open={open} onOpenChange={setOpen}>
+          <DialogPrimitive.Portal>
+            <DialogPrimitive.Backdrop
+              data-slot="dialog-overlay"
+              className="data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 bg-black/10 duration-100 supports-backdrop-filter:backdrop-blur-xs fixed inset-0 isolate z-50"
+            />
+            <DialogPrimitive.Popup
+              data-slot="command-dialog-content"
+              className="data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 bg-background ring-foreground/10 rounded-xl p-0 ring-1 duration-100 sm:max-w-lg group/dialog-content fixed top-1/2 left-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 overflow-hidden outline-none"
+            >
+              <div className="sr-only">
+                <DialogPrimitive.Title>Select Organization</DialogPrimitive.Title>
+                <DialogPrimitive.Description>
+                  Search and select an organization from the list
+                </DialogPrimitive.Description>
+              </div>
+              <CommandPrimitive
+                data-slot="command"
+                className="bg-popover text-popover-foreground rounded-xl p-1 flex size-full flex-col overflow-hidden"
+                filter={(value, search) => {
+                  const org = organizations.find((o) => o.id === value);
+                  if (!org) return 0;
+                  const query = search.toLowerCase();
+                  if (org.id.toLowerCase().includes(query)) return 1;
+                  if (org.name.toLowerCase().includes(query)) return 1;
+                  return 0;
+                }}
+              >
+                {/* Search Input */}
+                <div data-slot="command-input-wrapper" className="p-1 pb-0">
+                  <div
+                    data-slot="input-group"
+                    role="group"
+                    className="border-input/30 bg-input/30 h-8 rounded-lg border shadow-none transition-[color,box-shadow] has-[[data-slot=input-group-control]:focus-visible]:border-ring has-[[data-slot=input-group-control]:focus-visible]:ring-ring/50 has-[[data-slot=input-group-control]:focus-visible]:ring-[3px] group/input-group relative flex w-full min-w-0 items-center outline-none"
+                  >
+                    <CommandPrimitive.Input
+                      data-slot="command-input"
+                      placeholder={searchPlaceholder}
+                      className="w-full flex-1 bg-transparent px-2.5 py-1 text-sm outline-hidden disabled:cursor-not-allowed disabled:opacity-50"
+                    />
+                    <div
+                      data-slot="input-group-addon"
+                      data-align="inline-end"
+                      className="text-muted-foreground flex h-auto cursor-text items-center justify-center gap-2 pr-2 text-sm font-medium select-none"
+                    >
+                      <Search className="size-4 shrink-0 opacity-50" />
+                    </div>
+                  </div>
+                </div>
+
+                {/* Organization List */}
+                <CommandPrimitive.List
+                  data-slot="command-list"
+                  className="no-scrollbar max-h-72 scroll-py-1 outline-none overflow-x-hidden overflow-y-auto"
+                >
+                  {loading ? (
+                    <EmptyState icon={<LoadingSpinner />} text={loadingText} />
+                  ) : hasError ? (
+                    <EmptyState text={error!} />
+                  ) : isEmpty ? (
+                    <EmptyState text={emptyListText} />
+                  ) : (
+                    <CommandPrimitive.Group data-slot="command-group" className="text-foreground overflow-hidden p-1">
+                      <CommandPrimitive.Empty data-slot="command-empty" className="py-6 text-center text-sm">
+                        {emptySearchText}
+                      </CommandPrimitive.Empty>
+                      {organizations.map((org) => (
+                        <CommandPrimitive.Item
+                          key={org.id}
+                          data-slot="command-item"
+                          value={org.id}
+                          onSelect={() => handleValueChange(org.id)}
+                          className="data-[selected=true]:bg-muted data-[selected=true]:text-foreground relative flex cursor-default items-center gap-2 rounded-lg px-2 py-1.5 text-sm outline-hidden select-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0"
+                        >
+                          <OrganizationItemContent org={org} />
+                          {selectedValue === org.id && (
+                            <Checkmark className="ml-auto size-4" />
+                          )}
+                        </CommandPrimitive.Item>
+                      ))}
+                    </CommandPrimitive.Group>
+                  )}
+                </CommandPrimitive.List>
+              </CommandPrimitive>
+            </DialogPrimitive.Popup>
+          </DialogPrimitive.Portal>
+        </DialogPrimitive.Root>
+      </>
+    );
+  }
+
+  // Dropdown mode (default): inline combobox
   return (
     <ComboboxPrimitive.Root value={selectedValue} onValueChange={handleValueChange}>
       <ComboboxPrimitive.Trigger
+        ref={triggerRef}
         data-slot="organization-selector-trigger"
         data-size={size}
         disabled={disabled}
-        className={`border-input dark:bg-input/30 dark:hover:bg-input/50 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive gap-2 rounded-lg border bg-transparent py-2 pr-2 pl-2.5 text-sm transition-colors select-none focus-visible:ring-[3px] [&_svg:not([class*='size-'])]:size-4 flex w-full items-center justify-between whitespace-nowrap outline-none disabled:cursor-not-allowed disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 ${triggerSizeClass}`}
+        className={`gap-1.5 rounded-lg border border-transparent bg-transparent py-2 pr-2.5 pl-2.5 text-sm transition-colors select-none hover:bg-accent [&_svg:not([class*='size-'])]:size-4 flex w-fit items-center whitespace-nowrap outline-none disabled:cursor-not-allowed disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 ${triggerSizeClass}`}
       >
-        <span className="flex flex-1 items-center gap-2 truncate">
-          {selectedOrg ? (
-            <OrganizationItemContent org={selectedOrg} />
-          ) : (
-            <span className="text-muted-foreground">{placeholder}</span>
-          )}
-        </span>
-        <ChevronDown className="text-muted-foreground size-4 shrink-0" />
+        {selectedOrg ? (
+          <OrganizationItemContent org={selectedOrg} maxWidth={maxWidth} />
+        ) : (
+          <span className="text-muted-foreground">{placeholder}</span>
+        )}
+        <ChevronDown className="text-muted-foreground size-3.5 shrink-0" />
       </ComboboxPrimitive.Trigger>
 
       <ComboboxPrimitive.Portal>
@@ -164,10 +351,14 @@ function OrganizationSelector({
               data-slot="organization-selector-list"
               className="no-scrollbar max-h-64 scroll-py-1 overflow-y-auto p-1 overscroll-contain"
             >
-              {filteredOrganizations.length === 0 ? (
-                <div className="text-muted-foreground flex w-full justify-center py-6 text-center text-sm">
-                  {emptyText}
-                </div>
+              {loading ? (
+                <EmptyState icon={<LoadingSpinner />} text={loadingText} />
+              ) : hasError ? (
+                <EmptyState text={error!} />
+              ) : isEmpty ? (
+                <EmptyState text={emptyListText} />
+              ) : hasNoResults ? (
+                <EmptyState text={emptySearchText} />
               ) : (
                 filteredOrganizations.map((org) => (
                   <ComboboxPrimitive.Item

package/src/components/organisms/page-layout.tsx

@@ -3,6 +3,7 @@ import * as React from 'react';
 
 import { cn } from '../../../lib/utils';
 import { Stack } from '../atoms/stack';
+import { Skeleton } from '../atoms/skeleton';
 
 const pageLayoutVariants = cva('min-h-full bg-background text-foreground', {
   variants: {
@@ -48,6 +49,29 @@ interface PageLayoutProps
   maxWidth?: 'sm' | 'md' | 'lg' | 'xl' | '2xl';
   /** Vertical gap between children. Defaults to 'lg' (gap-6). */
   gap?: 'none' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '0' | '1' | '2' | '3' | '4' | '6' | '8';
+  /** Whether the page is loading. Shows skeleton placeholder when true. */
+  loading?: boolean;
+}
+
+function PageLayoutSkeleton() {
+  return (
+    <Stack gap="lg">
+      {/* Header skeleton */}
+      <div className="space-y-2">
+        <Skeleton style={{ width: '30%', height: 24 }} />
+        <Skeleton style={{ width: '50%', height: 16 }} />
+      </div>
+      {/* Content skeleton */}
+      <div className="space-y-4">
+        <Skeleton style={{ width: '100%', height: 200 }} />
+        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+          <Skeleton style={{ width: '100%', height: 120 }} />
+          <Skeleton style={{ width: '100%', height: 120 }} />
+          <Skeleton style={{ width: '100%', height: 120 }} />
+        </div>
+      </div>
+    </Stack>
+  );
 }
 
 function PageLayout({
@@ -56,13 +80,16 @@ function PageLayout({
   container = true,
   maxWidth,
   gap = 'lg',
+  loading = false,
   children,
   ...props
 }: PageLayoutProps) {
   // For center variant, default to smaller max-width (sm) for auth-style pages
   const resolvedMaxWidth = maxWidth ?? (variant === 'center' ? 'sm' : 'xl');
 
-  const content = (
+  const content = loading ? (
+    <PageLayoutSkeleton />
+  ) : (
     <Stack gap={gap}>
       {children}
     </Stack>
@@ -72,6 +99,7 @@ function PageLayout({
     <div
       data-slot="page-layout"
       data-variant={variant}
+      data-loading={loading || undefined}
       className={pageLayoutVariants({ variant, padding })}
       {...props}
     >