mirror of
				https://github.com/immich-app/immich.git
				synced 2025-11-03 19:17:11 -05:00 
			
		
		
		
	feat(web): improvements to slideshow (#8032)
* feat: improvements to slideshow * feat: pause video with slideshow bar * pr feedback * fix: remove dispatch * fix: simplify * pr feedback * pr feedback --------- Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
This commit is contained in:
		
							parent
							
								
									8ed6ed4d2b
								
							
						
					
					
						commit
						508f32c08a
					
				@ -97,6 +97,9 @@
 | 
				
			|||||||
  let isShowActivity = false;
 | 
					  let isShowActivity = false;
 | 
				
			||||||
  let isLiked: ActivityResponseDto | null = null;
 | 
					  let isLiked: ActivityResponseDto | null = null;
 | 
				
			||||||
  let numberOfComments: number;
 | 
					  let numberOfComments: number;
 | 
				
			||||||
 | 
					  let fullscreenElement: Element;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  $: isFullScreen = fullscreenElement !== null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  $: {
 | 
					  $: {
 | 
				
			||||||
    if (asset.stackCount && asset.stack) {
 | 
					    if (asset.stackCount && asset.stack) {
 | 
				
			||||||
@ -512,6 +515,8 @@
 | 
				
			|||||||
  ]}
 | 
					  ]}
 | 
				
			||||||
/>
 | 
					/>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<svelte:document bind:fullscreenElement />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<section
 | 
					<section
 | 
				
			||||||
  id="immich-asset-viewer"
 | 
					  id="immich-asset-viewer"
 | 
				
			||||||
  class="fixed left-0 top-0 z-[1001] grid h-screen w-screen grid-cols-4 grid-rows-[64px_1fr] overflow-hidden bg-black"
 | 
					  class="fixed left-0 top-0 z-[1001] grid h-screen w-screen grid-cols-4 grid-rows-[64px_1fr] overflow-hidden bg-black"
 | 
				
			||||||
@ -562,6 +567,8 @@
 | 
				
			|||||||
    {#if $slideshowState != SlideshowState.None}
 | 
					    {#if $slideshowState != SlideshowState.None}
 | 
				
			||||||
      <div class="z-[1000] absolute w-full flex">
 | 
					      <div class="z-[1000] absolute w-full flex">
 | 
				
			||||||
        <SlideshowBar
 | 
					        <SlideshowBar
 | 
				
			||||||
 | 
					          {isFullScreen}
 | 
				
			||||||
 | 
					          onSetToFullScreen={() => assetViewerHtmlElement.requestFullscreen()}
 | 
				
			||||||
          onPrevious={() => navigateAsset('previous')}
 | 
					          onPrevious={() => navigateAsset('previous')}
 | 
				
			||||||
          onNext={() => navigateAsset('next')}
 | 
					          onNext={() => navigateAsset('next')}
 | 
				
			||||||
          onClose={() => ($slideshowState = SlideshowState.StopSlideshow)}
 | 
					          onClose={() => ($slideshowState = SlideshowState.StopSlideshow)}
 | 
				
			||||||
 | 
				
			|||||||
@ -3,23 +3,46 @@
 | 
				
			|||||||
  import ProgressBar, { ProgressBarStatus } from '$lib/components/shared-components/progress-bar/progress-bar.svelte';
 | 
					  import ProgressBar, { ProgressBarStatus } from '$lib/components/shared-components/progress-bar/progress-bar.svelte';
 | 
				
			||||||
  import SlideshowSettings from '$lib/components/slideshow-settings.svelte';
 | 
					  import SlideshowSettings from '$lib/components/slideshow-settings.svelte';
 | 
				
			||||||
  import { SlideshowNavigation, slideshowStore } from '$lib/stores/slideshow.store';
 | 
					  import { SlideshowNavigation, slideshowStore } from '$lib/stores/slideshow.store';
 | 
				
			||||||
  import { mdiChevronLeft, mdiChevronRight, mdiClose, mdiCog, mdiPause, mdiPlay } from '@mdi/js';
 | 
					  import { mdiChevronLeft, mdiChevronRight, mdiClose, mdiCog, mdiFullscreen, mdiPause, mdiPlay } from '@mdi/js';
 | 
				
			||||||
  import { onDestroy, onMount } from 'svelte';
 | 
					  import { onDestroy, onMount } from 'svelte';
 | 
				
			||||||
 | 
					  import { fly } from 'svelte/transition';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  export let isFullScreen: boolean;
 | 
				
			||||||
  export let onNext = () => {};
 | 
					  export let onNext = () => {};
 | 
				
			||||||
  export let onPrevious = () => {};
 | 
					  export let onPrevious = () => {};
 | 
				
			||||||
  export let onClose = () => {};
 | 
					  export let onClose = () => {};
 | 
				
			||||||
 | 
					  export let onSetToFullScreen = () => {};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  const { restartProgress, stopProgress, slideshowDelay, showProgressBar, slideshowNavigation } = slideshowStore;
 | 
					  const { restartProgress, stopProgress, slideshowDelay, showProgressBar, slideshowNavigation } = slideshowStore;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  let progressBarStatus: ProgressBarStatus;
 | 
					  let progressBarStatus: ProgressBarStatus;
 | 
				
			||||||
  let progressBar: ProgressBar;
 | 
					  let progressBar: ProgressBar;
 | 
				
			||||||
  let showSettings = false;
 | 
					  let showSettings = false;
 | 
				
			||||||
 | 
					  let showControls = true;
 | 
				
			||||||
 | 
					  let timer: NodeJS.Timeout;
 | 
				
			||||||
 | 
					  let isOverControls = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  let unsubscribeRestart: () => void;
 | 
					  let unsubscribeRestart: () => void;
 | 
				
			||||||
  let unsubscribeStop: () => void;
 | 
					  let unsubscribeStop: () => void;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const resetTimer = () => {
 | 
				
			||||||
 | 
					    clearTimeout(timer);
 | 
				
			||||||
 | 
					    document.body.style.cursor = '';
 | 
				
			||||||
 | 
					    showControls = true;
 | 
				
			||||||
 | 
					    startTimer();
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const startTimer = () => {
 | 
				
			||||||
 | 
					    timer = setTimeout(() => {
 | 
				
			||||||
 | 
					      if (!isOverControls) {
 | 
				
			||||||
 | 
					        showControls = false;
 | 
				
			||||||
 | 
					        document.body.style.cursor = 'none';
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }, 10_000);
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  onMount(() => {
 | 
					  onMount(() => {
 | 
				
			||||||
 | 
					    startTimer();
 | 
				
			||||||
    unsubscribeRestart = restartProgress.subscribe((value) => {
 | 
					    unsubscribeRestart = restartProgress.subscribe((value) => {
 | 
				
			||||||
      if (value) {
 | 
					      if (value) {
 | 
				
			||||||
        progressBar.restart(value);
 | 
					        progressBar.restart(value);
 | 
				
			||||||
@ -52,8 +75,18 @@
 | 
				
			|||||||
  };
 | 
					  };
 | 
				
			||||||
</script>
 | 
					</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<div class="m-4 flex gap-2">
 | 
					<svelte:window on:mousemove={resetTimer} />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					{#if showControls}
 | 
				
			||||||
 | 
					  <!-- svelte-ignore a11y-no-static-element-interactions -->
 | 
				
			||||||
 | 
					  <div
 | 
				
			||||||
 | 
					    class="m-4 flex gap-2"
 | 
				
			||||||
 | 
					    on:mouseenter={() => (isOverControls = true)}
 | 
				
			||||||
 | 
					    on:mouseleave={() => (isOverControls = false)}
 | 
				
			||||||
 | 
					    transition:fly={{ duration: 150 }}
 | 
				
			||||||
 | 
					  >
 | 
				
			||||||
    <CircleIconButton buttonSize="50" icon={mdiClose} on:click={onClose} title="Exit Slideshow" />
 | 
					    <CircleIconButton buttonSize="50" icon={mdiClose} on:click={onClose} title="Exit Slideshow" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <CircleIconButton
 | 
					    <CircleIconButton
 | 
				
			||||||
      buttonSize="50"
 | 
					      buttonSize="50"
 | 
				
			||||||
      icon={progressBarStatus === ProgressBarStatus.Paused ? mdiPlay : mdiPause}
 | 
					      icon={progressBarStatus === ProgressBarStatus.Paused ? mdiPlay : mdiPause}
 | 
				
			||||||
@ -63,8 +96,16 @@
 | 
				
			|||||||
    <CircleIconButton buttonSize="50" icon={mdiChevronLeft} on:click={onPrevious} title="Previous" />
 | 
					    <CircleIconButton buttonSize="50" icon={mdiChevronLeft} on:click={onPrevious} title="Previous" />
 | 
				
			||||||
    <CircleIconButton buttonSize="50" icon={mdiChevronRight} on:click={onNext} title="Next" />
 | 
					    <CircleIconButton buttonSize="50" icon={mdiChevronRight} on:click={onNext} title="Next" />
 | 
				
			||||||
    <CircleIconButton buttonSize="50" icon={mdiCog} on:click={() => (showSettings = !showSettings)} title="Next" />
 | 
					    <CircleIconButton buttonSize="50" icon={mdiCog} on:click={() => (showSettings = !showSettings)} title="Next" />
 | 
				
			||||||
 | 
					    {#if !isFullScreen}
 | 
				
			||||||
 | 
					      <CircleIconButton
 | 
				
			||||||
 | 
					        buttonSize="50"
 | 
				
			||||||
 | 
					        icon={mdiFullscreen}
 | 
				
			||||||
 | 
					        on:click={onSetToFullScreen}
 | 
				
			||||||
 | 
					        title="Set Slideshow to fullscreen"
 | 
				
			||||||
 | 
					      />
 | 
				
			||||||
 | 
					    {/if}
 | 
				
			||||||
  </div>
 | 
					  </div>
 | 
				
			||||||
 | 
					{/if}
 | 
				
			||||||
{#if showSettings}
 | 
					{#if showSettings}
 | 
				
			||||||
  <SlideshowSettings onClose={() => (showSettings = false)} />
 | 
					  <SlideshowSettings onClose={() => (showSettings = false)} />
 | 
				
			||||||
{/if}
 | 
					{/if}
 | 
				
			||||||
 | 
				
			|||||||
@ -9,7 +9,9 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  export let assetId: string;
 | 
					  export let assetId: string;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  let element: HTMLVideoElement | undefined = undefined;
 | 
				
			||||||
  let isVideoLoading = true;
 | 
					  let isVideoLoading = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  const dispatch = createEventDispatcher<{ onVideoEnded: void; onVideoStarted: void }>();
 | 
					  const dispatch = createEventDispatcher<{ onVideoEnded: void; onVideoStarted: void }>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  const handleCanPlay = async (event: Event) => {
 | 
					  const handleCanPlay = async (event: Event) => {
 | 
				
			||||||
@ -29,6 +31,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
<div transition:fade={{ duration: 150 }} class="flex h-full select-none place-content-center place-items-center">
 | 
					<div transition:fade={{ duration: 150 }} class="flex h-full select-none place-content-center place-items-center">
 | 
				
			||||||
  <video
 | 
					  <video
 | 
				
			||||||
 | 
					    bind:this={element}
 | 
				
			||||||
    autoplay
 | 
					    autoplay
 | 
				
			||||||
    playsinline
 | 
					    playsinline
 | 
				
			||||||
    controls
 | 
					    controls
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user