Merge branches 'chore/web-bucketing-by-day' and 'main' of github.com:immich-app/immich into chore/web-bucketing-by-day

web/src/lib/actions/click-outside.ts

@@ -1,19 +1,12 @@
 import { matchesShortcut } from '$lib/actions/shortcut';
 import type { ActionReturn } from 'svelte/action';
 
-interface Attributes {
-  /** @deprecated */
-  'on:outclick'?: (e: CustomEvent) => void;
-  /** @deprecated **/
-  'on:escape'?: (e: CustomEvent) => void;
-}
-
 interface Options {
   onOutclick?: () => void;
   onEscape?: () => void;
 }
 
-export function clickOutside(node: HTMLElement, options: Options = {}): ActionReturn<void, Attributes> {
+export function clickOutside(node: HTMLElement, options: Options = {}): ActionReturn {
   const { onOutclick, onEscape } = options;
 
   const handleClick = (event: MouseEvent) => {
@@ -22,11 +15,7 @@ export function clickOutside(node: HTMLElement, options: Options = {}): ActionRe
       return;
     }
 
-    if (onOutclick) {
+    onOutclick?.();
-      onOutclick();
-    } else {
-      node.dispatchEvent(new CustomEvent('outclick'));
-    }
   };
 
   const handleKey = (event: KeyboardEvent) => {
@@ -37,8 +26,6 @@ export function clickOutside(node: HTMLElement, options: Options = {}): ActionRe
     if (onEscape) {
       event.stopPropagation();
       onEscape();
-    } else {
-      node.dispatchEvent(new CustomEvent('escape'));
     }
   };
 

web/src/lib/components/album-page/share-info-modal.svelte

@@ -126,7 +126,7 @@
                 />
 
                 {#if selectedMenuUser === user}
-                  <ContextMenu {...position} on:outclick={() => (selectedMenuUser = null)}>
+                  <ContextMenu {...position} onClose={() => (selectedMenuUser = null)}>
                     {#if role === AlbumUserRole.Viewer}
                       <MenuOption on:click={() => handleSetReadonly(user, AlbumUserRole.Editor)} text="Allow edits" />
                     {:else}

web/src/lib/components/asset-viewer/activity-viewer.svelte

@@ -201,8 +201,7 @@
                   <button
                     type="button"
                     class="absolute right-6 rounded-xl items-center bg-gray-300 dark:bg-slate-100 py-3 px-6 text-left text-sm font-medium text-immich-fg hover:bg-red-300 focus:outline-none focus:ring-2 focus:ring-inset dark:text-immich-dark-bg dark:hover:bg-red-100 transition-colors"
-                    use:clickOutside
+                    use:clickOutside={{ onOutclick: () => (showDeleteReaction[index] = false) }}
-                    on:outclick={() => (showDeleteReaction[index] = false)}
                     on:click={() => handleDeleteReaction(reaction, index)}
                   >
                     Remove
@@ -254,8 +253,7 @@
                     <button
                       type="button"
                       class="absolute right-6 rounded-xl items-center bg-gray-300 dark:bg-slate-100 py-3 px-6 text-left text-sm font-medium text-immich-fg hover:bg-red-300 focus:outline-none focus:ring-2 focus:ring-inset dark:text-immich-dark-bg dark:hover:bg-red-100 transition-colors"
-                      use:clickOutside
+                      use:clickOutside={{ onOutclick: () => (showDeleteReaction[index] = false) }}
-                      on:outclick={() => (showDeleteReaction[index] = false)}
                       on:click={() => handleDeleteReaction(reaction, index)}
                     >
                       Remove

web/src/lib/components/asset-viewer/asset-viewer.svelte

@@ -273,10 +273,12 @@
   };
 
   const closeViewer = async () => {
-    $slideshowState = SlideshowState.StopSlideshow;
+    if ($slideshowState === SlideshowState.None) {
-    document.body.style.cursor = '';
+      dispatch('close');
-    dispatch('close');
+      await navigate({ targetRoute: 'current', assetId: null });
-    await navigate({ targetRoute: 'current', assetId: null });
+    } else {
+      $slideshowState = SlideshowState.StopSlideshow;
+    }
   };
 
   const navigateAssetRandom = async () => {
@@ -793,7 +795,6 @@
       <DeleteAssetDialog
         size={1}
         on:cancel={() => (isShowDeleteConfirmation = false)}
-        on:escape={() => (isShowDeleteConfirmation = false)}
         on:confirm={() => deleteAsset()}
       />
     {/if}

web/src/lib/components/elements/dropdown.svelte

@@ -72,7 +72,7 @@
   $: renderedSelectedOption = renderOption(selectedOption);
 </script>
 
-<div use:clickOutside on:outclick={handleClickOutside} on:escape={handleClickOutside}>
+<div use:clickOutside={{ onOutclick: handleClickOutside, onEscape: handleClickOutside }}>
   <!-- BUTTON TITLE -->
   <LinkButton on:click={() => (showMenu = true)} fullwidth {title}>
     <div class="flex place-items-center gap-2 text-sm">

web/src/lib/components/faces-page/people-card.svelte

@@ -87,7 +87,7 @@
 
 {#if showContextMenu}
   <Portal target="body">
-    <ContextMenu {...contextMenuPosition} on:outclick={() => onMenuExit()}>
+    <ContextMenu {...contextMenuPosition} onClose={() => onMenuExit()}>
       <MenuOption on:click={() => onMenuClick('hide-person')} icon={mdiEyeOffOutline} text="Hide person" />
       <MenuOption on:click={() => onMenuClick('change-name')} icon={mdiAccountEditOutline} text="Change name" />
       <MenuOption

web/src/lib/components/photos-page/actions/delete-assets.svelte

@@ -2,7 +2,6 @@
   import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
   import MenuOption from '../../shared-components/context-menu/menu-option.svelte';
   import { getAssetControlContext } from '../asset-select-control-bar.svelte';
-  import { createEventDispatcher } from 'svelte';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { mdiTimerSand, mdiDeleteOutline } from '@mdi/js';
   import { type OnDelete, deleteAssets } from '$lib/utils/actions';
@@ -14,10 +13,6 @@
 
   const { clearSelect, getOwnedAssets } = getAssetControlContext();
 
-  const dispatch = createEventDispatcher<{
-    escape: void;
-  }>();
-
   let isShowConfirmation = false;
   let loading = false;
 
@@ -40,11 +35,6 @@
     isShowConfirmation = false;
     loading = false;
   };
-
-  const escape = () => {
-    dispatch('escape');
-    isShowConfirmation = false;
-  };
 </script>
 
 {#if menuItem}
@@ -60,6 +50,5 @@
     size={getOwnedAssets().size}
     on:confirm={handleDelete}
     on:cancel={() => (isShowConfirmation = false)}
-    on:escape={escape}
   />
 {/if}

web/src/lib/components/photos-page/asset-select-context-menu.svelte

@@ -25,7 +25,7 @@
   setContext(() => (showContextMenu = false));
 </script>
 
-<div use:clickOutside on:outclick={() => (showContextMenu = false)}>
+<div use:clickOutside={{ onOutclick: () => (showContextMenu = false) }}>
   <CircleIconButton {title} {icon} on:click={handleShowMenu} />
   {#if showContextMenu}
     <ContextMenu {...contextMenuPosition}>

web/src/lib/components/shared-components/combobox.svelte

@@ -18,8 +18,8 @@
   import { shortcuts } from '$lib/actions/shortcut';
   import { clickOutside } from '$lib/actions/click-outside';
   import { focusOutside } from '$lib/actions/focus-outside';
+  import { generateId } from '$lib/utils/generate-id';
   import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
-  import { uniqueIdStore } from '$lib/stores/unique-id.store';
 
   export let label: string;
   export let hideLabel = false;
@@ -30,7 +30,7 @@
   /**
    * Unique identifier for the combobox.
    */
-  let id: string = uniqueIdStore.generateId();
+  let id: string = generateId();
   /**
    * Indicates whether or not the dropdown autocomplete list should be visible.
    */

web/src/lib/components/shared-components/context-menu/context-menu.svelte

@@ -8,6 +8,7 @@
   export let y = 0;
 
   export let menuElement: HTMLDivElement | undefined = undefined;
+  export let onClose: (() => void) | undefined = undefined;
 
   let left: number;
   let top: number;
@@ -36,9 +37,7 @@
   style:top="{top}px"
   style:left="{left}px"
   role="menu"
-  use:clickOutside
+  use:clickOutside={{ onOutclick: onClose, onEscape: onClose }}
-  on:outclick
-  on:escape
 >
   <div class="flex flex-col rounded-lg">
     <slot />

web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte

@@ -49,14 +49,7 @@
       on:contextmenu|preventDefault={reopenContextMenu}
       role="presentation"
     >
-      <ContextMenu
+      <ContextMenu {x} {y} {direction} onClose={closeContextMenu} bind:menuElement={contextMenuElement}>
-        {x}
-        {y}
-        {direction}
-        on:outclick={closeContextMenu}
-        on:escape={closeContextMenu}
-        bind:menuElement={contextMenuElement}
-      >
         <slot />
       </ContextMenu>
     </section>

web/src/lib/components/shared-components/full-screen-modal.svelte

@@ -3,7 +3,7 @@
   import { fade } from 'svelte/transition';
   import FocusTrap from '$lib/components/shared-components/focus-trap.svelte';
   import ModalHeader from '$lib/components/shared-components/modal-header.svelte';
-  import { uniqueIdStore } from '$lib/stores/unique-id.store';
+  import { generateId } from '$lib/utils/generate-id';
 
   export let onClose: () => void;
   export let title: string;
@@ -27,7 +27,7 @@
   /**
    * Unique identifier for the modal.
    */
-  let id: string = uniqueIdStore.generateId();
+  let id: string = generateId();
 
   $: titleId = `${id}-title`;
   $: isStickyBottom = !!$$slots['sticky-bottom'];

web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte

@@ -114,9 +114,10 @@
         {/if}
 
         <div
-          use:clickOutside
+          use:clickOutside={{
-          on:outclick={() => (shouldShowAccountInfoPanel = false)}
+            onOutclick: () => (shouldShowAccountInfoPanel = false),
-          on:escape={() => (shouldShowAccountInfoPanel = false)}
+            onEscape: () => (shouldShowAccountInfoPanel = false),
+          }}
         >
           <button
             type="button"

web/src/lib/components/shared-components/settings/setting-switch.svelte

@@ -3,7 +3,7 @@
   import { fly } from 'svelte/transition';
   import { createEventDispatcher } from 'svelte';
   import Slider from '$lib/components/elements/slider.svelte';
-  import { uniqueIdStore } from '$lib/stores/unique-id.store';
+  import { generateId } from '$lib/utils/generate-id';
 
   export let title: string;
   export let subtitle = '';
@@ -11,7 +11,7 @@
   export let disabled = false;
   export let isEdited = false;
 
-  let id: string = uniqueIdStore.generateId();
+  let id: string = generateId();
 
   $: sliderId = `${id}-slider`;
   $: subtitleId = subtitle ? `${id}-subtitle` : undefined;

web/src/lib/stores/unique-id.store.spec.ts

@@ -1,14 +0,0 @@
-import { uniqueIdStore } from '$lib/stores/unique-id.store';
-
-describe('uniqueIdStore', () => {
-  afterEach(() => {
-    uniqueIdStore.update(() => -1);
-  });
-
-  it('should generate unique ids', () => {
-    const { generateId } = uniqueIdStore;
-    const ids = [generateId(), generateId(), generateId()];
-
-    expect(ids).toEqual(['id-0', 'id-1', 'id-2']);
-  });
-});

web/src/lib/stores/unique-id.store.ts

@@ -1,16 +0,0 @@
-import { get, writable } from 'svelte/store';
-
-function createIdStore() {
-  const { subscribe, update } = writable(-1);
-
-  return {
-    subscribe,
-    update,
-    generateId: () => {
-      update((value) => value + 1);
-      return `id-${get(uniqueIdStore)}`;
-    },
-  };
-}
-
-export const uniqueIdStore = createIdStore();

web/src/lib/utils/generate-id.ts

@@ -0,0 +1,2 @@
+let _count = 0;
+export const generateId = (): string => `id-${_count++}`;

web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -467,7 +467,7 @@
               <CircleIconButton title="Download" on:click={handleDownloadAlbum} icon={mdiFolderDownloadOutline} />
 
               {#if isOwned}
-                <div use:clickOutside on:outclick={() => (viewMode = ViewMode.VIEW)}>
+                <div use:clickOutside={{ onOutclick: () => (viewMode = ViewMode.VIEW) }}>
                   <CircleIconButton title="Album options" on:click={handleOpenAlbumOptions} icon={mdiDotsVertical} />
                   {#if viewMode === ViewMode.ALBUM_OPTIONS}
                     <ContextMenu {...contextMenuPosition}>

web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte

@@ -25,7 +25,6 @@
   import { preferences, user } from '$lib/stores/user.store';
 
   let { isViewing: showAssetViewer } = assetViewingStore;
-  let handleEscapeKey = false;
   const assetStore = new AssetStore({ isArchived: false, withStacked: true, withPartners: true });
   const assetInteractionStore = createAssetInteractionStore();
   const { isMultiSelectState, selectedAssets } = assetInteractionStore;
@@ -43,10 +42,6 @@
     if ($showAssetViewer) {
       return;
     }
-    if (handleEscapeKey) {
-      handleEscapeKey = false;
-      return;
-    }
     if ($isMultiSelectState) {
       assetInteractionStore.clearMultiselect();
       return;
@@ -79,11 +74,7 @@
       <ChangeDate menuItem />
       <ChangeLocation menuItem />
       <ArchiveAction menuItem onArchive={(assetIds) => assetStore.removeAssets(assetIds)} />
-      <DeleteAssets
+      <DeleteAssets menuItem onAssetDelete={(assetIds) => assetStore.removeAssets(assetIds)} />
-        menuItem
-        on:escape={() => (handleEscapeKey = true)}
-        onAssetDelete={(assetIds) => assetStore.removeAssets(assetIds)}
-      />
       <hr />
       <AssetJobActions />
     </AssetSelectContextMenu>

web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -97,13 +97,13 @@
 {#if $featureFlags.loaded && $featureFlags.trash}
   <UserPageLayout hideNavbar={$isMultiSelectState} title={data.meta.title} scrollbar={false}>
     <div class="flex place-items-center gap-2" slot="buttons">
-      <LinkButton on:click={handleRestoreTrash}>
+      <LinkButton on:click={handleRestoreTrash} disabled={$isMultiSelectState}>
         <div class="flex place-items-center gap-2 text-sm">
           <Icon path={mdiHistory} size="18" />
           Restore all
         </div>
       </LinkButton>
-      <LinkButton on:click={() => handleEmptyTrash()}>
+      <LinkButton on:click={() => handleEmptyTrash()} disabled={$isMultiSelectState}>
         <div class="flex place-items-center gap-2 text-sm">
           <Icon path={mdiDeleteOutline} size="18" />
           Empty trash

web/src/routes/admin/library-management/+page.svelte

@@ -397,7 +397,7 @@
 
                   {#if showContextMenu}
                     <Portal target="body">
-                      <ContextMenu {...contextMenuPosition} on:outclick={() => onMenuExit()}>
+                      <ContextMenu {...contextMenuPosition} onClose={() => onMenuExit()}>
                         <MenuOption on:click={() => onRenameClicked()} text={`Rename`} />
 
                         {#if selectedLibrary}