1 files changed, 18 insertions, 6 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/static/video-app.js b/packages/meshbay-hub/src/meshbay_hub/static/video-app.js
index 4c9f90c..4757395 100644
--- a/packages/meshbay-hub/src/meshbay_hub/static/video-app.js
+++ b/packages/meshbay-hub/src/meshbay_hub/static/video-app.js
@@ -493,10 +493,7 @@ function SeasonMenu({ seasons, selected, selectedYear, onSelect }) {
 // each caller builds one from the connection it already has.
 function buildSignFn(transportRef) {
   const transport = transportRef.current;
-  const sk = transport && transport.sessionKeys && transport.sessionKeys.skEdB64;
-  return (sk && window.MeshBayKeys)
-    ? (transcript) => window.MeshBayKeys.signBytes(sk, transcript)
-    : null;
+  return (transport && transport.signFn) || null;
 }
 
 function TmdbSearchOverlay({
@@ -619,6 +616,13 @@ function VideoDetailModal({
   const [selectedSeason, setSelectedSeason] = useState(null);
   useEffect(() => { setSelectedSeason(defaultSeason(show)); }, [show]);
 
+  // A show's modal stays open under the player (PosterGrid's onPlay), so
+  // closing the player lands back here. Marking the episode just started is
+  // what makes "the next one" the row under the mark, rather than a row the
+  // reader has to find again by its number.
+  const [lastPlayedId, setLastPlayedId] = useState(null);
+  useEffect(() => { setLastPlayedId(null); }, [show]);
+
   const showMultiSeason = Boolean(show && show.seasons.length > 1);
   const seasonMeta = useSeasonMeta(
     transportRef, confident ? meta.tmdb_id : null, selectedSeason,
@@ -708,7 +712,10 @@ function VideoDetailModal({
                     </div>
                   `}
                   ${s.episodes.map((ep) => html`
-                    <button class="video-episode-row" key=${ep.id} onClick=${() => onPlay(ep)}>
+                    <button key=${ep.id}
+                      class="video-episode-row ${ep.id === lastPlayedId ? 'last-played' : ''}"
+                      aria-current=${ep.id === lastPlayedId ? 'true' : undefined}
+                      onClick=${() => { setLastPlayedId(ep.id); onPlay(ep); }}>
                       <${LazyTile} cls="video-episode-thumb-slot">
                         <${MediaThumb} thumbHash=${ep.thumb_hash} alt=${ep.display_title || ep.name}
                           cls="video-episode-thumb" transportRef=${ep._tRef || transportRef} gekRef=${ep._gRef || gekRef}
@@ -857,13 +864,18 @@ function PosterGrid({
         </${LazyTile}>
       `; })}
     </div>
+    ${/* A show's modal is left open under the player: watching episode after
+          episode used to mean reopening the show and picking the season again
+          every time. A film has nothing left to pick, so its modal still
+          closes. The player stacks above it by its own z-index (style.css,
+          .video-player-overlay), not by DOM order. */''}
     ${detail && html`
       <${VideoDetailModal} title=${detail.title} meta=${detailMeta}
         repEntry=${detail.repEntry} show=${detail.show}
         transportRef=${detailTRef} gekRef=${detailGRef} isNodeAdmin=${isNodeAdmin}
         tmdbEnabled=${tmdbEnabled}
         onClose=${() => setDetail(null)}
-        onPlay=${(entry) => { setDetail(null); onPreview(entry); }} />
+        onPlay=${(entry) => { if (!detail.show) setDetail(null); onPreview(entry); }} />
     `}
   `;
 }