mirror of
https://github.com/cpvalente/ontime.git
synced 2026-09-05 14:29:20 +00:00
Compare commits
2 Commits
group-times
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 977b01a072 | |||
| dd718230ad |
@@ -7,13 +7,15 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
|
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
|
||||||
<meta name="theme-color" content="#101010" />
|
<meta name="theme-color" content="#101010" />
|
||||||
<meta name="ontime" content="ontime - time keeping for live events" />
|
<meta name="ontime" content="ontime - time keeping for live events" />
|
||||||
|
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||||
|
<meta name="mobile-web-app-capable" content="yes" />
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||||
|
<meta name="apple-mobile-web-app-title" content="Ontime" />
|
||||||
<link rel="apple-touch-icon" href="ontime-logo.png" />
|
<link rel="apple-touch-icon" href="ontime-logo.png" />
|
||||||
<link rel="icon" type="image/png" href="ontime-logo.png" />
|
<link rel="icon" type="image/png" href="ontime-logo.png" />
|
||||||
<link rel="manifest" href="site.webmanifest" />
|
|
||||||
<link rel="manifest" href="manifest.json" />
|
<link rel="manifest" href="manifest.json" />
|
||||||
<meta name="robots" content="noindex" />
|
<meta name="robots" content="noindex" />
|
||||||
<title>ontime</title>
|
<title>Ontime</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
|
|||||||
@@ -1,19 +1,21 @@
|
|||||||
{
|
{
|
||||||
"name": "ontime",
|
"name": "Ontime",
|
||||||
"short_name": "ontime",
|
"short_name": "Ontime",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "favicon.ico",
|
"src": "ontime-logo-192.png",
|
||||||
"type": "image/x-icon"
|
"sizes": "192x192",
|
||||||
|
"type": "image/png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "ontime-logo.png",
|
"src": "ontime-logo-512.png",
|
||||||
|
"sizes": "512x512",
|
||||||
"type": "image/png"
|
"type": "image/png"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"scope": "./",
|
"scope": "./",
|
||||||
"start_url": "./",
|
"start_url": "./",
|
||||||
"display": "",
|
"display": "standalone",
|
||||||
"theme_color": "#121212",
|
"theme_color": "#101010",
|
||||||
"background_color": "#101010"
|
"background_color": "#101010"
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 84 KiB |
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "",
|
|
||||||
"short_name": "",
|
|
||||||
"icons": [{ "src": "ontime-logo.png", "sizes": "295x295", "type": "image/png" }],
|
|
||||||
"theme_color": "#121212",
|
|
||||||
"background_color": "#101010",
|
|
||||||
"display": "standalone"
|
|
||||||
}
|
|
||||||
@@ -2,8 +2,8 @@ import { MaybeString } from 'ontime-types';
|
|||||||
import { RefObject, useCallback, useEffect } from 'react';
|
import { RefObject, useCallback, useEffect } from 'react';
|
||||||
|
|
||||||
function scrollToComponent<ComponentRef extends HTMLElement, ScrollRef extends HTMLElement>(
|
function scrollToComponent<ComponentRef extends HTMLElement, ScrollRef extends HTMLElement>(
|
||||||
componentRef: RefObject<ComponentRef>,
|
componentRef: RefObject<ComponentRef | null>,
|
||||||
scrollRef: RefObject<ScrollRef>,
|
scrollRef: RefObject<ScrollRef | null>,
|
||||||
topOffset: number,
|
topOffset: number,
|
||||||
) {
|
) {
|
||||||
if (!componentRef.current || !scrollRef.current) {
|
if (!componentRef.current || !scrollRef.current) {
|
||||||
@@ -21,18 +21,16 @@ interface UseFollowComponentProps {
|
|||||||
followRef: RefObject<HTMLElement | null>;
|
followRef: RefObject<HTMLElement | null>;
|
||||||
scrollRef: RefObject<HTMLElement | null>;
|
scrollRef: RefObject<HTMLElement | null>;
|
||||||
doFollow: boolean;
|
doFollow: boolean;
|
||||||
topOffset?: number;
|
followTrigger: MaybeString; // this would be an entry id or null
|
||||||
setScrollFlag?: (newValue: boolean) => void;
|
getTopOffset: () => number;
|
||||||
followTrigger?: MaybeString; // this would be an entry id or null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function useFollowComponent({
|
export default function useFollowComponent({
|
||||||
followRef,
|
followRef,
|
||||||
scrollRef,
|
scrollRef,
|
||||||
doFollow,
|
doFollow,
|
||||||
topOffset = 100,
|
|
||||||
setScrollFlag,
|
|
||||||
followTrigger,
|
followTrigger,
|
||||||
|
getTopOffset,
|
||||||
}: UseFollowComponentProps) {
|
}: UseFollowComponentProps) {
|
||||||
// when trigger moves, view should follow
|
// when trigger moves, view should follow
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -41,25 +39,17 @@ export default function useFollowComponent({
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (followRef.current && scrollRef.current) {
|
if (followRef.current && scrollRef.current) {
|
||||||
setScrollFlag?.(true);
|
|
||||||
// Use requestAnimationFrame to ensure the component is fully loaded
|
// Use requestAnimationFrame to ensure the component is fully loaded
|
||||||
window.requestAnimationFrame(() => {
|
window.requestAnimationFrame(() => {
|
||||||
scrollToComponent(followRef as RefObject<HTMLElement>, scrollRef as RefObject<HTMLElement>, topOffset);
|
// resolve the offset after layout, so that measured values are up to date
|
||||||
setScrollFlag?.(false);
|
scrollToComponent(followRef, scrollRef, getTopOffset());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, [followTrigger, doFollow, followRef, scrollRef, setScrollFlag, topOffset]);
|
}, [followTrigger, doFollow, followRef, scrollRef, getTopOffset]);
|
||||||
|
|
||||||
const scrollToRefComponent = useCallback(
|
const scrollToRefComponent = useCallback(() => {
|
||||||
(componentRef = followRef, containerRef = scrollRef, offset = topOffset) => {
|
scrollToComponent(followRef, scrollRef, getTopOffset());
|
||||||
if (componentRef && containerRef) {
|
}, [followRef, scrollRef, getTopOffset]);
|
||||||
// @ts-expect-error -- we know this are not null
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
||||||
scrollToComponent(componentRef!, containerRef!, offset);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
[followRef, scrollRef, topOffset],
|
|
||||||
);
|
|
||||||
|
|
||||||
return scrollToRefComponent;
|
return scrollToRefComponent;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,6 @@ import { useEffect } from 'react';
|
|||||||
*/
|
*/
|
||||||
export function useWindowTitle(title: string) {
|
export function useWindowTitle(title: string) {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
document.title = `ontime - ${title}`;
|
document.title = `Ontime - ${title}`;
|
||||||
}, []);
|
}, []);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ export default function ShutdownPanel() {
|
|||||||
{!isOntimeCloud && (
|
{!isOntimeCloud && (
|
||||||
<Panel.Section>
|
<Panel.Section>
|
||||||
<Button variant='destructive' onClick={handler.open} disabled={!canShutdown}>
|
<Button variant='destructive' onClick={handler.open} disabled={!canShutdown}>
|
||||||
Shutdown ontime
|
Shutdown Ontime
|
||||||
</Button>
|
</Button>
|
||||||
{!canShutdown && <Panel.Description>Only available from the machine running Ontime.</Panel.Description>}
|
{!canShutdown && <Panel.Description>Only available from the machine running Ontime.</Panel.Description>}
|
||||||
</Panel.Section>
|
</Panel.Section>
|
||||||
|
|||||||
@@ -18,6 +18,12 @@
|
|||||||
padding-bottom: 95vh;
|
padding-bottom: 95vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.groupSection {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
.editPrompt {
|
.editPrompt {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: $zindex-dialog;
|
z-index: $zindex-dialog;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { OntimeView, isOntimeEvent, isOntimeGroup } from 'ontime-types';
|
import { OntimeView, isOntimeEvent, isOntimeGroup } from 'ontime-types';
|
||||||
import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
|
||||||
import EmptyFill from '../../common/components/state/EmptyFill';
|
import EmptyFill from '../../common/components/state/EmptyFill';
|
||||||
import EmptyPage from '../../common/components/state/EmptyPage';
|
import EmptyPage from '../../common/components/state/EmptyPage';
|
||||||
@@ -25,7 +25,10 @@ import { OperatorData, useOperatorData } from './useOperatorData';
|
|||||||
|
|
||||||
import style from './Operator.module.scss';
|
import style from './Operator.module.scss';
|
||||||
|
|
||||||
const selectedOffset = 50;
|
/** Keeps the running event clear of the list edge when no group header is pinned above it */
|
||||||
|
const edgeOffset = 50;
|
||||||
|
/** How far the running event may drift from where we placed it before we stop following */
|
||||||
|
const followTolerance = 50;
|
||||||
|
|
||||||
export default function OperatorLoader() {
|
export default function OperatorLoader() {
|
||||||
const { data, status } = useOperatorData();
|
const { data, status } = useOperatorData();
|
||||||
@@ -54,11 +57,20 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
|
|||||||
const [lockAutoScroll, setLockAutoScroll] = useState(false);
|
const [lockAutoScroll, setLockAutoScroll] = useState(false);
|
||||||
const selectedRef = useRef<HTMLDivElement | null>(null);
|
const selectedRef = useRef<HTMLDivElement | null>(null);
|
||||||
const scrollRef = useRef<HTMLDivElement | null>(null);
|
const scrollRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
const stickyHeaderRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
|
||||||
|
// The header height varies with the viewport, so measure it at scroll time.
|
||||||
|
const getTopOffset = useCallback(() => {
|
||||||
|
const header = stickyHeaderRef.current;
|
||||||
|
// Sit right under the pinned header, so it covers the previous event instead of half of it.
|
||||||
|
return header ? header.offsetHeight + 2 : edgeOffset;
|
||||||
|
}, []);
|
||||||
|
|
||||||
const scrollToComponent = useFollowComponent({
|
const scrollToComponent = useFollowComponent({
|
||||||
followRef: selectedRef,
|
followRef: selectedRef,
|
||||||
scrollRef,
|
scrollRef,
|
||||||
doFollow: !lockAutoScroll,
|
doFollow: !lockAutoScroll,
|
||||||
topOffset: selectedOffset,
|
getTopOffset,
|
||||||
followTrigger: selectedEventId,
|
followTrigger: selectedEventId,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -82,15 +94,16 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
|
|||||||
|
|
||||||
// prevent considering automated scrolls as user scrolls
|
// prevent considering automated scrolls as user scrolls
|
||||||
const handleUserScroll = () => {
|
const handleUserScroll = () => {
|
||||||
if (selectedRef?.current && scrollRef?.current) {
|
if (!selectedRef.current || !scrollRef.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const selectedRect = selectedRef.current.getBoundingClientRect();
|
const selectedRect = selectedRef.current.getBoundingClientRect();
|
||||||
const scrollerRect = scrollRef.current.getBoundingClientRect();
|
const scrollerRect = scrollRef.current.getBoundingClientRect();
|
||||||
if (selectedRect && scrollerRect) {
|
// Measure the drift from where an automated scroll would place the event.
|
||||||
const distanceFromTop = selectedRect.top - scrollerRect.top;
|
const distanceFromTop = selectedRect.top - scrollerRect.top - getTopOffset();
|
||||||
const hasScrolledOutOfThreshold = distanceFromTop < -8 || distanceFromTop > selectedOffset;
|
const hasScrolledOutOfThreshold = distanceFromTop < -8 || distanceFromTop > followTolerance;
|
||||||
setLockAutoScroll(hasScrolledOutOfThreshold);
|
setLockAutoScroll(hasScrolledOutOfThreshold);
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
const throttledHandleScroll = throttle(handleUserScroll, 1000);
|
const throttledHandleScroll = throttle(handleUserScroll, 1000);
|
||||||
|
|
||||||
@@ -186,9 +199,9 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Fragment key={entry.id}>
|
<div className={style.groupSection} key={entry.id}>
|
||||||
<OperatorGroup
|
<OperatorGroup
|
||||||
key={entry.id}
|
ref={isCurrentParent ? stickyHeaderRef : undefined}
|
||||||
title={entry.title}
|
title={entry.title}
|
||||||
colour={entry.colour}
|
colour={entry.colour}
|
||||||
count={entry.entries.length}
|
count={entry.entries.length}
|
||||||
@@ -239,7 +252,7 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</Fragment>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -1,13 +1,20 @@
|
|||||||
.group {
|
.group {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
/* Padding is kept under the min-height so a single line fits without the list having to shrink the header,
|
||||||
|
while a taller title still grows the row. */
|
||||||
min-height: 2.5rem;
|
min-height: 2.5rem;
|
||||||
padding: 0.4rem 0.75rem;
|
padding: 0.25rem 0.75rem;
|
||||||
border-left: 0.35rem solid var(--group-colour, $gray-500);
|
border-left: 0.35rem solid var(--group-colour, $gray-500);
|
||||||
background-color: $gray-1350;
|
background-color: $gray-1350;
|
||||||
background: color-mix(in srgb, transparent 88%, var(--group-colour, $gray-500) 12%);
|
background: color-mix(in srgb, transparent 88%, var(--group-colour, $gray-500) 12%);
|
||||||
font-size: 1.25rem;
|
font-size: 1.25rem;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
|
|
||||||
|
position: sticky;
|
||||||
|
/* Cover the list padding so rows cannot scroll above the header. */
|
||||||
|
top: -0.25rem;
|
||||||
|
z-index: 1;
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { CSSProperties, memo } from 'react';
|
import { type CSSProperties, type Ref, memo } from 'react';
|
||||||
|
|
||||||
import { getAccessibleColour } from '../../../common/utils/styleUtils';
|
import { getAccessibleColour } from '../../../common/utils/styleUtils';
|
||||||
import { formatDuration } from '../../../common/utils/time';
|
import { formatDuration } from '../../../common/utils/time';
|
||||||
@@ -10,15 +10,16 @@ interface OperatorGroup {
|
|||||||
colour: string;
|
colour: string;
|
||||||
count: number;
|
count: number;
|
||||||
duration: number;
|
duration: number;
|
||||||
|
ref?: Ref<HTMLDivElement>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default memo(OperatorGroup);
|
export default memo(OperatorGroup);
|
||||||
function OperatorGroup({ title, colour, count, duration }: OperatorGroup) {
|
function OperatorGroup({ title, colour, count, duration, ref }: OperatorGroup) {
|
||||||
const groupColour = colour || '#929292';
|
const groupColour = colour || '#929292';
|
||||||
const groupColours = getAccessibleColour(groupColour);
|
const groupColours = getAccessibleColour(groupColour);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={style.group} style={{ ...groupColours, '--group-colour': groupColour } as CSSProperties}>
|
<div className={style.group} style={{ ...groupColours, '--group-colour': groupColour } as CSSProperties} ref={ref}>
|
||||||
<span className={style.title}>{title}</span>
|
<span className={style.title}>{title}</span>
|
||||||
<span className={style.meta}>
|
<span className={style.meta}>
|
||||||
<span>{`${count} ${count === 1 ? 'event' : 'events'}`}</span>
|
<span>{`${count} ${count === 1 ? 'event' : 'events'}`}</span>
|
||||||
|
|||||||
@@ -100,7 +100,20 @@ $item-height: 3.5rem;
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
|
||||||
padding-bottom: max(8rem, calc(5rem + env(safe-area-inset-bottom)));
|
padding-bottom: 95vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Flex prevents row margins collapsing and bounds the sticky header to its group. */
|
||||||
|
.sub-section {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
/* The select view renders the same cards in a flat list. */
|
||||||
|
.sub--group {
|
||||||
|
position: sticky;
|
||||||
|
top: 0;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ====================== LIST-ITEM ======================*/
|
/* ====================== LIST-ITEM ======================*/
|
||||||
@@ -196,9 +209,14 @@ $item-height: 3.5rem;
|
|||||||
|
|
||||||
.sub--group {
|
.sub--group {
|
||||||
box-shadow: inset 0 0 0 1px var(--user-color, $gray-1325);
|
box-shadow: inset 0 0 0 1px var(--user-color, $gray-1325);
|
||||||
background:
|
/* The opaque base prevents rows showing through; background shorthand cannot layer this colour. */
|
||||||
|
background-color: var(--background-color-override, $viewer-background-color);
|
||||||
|
background-image:
|
||||||
linear-gradient(90deg, color-mix(in srgb, var(--user-color, transparent) 18%, transparent), transparent 42%),
|
linear-gradient(90deg, color-mix(in srgb, var(--user-color, transparent) 18%, transparent), transparent 42%),
|
||||||
var(--card-background-color-override, $viewer-card-bg-color);
|
linear-gradient(
|
||||||
|
var(--card-background-color-override, $viewer-card-bg-color),
|
||||||
|
var(--card-background-color-override, $viewer-card-bg-color)
|
||||||
|
);
|
||||||
|
|
||||||
.sub__binder {
|
.sub__binder {
|
||||||
background: var(--user-color, var(--card-background-color-override, $viewer-card-bg-color));
|
background: var(--user-color, var(--card-background-color-override, $viewer-card-bg-color));
|
||||||
@@ -230,6 +248,16 @@ $item-height: 3.5rem;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Reserve the green fill for the running event. */
|
||||||
|
.sub--group.sub--live {
|
||||||
|
box-shadow: inset 0 0 0 2px $active-green;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Keep the armed state quieter than the live ring. */
|
||||||
|
.sub--group.sub--armed {
|
||||||
|
box-shadow: inset 0 0 0 2px $gray-1000;
|
||||||
|
}
|
||||||
|
|
||||||
.sub__title {
|
.sub__title {
|
||||||
grid-area: title;
|
grid-area: title;
|
||||||
padding-bottom: 0.5rem;
|
padding-bottom: 0.5rem;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { MaybeNumber, OntimeEvent } from 'ontime-types';
|
import { MaybeNumber, OntimeEvent } from 'ontime-types';
|
||||||
import { dayInMs } from 'ontime-utils';
|
import { dayInMs } from 'ontime-utils';
|
||||||
import { useEffect, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { IoPencil } from 'react-icons/io5';
|
import { IoPencil } from 'react-icons/io5';
|
||||||
|
|
||||||
import Button from '../../common/components/buttons/Button';
|
import Button from '../../common/components/buttons/Button';
|
||||||
@@ -22,6 +22,7 @@ import {
|
|||||||
CountdownTarget,
|
CountdownTarget,
|
||||||
extendEventData,
|
extendEventData,
|
||||||
getIsLive,
|
getIsLive,
|
||||||
|
groupSubscriptionTargets,
|
||||||
isOutsideRange,
|
isOutsideRange,
|
||||||
preferredFormat12,
|
preferredFormat12,
|
||||||
preferredFormat24,
|
preferredFormat24,
|
||||||
@@ -48,11 +49,22 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
|
|||||||
const [lockAutoScroll, setLockAutoScroll] = useState(false);
|
const [lockAutoScroll, setLockAutoScroll] = useState(false);
|
||||||
const selectedRef = useRef<HTMLDivElement | null>(null);
|
const selectedRef = useRef<HTMLDivElement | null>(null);
|
||||||
const scrollRef = useRef<HTMLDivElement | null>(null);
|
const scrollRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
const stickyHeaderRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
|
||||||
|
const sections = useMemo(() => groupSubscriptionTargets(subscribedEvents), [subscribedEvents]);
|
||||||
|
|
||||||
|
// Responsive sizing and wrapped titles make the sticky header height variable, so measure it at scroll time.
|
||||||
|
const getStickyOffset = useCallback(() => {
|
||||||
|
const header = stickyHeaderRef.current;
|
||||||
|
// Preserve the combined margins between the header and running event.
|
||||||
|
return header ? header.offsetHeight + 4 : 0;
|
||||||
|
}, []);
|
||||||
|
|
||||||
const scrollToComponent = useFollowComponent({
|
const scrollToComponent = useFollowComponent({
|
||||||
followRef: selectedRef,
|
followRef: selectedRef,
|
||||||
scrollRef,
|
scrollRef,
|
||||||
doFollow: !lockAutoScroll,
|
doFollow: !lockAutoScroll,
|
||||||
topOffset: 0,
|
getTopOffset: getStickyOffset,
|
||||||
followTrigger: selectedEventId,
|
followTrigger: selectedEventId,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -75,15 +87,16 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
|
|||||||
|
|
||||||
// prevent considering automated scrolls as user scrolls
|
// prevent considering automated scrolls as user scrolls
|
||||||
const handleUserScroll = () => {
|
const handleUserScroll = () => {
|
||||||
if (selectedRef?.current && scrollRef?.current) {
|
if (!selectedRef.current || !scrollRef.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const selectedRect = selectedRef.current.getBoundingClientRect();
|
const selectedRect = selectedRef.current.getBoundingClientRect();
|
||||||
const scrollerRect = scrollRef.current.getBoundingClientRect();
|
const scrollerRect = scrollRef.current.getBoundingClientRect();
|
||||||
if (selectedRect && scrollerRect) {
|
// Keep the threshold relative to the visible rows below the sticky header.
|
||||||
const distanceFromTop = selectedRect.top - scrollerRect.top;
|
const distanceFromTop = selectedRect.top - scrollerRect.top - getStickyOffset();
|
||||||
const hasScrolledOutOfThreshold = distanceFromTop < -8 || distanceFromTop > 50;
|
const hasScrolledOutOfThreshold = distanceFromTop < -8 || distanceFromTop > 50;
|
||||||
setLockAutoScroll(hasScrolledOutOfThreshold);
|
setLockAutoScroll(hasScrolledOutOfThreshold);
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
const throttledHandleScroll = throttle(handleUserScroll, 1000);
|
const throttledHandleScroll = throttle(handleUserScroll, 1000);
|
||||||
|
|
||||||
@@ -98,7 +111,14 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='list-container' onWheel={handleScroll} onTouchMove={handleScroll} ref={scrollRef}>
|
<div className='list-container' onWheel={handleScroll} onTouchMove={handleScroll} ref={scrollRef}>
|
||||||
{subscribedEvents.map((event) => {
|
{sections.map((section) => {
|
||||||
|
const rows = section.group ? [section.group, ...section.events] : section.events;
|
||||||
|
// the running event anchors the scroll, the group header stays pinned above it
|
||||||
|
const anchorId = section.events.find((event) => getIsLive(event.id, selectedEventId, playback))?.id ?? null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div key={section.group?.id ?? rows[0].id} className='sub-section'>
|
||||||
|
{rows.map((event) => {
|
||||||
// while a group is live, surface the running event's title as the secondary line
|
// while a group is live, surface the running event's title as the secondary line
|
||||||
const liveTitle = event.isGroup && event.liveEntry ? event.liveEntry.title : undefined;
|
const liveTitle = event.isGroup && event.liveEntry ? event.liveEntry.title : undefined;
|
||||||
const secondaryData = liveTitle ?? getPropertyValue(event, secondarySource);
|
const secondaryData = liveTitle ?? getPropertyValue(event, secondarySource);
|
||||||
@@ -107,12 +127,24 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
|
|||||||
// a subscribed group is live when any of its children is the selected/running event
|
// a subscribed group is live when any of its children is the selected/running event
|
||||||
const isLive = activeEntryId ? getIsLive(activeEntryId, selectedEventId, playback) : false;
|
const isLive = activeEntryId ? getIsLive(activeEntryId, selectedEventId, playback) : false;
|
||||||
const isArmed = !isLive && activeEntryId === selectedEventId;
|
const isArmed = !isLive && activeEntryId === selectedEventId;
|
||||||
const countdownEvent = extendEventData(event, currentDay, actualStart, plannedStart, offset, mode, reportData);
|
// only ever hand the ref to a single row, sharing it would null it out on the next commit
|
||||||
|
const isAnchor = isLive && (anchorId === null || event.id === anchorId);
|
||||||
|
const rowRef = isAnchor ? selectedRef : event.isGroup && anchorId ? stickyHeaderRef : undefined;
|
||||||
|
const countdownEvent = extendEventData(
|
||||||
|
event,
|
||||||
|
currentDay,
|
||||||
|
actualStart,
|
||||||
|
plannedStart,
|
||||||
|
offset,
|
||||||
|
mode,
|
||||||
|
reportData,
|
||||||
|
);
|
||||||
const displayTitle = getPropertyValue(event, mainSource ?? 'title');
|
const displayTitle = getPropertyValue(event, mainSource ?? 'title');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={event.id}
|
key={event.id}
|
||||||
ref={isLive ? selectedRef : undefined}
|
ref={rowRef}
|
||||||
className={cx([
|
className={cx([
|
||||||
'sub',
|
'sub',
|
||||||
isLive && 'sub--live',
|
isLive && 'sub--live',
|
||||||
@@ -136,6 +168,9 @@ export default function CountdownSubscriptions({ subscribedEvents, goToEditMode
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
<div className={cx(['fab-container', !showFab && 'fab-container--hidden'])}>
|
<div className={cx(['fab-container', !showFab && 'fab-container--hidden'])}>
|
||||||
<Button variant='primary' size='xlarge' onClick={goToEditMode}>
|
<Button variant='primary' size='xlarge' onClick={goToEditMode}>
|
||||||
<IoPencil /> Edit
|
<IoPencil /> Edit
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { OntimeEntry, OntimeEvent, OntimeGroup, SupportedEntry } from 'ontime-types';
|
import { OntimeEntry, OntimeEvent, OntimeGroup, SupportedEntry } from 'ontime-types';
|
||||||
|
|
||||||
import { ExtendedEntry } from '../../common/utils/rundownMetadata';
|
import { ExtendedEntry } from '../../common/utils/rundownMetadata';
|
||||||
import { resolveSubscriptionTarget } from './countdown.utils';
|
import { CountdownTarget, groupSubscriptionTargets, resolveSubscriptionTarget } from './countdown.utils';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Minimal builders for the extended (metadata enriched) entries the countdown view consumes.
|
* Minimal builders for the extended (metadata enriched) entries the countdown view consumes.
|
||||||
@@ -126,3 +126,89 @@ describe('resolveSubscriptionTarget()', () => {
|
|||||||
expect(result?.liveEntry).toBeNull();
|
expect(result?.liveEntry).toBeNull();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('groupSubscriptionTargets()', () => {
|
||||||
|
/**
|
||||||
|
* Resolves a group the same way the view does, so that the tests exercise the real target shape
|
||||||
|
* (a resolved group carries type Event, so the helper cannot rely on the entry type)
|
||||||
|
*/
|
||||||
|
function resolveGroup(group: ExtendedEntry<OntimeGroup>, flat: ExtendedEntry<OntimeEntry>[]): CountdownTarget {
|
||||||
|
const resolved = resolveSubscriptionTarget(group, flat);
|
||||||
|
if (resolved === null) {
|
||||||
|
throw new Error('test setup: group has no playable children');
|
||||||
|
}
|
||||||
|
return resolved;
|
||||||
|
}
|
||||||
|
|
||||||
|
it('returns no sections for an empty subscription list', () => {
|
||||||
|
expect(groupSubscriptionTargets([])).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('gives each ungrouped event its own section', () => {
|
||||||
|
const e1 = makeEvent({ id: 'e1' });
|
||||||
|
const e2 = makeEvent({ id: 'e2' });
|
||||||
|
|
||||||
|
expect(groupSubscriptionTargets([e1, e2])).toEqual([
|
||||||
|
{ group: null, events: [e1] },
|
||||||
|
{ group: null, events: [e2] },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('absorbs the children of a subscribed group into its section', () => {
|
||||||
|
const group = makeGroup({ id: 'g1' });
|
||||||
|
const c1 = makeEvent({ id: 'c1', parent: 'g1' });
|
||||||
|
const c2 = makeEvent({ id: 'c2', parent: 'g1' });
|
||||||
|
const resolved = resolveGroup(group, [group, c1, c2]);
|
||||||
|
|
||||||
|
expect(groupSubscriptionTargets([resolved, c1, c2])).toEqual([{ group: resolved, events: [c1, c2] }]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps a subscribed group with no subscribed children as an empty section', () => {
|
||||||
|
const group = makeGroup({ id: 'g1' });
|
||||||
|
const c1 = makeEvent({ id: 'c1', parent: 'g1' });
|
||||||
|
const resolved = resolveGroup(group, [group, c1]);
|
||||||
|
|
||||||
|
expect(groupSubscriptionTargets([resolved])).toEqual([{ group: resolved, events: [] }]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not absorb an event which belongs to a different group', () => {
|
||||||
|
const group1 = makeGroup({ id: 'g1' });
|
||||||
|
const c1 = makeEvent({ id: 'c1', parent: 'g1' });
|
||||||
|
const group2 = makeGroup({ id: 'g2' });
|
||||||
|
const c2 = makeEvent({ id: 'c2', parent: 'g2' });
|
||||||
|
const flat = [group1, c1, group2, c2];
|
||||||
|
const resolved1 = resolveGroup(group1, flat);
|
||||||
|
const resolved2 = resolveGroup(group2, flat);
|
||||||
|
|
||||||
|
expect(groupSubscriptionTargets([resolved1, c1, resolved2, c2])).toEqual([
|
||||||
|
{ group: resolved1, events: [c1] },
|
||||||
|
{ group: resolved2, events: [c2] },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not absorb an event whose parent group is not subscribed', () => {
|
||||||
|
const group1 = makeGroup({ id: 'g1' });
|
||||||
|
const c1 = makeEvent({ id: 'c1', parent: 'g1' });
|
||||||
|
const group2 = makeGroup({ id: 'g2' });
|
||||||
|
const c2 = makeEvent({ id: 'c2', parent: 'g2' });
|
||||||
|
const resolved1 = resolveGroup(group1, [group1, c1, group2, c2]);
|
||||||
|
|
||||||
|
// only the first group is subscribed, so the second group's child stands alone
|
||||||
|
expect(groupSubscriptionTargets([resolved1, c1, c2])).toEqual([
|
||||||
|
{ group: resolved1, events: [c1] },
|
||||||
|
{ group: null, events: [c2] },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('closes a section when an ungrouped event follows a group', () => {
|
||||||
|
const group = makeGroup({ id: 'g1' });
|
||||||
|
const c1 = makeEvent({ id: 'c1', parent: 'g1' });
|
||||||
|
const e1 = makeEvent({ id: 'e1' });
|
||||||
|
const resolved = resolveGroup(group, [group, c1]);
|
||||||
|
|
||||||
|
expect(groupSubscriptionTargets([resolved, c1, e1])).toEqual([
|
||||||
|
{ group: resolved, events: [c1] },
|
||||||
|
{ group: null, events: [e1] },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -252,6 +252,42 @@ export function resolveSubscriptionTarget(
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A subscribed group along with the subscribed events which belong to it.
|
||||||
|
* Events without a subscribed parent group form their own section with no group.
|
||||||
|
*/
|
||||||
|
export type CountdownSection = {
|
||||||
|
group: CountdownTarget | null;
|
||||||
|
events: CountdownTarget[];
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Folds the flat, rundown ordered subscription targets into sections.
|
||||||
|
* A group opens a section which absorbs the following targets that declare it as parent,
|
||||||
|
* which allows the group to be rendered as a sticky header for its own events.
|
||||||
|
*/
|
||||||
|
export function groupSubscriptionTargets(targets: CountdownTarget[]): CountdownSection[] {
|
||||||
|
const sections: CountdownSection[] = [];
|
||||||
|
|
||||||
|
for (const target of targets) {
|
||||||
|
// resolveSubscriptionTarget spreads the first child, so we cannot rely on the entry type here
|
||||||
|
if (target.isGroup) {
|
||||||
|
sections.push({ group: target, events: [] });
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const previousSection = sections.at(-1);
|
||||||
|
if (previousSection?.group?.id === target.parent) {
|
||||||
|
previousSection.events.push(target);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
sections.push({ group: null, events: [target] });
|
||||||
|
}
|
||||||
|
|
||||||
|
return sections;
|
||||||
|
}
|
||||||
|
|
||||||
export function extendEventData(
|
export function extendEventData(
|
||||||
event: CountdownTarget,
|
event: CountdownTarget,
|
||||||
currentDay: number,
|
currentDay: number,
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
http-equiv="Content-Security-Policy"
|
http-equiv="Content-Security-Policy"
|
||||||
content="default-src 'self'; style-src 'unsafe-inline'; script-src 'self'"
|
content="default-src 'self'; style-src 'unsafe-inline'; script-src 'self'"
|
||||||
/>
|
/>
|
||||||
<title>ontime</title>
|
<title>Ontime</title>
|
||||||
<style>
|
<style>
|
||||||
body {
|
body {
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
@@ -92,7 +92,7 @@
|
|||||||
<body>
|
<body>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<img src="../assets/logo.png" />
|
<img src="../assets/logo.png" />
|
||||||
<h1>ontime · event timers</h1>
|
<h1>Ontime · event timers</h1>
|
||||||
<div class="lds-ellipsis">
|
<div class="lds-ellipsis">
|
||||||
<div></div>
|
<div></div>
|
||||||
<div></div>
|
<div></div>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
body {
|
body {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background: #121212;
|
background: #101010;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
@@ -29,15 +29,19 @@ function makeHeadersWithFailingAuthorization(cookie?: string) {
|
|||||||
|
|
||||||
describe('isPublicAssetRequest()', () => {
|
describe('isPublicAssetRequest()', () => {
|
||||||
it('allows root public assets without a prefix', () => {
|
it('allows root public assets without a prefix', () => {
|
||||||
expect(isPublicAssetRequest('/site.webmanifest', '')).toBe(true);
|
|
||||||
expect(isPublicAssetRequest('/manifest.json', '')).toBe(true);
|
expect(isPublicAssetRequest('/manifest.json', '')).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('allows prefixed public assets in cloud deployments', () => {
|
it('allows prefixed public assets in cloud deployments', () => {
|
||||||
expect(isPublicAssetRequest('/stage-hash/site.webmanifest', '/stage-hash')).toBe(true);
|
expect(isPublicAssetRequest('/stage-hash/manifest.json', '/stage-hash')).toBe(true);
|
||||||
expect(isPublicAssetRequest('/stage-hash/ontime-logo.png?cache=1', '/stage-hash')).toBe(true);
|
expect(isPublicAssetRequest('/stage-hash/ontime-logo.png?cache=1', '/stage-hash')).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('allows the PWA install icons', () => {
|
||||||
|
expect(isPublicAssetRequest('/ontime-logo-192.png', '')).toBe(true);
|
||||||
|
expect(isPublicAssetRequest('/ontime-logo-512.png', '')).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
it('keeps non-public paths protected', () => {
|
it('keeps non-public paths protected', () => {
|
||||||
expect(isPublicAssetRequest('/stage-hash/data', '/stage-hash')).toBe(false);
|
expect(isPublicAssetRequest('/stage-hash/data', '/stage-hash')).toBe(false);
|
||||||
expect(isPublicAssetRequest('/backstage', '')).toBe(false);
|
expect(isPublicAssetRequest('/backstage', '')).toBe(false);
|
||||||
|
|||||||
@@ -17,8 +17,9 @@ const publicAssets = new Set([
|
|||||||
'/favicon.ico',
|
'/favicon.ico',
|
||||||
'/manifest.json',
|
'/manifest.json',
|
||||||
'/ontime-logo.png',
|
'/ontime-logo.png',
|
||||||
|
'/ontime-logo-192.png',
|
||||||
|
'/ontime-logo-512.png',
|
||||||
'/robots.txt',
|
'/robots.txt',
|
||||||
'/site.webmanifest',
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
export function isPublicAssetRequest(originalUrl: string, prefix: string): boolean {
|
export function isPublicAssetRequest(originalUrl: string, prefix: string): boolean {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ test.describe('pages routes are available', () => {
|
|||||||
test('editor', async ({ page }) => {
|
test('editor', async ({ page }) => {
|
||||||
await page.goto('/editor');
|
await page.goto('/editor');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
await expect(page.getByTestId('editor-container')).toBeVisible();
|
await expect(page.getByTestId('editor-container')).toBeVisible();
|
||||||
await expect(page.getByTestId('panel-rundown')).toBeVisible();
|
await expect(page.getByTestId('panel-rundown')).toBeVisible();
|
||||||
await expect(page.getByTestId('panel-timer-control')).toBeVisible();
|
await expect(page.getByTestId('panel-timer-control')).toBeVisible();
|
||||||
@@ -16,38 +16,38 @@ test.describe('pages routes are available', () => {
|
|||||||
test('cuesheet', async ({ page }) => {
|
test('cuesheet', async ({ page }) => {
|
||||||
await page.goto('/cuesheet');
|
await page.goto('/cuesheet');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
await expect(page.getByTestId('cuesheet')).toBeVisible();
|
await expect(page.getByTestId('cuesheet')).toBeVisible();
|
||||||
});
|
});
|
||||||
|
|
||||||
test('operator', async ({ page }) => {
|
test('operator', async ({ page }) => {
|
||||||
await page.goto('/op');
|
await page.goto('/op');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('timer', async ({ page }) => {
|
test('timer', async ({ page }) => {
|
||||||
await page.goto('/timer');
|
await page.goto('/timer');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('backstage', async ({ page }) => {
|
test('backstage', async ({ page }) => {
|
||||||
await page.goto('/backstage');
|
await page.goto('/backstage');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('studio', async ({ page }) => {
|
test('studio', async ({ page }) => {
|
||||||
await page.goto('/studio');
|
await page.goto('/studio');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('countdown', async ({ page }) => {
|
test('countdown', async ({ page }) => {
|
||||||
await page.goto('/countdown?sub=32d31');
|
await page.goto('/countdown?sub=32d31');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
|
|
||||||
await expect(page.getByText('Albania')).toBeVisible();
|
await expect(page.getByText('Albania')).toBeVisible();
|
||||||
await expect(page.getByText('Latvia')).toBeHidden();
|
await expect(page.getByText('Latvia')).toBeHidden();
|
||||||
|
|||||||
@@ -92,12 +92,12 @@ test.describe('test view navigation feature', () => {
|
|||||||
test('not-found', async ({ page }) => {
|
test('not-found', async ({ page }) => {
|
||||||
await page.goto('/not-found');
|
await page.goto('/not-found');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
await expect(page.getByRole('heading', { name: 'Not found' })).toBeVisible();
|
await expect(page.getByRole('heading', { name: 'Not found' })).toBeVisible();
|
||||||
|
|
||||||
await page.goto('/preset/not-found');
|
await page.goto('/preset/not-found');
|
||||||
|
|
||||||
await expect(page).toHaveTitle(/ontime/);
|
await expect(page).toHaveTitle(/ontime/i);
|
||||||
await expect(page.getByRole('heading', { name: 'Not found' })).toBeVisible();
|
await expect(page.getByRole('heading', { name: 'Not found' })).toBeVisible();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user