@tuturuuu/ui 0.8.0 → 0.9.0

package/src/components/ui/custom/combobox.tsx

@@ -14,11 +14,13 @@ import {
   CommandSeparator,
 } from '../command';
 import { Popover, PopoverContent, PopoverTrigger } from '../popover';
+import { Tooltip, TooltipContent, TooltipTrigger } from '../tooltip';
 
 export type ComboboxOption = {
   value: string;
   label: string;
   searchValue?: string;
+  group?: string;
   description?: React.ReactNode;
   badge?: React.ReactNode;
   icon?: React.ReactNode;
@@ -41,6 +43,8 @@ export type ComboboxCreateResult = string | ComboboxOption | undefined;
 export type ComboboxOptions = ComboboxOption;
 
 type Mode = 'single' | 'multiple';
+type ComboboxContentWidth = 'trigger' | 'sm' | 'md' | 'lg' | 'auto';
+type ComboboxTriggerMode = 'default' | 'compact';
 
 interface ComboboxProps {
   /** Options to display in the combobox */
@@ -67,6 +71,26 @@ interface ComboboxProps {
   creatingText?: string;
   /** Override label shown on the trigger button */
   label?: React.ReactNode;
+  /** Accessible label for compact/icon-first triggers */
+  ariaLabel?: string;
+  /** Whether to render the selected option icon inside the trigger button */
+  showSelectedIcon?: boolean;
+  /** Icon rendered in the trigger instead of the selected option icon */
+  triggerIcon?: React.ReactNode;
+  /** Whether to render the chevron inside the trigger button */
+  showChevron?: boolean;
+  /** Trigger layout mode */
+  triggerMode?: ComboboxTriggerMode;
+  /** Hide the visible trigger label while preserving the accessible label */
+  hideTriggerLabel?: boolean;
+  /** Tooltip rendered for compact/icon-only triggers */
+  triggerTooltip?: React.ReactNode;
+  /** Whether selected option colors should be applied to the trigger icon/text */
+  colorizeTriggerIcon?: boolean;
+  /** Width preset for the popover content */
+  contentWidth?: ComboboxContentWidth;
+  /** Additional class name for the popover content */
+  contentClassName?: string;
   /** Additional class name for the container */
   className?: string;
   /** Whether the combobox is disabled */
@@ -77,6 +101,8 @@ interface ComboboxProps {
   onCreate?: (value: string) => unknown | Promise<unknown>;
   /** Callback when search input changes */
   onSearchChange?: (value: string) => void;
+  /** Callback when the popover opens or closes */
+  onOpenChange?: (open: boolean) => void;
   /** Whether there are more options to load */
   hasMore?: boolean;
   /** Callback when the options list scrolls near the end */
@@ -107,11 +133,22 @@ export function Combobox({
   createText,
   creatingText,
   label,
+  ariaLabel,
+  showSelectedIcon = true,
+  triggerIcon,
+  showChevron = true,
+  triggerMode = 'default',
+  hideTriggerLabel = false,
+  triggerTooltip,
+  colorizeTriggerIcon = true,
+  contentWidth = 'trigger',
+  contentClassName,
   className,
   disabled,
   useFirstValueAsDefault = false,
   onCreate,
   onSearchChange,
+  onOpenChange,
   hasMore = false,
   onLoadMore,
   loadingMore = false,
@@ -146,6 +183,27 @@ export function Combobox({
     );
   }, [normalizedQuery, options]);
   const canCreate = Boolean(onCreate && normalizedQuery && !hasExactQueryMatch);
+  const groupedOptions = React.useMemo(() => {
+    const groups = new Map<string, ComboboxOption[]>();
+    const ungrouped: ComboboxOption[] = [];
+
+    for (const option of options) {
+      if (!option.group) {
+        ungrouped.push(option);
+        continue;
+      }
+
+      groups.set(option.group, [...(groups.get(option.group) ?? []), option]);
+    }
+
+    return {
+      ungrouped,
+      groups: [...groups.entries()].map(([heading, groupOptions]) => ({
+        heading,
+        options: groupOptions,
+      })),
+    };
+  }, [options]);
 
   React.useEffect(() => {
     if (!open) {
@@ -153,6 +211,14 @@ export function Combobox({
     }
   }, [open]);
 
+  const handleOpenChange = React.useCallback(
+    (nextOpen: boolean) => {
+      setOpen(nextOpen);
+      onOpenChange?.(nextOpen);
+    },
+    [onOpenChange]
+  );
+
   const handleListScroll = React.useCallback(
     (event: React.UIEvent<HTMLDivElement>) => {
       if (!hasMore || loadingMore || !onLoadMore) return;
@@ -214,7 +280,7 @@ export function Combobox({
             disabled={action.disabled}
             onSelect={() => {
               action.onSelect();
-              setOpen(false);
+              handleOpenChange(false);
               setQuery('');
             }}
             className="font-medium text-primary [&_svg]:text-primary"
@@ -227,6 +293,96 @@ export function Combobox({
     );
   };
 
+  const renderOption = (option: ComboboxOption) => (
+    <CommandItem
+      key={option.value}
+      value={option.searchValue ?? option.label}
+      className={cn(option.muted && 'bg-muted/30')}
+      onSelect={() => {
+        if (onChange) {
+          if (mode === 'multiple' && Array.isArray(selected)) {
+            onChange(
+              selected.includes(option.value)
+                ? selected.filter((item) => item !== option.value)
+                : [...selected, option.value]
+            );
+          } else {
+            onChange(option.value);
+          }
+        }
+        if (mode === 'single') {
+          handleOpenChange(false);
+        }
+      }}
+    >
+      <span className="flex min-w-0 flex-1 items-center gap-2">
+        {option.icon && (
+          <span className="flex shrink-0 items-center justify-center">
+            {React.isValidElement(option.icon)
+              ? React.cloneElement(
+                  option.icon as React.ReactElement<{
+                    style?: React.CSSProperties;
+                  }>,
+                  {
+                    style: option.color
+                      ? {
+                          ...((
+                            option.icon as React.ReactElement<{
+                              style?: React.CSSProperties;
+                            }>
+                          ).props?.style || {}),
+                          color: option.color,
+                        }
+                      : (
+                          option.icon as React.ReactElement<{
+                            style?: React.CSSProperties;
+                          }>
+                        ).props?.style,
+                  }
+                )
+              : option.icon}
+          </span>
+        )}
+        <span className="min-w-0 flex-1">
+          <span className="flex min-w-0 items-start justify-between gap-2">
+            <span
+              className={cn(
+                'min-w-0 flex-1 whitespace-normal break-words',
+                option.muted && 'text-muted-foreground'
+              )}
+              style={option.color ? { color: option.color } : undefined}
+            >
+              {option.label}
+            </span>
+            {option.badge}
+          </span>
+          {option.description ? (
+            <span className="mt-0.5 block whitespace-normal break-words text-muted-foreground text-xs leading-snug">
+              {option.description}
+            </span>
+          ) : null}
+        </span>
+      </span>
+      <Check
+        className={cn(
+          'ml-auto shrink-0',
+          isSelected(option.value) ? 'opacity-100' : 'opacity-0'
+        )}
+      />
+    </CommandItem>
+  );
+
+  const contentWidthClass =
+    contentWidth === 'trigger'
+      ? 'w-(--radix-popover-trigger-width) min-w-[min(16rem,calc(100vw-2rem))]'
+      : contentWidth === 'sm'
+        ? 'w-64'
+        : contentWidth === 'md'
+          ? 'w-80'
+          : contentWidth === 'lg'
+            ? 'w-96'
+            : 'w-auto min-w-[min(16rem,calc(100vw-2rem))]';
+
   const commitCreatedValue = React.useCallback(
     (result: unknown) => {
       if (!onChange) return;
@@ -264,7 +420,7 @@ export function Combobox({
     try {
       const result = await onCreate(trimmedQuery);
       commitCreatedValue(result);
-      setOpen(false);
+      handleOpenChange(false);
       setQuery('');
     } catch {
       // Keep the popover open so callers can surface their own error UI.
@@ -272,84 +428,117 @@ export function Combobox({
       createInFlightRef.current = false;
       setCreating(false);
     }
-  }, [commitCreatedValue, onCreate, trimmedQuery]);
+  }, [commitCreatedValue, handleOpenChange, onCreate, trimmedQuery]);
 
-  return (
-    <div className={cn('block min-w-0', className)}>
-      <Popover open={open} onOpenChange={setOpen} modal={true}>
-        <PopoverTrigger asChild>
-          <Button
-            type="button"
-            variant="outline"
-            role="combobox"
-            aria-expanded={open}
-            className={cn(
-              'w-full min-w-0 justify-between overflow-hidden',
-              !selectedLabel && 'text-muted-foreground'
-            )}
-            disabled={disabled}
-          >
-            <span
-              className={cn(
-                'flex min-w-0 items-center gap-2',
-                !selectedLabel && 'text-muted-foreground'
-              )}
-            >
-              {selectedOption?.icon && (
-                <span className="flex shrink-0 items-center justify-center">
-                  {React.isValidElement(selectedOption.icon)
-                    ? React.cloneElement(
-                        selectedOption.icon as React.ReactElement<{
-                          style?: React.CSSProperties;
-                        }>,
-                        {
-                          style: selectedOption.color
-                            ? {
-                                ...((
-                                  selectedOption.icon as React.ReactElement<{
-                                    style?: React.CSSProperties;
-                                  }>
-                                ).props?.style || {}),
-                                color: selectedOption.color,
-                              }
-                            : (
-                                selectedOption.icon as React.ReactElement<{
+  const triggerOptionIcon = triggerIcon ?? selectedOption?.icon;
+
+  const triggerButton = (
+    <Button
+      type="button"
+      variant="outline"
+      role="combobox"
+      aria-label={ariaLabel}
+      aria-expanded={open}
+      className={cn(
+        'min-w-0 overflow-hidden',
+        triggerMode === 'compact'
+          ? 'w-auto justify-center gap-1.5'
+          : 'w-full justify-between',
+        hideTriggerLabel && 'aspect-square px-0',
+        !selectedLabel && 'text-muted-foreground'
+      )}
+      disabled={disabled}
+    >
+      <span
+        className={cn(
+          'flex min-w-0 items-center gap-2',
+          !selectedLabel && 'text-muted-foreground'
+        )}
+      >
+        {showSelectedIcon && triggerOptionIcon && (
+          <span className="flex shrink-0 items-center justify-center">
+            {triggerIcon
+              ? triggerIcon
+              : React.isValidElement(triggerOptionIcon)
+                ? React.cloneElement(
+                    triggerOptionIcon as React.ReactElement<{
+                      style?: React.CSSProperties;
+                    }>,
+                    {
+                      style:
+                        colorizeTriggerIcon && selectedOption?.color
+                          ? {
+                              ...((
+                                triggerOptionIcon as React.ReactElement<{
                                   style?: React.CSSProperties;
                                 }>
-                              ).props?.style,
-                        }
-                      )
-                    : selectedOption.icon}
+                              ).props?.style || {}),
+                              color: selectedOption.color,
+                            }
+                          : (
+                              triggerOptionIcon as React.ReactElement<{
+                                style?: React.CSSProperties;
+                              }>
+                            ).props?.style,
+                    }
+                  )
+                : triggerOptionIcon}
+          </span>
+        )}
+        {hideTriggerLabel ? (
+          <span className="sr-only">{selectedLabel ?? placeholder}</span>
+        ) : (
+          <span className="min-w-0 flex-1 truncate text-left">
+            {label ? (
+              label
+            ) : (
+              <span className="flex min-w-0 items-center gap-2">
+                <span
+                  className={cn(
+                    'truncate',
+                    selectedOption?.muted && 'text-muted-foreground'
+                  )}
+                  style={
+                    colorizeTriggerIcon && selectedOption?.color
+                      ? { color: selectedOption.color }
+                      : undefined
+                  }
+                >
+                  {selectedLabel ?? placeholder}
                 </span>
-              )}
-              <span className="min-w-0 flex-1 truncate text-left">
-                {label ? (
-                  label
-                ) : (
-                  <span className="flex min-w-0 items-center gap-2">
-                    <span
-                      className={cn(
-                        'truncate',
-                        selectedOption?.muted && 'text-muted-foreground'
-                      )}
-                      style={
-                        selectedOption?.color
-                          ? { color: selectedOption.color }
-                          : undefined
-                      }
-                    >
-                      {selectedLabel ?? placeholder}
-                    </span>
-                    {selectedOption?.badge}
-                  </span>
-                )}
+                {selectedOption?.badge}
               </span>
-            </span>
-            <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-          </Button>
-        </PopoverTrigger>
+            )}
+          </span>
+        )}
+      </span>
+      {showChevron && (
+        <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+      )}
+    </Button>
+  );
+
+  const trigger = triggerTooltip ? (
+    <Tooltip delayDuration={0}>
+      <TooltipTrigger asChild>
+        <PopoverTrigger asChild>{triggerButton}</PopoverTrigger>
+      </TooltipTrigger>
+      <TooltipContent>{triggerTooltip}</TooltipContent>
+    </Tooltip>
+  ) : (
+    <PopoverTrigger asChild>{triggerButton}</PopoverTrigger>
+  );
+
+  return (
+    <div className={cn('block min-w-0', className)}>
+      <Popover open={open} onOpenChange={handleOpenChange} modal={true}>
+        {trigger}
         <PopoverContent
-          className="z-9999 w-(--radix-popover-trigger-width) max-w-[calc(100vw-2rem)] p-0"
+          className={cn(
+            'z-9999 max-w-[calc(100vw-2rem)] p-0',
+            contentWidthClass,
+            contentClassName
+          )}
           align="start"
           sideOffset={4}
         >
@@ -411,88 +600,16 @@ export function Combobox({
                   <CommandSeparator />
                 </>
               ) : null}
-              <CommandGroup>
-                {options.map((option) => (
-                  <CommandItem
-                    key={option.value}
-                    value={option.searchValue ?? option.label}
-                    className={cn(option.muted && 'bg-muted/30')}
-                    onSelect={() => {
-                      if (onChange) {
-                        if (mode === 'multiple' && Array.isArray(selected)) {
-                          onChange(
-                            selected.includes(option.value)
-                              ? selected.filter((item) => item !== option.value)
-                              : [...selected, option.value]
-                          );
-                        } else {
-                          onChange(option.value);
-                        }
-                      }
-                      if (mode === 'single') {
-                        setOpen(false);
-                      }
-                    }}
-                  >
-                    <span className="flex min-w-0 flex-1 items-center gap-2">
-                      {option.icon && (
-                        <span className="flex shrink-0 items-center justify-center">
-                          {React.isValidElement(option.icon)
-                            ? React.cloneElement(
-                                option.icon as React.ReactElement<{
-                                  style?: React.CSSProperties;
-                                }>,
-                                {
-                                  style: option.color
-                                    ? {
-                                        ...((
-                                          option.icon as React.ReactElement<{
-                                            style?: React.CSSProperties;
-                                          }>
-                                        ).props?.style || {}),
-                                        color: option.color,
-                                      }
-                                    : (
-                                        option.icon as React.ReactElement<{
-                                          style?: React.CSSProperties;
-                                        }>
-                                      ).props?.style,
-                                }
-                              )
-                            : option.icon}
-                        </span>
-                      )}
-                      <span className="min-w-0 flex-1">
-                        <span className="flex min-w-0 items-start justify-between gap-2">
-                          <span
-                            className={cn(
-                              'truncate',
-                              option.muted && 'text-muted-foreground'
-                            )}
-                            style={
-                              option.color ? { color: option.color } : undefined
-                            }
-                          >
-                            {option.label}
-                          </span>
-                          {option.badge}
-                        </span>
-                        {option.description ? (
-                          <span className="mt-0.5 block truncate text-muted-foreground text-xs">
-                            {option.description}
-                          </span>
-                        ) : null}
-                      </span>
-                    </span>
-                    <Check
-                      className={cn(
-                        'ml-auto shrink-0',
-                        isSelected(option.value) ? 'opacity-100' : 'opacity-0'
-                      )}
-                    />
-                  </CommandItem>
-                ))}
-              </CommandGroup>
+              {groupedOptions.ungrouped.length ? (
+                <CommandGroup>
+                  {groupedOptions.ungrouped.map(renderOption)}
+                </CommandGroup>
+              ) : null}
+              {groupedOptions.groups.map((group) => (
+                <CommandGroup heading={group.heading} key={group.heading}>
+                  {group.options.map(renderOption)}
+                </CommandGroup>
+              ))}
               {actionsPosition === 'bottom' && actions?.length ? (
                 <>
                   <CommandSeparator />

package/src/components/ui/custom/education/modules/youtube/delete-link-button.tsx

@@ -3,43 +3,36 @@
 import { Trash } from '@tuturuuu/icons';
 import { updateWorkspaceCourseModule } from '@tuturuuu/internal-api/education';
 import { Button } from '@tuturuuu/ui/button';
+import { toast } from '@tuturuuu/ui/sonner';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 
 export default function DeleteLinkButton({
   wsId,
   moduleId,
-  courseId,
   link,
   links,
 }: {
   wsId: string;
   moduleId: string;
-  courseId: string;
+  courseId?: string;
   link: string;
   links: string[];
 }) {
   const router = useRouter();
   const [loading, setLoading] = useState(false);
 
-  const updateYoutubeLinks = async (
-    moduleId: string,
-    courseId: string,
-    links: string[]
-  ) => {
+  const updateYoutubeLinks = async (moduleId: string, links: string[]) => {
     setLoading(true);
     try {
       await updateWorkspaceCourseModule(wsId, moduleId, {
-        course_id: courseId,
         youtube_links: links,
       });
       router.refresh();
-      setLoading(false);
-      return null;
     } catch (error) {
-      console.error('error', error);
+      toast.error(error instanceof Error ? error.message : String(error));
+    } finally {
       setLoading(false);
-      return null;
     }
   };
 
@@ -48,7 +41,6 @@ export default function DeleteLinkButton({
       onClick={async () => {
         await updateYoutubeLinks(
           moduleId,
-          courseId,
           links.filter((l) => l !== link)
         );
       }}

package/src/components/ui/custom/facebook-mockup/facebook-mockup.tsx

@@ -1,5 +1,11 @@
 'use client';
-import { Download, Monitor, Smartphone, Tablet, X } from '@tuturuuu/icons';
+import {
+  Download,
+  Monitor,
+  Smartphone,
+  Tablet,
+  X,
+} from '@tuturuuu/icons/lucide';
 import { Button } from '@tuturuuu/ui/button';
 import { cn } from '@tuturuuu/utils/format';
 import { useLocale, useTranslations } from 'next-intl';

package/src/components/ui/custom/facebook-mockup/form.tsx

@@ -11,7 +11,7 @@ import {
   Smartphone,
   Sun,
   Tablet,
-} from '@tuturuuu/icons';
+} from '@tuturuuu/icons/lucide';
 import { Button } from '@tuturuuu/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@tuturuuu/ui/card';
 import { Checkbox } from '@tuturuuu/ui/checkbox';

package/src/components/ui/custom/facebook-mockup/image-upload-field.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { Image as ImageIcon, Upload, X } from '@tuturuuu/icons';
+import { Image as ImageIcon, Upload, X } from '@tuturuuu/icons/lucide';
 import { Button } from '@tuturuuu/ui/button';
 import { Label } from '@tuturuuu/ui/label';
 import { cn } from '@tuturuuu/utils/format';

package/src/components/ui/custom/facebook-mockup/preview.tsx

@@ -15,7 +15,7 @@ import {
   ThumbsUp,
   Tv,
   X,
-} from '@tuturuuu/icons';
+} from '@tuturuuu/icons/lucide';
 import { cn } from '@tuturuuu/utils/format';
 import {
   forwardRef,

package/src/components/ui/custom/settings-dialog-shell.tsx

@@ -273,7 +273,8 @@ export function SettingsDialogShell({
 
   return (
     <DialogContent
-      className="top-0 left-0 flex h-dvh max-h-dvh w-screen max-w-none translate-x-0 translate-y-0 flex-col gap-0 overflow-hidden rounded-none border-0 p-0 shadow-none sm:max-w-none"
+      presentation="fullscreen"
+      className="flex-col"
       onKeyDown={handleKeyboardNavigation}
       showCloseButton={false}
     >

package/src/components/ui/custom/theme-toggle.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { Moon, Sun } from '@tuturuuu/icons';
+import { Moon, Sun } from '@tuturuuu/icons/lucide-static';
 import { Button } from '@tuturuuu/ui/button';
 import { cn } from '@tuturuuu/utils/format';
 import { useTheme } from 'next-themes';

package/src/components/ui/custom/workspace-select.tsx

@@ -23,9 +23,9 @@ import {
   toWorkspaceSlug,
 } from '@tuturuuu/utils/constants';
 import { cn } from '@tuturuuu/utils/format';
-import { getInitials } from '@tuturuuu/utils/name-helper';
 import { workspaceHandleSchema } from '@tuturuuu/utils/workspace-handle';
 import { WORKSPACE_LIMIT_ERROR_CODE } from '@tuturuuu/utils/workspace-limits';
+import Image from 'next/image';
 import { usePathname, useRouter } from 'next/navigation';
 import { useTranslations } from 'next-intl';
 import type { ReactNode } from 'react';
@@ -98,6 +98,7 @@ function WorkspaceIcon({
     avatarUrl,
     fallbackLogoUrl
   );
+  const shouldSkipFallbackOptimization = /^https?:\/\//u.test(fallbackLogoUrl);
 
   return (
     <Avatar
@@ -124,11 +125,15 @@ function WorkspaceIcon({
           resolvedAvatarUrl ? 'rounded-xs' : 'rounded-sm'
         )}
       >
-        <AvatarImage
+        <Image
+          alt=""
+          aria-hidden="true"
           className="h-full w-full object-cover"
+          height={20}
           src={fallbackLogoUrl}
+          unoptimized={shouldSkipFallbackOptimization}
+          width={20}
         />
-        {name ? getInitials(name) : '?'}
       </AvatarFallback>
     </Avatar>
   );