Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions static/src/elements/santa-cardnav.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ export class SantaCardNavElement extends LitElement {
const available = [];
const videos = config.videos();

const cardHtml = this.cards.map((sceneName, i) => {
const locked = config.lockedTo(sceneName);

// Calculate order for all cards
const cardsWithOrder = this.cards.map((sceneName) => {
const isVideo = videos.indexOf(sceneName) !== -1;

let order = currentOrder;
Expand All @@ -112,6 +111,15 @@ export class SantaCardNavElement extends LitElement {
}
}

return {sceneName, order, isVideo};
});

// Sort by visual order (for tab focus order)
cardsWithOrder.sort((a, b) => a.order - b.order);

// Render
const cardHtml = cardsWithOrder.map(({sceneName, order, isVideo}) => {
const locked = config.lockedTo(sceneName);
const style = `transition-delay: ${0.2 + order * 0.05}s; order: ${order}`;
return html`<santa-card style=${style} locked=${ifDefined(locked)} scene=${sceneName} .video=${isVideo} ?wide=${isVideo}></santa-card>`;
});
Expand Down