@immich/ui 0.49.3 → 0.50.0

package/dist/components/AppShell/AppShellSidebar.svelte

@@ -18,7 +18,7 @@
   <Scrollable
     class={cleanClass(
       'bg-light text-dark absolute shrink-0 border-e shadow-lg transition-all duration-200 md:relative',
-      open ? `${zIndex.AppShellSidebar} w-[min(100vw,16rem)]` : 'w-[0px] border-e-0',
+      open ? `${zIndex.AppShellSidebar} w-[min(100vw,16rem)]` : 'w-0 border-e-0',
       className,
     )}
   >

package/dist/components/Breadcrumbs/Breadcrumbs.svelte

@@ -19,7 +19,7 @@
   </span>
 {/snippet}
 
-<nav class={cleanClass('flex items-center gap-1', className)} {...props}>
+<nav class={cleanClass('flex flex-wrap items-center gap-1', className)} {...props}>
   {#each items as item, index (index)}
     {#if index > 0}
       {#if typeof separator === 'object' && 'text' in separator}

package/dist/components/Card/Card.svelte

@@ -9,7 +9,6 @@
   import { cubicOut } from 'svelte/easing';
   import type { HTMLAttributes } from 'svelte/elements';
   import { slide } from 'svelte/transition';
-  import { twMerge } from 'tailwind-merge';
   import { tv } from 'tailwind-variants';
 
   type Props = HTMLAttributes<HTMLDivElement> & {
@@ -87,14 +86,12 @@
   const headerPadding = $derived(headerBorder || !expanded);
 
   const headerContainerClasses = $derived(
-    twMerge(
-      cleanClass(
-        headerContainerStyles({
-          padding: headerPadding,
-          border: headerBorder,
-        }),
-        headerChild?.class,
-      ),
+    cleanClass(
+      headerContainerStyles({
+        padding: headerPadding,
+        border: headerBorder,
+      }),
+      headerChild?.class,
     ),
   );
 </script>
@@ -137,14 +134,14 @@
     {#if bodyChild && expanded}
       <div
         transition:slide={{ duration: expandable ? 200 : 0, easing: cubicOut }}
-        class={twMerge(cleanClass('immich-scrollbar h-full w-full overflow-auto p-4', bodyChild?.class))}
+        class={cleanClass('immich-scrollbar h-full w-full overflow-auto p-4', bodyChild?.class)}
       >
         {@render bodyChild?.snippet()}
       </div>
     {/if}
 
     {#if footerChild}
-      <div class={twMerge(cleanClass('flex items-center border-t p-4', footerChild.class))}>
+      <div class={cleanClass('flex items-center border-t p-4', footerChild.class)}>
         {@render footerChild.snippet()}
       </div>
     {/if}

package/dist/components/ContextMenu/ContextMenu.svelte

@@ -3,7 +3,8 @@
   import Text from '../Text/Text.svelte';
   import { zIndex } from '../../constants.js';
   import { styleVariants } from '../../styles.js';
-  import { MenuItemType, type ContextMenuProps, type ActionItem } from '../../types.js';
+  import { type ActionItem, type ContextMenuProps, type MenuItems } from '../../types.js';
+  import { isMenuItemType } from '../../utilities/common.js';
   import { cleanClass, isEnabled } from '../../utilities/internal.js';
   import { DropdownMenu } from 'bits-ui';
   import { fly } from 'svelte/transition';
@@ -20,10 +21,6 @@
     ...restProps
   }: ContextMenuProps = $props();
 
-  const isDivider = (item: ActionItem | MenuItemType): item is MenuItemType => {
-    return item === MenuItemType.Divider;
-  };
-
   const itemStyles = tv({
     base: 'hover:bg-light-200 flex w-full items-center gap-1 rounded-lg p-1 text-start hover:cursor-pointer',
     variants: {
@@ -83,10 +80,35 @@
     }
   };
 
-  const filteredItems = $derived(
-    items.filter((item) => item !== undefined).filter((item) => isDivider(item) || isEnabled(item)),
-  );
-  const filteredBottomItems = $derived(bottomItems?.filter((item) => item !== undefined).filter(isEnabled));
+  const getFilteredItems = (items?: MenuItems) => {
+    if (!items) {
+      return [];
+    }
+
+    const results = [];
+    for (const item of items) {
+      if (item && (isMenuItemType(item) || isEnabled(item))) {
+        results.push(item);
+        continue;
+      }
+    }
+
+    // remove trailing dividers
+    for (let i = results.length - 1; i >= 0; i--) {
+      const item = results[i];
+      if (isMenuItemType(item)) {
+        results.pop();
+        continue;
+      }
+
+      break;
+    }
+
+    return results;
+  };
+
+  const filteredItems = $derived(getFilteredItems(items));
+  const filteredBottomItems = $derived(getFilteredItems(bottomItems) as ActionItem[]);
 
   const alignOffset = $derived(target.clientWidth / 2);
   const sideOffset = $derived(-target.clientHeight / 2);
@@ -100,8 +122,8 @@
         {#if open}
           <div {...wrapperProps} class={zIndex.ContextMenu}>
             <div {...props} {...restProps} class={cleanClass(wrapperStyles({ size }), className)} transition:fly>
-              {#each filteredItems as item, i (isDivider(item) ? i : item.title)}
-                {#if isDivider(item)}
+              {#each filteredItems as item, i (isMenuItemType(item) ? i : item.title)}
+                {#if isMenuItemType(item)}
                   <DropdownMenu.Separator class="dark:border-light-300 my-0.5 border-t" />
                 {:else}
                   <DropdownMenu.Item
@@ -118,7 +140,7 @@
                 {/if}
               {/each}
 
-              {#if filteredBottomItems}
+              {#if filteredBottomItems.length > 0}
                 <DropdownMenu.Separator class="dark:border-light-300 my-0.5 border-t" />
                 <div class="flex gap-1 px-1">
                   {#each filteredBottomItems as item (item.title)}

package/dist/components/ContextMenu/ContextMenuButton.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import IconButton from '../IconButton/IconButton.svelte';
   import { menuManager } from '../../services/menu-manager.svelte.js';
+  import { t } from '../../services/translation.svelte.js';
   import type { ContextMenuButtonProps } from '../../types.js';
   import { mdiDotsVertical } from '@mdi/js';
 
@@ -10,8 +11,10 @@
     icon = mdiDotsVertical,
     variant = 'ghost',
     shape = 'round',
+    'aria-label': ariaLabel,
     items,
     bottomItems,
+    translations,
     ...rest
   }: ContextMenuButtonProps = $props();
 
@@ -20,4 +23,12 @@
   };
 </script>
 
-<IconButton {icon} {color} {shape} {variant} {...rest} {onclick} />
+<IconButton
+  {icon}
+  {color}
+  {shape}
+  {variant}
+  aria-label={ariaLabel ?? t('open_menu', translations)}
+  {...rest}
+  {onclick}
+/>

package/dist/components/Toast/ToastPanel.svelte

@@ -4,7 +4,6 @@
   import { isCustomToast } from '../../services/toast-manager.svelte.js';
   import type { ToastPanelProps } from '../../types.js';
   import { cleanClass } from '../../utilities/internal.js';
-  import { twMerge } from 'tailwind-merge';
 
   const { items, class: className, ...props }: ToastPanelProps = $props();
 
@@ -12,12 +11,10 @@
 </script>
 
 <div
-  class={twMerge(
-    cleanClass(
-      isEmpty ? 'hidden' : 'absolute top-0 right-0 flex flex-col items-end justify-end gap-2 p-4',
-      zIndex.ToastPanel,
-      className,
-    ),
+  class={cleanClass(
+    isEmpty ? 'hidden' : 'absolute top-0 right-0 flex flex-col items-end justify-end gap-2 p-4',
+    zIndex.ToastPanel,
+    className,
   )}
   {...props}
 >

package/dist/internal/Button.svelte

@@ -7,7 +7,6 @@
   import { cleanClass } from '../utilities/internal.js';
   import { Button as ButtonPrimitive } from 'bits-ui';
   import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements';
-  import { twMerge } from 'tailwind-merge';
   import { tv } from 'tailwind-variants';
 
   type InternalButtonProps = ButtonProps & {
@@ -99,22 +98,20 @@
 
   const classList = $derived(
     cleanClass(
-      twMerge(
-        buttonVariants({
-          shape,
-          fullWidth,
-          textPadding: icon ? undefined : size,
-          textSize: size,
-          iconSize: icon ? size : undefined,
-          disabled,
-          roundedSize: shape === 'semi-round' ? size : undefined,
-          filledColor: variant === 'filled' ? color : undefined,
-          filledColorHover: variant === 'filled' ? color : undefined,
-          outlineColor: variant === 'outline' ? color : undefined,
-          ghostColor: variant === 'ghost' ? color : undefined,
-        }),
-        className,
-      ),
+      buttonVariants({
+        shape,
+        fullWidth,
+        textPadding: icon ? undefined : size,
+        textSize: size,
+        iconSize: icon ? size : undefined,
+        disabled,
+        roundedSize: shape === 'semi-round' ? size : undefined,
+        filledColor: variant === 'filled' ? color : undefined,
+        filledColorHover: variant === 'filled' ? color : undefined,
+        outlineColor: variant === 'outline' ? color : undefined,
+        ghostColor: variant === 'ghost' ? color : undefined,
+      }),
+      className,
     ),
   );
 

package/dist/services/command-palette-manager.svelte.d.ts

@@ -4,16 +4,76 @@ export declare const asText: (...items: unknown[]) => string;
 declare class CommandPaletteManager {
     #private;
     selectedIndex: number;
-    items: (ActionItem & {
+    items: ({
+        title: string;
+        description?: string;
+        type?: string;
+        searchText?: string;
+        icon: import("../types.js").IconLike;
+        iconClass?: string;
+        color?: import("../types.js").Color;
+        onAction: import("../types.js").ActionItemHandler;
+        shortcuts?: MaybeArray<import("../actions/shortcut.js").Shortcut>;
+        shortcutOptions?: {
+            ignoreInputFields?: boolean;
+            preventDefault?: boolean;
+        };
+        isGlobal?: boolean;
+    } & import("../types.js").IfLike & {
         id: string;
     })[];
-    filteredItems: (ActionItem & {
+    filteredItems: ({
+        title: string;
+        description?: string;
+        type?: string;
+        searchText?: string;
+        icon: import("../types.js").IconLike;
+        iconClass?: string;
+        color?: import("../types.js").Color;
+        onAction: import("../types.js").ActionItemHandler;
+        shortcuts?: MaybeArray<import("../actions/shortcut.js").Shortcut>;
+        shortcutOptions?: {
+            ignoreInputFields?: boolean;
+            preventDefault?: boolean;
+        };
+        isGlobal?: boolean;
+    } & import("../types.js").IfLike & {
         id: string;
     })[];
-    recentItems: (ActionItem & {
+    recentItems: ({
+        title: string;
+        description?: string;
+        type?: string;
+        searchText?: string;
+        icon: import("../types.js").IconLike;
+        iconClass?: string;
+        color?: import("../types.js").Color;
+        onAction: import("../types.js").ActionItemHandler;
+        shortcuts?: MaybeArray<import("../actions/shortcut.js").Shortcut>;
+        shortcutOptions?: {
+            ignoreInputFields?: boolean;
+            preventDefault?: boolean;
+        };
+        isGlobal?: boolean;
+    } & import("../types.js").IfLike & {
         id: string;
     })[];
-    results: (ActionItem & {
+    results: ({
+        title: string;
+        description?: string;
+        type?: string;
+        searchText?: string;
+        icon: import("../types.js").IconLike;
+        iconClass?: string;
+        color?: import("../types.js").Color;
+        onAction: import("../types.js").ActionItemHandler;
+        shortcuts?: MaybeArray<import("../actions/shortcut.js").Shortcut>;
+        shortcutOptions?: {
+            ignoreInputFields?: boolean;
+            preventDefault?: boolean;
+        };
+        isGlobal?: boolean;
+    } & import("../types.js").IfLike & {
         id: string;
     })[];
     get isEnabled(): boolean;

package/dist/services/translation.svelte.d.ts

@@ -12,6 +12,7 @@ declare const defaultTranslations: {
     show_password: string;
     hide_password: string;
     dark_theme: string;
+    open_menu: string;
     command_palette_prompt_default: string;
     command_palette_to_select: string;
     command_palette_to_navigate: string;

package/dist/services/translation.svelte.js

@@ -17,6 +17,8 @@ const defaultTranslations = {
     hide_password: 'Hide password',
     // theme switcher
     dark_theme: 'Toggle dark theme',
+    // context menu
+    open_menu: 'Open menu',
     // command palette
     command_palette_prompt_default: 'Quickly find pages, actions, or commands',
     command_palette_to_select: 'to select',

package/dist/types.d.ts

@@ -1,8 +1,8 @@
+import type { Shortcut } from './actions/shortcut.js';
 import type { Translations } from './services/translation.svelte.js';
 import type { DateTime } from 'luxon';
 import type { Component, Snippet } from 'svelte';
 import type { HTMLAnchorAttributes, HTMLAttributes, HTMLButtonAttributes, HTMLInputAttributes, HTMLLabelAttributes, HTMLTextareaAttributes } from 'svelte/elements';
-import type { Shortcut } from './actions/shortcut.js';
 export type Color = 'primary' | 'secondary' | 'success' | 'danger' | 'warning' | 'info';
 export type TextColor = Color | 'muted';
 export type TextVariant = 'italic';
@@ -71,9 +71,9 @@ export type CloseButtonProps = {
 export type ContextMenuButtonProps = ButtonBase & {
     icon?: IconLike;
     position?: ContextMenuPosition;
-    'aria-label': string;
     items: MenuItems;
     bottomItems?: Array<ActionItem | undefined>;
+    translations?: TranslationProps<'open_menu'>;
 } & Omit<HTMLButtonAttributes, 'color' | 'size'>;
 export type IconButtonProps = ButtonBase & {
     icon: IconLike;
@@ -243,8 +243,8 @@ export type DatePickerProps = {
 export type IfLike = {
     $if?: () => boolean;
 };
-export type ActionItemHandler<T = never> = (item: ActionItem<T>) => void | Promise<void>;
-export type ActionItem<T = never> = Omit<{
+export type ActionItemHandler<T extends ActionItem = ActionItem> = (item: T) => void | Promise<void>;
+export type ActionItem = {
     title: string;
     description?: string;
     type?: string;
@@ -252,17 +252,14 @@ export type ActionItem<T = never> = Omit<{
     icon: IconLike;
     iconClass?: string;
     color?: Color;
-    onAction: ActionItemHandler<T>;
-    data: T;
+    onAction: ActionItemHandler;
     shortcuts?: MaybeArray<Shortcut>;
     shortcutOptions?: {
         ignoreInputFields?: boolean;
         preventDefault?: boolean;
     };
     isGlobal?: boolean;
-} & IfLike, [
-    T
-] extends [never] ? 'data' : ''>;
+} & IfLike;
 export type BreadcrumbsProps = {
     separator?: IconLike | {
         text: string;

package/dist/utilities/common.d.ts

@@ -1,3 +1,4 @@
+import { MenuItemType, type ActionItem } from '../types.js';
 import type { DateTime } from 'luxon';
 export declare const resolveUrl: (url: string, currentHostname?: string) => string;
 export declare const isExternalLink: (href: string) => boolean;
@@ -14,6 +15,7 @@ export type ArticleMetadata = {
     section?: string;
     tags?: string[];
 };
+export declare const isMenuItemType: (item: ActionItem | MenuItemType) => item is MenuItemType;
 export declare const resolveMetadata: (site: Metadata, page?: Metadata, article?: ArticleMetadata) => {
     type: string;
     siteName: string;

package/dist/utilities/common.js

@@ -1,4 +1,5 @@
 import { env } from '$env/dynamic/public';
+import { MenuItemType } from '../types.js';
 const getImmichApp = (host) => {
     if (!host || !host.endsWith('immich.app')) {
         return false;
@@ -25,6 +26,9 @@ export const resolveUrl = (url, currentHostname) => {
 export const isExternalLink = (href) => {
     return !(href.startsWith('/') || href.startsWith('#'));
 };
+export const isMenuItemType = (item) => {
+    return item === MenuItemType.Divider;
+};
 export const resolveMetadata = (site, page, article) => {
     const title = page ? `${page.title} | ${site.title}` : site.title;
     const description = page?.description ?? site.description;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/ui",
-  "version": "0.49.3",
+  "version": "0.50.0",
   "license": "GNU Affero General Public License version 3",
   "repository": {
     "type": "git",