From e85d46d84a13e173827e491bae2dc398016dc6b8 Mon Sep 17 00:00:00 2001
From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Sun, 8 Jan 2023 10:34:18 -0800
Subject: [PATCH] Reset carousel plugins if results change.

---
 src/components/viewer.ts | 41 +++++++++++++++-------------------------
 src/view/view.ts         |  1 -
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/components/viewer.ts b/src/components/viewer.ts
index 13177a25..82e16687 100644
--- a/src/components/viewer.ts
+++ b/src/components/viewer.ts
@@ -31,7 +31,6 @@ import { contentsChanged } from '../utils/basic.js';
 import { getFullDependentBrowseMediaQueryParametersOrDispatchError } from '../utils/ha/browse-media.js';
 import { ResolvedMediaCache, resolveMedia } from '../utils/ha/resolved-media.js';
 import { View } from '../view/view.js';
-import { MediaQueriesResults } from '../view/media-queries-results';
 import { MediaQueriesClassifier } from '../view/media-queries-classifier';
 import { AutoMediaPlugin } from './embla-plugins/automedia.js';
 import { Lazyload } from './embla-plugins/lazyload.js';
@@ -174,7 +173,7 @@ export class FrigateCardViewer extends LitElement {
         .cameras=${this.cameras}
         .viewerConfig=${this.viewerConfig}
         .resolvedMediaCache=${this.resolvedMediaCache}
-        .cameraManager=${this.cameraManager}       
+        .cameraManager=${this.cameraManager}
         .cardWideConfig=${this.cardWideConfig}
       >
       </frigate-card-viewer-carousel>
@@ -221,9 +220,6 @@ export class FrigateCardViewerCarousel extends LitElement {
 
   protected _refMediaCarousel: Ref<FrigateCardMediaCarousel> = createRef();
 
-  protected _carouselOptions?: EmblaOptionsType;
-  protected _carouselPlugins?: EmblaPluginType[];
-
   // A task to resolve target media if lazy loading is disabled.
   protected _mediaResolutionTask = new Task<
     [ViewerConfig | undefined, Map<string, CameraConfig> | undefined, View | undefined],
@@ -398,11 +394,13 @@ export class FrigateCardViewerCarousel extends LitElement {
       return;
     }
 
-    this.view.evolve({
-      view: 'media',
-      query: clipQuery,
-      queryResults: results,
-    }).dispatchChangeEvent(this);
+    this.view
+      .evolve({
+        view: 'media',
+        query: clipQuery,
+        queryResults: results,
+      })
+      .dispatchChangeEvent(this);
   }
 
   /**
@@ -525,20 +523,6 @@ export class FrigateCardViewerCarousel extends LitElement {
     if (changedProps.has('viewerConfig')) {
       updateElementStyleFromMediaLayoutConfig(this, this.viewerConfig?.layout);
     }
-    if (!this._carouselOptions || changedProps.has('viewerConfig')) {
-      this._carouselOptions = {
-        draggable: this.viewerConfig?.draggable ?? true,
-      };
-    }
-    if (
-      !this._carouselPlugins ||
-      changedProps.has('viewerConfig') ||
-      (changedProps.has('view') &&
-        this.view?.queryResults?.getResultsCount() !==
-          changedProps.get('view')?.queryResults?.getResultsCount())
-    ) {
-      this._carouselPlugins = this._getPlugins();
-    }
   }
 
   /**
@@ -586,8 +570,13 @@ export class FrigateCardViewerCarousel extends LitElement {
 
     return html` <frigate-card-media-carousel
       ${ref(this._refMediaCarousel)}
-      .carouselOptions=${this._carouselOptions}
-      .carouselPlugins=${this._carouselPlugins}
+      .carouselOptions=${guard([this.viewerConfig], () => ({
+        draggable: this.viewerConfig?.draggable ?? true,
+      }))}
+      .carouselPlugins=${guard(
+        [this.viewerConfig, this.view?.queryResults?.getResults()],
+        this._getPlugins.bind(this),
+      )}
       .label=${media.getTitle() ?? undefined}
       .titlePopupConfig=${this.viewerConfig?.controls.title}
       .selected=${this.view?.queryResults?.getSelectedIndex() ?? 0}
diff --git a/src/view/view.ts b/src/view/view.ts
index 5105b366..182ca7c9 100644
--- a/src/view/view.ts
+++ b/src/view/view.ts
@@ -6,7 +6,6 @@
 //  - TODO: ts-prune https://camchenry.com/blog/deleting-dead-code-in-typescript
 
 // Hard:
-//  - TODO: There are circumstances when lazy load doesn't work (e.g. snapshot -> clips re-query)
 //  - TODO: Implement dragging the timeline seeking forward in both Frigate recordings & events.
 //  - TODO: Implement gallery.
 //  - TODO: Remove FrigateBrowseMediaSource if not necessary (post-gallery).