S3 wires the shelf's editor. The gesture is the E10 right-click menu, so the decision "this is comfort media" can be made where the thing is — the feed, a Plex grid, a channel row, a playlist — rather than only on the page that lists the shelf. One shared piece, `components/comfortPin.tsx`: the five pin-kind constructors, the shelf query, and ONE `ActionMenuItem` that switches Pin/Unpin honestly (and says "not known yet" with a disabled row until the shelf has answered, since a confident "Pin" over something already pinned is exactly the quiet lie the house rules forbid). Surfaces that already have a row menu compose the item in (`Playlists`, `PlaylistsRail`); the rest mount `ComfortPinMenu`. Two structural notes: - The feed's menu lives in `VirtualFeed`, not in `Feed` — that is the list, and it is also what gives the channel page the gesture for free, since it renders `<Feed channelScoped>` all the way down. - Cards take `menuProps` as a FUNCTION of the row, not the built props object. `triggerProps` is stable across renders while its return value is not, and a fresh object prop would blow past `VideoCard`'s memo for every card in the virtualized feed on every parent render. `DataTable` and `ChannelLayoutGrid` grow a generic `rowProps` so a channel row answers the same gesture in both of the manager's layouts; the table stays domain-free and never learns what a menu is. On Home the shelf tile's menu is the whole editor: four move rows (front / left / right / end, reusing the playlist menu's ordering idiom) plus the unpin, over menu rows rather than drag & drop — dragging inside a horizontal, scrolling Carousel fights the scroll, and menu rows are keyboard-reachable for free. The reorder is optimistic on the cached payload and re-asks the server on failure rather than showing an order that was never accepted. The exhausted shelf tile (a pinned channel with nothing unwatched left) is `aria-disabled`, not `disabled`: measured in Chromium, a disabled button still receives contextmenu and pointerdown, but it loses focus — and with it Shift+F10, the only keyboard route to the menu it most needs. Verified end to end in the browser against the live account: all five pin kinds, the reorder (persisted across a reload), the unpin, and the honest Unpin label on a resume tile that is already on the shelf.
98 lines
3.8 KiB
TypeScript
98 lines
3.8 KiB
TypeScript
import { Fragment } from "react";
|
|
import { useTranslation } from "react-i18next";
|
|
import { type Column } from "./ui/DataTable";
|
|
import VirtualGrid from "./ui/VirtualGrid";
|
|
import { CHANNEL_LAYOUT_SPEC } from "../lib/channelLayout";
|
|
|
|
// The channel manager's `cards` layout (E4 S3), built by reusing the SAME `Column<T>` render closures
|
|
// the DataTable draws — so the subscribed and discovery tables (which have different columns) both get
|
|
// the card view for free, and a cell's behaviour (priority bump, tag toggle, sync, actions) is defined
|
|
// once. The `table` layout keeps DataTable; this renders only when the manager's layout is `cards`.
|
|
//
|
|
// Named slots place the columns that need bespoke positions; everything else flows in the meta line.
|
|
// Unlike DataTable's cramped narrow-screen card fallback, the desktop card is roomy, so it shows the
|
|
// `hideInCard` columns too (About, priority) — the user wants those affordances in every layout.
|
|
|
|
interface ChannelLayoutGridProps<T> {
|
|
rows: T[];
|
|
columns: Column<T>[];
|
|
rowKey: (row: T) => string;
|
|
/** Column key docked at the top-right of the card (the priority stepper). */
|
|
leadKey?: string;
|
|
/** Column key rendered as a full-width description line (the About cell + its hover overlay). */
|
|
aboutKey?: string;
|
|
/** Column key rendered as the action cluster, pinned to the card's bottom edge. */
|
|
actionsKey?: string;
|
|
rowClassName?: (row: T) => string;
|
|
/** Extra DOM props per card — same escape hatch, same single consumer, as `DataTable.rowProps`, so
|
|
* a channel answers the right-click in the card layout exactly as it does in the table. */
|
|
rowProps?: (row: T) => Record<string, unknown>;
|
|
emptyText?: string;
|
|
}
|
|
|
|
export default function ChannelLayoutGrid<T>({
|
|
rows,
|
|
columns,
|
|
rowKey,
|
|
leadKey,
|
|
aboutKey,
|
|
actionsKey,
|
|
rowClassName,
|
|
rowProps,
|
|
emptyText,
|
|
}: ChannelLayoutGridProps<T>) {
|
|
const { t } = useTranslation();
|
|
const spec = CHANNEL_LAYOUT_SPEC.cards;
|
|
|
|
const slotted = new Set([leadKey, aboutKey, actionsKey].filter(Boolean) as string[]);
|
|
const primary = columns.filter((c) => c.cardPrimary);
|
|
const lead = leadKey ? columns.find((c) => c.key === leadKey) : undefined;
|
|
const about = aboutKey ? columns.find((c) => c.key === aboutKey) : undefined;
|
|
const actions = actionsKey ? columns.find((c) => c.key === actionsKey) : undefined;
|
|
// Everything else flows in the meta line: not the heading, not a slotted column.
|
|
const meta = columns.filter((c) => !c.cardPrimary && !slotted.has(c.key));
|
|
|
|
const renderCard = (row: T) => (
|
|
<div
|
|
{...rowProps?.(row)}
|
|
className={`glass-card rounded-xl p-3 h-full flex flex-col gap-2 ${rowClassName?.(row) ?? ""}`}
|
|
>
|
|
<div className="flex items-start justify-between gap-2">
|
|
<div className="min-w-0 flex-1 font-medium">
|
|
{primary.map((col) => (
|
|
<Fragment key={col.key}>{col.render(row)}</Fragment>
|
|
))}
|
|
</div>
|
|
{lead && <div className="shrink-0">{lead.render(row)}</div>}
|
|
</div>
|
|
{about && <div className="min-w-0 text-sm">{about.render(row)}</div>}
|
|
<div className="flex flex-wrap items-center gap-x-3 gap-y-1.5 text-sm min-w-0">
|
|
{meta.map((col) => (
|
|
<span key={col.key} className="inline-flex items-center gap-1">
|
|
{col.cardLabel !== false && <span className="text-muted text-xs">{col.header}</span>}
|
|
{col.render(row)}
|
|
</span>
|
|
))}
|
|
</div>
|
|
{actions && <div className="mt-auto pt-1">{actions.render(row)}</div>}
|
|
</div>
|
|
);
|
|
|
|
if (rows.length === 0) {
|
|
return (
|
|
<div className="text-muted py-8 text-center text-sm">{emptyText ?? t("datatable.empty")}</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<VirtualGrid
|
|
items={rows}
|
|
getKey={rowKey}
|
|
minCol={spec.minCol}
|
|
colMaxWidth={null}
|
|
rowEst={spec.rowEst}
|
|
renderItem={renderCard}
|
|
/>
|
|
);
|
|
}
|