Release Kaleido Desktop 1.0.0
All checks were successful
Validate Kaleido Desktop / validate (push) Successful in 1m30s
All checks were successful
Validate Kaleido Desktop / validate (push) Successful in 1m30s
Out of beta. Show and season pages: - Season pages list episodes as a grid of cards (still, description, watched state) instead of the episode list and season picker; the season title opens a menu of the show's seasons (replacing the page, so Back returns to the show). - Show pages keep only the Seasons row; single-season shows list their episodes. The up-next line adds the title instead of repeating the episode number. - Season Play/Resume follows the show's on-deck episode, and the season shows the year it aired. Watching: - A title Plex has counted as played stays watched during an unfinished rewatch; leftover positions only show in Continue Watching and on the episode you're up to. Resume buttons use resumable(). - Next/previous episode (autoplay, Up Next, player) start from the top. Browsing: - Rows that haven't been scrolled stay at their start when items are added in front (scroll snapping kept the old first card in place). - Show names on episode cards link to the show; seasons outside their show's page are captioned with the show's name. - Detail facts show the runtime; the Resume button has the time left. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
5719432fe8
commit
bc3358cb07
15 changed files with 263 additions and 247 deletions
|
|
@ -1,9 +1,10 @@
|
|||
import { memo, useEffect, useRef, useState, type ReactNode } from 'react';
|
||||
import { memo, useEffect, useLayoutEffect, useRef, useState, type ReactNode } from 'react';
|
||||
import type { Item } from '../plex/types';
|
||||
import { useServer, useSession } from '../app/session';
|
||||
import { useSettings } from '../app/settings';
|
||||
import { art, displayTitle, duration, episodeLabel, formatBadges, isWatched, progress, remaining, remainingEpisodes } from '../app/format';
|
||||
import { art, date, displayTitle, duration, episodeLabel, formatBadges, isWatched, progress, remaining, remainingEpisodes } from '../app/format';
|
||||
import { itemMenu, openItem, playWithVersion } from '../app/actions';
|
||||
import { navigate } from '../app/router';
|
||||
import { Artwork } from './primitives';
|
||||
import { Icon } from './Icon';
|
||||
import { openMenu } from './overlays';
|
||||
|
|
@ -141,9 +142,14 @@ function WatchBadge({ item }: { item: Item }) {
|
|||
return null;
|
||||
}
|
||||
|
||||
function ProgressLine({ item }: { item: Item }) {
|
||||
/**
|
||||
* A watched title's leftover position (from an unfinished rewatch) only shows where it's
|
||||
* what you're resuming: Continue Watching, or the season's up-next episode.
|
||||
*/
|
||||
function ProgressLine({ item, always = false }: { item: Item; always?: boolean }) {
|
||||
const percent = useSettings((s) => s.watchedPercent);
|
||||
const p = progress(item);
|
||||
if (!p || p > 0.995) return null;
|
||||
if (!p || p > 0.995 || (!always && isWatched(item, percent))) return null;
|
||||
return (
|
||||
<span className="progress-line">
|
||||
<i style={{ width: `${Math.max(3, p * 100)}%` }} />
|
||||
|
|
@ -204,12 +210,15 @@ export const PosterCard = memo(function PosterCard({ item, caption = 'year', cla
|
|||
const server = useServer();
|
||||
const handlers = useCardHandlers(item);
|
||||
const path = art.poster(item);
|
||||
// On its show's page a season is just "Season 2"; anywhere else it needs the show's name.
|
||||
const seasonAlone = item.type === 'season' && caption !== 'episodes' && !!item.parentTitle;
|
||||
const title = item.type === 'season' && !seasonAlone ? item.title : displayTitle(item);
|
||||
let meta: ReactNode = null;
|
||||
if (caption === 'year') meta = item.type === 'episode' ? episodeLabel(item) : item.type === 'season' ? (item.leafCount ? `${item.leafCount} episodes` : '') : item.type === 'collection' ? (item.childCount ? `${item.childCount} titles` : 'Collection') : item.year || '';
|
||||
if (caption === 'year') meta = item.type === 'episode' ? episodeLabel(item) : item.type === 'season' ? item.title : item.type === 'collection' ? (item.childCount ? `${item.childCount} titles` : 'Collection') : item.year || '';
|
||||
if (caption === 'episodes') meta = item.leafCount ? `${item.leafCount} episodes` : '';
|
||||
if (caption === 'role') meta = (item as any).roleName ?? item.year;
|
||||
return (
|
||||
<article className={`card poster ${className}`} role="button" tabIndex={0} aria-label={item.title} {...handlers} {...previewHandlers(item)}>
|
||||
<article className={`card poster ${className}`} role="button" tabIndex={0} aria-label={seasonAlone ? `${title}, ${item.title}` : title} {...handlers} {...previewHandlers(item)}>
|
||||
<div className="card-cover">
|
||||
<Artwork src={server.image(path, 240, 360)} alt="" fallback={<span className="cover-fallback">{displayTitle(item)}</span>} />
|
||||
<div className="card-hover" />
|
||||
|
|
@ -219,8 +228,8 @@ export const PosterCard = memo(function PosterCard({ item, caption = 'year', cla
|
|||
</div>
|
||||
{caption !== 'none' && (
|
||||
<div className="card-caption">
|
||||
<div className="card-title" title={item.type === 'season' ? item.title : displayTitle(item)}>
|
||||
{item.type === 'season' ? item.title : displayTitle(item)}
|
||||
<div className="card-title" title={title}>
|
||||
{title}
|
||||
</div>
|
||||
{meta ? <div className="card-meta">{meta}</div> : null}
|
||||
</div>
|
||||
|
|
@ -232,14 +241,16 @@ export const PosterCard = memo(function PosterCard({ item, caption = 'year', cla
|
|||
export const LandscapeCard = memo(function LandscapeCard({ item, continueWatching, showTitle = true, episodeStyle = false }: { item: Item; continueWatching?: boolean; showTitle?: boolean; episodeStyle?: boolean }) {
|
||||
const server = useServer();
|
||||
const handlers = useCardHandlers(item, { continueWatching });
|
||||
const percent = useSettings((s) => s.watchedPercent);
|
||||
const inProgress = !!item.viewOffset && (continueWatching || !isWatched(item, percent));
|
||||
const isEp = item.type === 'episode';
|
||||
const path = isEp ? item.thumb || item.grandparentArt : art.landscape(item);
|
||||
const title = episodeStyle && isEp ? `${item.index}. ${item.title}` : displayTitle(item);
|
||||
const meta = isEp
|
||||
? episodeStyle
|
||||
? [duration(item.duration), item.viewOffset ? remaining(item) : ''].filter(Boolean).join(' · ')
|
||||
? [duration(item.duration), inProgress ? remaining(item) : ''].filter(Boolean).join(' · ')
|
||||
: `${episodeLabel(item)} ${item.title}`
|
||||
: item.viewOffset
|
||||
: inProgress
|
||||
? remaining(item)
|
||||
: [item.year, duration(item.duration)].filter(Boolean).join(' · ');
|
||||
return (
|
||||
|
|
@ -254,12 +265,25 @@ export const LandscapeCard = memo(function LandscapeCard({ item, continueWatchin
|
|||
<div className="card-hover" />
|
||||
<CardActions item={item} ctx={{ continueWatching }} />
|
||||
{episodeStyle && <WatchBadge item={item} />}
|
||||
<ProgressLine item={item} />
|
||||
<ProgressLine item={item} always={continueWatching} />
|
||||
</div>
|
||||
{showTitle && (
|
||||
<div className="card-caption">
|
||||
<div className="card-title" title={title}>
|
||||
{title}
|
||||
{isEp && !episodeStyle && item.grandparentId ? (
|
||||
<button
|
||||
className="card-title-link"
|
||||
tabIndex={-1}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate({ name: 'item', id: item.grandparentId, title: item.grandparentTitle });
|
||||
}}
|
||||
>
|
||||
{title}
|
||||
</button>
|
||||
) : (
|
||||
title
|
||||
)}
|
||||
</div>
|
||||
<div className="card-meta">{meta}</div>
|
||||
</div>
|
||||
|
|
@ -268,6 +292,34 @@ export const LandscapeCard = memo(function LandscapeCard({ item, continueWatchin
|
|||
);
|
||||
});
|
||||
|
||||
/** An episode with its synopsis, for a season's episode grid. `upNext` shows its resume point even when watched. */
|
||||
export const EpisodeCard = memo(function EpisodeCard({ item, upNext = false }: { item: Item; upNext?: boolean }) {
|
||||
const server = useServer();
|
||||
const handlers = useCardHandlers(item);
|
||||
const percent = useSettings((s) => s.watchedPercent);
|
||||
const inProgress = !!item.viewOffset && (upNext || !isWatched(item, percent));
|
||||
const title = item.index ? `${item.index}. ${item.title}` : item.title;
|
||||
const meta = [duration(item.duration), inProgress ? remaining(item) : date(item.originallyAvailableAt)].filter(Boolean).join(' · ');
|
||||
return (
|
||||
<article className="card landscape episode-card" role="button" tabIndex={0} aria-label={title} {...handlers}>
|
||||
<div className="card-cover">
|
||||
<Artwork src={server.image(item.thumb || item.grandparentArt, 400, 225)} alt="" fallback={<span className="cover-fallback">{title}</span>} />
|
||||
<div className="card-hover" />
|
||||
<CardActions item={item} />
|
||||
<WatchBadge item={item} />
|
||||
<ProgressLine item={item} always={upNext} />
|
||||
</div>
|
||||
<div className="card-caption">
|
||||
<div className="card-title" title={title}>
|
||||
{title}
|
||||
</div>
|
||||
<div className="card-meta">{meta}</div>
|
||||
{item.summary && <p className="episode-card-summary">{item.summary}</p>}
|
||||
</div>
|
||||
</article>
|
||||
);
|
||||
});
|
||||
|
||||
export function PersonCard({ name, role, thumb, onClick }: { name: string; role?: string; thumb?: string; onClick?: () => void }) {
|
||||
const server = useServer();
|
||||
const initials = name
|
||||
|
|
@ -290,15 +342,22 @@ export function PersonCard({ name, role, thumb, onClick }: { name: string; role?
|
|||
|
||||
export function Shelf({ title, subtitle, onViewAll, children, className = '', kind = 'poster' }: { title: ReactNode; subtitle?: ReactNode; onViewAll?: () => void; children: ReactNode; className?: string; kind?: 'poster' | 'landscape' | 'people' | 'wide' }) {
|
||||
const row = useRef<HTMLDivElement>(null);
|
||||
const atStart = useRef(true);
|
||||
const [edges, setEdges] = useState({ start: true, end: false });
|
||||
const update = () => {
|
||||
const el = row.current;
|
||||
if (!el) return;
|
||||
const start = el.scrollLeft < 8;
|
||||
const end = el.scrollLeft + el.clientWidth >= el.scrollWidth - 8;
|
||||
atStart.current = start;
|
||||
// Runs on every scroll event; re-render only when an edge changes.
|
||||
setEdges((prev) => (prev.start === start && prev.end === end ? prev : { start, end }));
|
||||
};
|
||||
// A row the viewer hasn't scrolled stays at its start when items are added
|
||||
// in front (Continue Watching), rather than holding on to the old first card.
|
||||
useLayoutEffect(() => {
|
||||
if (atStart.current && row.current) row.current.scrollLeft = 0;
|
||||
}, [children]);
|
||||
useEffect(() => {
|
||||
update();
|
||||
const el = row.current;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue