fixup! feat: implement speed controls

feat: implement speed controls
2026-07-26 10:38:55 +00:00 · 2025-03-02 14:45:40 +01:00 · 2025-03-02 14:45:32 +01:00 · 2025-03-02 14:13:53 +01:00
132 changed files with 823 additions and 991 deletions
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.14.5",
+    "version": "3.13.1",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "3.14.5",
+  "version": "3.13.1",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -13,8 +13,8 @@
    "@emotion/styled": "^11.10.6",
    "@fontsource/open-sans": "^5.0.28",
    "@mantine/hooks": "^7.13.3",
+    "@react-icons/all-files": "^4.1.0",
    "@sentry/react": "^8.43.0",
-    "@table-nav/react": "^0.0.7",
    "@tanstack/react-query": "^5.62.7",
    "@tanstack/react-query-devtools": "^5.62.7",
    "@tanstack/react-table": "^8.20.5",
@@ -28,7 +28,6 @@
    "react-dom": "^18.3.1",
    "react-fast-compare": "^3.2.2",
    "react-hook-form": "^7.53.1",
-    "react-icons": "5.4.0",
    "react-qr-code": "^2.0.12",
    "react-router-dom": "^6.3.0",
    "web-vitals": "^3.1.1",
@@ -158,14 +158,7 @@ export default function AppRouter() {
        {/*/!* Protected Routes *!/*/}
        <Route path='/editor' element={<Editor />} />
        <Route path='/cuesheet' element={<PCuesheet />} />
-        <Route
-          path='/op'
-          element={
-            <ViewLoader>
-              <POperator />
-            </ViewLoader>
-          }
-        />
+        <Route path='/op' element={<POperator />} />

        {/*/!* Protected Routes - Elements *!/*/}
        <Route
@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import { IoArrowForward } from 'react-icons/io5';
 import {
  IconButton,
  Input,
@@ -11,6 +10,7 @@ import {
  ModalOverlay,
  Select,
 } from '@chakra-ui/react';
+import { IoArrowForward } from '@react-icons/all-files/io5/IoArrowForward';

 import { navigatorConstants } from '../../../viewerConfig';
 import { setClientRemote } from '../../hooks/useSocket';
@@ -2,8 +2,8 @@
 // https://github.com/lukasbach/chakra-ui-contextmenu/blob/main/src/ContextMenu.tsx

 import { ReactElement } from 'react';
-import { IconType } from 'react-icons';
 import { Menu, MenuButton, MenuGroup, MenuList } from '@chakra-ui/react';
+import { IconType } from '@react-icons/all-files';
 import { create } from 'zustand';

 import { ContextMenuOption } from './ContextMenuOption';
@@ -1,7 +1,7 @@
 import { PropsWithChildren, useState } from 'react';
-import { IoCheckmark } from 'react-icons/io5';
-import { IoCopy } from 'react-icons/io5';
 import { Button, ButtonGroup, IconButton, Tooltip } from '@chakra-ui/react';
+import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';
+import { IoCopy } from '@react-icons/all-files/io5/IoCopy';

 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { Size } from '../../models/Util.type';
@@ -1,5 +1,6 @@
-import { IoChevronDown, IoChevronUp } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
+import { IoChevronUp } from '@react-icons/all-files/io5/IoChevronUp';

 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { millisToDelayString } from '../../utils/dateConfig';
@@ -26,22 +26,17 @@ class ErrorBoundary extends React.Component {
      error,
      errorInfo: info,
    });
-    this.reportContent = `${error} ${info.componentStack}`;
-
-    const appState = runtimeStore.getState();
-    if (appState.ping < 0) {
-      return;
-    }

    Sentry.withScope((scope) => {
      scope.setExtras({
        error,
-        store: appState,
+        store: runtimeStore.getState(),
        hasSocket: { hasConnected, shouldReconnect, reconnectAttempts },
      });
      const eventId = Sentry.captureException(error);
      this.setState({ eventId, info });
    });
+    this.reportContent = `${error} ${info.componentStack}`;
  }

  render() {
@@ -1,5 +1,5 @@
 import { PropsWithChildren } from 'react';
-import { IoAlertCircle } from 'react-icons/io5';
+import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';

 import { cx } from '../../utils/styleUtils';

@@ -1,4 +1,4 @@
-import { IoBan } from 'react-icons/io5';
+import { IoBan } from '@react-icons/all-files/io5/IoBan';

 import { cx } from '../../../utils/styleUtils';

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 import { useController, UseControllerProps } from 'react-hook-form';
-import { IoEyedrop } from 'react-icons/io5';
+import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
 import { ViewSettings } from 'ontime-types';

 import { debounce } from '../../../utils/debounce';
@@ -17,7 +17,6 @@ export default function useReactiveTextInput(
    submitOnCtrlEnter?: boolean;
    onCancelUpdate?: () => void;
    allowSubmitSameValue?: boolean;
-    allowKeyboardNavigation?: boolean;
  },
 ): UseReactiveTextInputReturn {
  const [text, setText] = useState<string>(initialText);
@@ -59,14 +58,7 @@ export default function useReactiveTextInput(
          setText(cleanVal);
        }
      }
-
-      setTimeout(() => {
-        if (options?.allowKeyboardNavigation) {
-          ref.current?.parentElement?.focus(); // Focus on parent element to continue keyboard navigation
-        } else {
-          ref.current?.blur();
-        }
-      }); // Immediate timeout to ensure text is set before blurring
+      setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
    },
    [initialText, options, ref, submitCallback],
  );
@@ -78,25 +70,12 @@ export default function useReactiveTextInput(
  const handleEscape = useCallback(() => {
    // No need to update if it hasn't changed
    setText(initialText);
-    // force the text to be the initial value
-    if (ref.current) {
-      ref.current.value = initialText;
-    }
    options?.onCancelUpdate?.();
-    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before blurring
+    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
  }, [initialText, options, ref]);

  const keyHandler = useMemo(() => {
-    const hotKeys: HotkeyItem[] = [
-      [
-        'Escape',
-        (event) => {
-          event.preventDefault();
-          handleEscape();
-        },
-        { preventDefault: true },
-      ],
-    ];
+    const hotKeys: HotkeyItem[] = [['Escape', handleEscape, { preventDefault: true }]];

    if (options?.submitOnEnter) {
      hotKeys.push(['Enter', () => handleSubmit(text)]);
@@ -105,22 +84,7 @@ export default function useReactiveTextInput(
    if (options?.submitOnCtrlEnter) {
      hotKeys.push(['mod + Enter', () => handleSubmit(text)]);
    }
-
-    const hotKeyHandler = getHotkeyHandler(hotKeys);
-
-    return (event: KeyboardEvent<HTMLElement>) => {
-      // allow moving in input field with arrow keys
-      if (
-        event.key === 'ArrowLeft' ||
-        event.key === 'ArrowRight' ||
-        event.key === 'ArrowUp' ||
-        event.key === 'ArrowDown'
-      ) {
-        event.stopPropagation();
-      }
-
-      hotKeyHandler(event);
-    };
+    return getHotkeyHandler(hotKeys);
  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, text]);

  return {
@@ -1,9 +1,12 @@
 import { type PropsWithChildren } from 'react';
 import { useNavigate } from 'react-router-dom';

+import { cx } from '../../../utils/styleUtils';
+
 import style from './AppLink.module.scss';

 interface AppLinkProps {
+  className?: string;
  search: string;
 }

@@ -12,13 +15,13 @@ interface AppLinkProps {
 * Handles the path to respect Ontime Clouds base URL
 */
 export default function AppLink(props: PropsWithChildren<AppLinkProps>) {
-  const { search, children } = props;
+  const { className, search, children } = props;
  const navigate = useNavigate();

  const handleClick = () => navigate({ search });

  return (
-    <button onClick={handleClick} className={style.link}>
+    <button onClick={handleClick} className={cx([style.link, className])}>
      {children}
    </button>
  );
@@ -1,5 +1,5 @@
 import { MouseEvent, ReactNode } from 'react';
-import { IoOpenOutline } from 'react-icons/io5';
+import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';

 import { openLink } from '../../../utils/linkUtils';
 import { cx } from '../../../utils/styleUtils';
@@ -1,5 +1,5 @@
-import { IoApps } from 'react-icons/io5';
-import { IoSettingsOutline } from 'react-icons/io5';
+import { IoApps } from '@react-icons/all-files/io5/IoApps';
+import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';

 import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
@@ -1,6 +1,5 @@
 import { memo, PropsWithChildren } from 'react';
 import { createPortal } from 'react-dom';
-import { IoArrowUp, IoContract, IoExpand, IoLockClosedOutline, IoSwapVertical } from 'react-icons/io5';
 import { Link, useLocation } from 'react-router-dom';
 import {
  Drawer,
@@ -12,6 +11,11 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';
 import { useFullscreen } from '@mantine/hooks';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+import { IoContract } from '@react-icons/all-files/io5/IoContract';
+import { IoExpand } from '@react-icons/all-files/io5/IoExpand';
+import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
+import { IoSwapVertical } from '@react-icons/all-files/io5/IoSwapVertical';

 import { isLocalhost } from '../../../externals';
 import { navigatorConstants } from '../../../viewerConfig';
@@ -1,4 +1,4 @@
-import { IoLockClosedOutline } from 'react-icons/io5';
+import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';

 import { useFadeOutOnInactivity } from '../../hooks/useFadeOutOnInactivity';
 import { cx } from '../../utils/styleUtils';
@@ -1,5 +1,7 @@
-import { IoPause, IoPlay, IoStop } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoPause } from '@react-icons/all-files/io5/IoPause';
+import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
+import { IoStop } from '@react-icons/all-files/io5/IoStop';
 import { Playback } from 'ontime-types';

 import { tooltipDelayFast } from '../../../ontimeConfig';
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react';
-import { IoCheckmark } from 'react-icons/io5';
 import { IconButton, PinInput, PinInputField } from '@chakra-ui/react';
+import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';

 import style from './ProtectRoute.module.scss';

@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import { IoChevronDown } from 'react-icons/io5';
 import { useSearchParams } from 'react-router-dom';
 import {
  Button,
@@ -14,6 +13,7 @@ import {
  Select,
  Switch,
 } from '@chakra-ui/react';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

 import { isStringBoolean } from '../../../features/viewers/common/viewUtils';

@@ -126,9 +126,9 @@ function MultiOption(props: EditFormMultiOptionProps) {
            onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
          >
            {Object.values(paramField.values).map((option) => {
-              const { value, label, colour } = option;
+              const { value, label } = option;
              return (
-                <MenuItemOption value={value} key={value} style={{ borderRight: `8px solid ${colour}` }}>
+                <MenuItemOption value={value} key={value}>
                  {label}
                </MenuItemOption>
              );
@@ -1,5 +1,5 @@
-import { IoChevronDown } from 'react-icons/io5';
 import { useLocalStorage } from '@mantine/hooks';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

 import { cx } from '../../utils/styleUtils';

@@ -1,13 +1,13 @@
 import { CustomFields } from 'ontime-types';

-import type { MultiselectOptions, ParamField } from './types';
+import type { ParamField } from './types';

 export const makeOptionsFromCustomFields = (
  customFields: CustomFields,
-  additionalOptions: Readonly<Record<string, string>> = {},
+  additionalOptions: Record<string, string> = {},
  filterImageType = true,
 ) => {
-  const options = { ...additionalOptions };
+  const options = structuredClone(additionalOptions);
  for (const [key, value] of Object.entries(customFields)) {
    if (filterImageType && value.type === 'image') {
      continue;
@@ -18,17 +18,6 @@ export const makeOptionsFromCustomFields = (
  return options;
 };

-export function makeCustomFieldSelectOptions(customFields: CustomFields, filterImageType = true): MultiselectOptions {
-  const options: MultiselectOptions = {};
-  for (const [key, value] of Object.entries(customFields)) {
-    if (filterImageType && value.type === 'image') {
-      continue;
-    }
-    options[key] = { value: key, label: value.label, colour: value.colour };
-  }
-  return options;
-}
-
 export const getTimeOption = (timeFormat: string): ParamField => {
  const placeholder = `${timeFormat} (default)`;
  return {
@@ -12,11 +12,9 @@ type OptionsField = {
  defaultValue?: string;
 };

-export type MultiselectOption = { value: string; label: string; colour: string };
-export type MultiselectOptions = Record<string, MultiselectOption>;
 type MultiOptionsField = {
  type: 'multi-option';
-  values: MultiselectOptions;
+  values: Record<string, { value: string; label: string; colour: string }>;
  defaultValue?: string;
 };

@@ -41,6 +41,17 @@ export const useExternalMessageInput = createSelector((state: RuntimeStore) => (
  visible: state.message.timer.secondarySource === 'external',
 }));

+export const useTimerSchedule = createSelector((state: RuntimeStore) => ({
+  startedAt: state.timer.startedAt,
+  expectedFinish: state.timer.expectedFinish,
+  phase: state.timer.phase,
+  playback: state.timer.playback,
+}));
+
+export const useTimerCurrent = createSelector((state: RuntimeStore) => ({
+  current: state.timer.current,
+}));
+
 export const useMessagePreview = createSelector((state: RuntimeStore) => ({
  blink: state.message.timer.blink,
  blackout: state.message.timer.blackout,
@@ -114,6 +125,15 @@ export const setAuxTimer = {
  setDuration: (time: number) => socketSendJson('auxtimer', { '1': { duration: time } }),
 };

+export const useTimerSpeed = createSelector((state: RuntimeStore) => ({
+  speed: state.timer.speed,
+}));
+
+export const setTimerSpeed = {
+  getSpeed: () => socketSendJson('get-speed'),
+  setSpeed: (speed: number) => socketSendJson('set-speed', speed),
+};
+
 export const useSelectedEventId = createSelector((state: RuntimeStore) => ({
  selectedEventId: state.eventNow?.id ?? null,
 }));
@@ -170,12 +190,6 @@ export const useTimelineStatus = createSelector((state: RuntimeStore) => ({
  offset: state.runtime.offset,
 }));

-export const useTimeUntilData = createSelector((state: RuntimeStore) => ({
-  clock: state.clock,
-  offset: state.runtime.offset,
-  currentDay: state.eventNow?.dayOffset ?? 0, //The day of the currently running event
-}));
-
 export const useRuntimeOffset = createSelector((state: RuntimeStore) => ({
  offset: state.runtime.offset,
 }));
@@ -1,10 +1,10 @@
-import { EndAction, EventCustomFields, OntimeEvent, SupportedEvent, TimerType, TimeStrategy } from 'ontime-types';
+import { EndAction, EventCustomFields, OntimeEvent, SupportedEvent, TimerType } from 'ontime-types';

 import { cloneEvent } from '../eventsManager';

 describe('cloneEvent()', () => {
  it('creates a stem from a given event', () => {
-    const original: OntimeEvent = {
+    const original = {
      id: 'unique',
      type: SupportedEvent.Event,
      title: 'title',
@@ -14,9 +14,6 @@ describe('cloneEvent()', () => {
      duration: 10,
      timeEnd: 10,
      timerType: TimerType.CountDown,
-      timeStrategy: TimeStrategy.LockEnd,
-      linkStart: null,
-      countToEnd: false,
      endAction: EndAction.None,
      isPublic: false,
      skip: false,
@@ -24,39 +21,29 @@ describe('cloneEvent()', () => {
      revision: 10,
      timeWarning: 120000,
      timeDanger: 60000,
-      delay: 0,
-      dayOffset: 0,
-      gap: 0,
      custom: {
        lighting: '3',
      } as EventCustomFields,
-    };
+    } as OntimeEvent;

    const cloned = cloneEvent(original);
    expect(cloned).not.toBe(original);
-    expect(cloned.custom).not.toBe(original.custom);
-
-    expect(cloned).toMatchObject({
-      type: SupportedEvent.Event,
-      title: original.title,
-      note: original.note,
-      timeStart: original.timeStart,
-      duration: original.duration,
-      timeEnd: original.timeEnd,
-      timerType: original.timerType,
-      timeStrategy: original.timeStrategy,
-      countToEnd: original.countToEnd,
-      linkStart: original.linkStart,
-      endAction: original.endAction,
-      isPublic: original.isPublic,
-      skip: original.skip,
-      colour: original.colour,
-      revision: 0,
-      delay: original.delay,
-      dayOffset: original.dayOffset,
-      gap: 0,
-      timeWarning: original.timeWarning,
-      timeDanger: original.timeDanger,
-    });
+    // @ts-expect-error -- safeguarding this
+    expect(cloned?.id).toBe(undefined);
+    expect(cloned.title).toBe(original.title);
+    expect(cloned.note).toBe(original.note);
+    expect(cloned.endAction).toBe(original.endAction);
+    expect(cloned.timerType).toBe(original.timerType);
+    expect(cloned.timeStart).toBe(original.timeStart);
+    expect(cloned.timeEnd).toBe(original.timeEnd);
+    expect(cloned.duration).toBe(original.duration);
+    expect(cloned.isPublic).toBe(original.isPublic);
+    expect(cloned.skip).toBe(original.skip);
+    expect(cloned.colour).toBe(original.colour);
+    expect(cloned.type).toBe(SupportedEvent.Event);
+    expect(cloned.revision).toBe(0);
+    expect(cloned.timeWarning).toBe(original.timeWarning);
+    expect(cloned.timeDanger).toBe(original.timeDanger);
+    expect(cloned.custom).toStrictEqual({});
  });
 });
@@ -1,4 +1,4 @@
-import { calculateTimeUntilStart, formatTime, nowInMillis } from '../time';
+import { formatTime, nowInMillis } from '../time';

 describe('nowInMillis()', () => {
  it('should return the current time in milliseconds', () => {
@@ -38,84 +38,3 @@ describe('formatTime()', () => {
    expect(time).toStrictEqual('-01:00');
  });
 });
-
-describe('calculateTimeUntilStart()', () => {
-  test('ontime', () => {
-    const test = {
-      timeStart: 100,
-      dayOffset: 0,
-      delay: 0,
-      currentDay: 0,
-      totalGap: 0,
-      clock: 90,
-      offset: 0,
-    };
-
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(10);
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
-  });
-
-  test('running behind', () => {
-    const test = {
-      timeStart: 100,
-      dayOffset: 0,
-      delay: 0,
-      currentDay: 0,
-      totalGap: 0,
-      clock: 90,
-      offset: -20,
-    };
-
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(30);
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(30);
-  });
-
-  test('running ahead', () => {
-    const test = {
-      timeStart: 100,
-      dayOffset: 0,
-      delay: 0,
-      currentDay: 0,
-      totalGap: 0,
-      clock: 80,
-      offset: 10,
-    };
-
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(20); // <-- when running ahead the unlinked timer stays put
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(10);
-  });
-
-  test('running behind with enough gaps', () => {
-    const test = {
-      timeStart: 100,
-      dayOffset: 0,
-      delay: 0,
-      currentDay: 0,
-      totalGap: 20,
-      clock: 50,
-      offset: -20,
-    };
-
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(50);
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
-  });
-
-  test('running behind with to little gaps', () => {
-    const test = {
-      timeStart: 100,
-      dayOffset: 0,
-      delay: 0,
-      currentDay: 0,
-      totalGap: 10,
-      clock: 50,
-      offset: -20,
-    };
-
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: false })).toBe(60);
-    expect(calculateTimeUntilStart({ ...test, isLinkedToLoaded: true })).toBe(70); // This should not be possible
-  });
-
-  //TODO: more indepth testing,
-  // including day offset handling
-  // and more?
-});
@@ -24,11 +24,11 @@ export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
    skip: event.skip,
    colour: event.colour,
    revision: 0,
-    delay: event.delay, // the events will be collocated, so having the same metadata is a good start
-    dayOffset: event.dayOffset,
+    delay: 0,
+    dayOffset: 0,
    gap: 0,
    timeWarning: event.timeWarning,
    timeDanger: event.timeDanger,
-    custom: { ...event.custom },
+    custom: {},
  };
 };
@@ -1,12 +0,0 @@
-/**
- * Allows lazy evaluation and caching of a functions result
- */
-export function lazyEvaluate<T>(fn: () => T): () => T {
-  let result: T | undefined;
-  return function () {
-    if (result === undefined) {
-      result = fn();
-    }
-    return result;
-  };
-}
@@ -48,12 +48,10 @@ export const connectSocket = () => {

  websocket.onclose = () => {
    console.warn('WebSocket disconnected');
+    setOnlineStatus(false);

    if (shouldReconnect) {
      reconnectTimeout = setTimeout(() => {
-        if (reconnectAttempts > 2) {
-          setOnlineStatus(false);
-        }
        console.warn('WebSocket: attempting reconnect');
        if (websocket && websocket.readyState === WebSocket.CLOSED) {
          reconnectAttempts += 1;
@@ -1,9 +1,8 @@
-import { MaybeNumber, OntimeEvent, Settings, TimeFormat } from 'ontime-types';
-import { dayInMs, formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';
+import { MaybeNumber, Settings, TimeFormat } from 'ontime-types';
+import { formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';

 import { FORMAT_12, FORMAT_24 } from '../../viewerConfig';
 import { APP_SETTINGS } from '../api/constants';
-import { useTimeUntilData } from '../hooks/useSocket';
 import { ontimeQueryClient } from '../queryClient';

 /**
@@ -126,71 +125,3 @@ export function formatDuration(duration: number, hideSeconds = true): string {
  }
  return result;
 }
-
-/**
- *
- * @param totalGap accumulated gap from the current event
- * @param isLinkedToLoaded is this event part of a chain linking back to the current loaded event
- * @returns
- */
-export function useTimeUntilStart(
-  // typed like this to make it very clear what the data is
-  data: Pick<OntimeEvent, 'timeStart' | 'dayOffset' | 'delay'> & {
-    totalGap: number;
-    isLinkedToLoaded: boolean;
-  },
-): number {
-  const { offset, clock, currentDay } = useTimeUntilData();
-  return calculateTimeUntilStart({ ...data, currentDay, clock, offset });
-}
-
-/**
- *
- * @param currentDay the day offset of the urrently running event
- * @param totalGap accumulated gap from the current event
- * @param isLinkedToLoaded is this event part of a chain linking back to the current loaded event
- * @param clock
- * @param offset
- * @returns
- */
-export function calculateTimeUntilStart(
-  data: Pick<OntimeEvent, 'timeStart' | 'dayOffset' | 'delay'> & {
-    currentDay: number;
-    totalGap: number;
-    isLinkedToLoaded: boolean;
-    clock: number;
-    offset: number;
-  },
-): number {
-  const { timeStart, dayOffset, currentDay, totalGap, isLinkedToLoaded, clock, offset, delay } = data;
-
-  //How many days from the currently running event to this one
-  const relativeDayOffset = dayOffset - currentDay;
-
-  const delayedStart = Math.max(0, timeStart + delay);
-
-  //The normalised start time of this event relative to the currently running event
-  const normalisedTimeStart = delayedStart + relativeDayOffset * dayInMs;
-
-  const offsetTimestart = normalisedTimeStart - offset;
-  const offsetTimeUntil = offsetTimestart - clock;
-
-  if (isLinkedToLoaded) {
-    //if we are directly linked back to the loaded event we just follow the offset
-    return offsetTimeUntil;
-  }
-
-  const scheduledTimeUntil = normalisedTimeStart - clock;
-
-  const isAheadOfSchedule = offset >= 0;
-  const gapsCanCompensadeForOffset = totalGap + offset >= 0;
-
-  if (isAheadOfSchedule || gapsCanCompensadeForOffset) {
-    // if we are ahead of schedule or the gap can compensate for the amount we are behind then expect to start at the scheduled time
-    return scheduledTimeUntil;
-  }
-
-  // otherwise consume as much of the offset as possible with the gap
-  const offsetTimeUntilBufferedByGaps = offsetTimeUntil - totalGap;
-  return offsetTimeUntilBufferedByGaps;
-}
@@ -19,10 +19,9 @@ export const buyMeACoffeeUrl = 'https://buymeacoffee.com/cpvalente';
 export const appVersion = version;
 export const isProduction = import.meta.env.MODE === 'production';
 export const isDev = !isProduction;
-export const currentHostName = window.location.hostname;
-export const isLocalhost = currentHostName === 'localhost' || currentHostName === '127.0.0.1';
+export const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
 export const isDockerImage = Boolean(import.meta.env.VITE_IS_DOCKER);
-export const isOntimeCloud = currentHostName.includes('cloud.getontime.no');
+export const isOntimeCloud = window.location.hostname.includes('cloud.getontime.no');

 // resolve entrypoint URLs

@@ -76,4 +75,4 @@ function resolveBaseURI(): string {
  }

  return base;
-}
+}
@@ -1,6 +1,6 @@
 import { PropsWithChildren } from 'react';
-import { IoClose } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoClose } from '@react-icons/all-files/io5/IoClose';

 import style from './PanelContent.module.scss';

@@ -1,6 +1,6 @@
 import { HTMLAttributes, PropsWithChildren, ReactNode } from 'react';
-import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';

 import { cx } from '../../../common/utils/styleUtils';

@@ -1,7 +1,8 @@
 import { useEffect, useMemo } from 'react';
 import { Controller, useFieldArray, useForm } from 'react-hook-form';
-import { IoAdd, IoTrash } from 'react-icons/io5';
 import { Button, IconButton, Input, Radio, RadioGroup, Select } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import {
  Automation,
  AutomationDTO,
@@ -30,7 +31,7 @@ import OntimeActionForm from './OntimeActionForm';

 import style from './AutomationForm.module.scss';

-const integrationsDocsUrl = 'https://docs.getontime.no/api/automation/#using-variables-in-automation';
+const integrationsDocsUrl = 'https://docs.getontime.no/api/integrations/#using-variables-in-integrations';

 interface AutomationFormProps {
  automation: Automation | AutomationDTO;
@@ -1,6 +1,8 @@
 import { Fragment, useState } from 'react';
-import { IoAdd, IoPencil, IoTrash } from 'react-icons/io5';
 import { Button, IconButton } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { AutomationDTO, NormalisedAutomation } from 'ontime-types';

 import { deleteAutomation } from '../../../../common/api/automation';
@@ -1,6 +1,6 @@
 import { Fragment, useMemo, useState } from 'react';
-import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { NormalisedAutomation, Trigger } from 'ontime-types';

 import { deleteTrigger } from '../../../../common/api/automation';
@@ -1,6 +1,8 @@
 import { useState } from 'react';
-import { IoPencil, IoTrash, IoWarningOutline } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
+import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
+import { IoWarningOutline } from '@react-icons/all-files/io5/IoWarningOutline';
 import { NormalisedAutomation, TimerLifeCycle } from 'ontime-types';

 import Tag from '../../../../common/components/tag/Tag';
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
-import { IoTrashBin } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoTrashBin } from '@react-icons/all-files/io5/IoTrashBin';

 import { deleteAllReport } from '../../../../common/api/report';
 import { createBlob, downloadBlob } from '../../../../common/api/utils';
@@ -1,7 +1,9 @@
 import { useEffect } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
-import { IoAdd, IoOpenOutline, IoTrash } from 'react-icons/io5';
 import { Button, IconButton, Input, Switch } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { URLPreset } from 'ontime-types';

 import { postUrlPresets } from '../../../../common/api/urlPresets';
@@ -1,6 +1,7 @@
 import { useState } from 'react';
-import { IoPencil, IoTrash } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
+import { IoPencil } from '@react-icons/all-files/io5/IoPencil';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { CustomField, CustomFieldLabel } from 'ontime-types';

 import CopyTag from '../../../../../common/components/copy-tag/CopyTag';
@@ -1,6 +1,6 @@
 import { useState } from 'react';
-import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { CustomField, CustomFieldLabel } from 'ontime-types';

 import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields';
@@ -1,7 +1,7 @@
 import { PropsWithChildren, useState } from 'react';
 import { UseFormRegister } from 'react-hook-form';
-import { IoEyeOutline } from 'react-icons/io5';
 import { IconButton, Input, InputGroup, InputRightElement } from '@chakra-ui/react';
+import { IoEyeOutline } from '@react-icons/all-files/io5/IoEyeOutline';
 import { Settings } from 'ontime-types';

 import { isAlphanumeric } from '../../../../common/utils/regex';
@@ -3,12 +3,3 @@
  background: $ui-white;
  border-radius: 3px;
 }
-
-.column {
-  margin-top: 1rem;
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  color: $label-gray;
-  user-select: text;
-}
@@ -6,12 +6,13 @@ import { Button, Select, Switch } from '@chakra-ui/react';
 import { generateUrl } from '../../../../common/api/session';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import Info from '../../../../common/components/info/Info';
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useInfo from '../../../../common/hooks-query/useInfo';
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
 import copyToClipboard from '../../../../common/utils/copyToClipboard';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { linkToOtherHost } from '../../../../common/utils/linkUtils';
-import { currentHostName, isOntimeCloud, serverURL } from '../../../../externals';
+import { serverURL } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';

 import style from './GenerateLinkForm.module.scss';
@@ -38,12 +39,6 @@ export default function GenerateLinkForm() {
    formState: { errors },
  } = useForm<GenerateLinkFormOptions>({
    mode: 'onChange',
-    defaultValues: {
-      baseUrl: currentHostName,
-      path: '',
-      lock: false,
-      authenticate: false,
-    },
    resetOptions: {
      keepDirtyValues: true,
    },
@@ -77,11 +72,8 @@ export default function GenerateLinkForm() {
      </Info>
      <Panel.ListGroup>
        <Panel.ListItem>
-          <Panel.Field
-            title='Host IP'
-            description={`Which IP address will be used${isOntimeCloud ? ' (not applicable in Ontime Cloud)' : ''}`}
-          />
-          <Select variant='ontime' isDisabled={isOntimeCloud} size='sm' {...register('baseUrl')}>
+          <Panel.Field title='Host IP' description='Which IP address will be used' />
+          <Select variant='ontime' size='sm' {...register('baseUrl')}>
            {infoData.networkInterfaces.map((nif) => {
              return (
                <option key={nif.name} value={nif.address}>
@@ -136,9 +128,9 @@ export default function GenerateLinkForm() {
          >
            {formState === 'success' ? 'Link copied to clipboard!' : 'Update share link'}
          </Button>
-          <div className={style.column}>
+          <div style={{ marginTop: '1rem', display: 'flex', flexDirection: 'column', gap: '0.25rem' }}>
            <QRCode size={172} value={url} className={style.qrCode} />
-            <div>{url}</div>
+            <ExternalLink href={url}>{url}</ExternalLink>
          </div>
        </Panel.ListItem>
      </Panel.ListGroup>
@@ -1,4 +1,4 @@
-import { IoArrowUp } from 'react-icons/io5';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';

 import CopyTag from '../../../../common/components/copy-tag/CopyTag';
 import useInfo from '../../../../common/hooks-query/useInfo';
@@ -1,6 +1,6 @@
 import { MouseEvent } from 'react';
-import { IoArrowUp } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';

 import { handleLinks } from '../../../../common/utils/linkUtils';
 import Log from '../../../log/Log';
@@ -3,7 +3,7 @@ import { useEffect } from 'react';
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
 import { usePing } from '../../../../common/hooks/useSocket';
 import { socketSendJson } from '../../../../common/utils/socket';
-import { isDockerImage, isOntimeCloud } from '../../../../externals';
+import { isDockerImage } from '../../../../externals';
 import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import ClientControlPanel from '../client-control-panel/ClientControlPanel';
@@ -30,12 +30,8 @@ export default function NetworkLogPanel({ location }: PanelBaseProps) {
          <Panel.Card>
            <Panel.SubHeader>Share Ontime Link</Panel.SubHeader>
            <Panel.Divider />
-            {!isOntimeCloud && (
-              <>
-                <Panel.Paragraph>Ontime is streaming on the following network interfaces</Panel.Paragraph>
-                <InfoNif />
-              </>
-            )}
+            <Panel.Paragraph>Ontime is streaming on the following network interfaces</Panel.Paragraph>
+            <InfoNif />
            <GenerateLinkForm />
          </Panel.Card>
        </Panel.Section>
@@ -1,7 +1,7 @@
 import { ChangeEvent, useRef, useState } from 'react';
-import { IoAdd } from 'react-icons/io5';
 import { useSearchParams } from 'react-router-dom';
 import { Button, Input } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';

 import { uploadProjectFile } from '../../../../common/api/db';
 import { invalidateAllCaches, maybeAxiosError } from '../../../../common/api/utils';
@@ -1,7 +1,8 @@
 import { ChangeEvent, useEffect, useRef } from 'react';
 import { useForm } from 'react-hook-form';
-import { IoDownloadOutline, IoTrash } from 'react-icons/io5';
 import { Button, Input, Textarea } from '@chakra-ui/react';
+import { IoDownloadOutline } from '@react-icons/all-files/io5/IoDownloadOutline';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { type ProjectData } from 'ontime-types';

 import { projectLogoPath } from '../../../../common/api/constants';
@@ -96,7 +97,7 @@ export default function ProjectData() {
  const isLoading = status === 'pending';

  return (
-    <Panel.Section as='form' onSubmit={handleSubmit(onSubmit)} onKeyDown={(event) => preventEscape(event, onReset)}>
+    <Panel.Section as='form' onSubmit={handleSubmit(onSubmit)}  onKeyDown={(event) => preventEscape(event, onReset)}>
      <Panel.Card>
        <Panel.SubHeader>
          Project data
@@ -1,6 +1,6 @@
 import { useState } from 'react';
-import { IoEllipsisHorizontal } from 'react-icons/io5';
 import { IconButton, Menu, MenuButton, MenuItem, MenuList } from '@chakra-ui/react';
+import { IoEllipsisHorizontal } from '@react-icons/all-files/io5/IoEllipsisHorizontal';

 import {
  deleteProject,
@@ -1,6 +1,7 @@
 import { ChangeEvent, useEffect, useState } from 'react';
-import { IoCheckmark, IoShieldCheckmarkOutline } from 'react-icons/io5';
 import { Button, Input, Spinner } from '@chakra-ui/react';
+import { IoCheckmark } from '@react-icons/all-files/io5/IoCheckmark';
+import { IoShieldCheckmarkOutline } from '@react-icons/all-files/io5/IoShieldCheckmarkOutline';

 import { getWorksheetNames } from '../../../../common/api/sheets';
 import { maybeAxiosError } from '../../../../common/api/utils';
@@ -1,6 +1,7 @@
 import { ChangeEvent, useRef, useState } from 'react';
-import { IoCloudOutline, IoDownloadOutline } from 'react-icons/io5';
 import { Button, Input } from '@chakra-ui/react';
+import { IoCloudOutline } from '@react-icons/all-files/io5/IoCloudOutline';
+import { IoDownloadOutline } from '@react-icons/all-files/io5/IoDownloadOutline';
 import { getErrorMessage, ImportMap } from 'ontime-utils';

 import {
@@ -1,7 +1,8 @@
 import { useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
-import { IoAdd, IoTrash } from 'react-icons/io5';
 import { Button, IconButton, Input, Select, Tooltip } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { ImportMap, isAlphanumericWithSpace } from 'ontime-utils';

 import * as Panel from '../../../panel-utils/PanelUtils';
@@ -1,5 +1,5 @@
 import { Fragment } from 'react';
-import { IoLink } from 'react-icons/io5';
+import { IoLink } from '@react-icons/all-files/io5/IoLink';
 import { CustomFields, isOntimeBlock, isOntimeEvent, OntimeRundown } from 'ontime-types';
 import { millisToString } from 'ontime-utils';

@@ -1,7 +1,10 @@
-import { PropsWithChildren, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef } from 'react';
 import { Input } from '@chakra-ui/react';
+import { IoEye } from '@react-icons/all-files/io5/IoEye';
+import { IoEyeOffOutline } from '@react-icons/all-files/io5/IoEyeOffOutline';

-import { cx } from '../../../common/utils/styleUtils';
+import TooltipActionBtn from '../../../common/components/buttons/TooltipActionBtn';
+import { tooltipDelayMid } from '../../../ontimeConfig';

 import style from './InputRow.module.scss';

@@ -10,53 +13,50 @@ interface InputRowProps {
  placeholder: string;
  text: string;
  visible: boolean;
+  actionHandler: () => void;
  changeHandler: (newValue: string) => void;
 }

-export default function InputRow(props: PropsWithChildren<InputRowProps>) {
-  const { label, placeholder, text, visible, changeHandler, children } = props;
+export default function InputRow(props: InputRowProps) {
+  const { label, placeholder, text, visible, actionHandler, changeHandler } = props;

-  const [value, setValue] = useState(text);
  const inputRef = useRef<HTMLInputElement>(null);
  const cursorPositionRef = useRef(0);

  // sync cursor position with text
  useEffect(() => {
-    if (inputRef.current && inputRef.current !== document.activeElement) {
+    if (inputRef.current) {
      inputRef.current.selectionStart = cursorPositionRef.current;
      inputRef.current.selectionEnd = cursorPositionRef.current;
    }
  }, [text]);

-  // synchronise external text
-  useEffect(() => {
-    if (inputRef.current !== document.activeElement) {
-      setValue(text);
-    }
-  }, [text]);
-
  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    cursorPositionRef.current = event.target.selectionStart ?? 0;
-    setValue(event.target.value);
    changeHandler(event.target.value);
  };

  return (
    <div className={style.inputRow}>
-      <label className={cx([style.label, visible ?? style.active])} htmlFor={label}>
-        {label}
-      </label>
+      <label className={`${style.label} ${visible ? style.active : ''}`}>{label}</label>
      <div className={style.inputItems}>
        <Input
-          id={label}
          ref={inputRef}
          size='sm'
          variant='ontime-filled'
-          value={value}
+          value={text}
          onChange={handleInputChange}
          placeholder={placeholder}
        />
-        {children}
+        <TooltipActionBtn
+          clickHandler={actionHandler}
+          tooltip={visible ? 'Make invisible' : 'Make visible'}
+          aria-label={`Toggle ${label}`}
+          openDelay={tooltipDelayMid}
+          icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
+          variant={visible ? 'ontime-filled' : 'ontime-subtle'}
+          size='sm'
+        />
      </div>
    </div>
  );
@@ -1,8 +1,4 @@
-import { IoEye, IoEyeOffOutline } from 'react-icons/io5';
-
-import TooltipActionBtn from '../../../common/components/buttons/TooltipActionBtn';
 import { setMessage, useExternalMessageInput, useTimerMessageInput } from '../../../common/hooks/useSocket';
-import { tooltipDelayMid } from '../../../ontimeConfig';

 import InputRow from './InputRow';
 import TimerControlsPreview from './TimerViewControl';
@@ -27,17 +23,8 @@ function TimerMessageInput() {
      text={text}
      visible={visible}
      changeHandler={(newValue) => setMessage.timerText(newValue)}
-    >
-      <TooltipActionBtn
-        clickHandler={() => setMessage.timerVisible(!visible)}
-        tooltip={visible ? 'Make invisible' : 'Make visible'}
-        aria-label='Toggle timer message visibility'
-        openDelay={tooltipDelayMid}
-        icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
-        variant={visible ? 'ontime-filled' : 'ontime-subtle'}
-        size='sm'
-      />
-    </InputRow>
+      actionHandler={() => setMessage.timerVisible(!visible)}
+    />
  );
 }

@@ -59,16 +46,7 @@ function ExternalInput() {
      text={text}
      visible={visible}
      changeHandler={(newValue) => setMessage.externalText(newValue)}
-    >
-      <TooltipActionBtn
-        clickHandler={toggleExternal}
-        tooltip={visible ? 'Make invisible' : 'Make visible'}
-        aria-label='Toggle external message visibility'
-        openDelay={tooltipDelayMid}
-        icon={visible ? <IoEye size='18px' /> : <IoEyeOffOutline size='18px' />}
-        variant={visible ? 'ontime-filled' : 'ontime-subtle'}
-        size='sm'
-      />
-    </InputRow>
+      actionHandler={toggleExternal}
+    />
  );
 }
@@ -1,5 +1,9 @@
-import { IoArrowDown, IoArrowUp, IoBan, IoFlag, IoTime } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoArrowDown } from '@react-icons/all-files/io5/IoArrowDown';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+import { IoBan } from '@react-icons/all-files/io5/IoBan';
+import { IoFlag } from '@react-icons/all-files/io5/IoFlag';
+import { IoTime } from '@react-icons/all-files/io5/IoTime';
 import { TimerPhase, TimerType } from 'ontime-types';

 import { useMessagePreview } from '../../../common/hooks/useSocket';
@@ -6,6 +6,7 @@ import AddTime from './add-time/AddTime';
 import { AuxTimer } from './aux-timer/AuxTimer';
 import PlaybackButtons from './playback-buttons/PlaybackButtons';
 import PlaybackTimer from './playback-timer/PlaybackTimer';
+import TimerSpeed from './timer-speed/TimerSpeed';

 import style from './PlaybackControl.module.scss';

@@ -14,7 +15,7 @@ export default function PlaybackControl() {

  return (
    <div className={style.mainContainer}>
-      <PlaybackTimer playback={data.playback as Playback}>
+      <PlaybackTimer playback={data.playback}>
        <AddTime playback={data.playback} />
      </PlaybackTimer>
      <PlaybackButtons
@@ -23,6 +24,7 @@ export default function PlaybackControl() {
        selectedEventIndex={data.selectedEventIndex}
        timerPhase={data.timerPhase}
      />
+      <TimerSpeed isPlaying={data.playback === Playback.Play} eventIndex={data.selectedEventIndex} />
      <AuxTimer />
    </div>
  );
@@ -1,6 +1,8 @@
-import { IoAdd, IoRemove } from 'react-icons/io5';
+import { memo } from 'react';
 import { Tooltip } from '@chakra-ui/react';
 import { useLocalStorage } from '@mantine/hooks';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoRemove } from '@react-icons/all-files/io5/IoRemove';
 import { Playback } from 'ontime-types';
 import { MILLIS_PER_HOUR, MILLIS_PER_SECOND, parseUserTime } from 'ontime-utils';

@@ -15,7 +17,9 @@ interface AddTimeProps {
  playback: Playback;
 }

-export default function AddTime(props: AddTimeProps) {
+export default memo(AddTime);
+
+function AddTime(props: AddTimeProps) {
  const { playback } = props;
  const [time, setTime] = useLocalStorage({ key: 'add-time', defaultValue: 300_000 }); // 5 minutes

@@ -1,4 +1,8 @@
-import { IoArrowDown, IoArrowUp, IoPause, IoPlay, IoStop } from 'react-icons/io5';
+import { IoArrowDown } from '@react-icons/all-files/io5/IoArrowDown';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+import { IoPause } from '@react-icons/all-files/io5/IoPause';
+import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
+import { IoStop } from '@react-icons/all-files/io5/IoStop';
 import { Playback, SimpleDirection, SimplePlayback } from 'ontime-types';
 import { parseUserTime } from 'ontime-utils';

@@ -1,6 +1,12 @@
 import { useMemo } from 'react';
-import { IoPause, IoPlay, IoPlaySkipBack, IoPlaySkipForward, IoReload, IoStop, IoTime } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoPause } from '@react-icons/all-files/io5/IoPause';
+import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
+import { IoPlaySkipBack } from '@react-icons/all-files/io5/IoPlaySkipBack';
+import { IoPlaySkipForward } from '@react-icons/all-files/io5/IoPlaySkipForward';
+import { IoReload } from '@react-icons/all-files/io5/IoReload';
+import { IoStop } from '@react-icons/all-files/io5/IoStop';
+import { IoTime } from '@react-icons/all-files/io5/IoTime';
 import { Playback, TimerPhase } from 'ontime-types';
 import { validatePlayback } from 'ontime-utils';

@@ -1,9 +1,6 @@
 .timeContainer {
  display: grid;
-  grid-template-areas:
-    'indicators timer  addtime'
-    'status     status addtime';
-  grid-template-rows: 1fr auto;
+  grid-template-areas: 'indicators timer addtime';
  grid-template-columns: 1.25rem 1fr 6.5rem;
  gap: $element-inner-spacing;
 }
@@ -50,29 +47,3 @@
    background-color: $playback-negative;
  }
 }
-
-// ---------> LABELS
-
-.status {
-  grid-area: status;
-  height: 1.5rem;
-  display: flex;
-  gap: $section-spacing;
-  margin-left: 1.5rem;
-}
-
-.tag {
-  color: $label-gray;
-  font-size: calc(1rem - 2px);
-  margin-right: 0.25rem;
-}
-
-.time {
-  color: $section-white;
-  font-size: $text-body-size;
-}
-
-.rolltag {
-  color: $ontime-roll;
-  font-size: $text-body-size;
-}
@@ -1,11 +1,8 @@
 import { PropsWithChildren } from 'react';
 import { Tooltip } from '@chakra-ui/react';
-import { MaybeNumber, Playback, TimerPhase } from 'ontime-types';
-import { dayInMs, millisToString } from 'ontime-utils';
+import { Playback, TimerPhase } from 'ontime-types';

-import AppLink from '../../../../common/components/link/app-link/AppLink';
 import { useTimer } from '../../../../common/hooks/useSocket';
-import useReport from '../../../../common/hooks-query/useReport';
 import { formatDuration } from '../../../../common/utils/time';
 import TimerDisplay from '../timer-display/TimerDisplay';

@@ -36,7 +33,16 @@ export default function PlaybackTimer(props: PropsWithChildren<PlaybackTimerProp
  const isOvertime = timer.phase === TimerPhase.Overtime;
  const hasAddedTime = Boolean(timer.addedTime);

-  const rollLabel = isRolling ? 'Roll mode active' : '';
+  const rollLabel = (() => {
+    if (!isRolling) {
+      return '';
+    }
+    if (isWaiting) {
+      return 'Roll: Countdown to start';
+    }
+
+    return 'Roll mode active';
+  })();

  const addedTimeLabel = resolveAddedTimeLabel(timer.addedTime);

@@ -52,55 +58,7 @@ export default function PlaybackTimer(props: PropsWithChildren<PlaybackTimerProp
        </Tooltip>
      </div>
      <TimerDisplay time={isWaiting ? timer.secondaryTimer : timer.current} />
-      <div className={style.status}>
-        {isWaiting ? (
-          <span className={style.rolltag}>Roll: Countdown to start</span>
-        ) : (
-          <RunningStatus startedAt={timer.startedAt} expectedFinish={timer.expectedFinish} playback={playback} />
-        )}
-      </div>
      {children}
    </div>
  );
 }
-
-interface RunningStatusProps {
-  startedAt: MaybeNumber;
-  expectedFinish: MaybeNumber;
-  playback: Playback;
-}
-function RunningStatus(props: RunningStatusProps) {
-  const { startedAt, expectedFinish, playback } = props;
-
-  if (playback === Playback.Stop) {
-    return <StoppedStatus />;
-  }
-
-  const started = millisToString(startedAt);
-  const finishedMs = expectedFinish !== null ? expectedFinish % dayInMs : null;
-  const finish = millisToString(finishedMs);
-
-  return (
-    <>
-      <span className={style.start}>
-        <span className={style.tag}>Started at</span>
-        <span className={style.time}>{started}</span>
-      </span>
-      <span className={style.finish}>
-        <span className={style.tag}>Expect end</span>
-        <span className={style.time}>{finish}</span>
-      </span>
-    </>
-  );
-}
-
-function StoppedStatus() {
-  const { data } = useReport();
-  const hasReport = Object.keys(data).length > 0;
-
-  if (hasReport) {
-    return <AppLink search='settings=feature_settings__report'>Go to report management</AppLink>;
-  }
-
-  return null;
-}
@@ -9,6 +9,7 @@
  color: $timer-color;
  line-height: 0.9em;
  text-align: center;
+  align-self: center;
  letter-spacing: 0.1em;
  font-weight: 600;
  font-size: 3.5rem;
@@ -0,0 +1,88 @@
+import { Playback, TimerPhase } from 'ontime-types';
+import { dayInMs } from 'ontime-utils';
+
+import AppLink from '../../../../common/components/link/app-link/AppLink';
+import { useClock, useTimerCurrent, useTimerSchedule } from '../../../../common/hooks/useSocket';
+import useReport from '../../../../common/hooks-query/useReport';
+import { cx } from '../../../../common/utils/styleUtils';
+import { formatTime } from '../../../../common/utils/time';
+
+import style from './TimerSpeed.module.scss';
+
+interface MeetScheduleProps {
+  speed: number;
+  newSpeed: number;
+}
+
+/**
+ * We isolate this component since it has the potential to re-render on every second
+ */
+export default function TimerSchedule(props: MeetScheduleProps) {
+  const { speed, newSpeed } = props;
+  const { startedAt, expectedFinish, phase, playback } = useTimerSchedule();
+
+  const started = formatTime(startedAt);
+  const normalisedExpectedEnd = expectedFinish !== null ? expectedFinish % dayInMs : null;
+  const endTime = formatTime(normalisedExpectedEnd);
+
+  const isWaiting = phase === TimerPhase.Pending;
+  const hasNewSpeed = speed !== newSpeed;
+
+  if (isWaiting) {
+    return <div className={cx([style.entry, style.roll])}>Roll: Countdown to start</div>;
+  }
+
+  if (playback === Playback.Stop) {
+    return <StoppedStatus />;
+  }
+
+  return (
+    <div className={style.timers}>
+      <div className={style.entry}>
+        <div className={style.timerLabel}>Started at</div>
+        <div>{started}</div>
+      </div>
+      <div className={style.entry}>
+        <div className={style.timerLabel}>Expected end</div>
+        {hasNewSpeed ? <SpeedFinish newSpeed={newSpeed} /> : <div>{endTime}</div>}
+      </div>
+    </div>
+  );
+}
+
+// TODO: extract and test
+// calculate the new finish time
+function useExpectedTime(remainingTimeMs: number, speedFactor: number): number {
+  const { clock } = useClock();
+  const adjustedRemainingTimeMs = remainingTimeMs / speedFactor;
+  const newFinishTimeMs = clock + adjustedRemainingTimeMs;
+  return newFinishTimeMs;
+}
+
+function StoppedStatus() {
+  const { data } = useReport();
+  const hasReport = Object.keys(data).length > 0;
+
+  if (hasReport) {
+    return (
+      <AppLink className={style.entry} search='settings=feature_settings__report'>
+        Go to report management
+      </AppLink>
+    );
+  }
+
+  return <div className={style.entry}>No running playback</div>;
+}
+
+interface SpeedFinishProps {
+  newSpeed: number;
+}
+
+function SpeedFinish(props: SpeedFinishProps) {
+  const { newSpeed } = props;
+  const { current } = useTimerCurrent();
+
+  const newFinish = formatTime(useExpectedTime(current ?? 0, newSpeed));
+
+  return <div className={style.highlight}>{newFinish}</div>;
+}
@@ -0,0 +1,48 @@
+.panelContainer {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  margin-top: 0.5rem;
+}
+
+.inlineApart {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 1rem;
+}
+
+.inlineSiblings {
+  display: flex;
+  gap: 0.5rem;
+}
+
+.timers {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+}
+
+.entry {
+  display: flex;
+  gap: 0.25rem;
+  height: 1.2rem;
+  align-items: end;
+  line-height: 1em;
+}
+
+.timerLabel {
+  color: $label-gray;
+  font-size: calc(1rem - 3px);
+}
+
+.roll {
+    color: $ontime-roll;
+}
+
+.highlight {
+  color: $highlight-orange;
+}
+
+.disabled {
+  opacity: $opacity-disabled;
+}
@@ -0,0 +1,78 @@
+import { memo, useEffect, useState } from 'react';
+import { Button, Slider, SliderFilledTrack, SliderMark, SliderThumb, SliderTrack } from '@chakra-ui/react';
+import { MaybeNumber } from 'ontime-types';
+
+import { setTimerSpeed, useTimerSpeed } from '../../../../common/hooks/useSocket';
+import { cx } from '../../../../common/utils/styleUtils';
+
+import TimerSchedule from './TimerSchedule';
+
+import style from './TimerSpeed.module.scss';
+
+interface TimerSpeedProps {
+  isPlaying: boolean;
+  eventIndex: MaybeNumber;
+}
+
+export default memo(TimerSpeed);
+
+function TimerSpeed(props: TimerSpeedProps) {
+  const { isPlaying, eventIndex } = props;
+  const { speed } = useTimerSpeed();
+  const [newSpeed, setNewSpeed] = useState(1);
+  const { setSpeed } = setTimerSpeed;
+
+  // when a new timer is set, we want to reset the speed
+  useEffect(() => {
+    setNewSpeed(1);
+  }, [eventIndex]);
+
+  const handleApply = () => setSpeed(newSpeed);
+  const handleReset = () => {
+    setNewSpeed(1.0);
+    setSpeed(1.0);
+  };
+
+  const canReset = isPlaying && speed === newSpeed && newSpeed !== 1;
+  const canApply = isPlaying && speed !== newSpeed;
+  const willChangeSpeed = speed === 1 && !canApply;
+
+  return (
+    <div className={style.panelContainer}>
+      <TimerSchedule speed={speed} newSpeed={newSpeed} />
+      <div className={style.inlineApart}>
+        <div className={style.entry}>
+          <span className={cx([willChangeSpeed && style.disabled])}>{`${speed}x`}</span>
+          {newSpeed !== speed && <span className={style.highlight}>{` ⇢ ${newSpeed}x`}</span>}
+        </div>
+        <div className={style.inlineSiblings}>
+          <Button size='sm' variant='ontime-subtle-white' onClick={handleReset} isDisabled={!canReset}>
+            Reset
+          </Button>
+          <Button size='sm' variant='ontime-subtle-white' onClick={handleApply} isDisabled={!canApply}>
+            Apply
+          </Button>
+        </div>
+      </div>
+      <Slider
+        variant={newSpeed === 1 ? 'ontime' : 'ontime-highlight'}
+        defaultValue={newSpeed}
+        min={0.5}
+        max={2.0}
+        step={0.01}
+        onChange={(v) => setNewSpeed(v)}
+        value={newSpeed}
+        isDisabled={!isPlaying}
+      >
+        <SliderMark value={0.5}>0.5x</SliderMark>
+        <SliderMark value={1.0}>1.0x</SliderMark>
+        <SliderMark value={1.5}>1.5x</SliderMark>
+        <SliderMark value={2.0}>2.0x</SliderMark>
+        <SliderTrack>
+          <SliderFilledTrack />
+        </SliderTrack>
+        <SliderThumb />
+      </Slider>
+    </div>
+  );
+}
@@ -1,7 +1,9 @@
 import { lazy, useCallback, useEffect } from 'react';
-import { IoApps, IoClose, IoSettingsOutline } from 'react-icons/io5';
 import { IconButton, useDisclosure } from '@chakra-ui/react';
 import { useHotkeys } from '@mantine/hooks';
+import { IoApps } from '@react-icons/all-files/io5/IoApps';
+import { IoClose } from '@react-icons/all-files/io5/IoClose';
+import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';

 import NavigationMenu from '../../common/components/navigation-menu/NavigationMenu';
 import { useElectronListener } from '../../common/hooks/useElectronEvent';
@@ -1,6 +1,6 @@
 import type { HTMLAttributes, LabelHTMLAttributes } from 'react';
-import { IconBaseProps } from 'react-icons';
-import { IoArrowUp } from 'react-icons/io5';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+import { type IconBaseProps } from '@react-icons/all-files/lib';

 import { cx } from '../../../common/utils/styleUtils';

@@ -116,7 +116,7 @@ export default function Operator() {

  // subscriptions is a MultiSelect and may have multiple values
  const subscriptions = searchParams.getAll('subscribe').filter((value) => Object.hasOwn(customFields, value));
-  const canEdit = shouldEdit && subscriptions.length;
+  const canEdit = shouldEdit && subscriptions;

  const main = searchParams.get('main') as keyof TitleFields | null;
  const secondary = searchParams.get('secondary');
@@ -1,4 +1,4 @@
-import { IoLocate } from 'react-icons/io5';
+import { IoLocate } from '@react-icons/all-files/io5/IoLocate';

 import { cx } from '../../../common/utils/styleUtils';

@@ -2,7 +2,6 @@ import { CustomFields } from 'ontime-types';

 import {
  getTimeOption,
-  makeCustomFieldSelectOptions,
  makeOptionsFromCustomFields,
  OptionTitle,
 } from '../../common/components/view-params-editor/constants';
@@ -10,7 +9,13 @@ import { ViewOption } from '../../common/components/view-params-editor/types';

 export const getOperatorOptions = (customFields: CustomFields, timeFormat: string): ViewOption[] => {
  const fieldOptions = makeOptionsFromCustomFields(customFields, { title: 'Title', note: 'Note' });
-  const customFieldSelect = makeCustomFieldSelectOptions(customFields);
+
+  const customFieldSelect = Object.entries(customFields).reduce<
+    Record<string, { value: string; label: string; colour: string }>
+  >((acc, [key, field]) => {
+    acc[key] = { value: key, label: field.label, colour: field.colour };
+    return acc;
+  }, {});

  return [
    { title: OptionTitle.ClockOptions, collapsible: true, options: [getTimeOption(timeFormat)] },
@@ -41,13 +46,6 @@ export const getOperatorOptions = (customFields: CustomFields, timeFormat: strin
          type: 'multi-option',
          values: customFieldSelect,
        },
-        {
-          id: 'shouldEdit',
-          title: 'Edit custom field',
-          description: 'Allows editing an highlighted custom field by long pressing',
-          type: 'boolean',
-          defaultValue: false,
-        },
      ],
    },
    {
@@ -61,6 +59,13 @@ export const getOperatorOptions = (customFields: CustomFields, timeFormat: strin
          type: 'boolean',
          defaultValue: false,
        },
+        {
+          id: 'shouldEdit',
+          title: 'Edit custom field',
+          description: 'Allows editing an events selected custom field by long pressing.',
+          type: 'boolean',
+          defaultValue: false,
+        },
      ],
    },
  ];
@@ -7,6 +7,7 @@ import {
  isOntimeEvent,
  isPlayableEvent,
  MaybeString,
+  OntimeEvent,
  PlayableEvent,
  Playback,
  RundownCached,
@@ -271,7 +272,7 @@ export default function Rundown({ data }: RundownProps) {
  let isNextDay = false;
  let totalGap = 0;
  const isEditMode = appMode === AppMode.Edit;
-  let isLinkedToLoaded = true; //check if the event can link all the way back to the currently playing event
+  let currentDay = 0;
  return (
    <div className={style.rundownContainer} ref={scrollRef} data-testid='rundown'>
      <DndContext onDragEnd={handleOnDragEnd} sensors={sensors} collisionDetection={closestCenter}>
@@ -298,11 +299,7 @@ export default function Rundown({ data }: RundownProps) {

                if (isPlayableEvent(entry)) {
                  isNextDay = checkIsNextDay(entry, lastEvent);
-                  if (!isPast) {
-                    totalGap += entry.gap;
-                    // We also include countToEnd in this test as the behavior of a linked event coming after a countToEnd is simelar to an unlinked event
-                    isLinkedToLoaded = isLinkedToLoaded && entry.linkStart !== null && !lastEvent?.countToEnd;
-                  }
+                  totalGap += !isPast ? entry.gap : 0;
                  if (isNewLatest(entry, lastEvent)) {
                    // populate previous entry
                    thisEvent = entry;
@@ -316,6 +313,7 @@ export default function Rundown({ data }: RundownProps) {
              const hasCursor = entry.id === cursor;
              if (isLoaded) {
                isPast = false;
+                currentDay = (entry as OntimeEvent).dayOffset;
              }

              return (
@@ -338,7 +336,7 @@ export default function Rundown({ data }: RundownProps) {
                        isRolling={featureData.playback === Playback.Roll}
                        isNextDay={isNextDay}
                        totalGap={totalGap}
-                        isLinkedToLoaded={isLinkedToLoaded}
+                        currentDay={currentDay}
                      />
                    </div>
                  </div>
@@ -1,5 +1,5 @@
-import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';

 import Empty from '../../common/components/state/Empty';

@@ -39,7 +39,7 @@ interface RundownEntryProps {
  playback?: Playback; // we only care about this if this event is playing
  isRolling: boolean; // we need to know even if not related to this event
  totalGap: number;
-  isLinkedToLoaded: boolean;
+  currentDay: number;
 }

 export default function RundownEntry(props: RundownEntryProps) {
@@ -56,7 +56,7 @@ export default function RundownEntry(props: RundownEntryProps) {
    eventIndex,
    isNextDay,
    totalGap,
-    isLinkedToLoaded,
+    currentDay,
  } = props;
  const { emitError } = useEmitLog();
  const { addEvent, updateEvent, batchUpdateEvents, deleteEvent, swapEvents } = useEventAction();
@@ -178,9 +178,8 @@ export default function RundownEntry(props: RundownEntryProps) {
        isRolling={isRolling}
        gap={data.gap}
        isNextDay={isNextDay}
-        dayOffset={data.dayOffset}
+        dayOffset={data.dayOffset - currentDay}
        totalGap={totalGap}
-        isLinkedToLoaded={isLinkedToLoaded}
        actionHandler={actionHandler}
      />
    );
@@ -1,7 +1,7 @@
 import { useRef } from 'react';
-import { IoReorderTwo } from 'react-icons/io5';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
+import { IoReorderTwo } from '@react-icons/all-files/io5/IoReorderTwo';
 import { OntimeBlock } from 'ontime-types';

 import { cx } from '../../../common/utils/styleUtils';
@@ -1,5 +1,5 @@
-import { IoTrash } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';

 import { AppMode, useAppMode } from '../../../common/stores/appModeStore';

@@ -51,8 +51,6 @@ export default function EditableBlockTitle(props: TitleEditorProps) {
      fontWeight='600'
      letterSpacing='0.25px'
      paddingLeft='0'
-      size='sm'
-      fontSize='1rem'
    />
  );
 }
@@ -1,8 +1,10 @@
 import { useEffect, useRef } from 'react';
-import { IoCheckmarkDone, IoClose, IoReorderTwo } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
+import { IoCheckmarkDone } from '@react-icons/all-files/io5/IoCheckmarkDone';
+import { IoClose } from '@react-icons/all-files/io5/IoClose';
+import { IoReorderTwo } from '@react-icons/all-files/io5/IoReorderTwo';
 import { OntimeDelay } from 'ontime-types';

 import DelayInput from '../../../common/components/input/delay-input/DelayInput';
@@ -15,11 +15,10 @@ $skip-opacity: 0.2;
    'binder ...        ...     ...';

  grid-template-columns: $block-binder-width 3rem 1fr auto;
-  grid-template-rows: 0.125rem 2rem 2rem 2rem 0.125rem;
+  grid-template-rows: 0.25rem 2.25rem 2.25rem 2.25rem 0.25rem;
  align-items: center;
  padding-right: $block-clearance;
  gap: 2px;
-  row-gap: 0.25rem;

  transition-property: background-color;
  transition-duration: $transition-time-feedback;
@@ -121,7 +120,7 @@ $skip-opacity: 0.2;
  display: flex;
  flex-direction: column;
  margin: 0 0.5rem;
-  gap: 0.25rem;
+  gap: 0.5rem;
 }

 .eventTimers {
@@ -1,17 +1,15 @@
 import { MouseEvent, useEffect, useLayoutEffect, useRef, useState } from 'react';
-import {
-  IoAdd,
-  IoDuplicateOutline,
-  IoLink,
-  IoPeople,
-  IoPeopleOutline,
-  IoReorderTwo,
-  IoSwapVertical,
-  IoTrash,
-  IoUnlink,
-} from 'react-icons/io5';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoDuplicateOutline } from '@react-icons/all-files/io5/IoDuplicateOutline';
+import { IoLink } from '@react-icons/all-files/io5/IoLink';
+import { IoPeople } from '@react-icons/all-files/io5/IoPeople';
+import { IoPeopleOutline } from '@react-icons/all-files/io5/IoPeopleOutline';
+import { IoReorderTwo } from '@react-icons/all-files/io5/IoReorderTwo';
+import { IoSwapVertical } from '@react-icons/all-files/io5/IoSwapVertical';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
+import { IoUnlink } from '@react-icons/all-files/io5/IoUnlink';
 import { EndAction, MaybeString, OntimeEvent, Playback, TimerType, TimeStrategy } from 'ontime-types';

 import { useContextMenu } from '../../../common/hooks/useContextMenu';
@@ -53,7 +51,6 @@ interface EventBlockProps {
  isNextDay: boolean;
  dayOffset: number;
  totalGap: number;
-  isLinkedToLoaded: boolean;
  actionHandler: (
    action: EventItemActions,
    payload?:
@@ -94,7 +91,6 @@ export default function EventBlock(props: EventBlockProps) {
    isNextDay,
    dayOffset,
    totalGap,
-    isLinkedToLoaded,
    actionHandler,
  } = props;
  const { selectedEventId, setSelectedEventId, clearSelectedEventId } = useEventIdSwapping();
@@ -314,7 +310,6 @@ export default function EventBlock(props: EventBlockProps) {
          dayOffset={dayOffset}
          isPast={isPast}
          totalGap={totalGap}
-          isLinkedToLoaded={isLinkedToLoaded}
        />
      )}
    </div>
@@ -1,18 +1,17 @@
 import { memo, useEffect, useState } from 'react';
-import {
-  IoArrowDown,
-  IoArrowUp,
-  IoBan,
-  IoFlag,
-  IoPeople,
-  IoPlay,
-  IoPlayForward,
-  IoPlaySkipForward,
-  IoStop,
-  IoTime,
-} from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoArrowDown } from '@react-icons/all-files/io5/IoArrowDown';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+import { IoBan } from '@react-icons/all-files/io5/IoBan';
+import { IoFlag } from '@react-icons/all-files/io5/IoFlag';
+import { IoPeople } from '@react-icons/all-files/io5/IoPeople';
+import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
+import { IoPlayForward } from '@react-icons/all-files/io5/IoPlayForward';
+import { IoPlaySkipForward } from '@react-icons/all-files/io5/IoPlaySkipForward';
+import { IoStop } from '@react-icons/all-files/io5/IoStop';
+import { IoTime } from '@react-icons/all-files/io5/IoTime';
 import { EndAction, MaybeString, Playback, TimerType, TimeStrategy } from 'ontime-types';
+import { dayInMs } from 'ontime-utils';

 import { cx } from '../../../common/utils/styleUtils';
 import { tooltipDelayMid } from '../../../ontimeConfig';
@@ -48,7 +47,6 @@ interface EventBlockInnerProps {
  dayOffset: number;
  isPast: boolean;
  totalGap: number;
-  isLinkedToLoaded: boolean;
 }

 function EventBlockInner(props: EventBlockInnerProps) {
@@ -74,7 +72,6 @@ function EventBlockInner(props: EventBlockInnerProps) {
    dayOffset,
    isPast,
    totalGap,
-    isLinkedToLoaded,
  } = props;

  const [renderInner, setRenderInner] = useState(false);
@@ -123,13 +120,11 @@ function EventBlockInner(props: EventBlockInnerProps) {
        <EventBlockChip
          className={style.chipSection}
          id={eventId}
-          timeStart={timeStart}
-          delay={delay}
-          dayOffset={dayOffset}
-          isLinkedToLoaded={isLinkedToLoaded}
+          trueTimeStart={timeStart + dayOffset * dayInMs}
          isPast={isPast}
          isLoaded={loaded}
          totalGap={totalGap}
+          isLinkedAndNext={isNext && linkStart !== null}
          duration={duration}
        />
      )}
@@ -1,31 +1,29 @@
 import { useMemo } from 'react';
-import { IoCheckmarkCircle } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoCheckmarkCircle } from '@react-icons/all-files/io5/IoCheckmarkCircle';
 import { isPlaybackActive, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils';

-import { usePlayback } from '../../../../common/hooks/useSocket';
+import { usePlayback, useTimelineStatus } from '../../../../common/hooks/useSocket';
 import useReport from '../../../../common/hooks-query/useReport';
 import { cx } from '../../../../common/utils/styleUtils';
-import { formatDuration, formatTime, useTimeUntilStart } from '../../../../common/utils/time';
+import { formatDuration, formatTime } from '../../../../common/utils/time';
 import { tooltipDelayFast } from '../../../../ontimeConfig';

 import style from './EventBlockChip.module.scss';

 interface EventBlockChipProps {
  id: string;
-  timeStart: number;
-  delay: number;
-  dayOffset: number;
+  trueTimeStart: number;
  isPast: boolean;
  isLoaded: boolean;
  className: string;
  totalGap: number;
+  isLinkedAndNext: boolean;
  duration: number;
-  isLinkedToLoaded: boolean;
 }

 export default function EventBlockChip(props: EventBlockChipProps) {
-  const { timeStart, delay, dayOffset, isPast, isLoaded, className, totalGap, id, duration, isLinkedToLoaded } = props;
+  const { trueTimeStart, isPast, isLoaded, className, totalGap, isLinkedAndNext, id, duration } = props;
  const { playback } = usePlayback();

  if (isLoaded) {
@@ -43,13 +41,7 @@ export default function EventBlockChip(props: EventBlockChipProps) {
    return (
      <Tooltip label='Expected time until start' openDelay={tooltipDelayFast}>
        <div className={className}>
-          <EventUntil
-            timeStart={timeStart}
-            delay={delay}
-            dayOffset={dayOffset}
-            totalGap={totalGap}
-            isLinkedToLoaded={isLinkedToLoaded}
-          />
+          <EventUntil trueTimeStart={trueTimeStart} totalGap={totalGap} isLinkedAndNext={isLinkedAndNext} />
        </div>
      </Tooltip>
    );
@@ -59,17 +51,18 @@ export default function EventBlockChip(props: EventBlockChipProps) {
 }

 interface EventUntilProps {
-  timeStart: number;
-  delay: number;
-  dayOffset: number;
+  trueTimeStart: number;
  totalGap: number;
-  isLinkedToLoaded: boolean;
+  isLinkedAndNext: boolean;
 }

 function EventUntil(props: EventUntilProps) {
-  const { timeStart, delay, dayOffset, totalGap, isLinkedToLoaded } = props;
+  const { trueTimeStart, totalGap, isLinkedAndNext } = props;
+  const { clock, offset } = useTimelineStatus();

-  const timeUntil = useTimeUntilStart({ timeStart, delay, dayOffset, totalGap, isLinkedToLoaded });
+  const consumedOffset = isLinkedAndNext ? offset : Math.min(offset + totalGap, 0);
+  const offsetTimestart = trueTimeStart - consumedOffset;
+  const timeUntil = offsetTimestart - clock;
  const isDue = timeUntil < MILLIS_PER_SECOND;

  const timeUntilString = isDue ? 'DUE' : `${formatDuration(Math.abs(timeUntil), timeUntil > 2 * MILLIS_PER_MINUTE)}`;
@@ -1,5 +1,9 @@
 import { memo, MouseEvent } from 'react';
-import { IoPause, IoPlay, IoReload, IoRemoveCircle, IoRemoveCircleOutline } from 'react-icons/io5';
+import { IoPause } from '@react-icons/all-files/io5/IoPause';
+import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
+import { IoReload } from '@react-icons/all-files/io5/IoReload';
+import { IoRemoveCircle } from '@react-icons/all-files/io5/IoRemoveCircle';
+import { IoRemoveCircleOutline } from '@react-icons/all-files/io5/IoRemoveCircleOutline';

 import TooltipActionBtn from '../../../../common/components/buttons/TooltipActionBtn';
 import { useEventAction } from '../../../../common/hooks/useEventAction';
@@ -2,7 +2,6 @@ import { useEffect, useState } from 'react';
 import { isOntimeEvent, OntimeEvent } from 'ontime-types';

 import useRundown from '../../../common/hooks-query/useRundown';
-import { cx } from '../../../common/utils/styleUtils';

 import EventEditor from './EventEditor';

@@ -38,7 +37,7 @@ export default function CuesheetEventEditor(props: CuesheetEventEditorProps) {
  }

  return (
-    <div className={cx([style.eventEditor, style.inModal])} data-testid='editor-container'>
+    <div className={style.eventEditor} data-testid='editor-container'>
      <EventEditor event={event} />
    </div>
  );
@@ -1,12 +1,8 @@
 .eventEditor {
-  max-height: 100%;
+  max-height: 80vh;
  display: flex;
  flex-direction: column;
  overflow-x: auto;
-
-  &.inModal {
-    max-height: 80vh;
-  }
 }

 .content {
@@ -1,6 +1,6 @@
 import { memo } from 'react';
-import { IoInformationCircle } from 'react-icons/io5';
 import { Select, Switch, Tooltip } from '@chakra-ui/react';
+import { IoInformationCircle } from '@react-icons/all-files/io5/IoInformationCircle';
 import { EndAction, MaybeString, TimerType, TimeStrategy } from 'ontime-types';
 import { millisToString, parseUserTime } from 'ontime-utils';

@@ -1,6 +1,6 @@
 import { memo, useCallback, useRef } from 'react';
-import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { SupportedEvent } from 'ontime-types';

 import { useEventAction } from '../../../common/hooks/useEventAction';
@@ -1,5 +1,4 @@
 import { useCallback, useRef } from 'react';
-import { IoTrash } from 'react-icons/io5';
 import {
  AlertDialog,
  AlertDialogBody,
@@ -10,6 +9,7 @@ import {
  Button,
  useDisclosure,
 } from '@chakra-ui/react';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';

 import { useEventAction } from '../../../common/hooks/useEventAction';
 import { useAppMode } from '../../../common/stores/appModeStore';
@@ -1,6 +1,10 @@
 import { memo } from 'react';
-import { IoAlertCircleOutline, IoLink, IoLockClosed, IoLockOpenOutline, IoUnlink } from 'react-icons/io5';
 import { InputRightElement, Tooltip } from '@chakra-ui/react';
+import { IoAlertCircleOutline } from '@react-icons/all-files/io5/IoAlertCircleOutline';
+import { IoLink } from '@react-icons/all-files/io5/IoLink';
+import { IoLockClosed } from '@react-icons/all-files/io5/IoLockClosed';
+import { IoLockOpenOutline } from '@react-icons/all-files/io5/IoLockOpenOutline';
+import { IoUnlink } from '@react-icons/all-files/io5/IoUnlink';
 import { MaybeString, TimeField, TimeStrategy } from 'ontime-types';
 import { dayInMs } from 'ontime-utils';

@@ -16,6 +16,7 @@ $warning-orange: $orange-500;
 $info-blue: $blue-500;
 $opacity-disabled: 0.4;
 $active-red: $red-700;
+$highlight-orange: $orange-600;

 // playback colours
 $playback-start: $green-600;
@@ -17,7 +17,7 @@ export const ontimeButtonFilled = {

 export const ontimeButtonOutlined = {
  backgroundColor: '#2d2d2d', // $gray-1100
-  color: '#e2e2e2', // $blue-400
+  color: '#e2e2e2', // $gray-200
  border: '1px solid rgba(255, 255, 255, 0.10)', // white-10
  _hover: {
    backgroundColor: '#404040', // $gray-1000
@@ -74,5 +74,4 @@ export const ontimeButtonGhosted = {
 export const ontimeButtonSubtleWhite = {
  ...ontimeButtonSubtle,
  color: '#f6f6f6', // $gray-50
-  fontWeight: 600,
 };
@@ -0,0 +1,25 @@
+export const ontimeSlider = {
+  thumb: {
+    background: '#f6f6f6', // $ui-white
+    width: '0.25rem',
+  },
+  filledTrack: {
+    background: '#779BE7', // $blue-400
+  },
+  track: {
+    background: '#303030', // $gray-1050
+  },
+  mark: {
+    color: '#b1b1b1', // $label-gray
+    mt: '2',
+    ml: '-2.5',
+    fontSize: 'calc(1rem - 3px)',
+  },
+};
+
+export const ontimeHighlightSlider = {
+  ...ontimeSlider,
+  filledTrack: {
+    background: '#FFAB33', // $highlight-orange
+  },
+};
@@ -16,6 +16,7 @@ import { ontimeMenuOnDark } from './ontimeMenu';
 import { ontimeModal } from './ontimeModal';
 import { ontimeBlockRadio, ontimeRadio } from './ontimeRadio';
 import { ontimeSelect } from './ontimeSelect';
+import { ontimeHighlightSlider, ontimeSlider } from './ontimeSlider';
 import { ontimeSwitch } from './ontimeSwitch';
 import { ontimeTab } from './ontimeTab';
 import {
@@ -140,6 +141,12 @@ const theme = extendTheme({
        ontime: { ...ontimeSelect },
      },
    },
+    Slider: {
+      variants: {
+        ontime: { ...ontimeSlider },
+        'ontime-highlight': { ...ontimeHighlightSlider },
+      },
+    },
  },
 });

@@ -81,18 +81,10 @@ export default function Backstage(props: BackstageProps) {
  const clock = formatTime(time.clock);
  const isPendingStart = getIsPendingStart(time.playback, time.phase);
  const startedAt = isPendingStart ? formatTime(time.secondaryTimer) : formatTime(time.startedAt);
-
-  const scheduledStart = (() => {
-    if (showNow) return undefined;
-    if (!hasEvents) return undefined;
-    return formatTime(runtime.plannedStart, { format12: 'hh:mm a', format24: 'HH:mm' });
-  })();
-
-  const scheduledEnd = (() => {
-    if (showNow) return undefined;
-    if (!hasEvents) return undefined;
-    return formatTime(runtime.plannedEnd, { format12: 'hh:mm a', format24: 'HH:mm' });
-  })();
+  const scheduledStart =
+    hasEvents && showNow ? '' : formatTime(runtime.plannedStart, { format12: 'hh:mm a', format24: 'HH:mm' });
+  const scheduledEnd =
+    hasEvents && showNow ? '' : formatTime(runtime.plannedEnd, { format12: 'hh:mm a', format24: 'HH:mm' });

  let displayTimer = millisToString(time.current, { fallback: timerPlaceholderMin });
  displayTimer = removeLeadingZero(displayTimer);
@@ -101,7 +93,6 @@ export default function Backstage(props: BackstageProps) {
  const qrSize = Math.max(window.innerWidth / 15, 72);
  const showProgress = getShowProgressBar(time.playback);
  const showSchedule = hasEvents && screenHeight > 420; // in vertical screens we may not have space
-  const showPending = scheduledStart && scheduledEnd;

  // gather option data
  const defaultFormat = getDefaultFormat(settings?.timeFormat);
@@ -152,7 +143,7 @@ export default function Backstage(props: BackstageProps) {
          </div>
        )}

-        {showPending && (
+        {!showNow && hasEvents && (
          <div className='event'>
            <div className='title-card__placeholder'>{getLocalizedString('countdown.waiting')}</div>
            <div className='timer-group'>
@@ -140,7 +140,7 @@ export const ScheduleProvider = ({
  let selectedEventIndex = events.findIndex((event) => event.id === selectedEventId);

  // we want to show the event after the current
-  const viewEvents = events.slice(selectedEventIndex + 1);
+  const viewEvents = events.toSpliced(0, selectedEventIndex + 1);
  selectedEventIndex = 0;

  return (
@@ -2,8 +2,7 @@
  background-color: $ui-black;
  width: 100%;
  height: 100vh;
-  padding-inline: 0.5rem;
-  padding-block: 0.5rem 1rem;
+  padding: 1rem 0.5rem;

  display: grid;
  grid-template-rows: 3rem auto auto 1fr;
@@ -1,6 +1,7 @@
 import { useCallback, useMemo, useState } from 'react';
-import { IoApps, IoSettingsOutline } from 'react-icons/io5';
 import { IconButton, Modal, ModalContent, ModalOverlay, useDisclosure } from '@chakra-ui/react';
+import { IoApps } from '@react-icons/all-files/io5/IoApps';
+import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';

 import NavigationMenu from '../../common/components/navigation-menu/NavigationMenu';
 import useViewEditor from '../../common/components/navigation-menu/useViewEditor';
@@ -22,8 +23,8 @@ import styles from './CuesheetPage.module.scss';

 export default function CuesheetPage() {
  // TODO: can we use the normalised rundown for the table?
-  const { data: flatRundown, status: rundownStatus } = useFlatRundown();
-  const { data: customFields, status: customFieldStatus } = useCustomFields();
+  const { data: flatRundown } = useFlatRundown();
+  const { data: customFields } = useCustomFields();
  const { showEditFormDrawer, isViewLocked } = useViewEditor({ isLockable: true });
  const { isOpen: isMenuOpen, onOpen, onClose } = useDisclosure();
  const { isOpen: isEventEditorOpen, onOpen: onEventEditorOpen, onClose: onEventEditorClose } = useDisclosure();
@@ -49,7 +50,7 @@ export default function CuesheetPage() {
    [onEventEditorClose, onEventEditorOpen],
  );

-  if (!customFields || !flatRundown || rundownStatus === 'pending' || customFieldStatus === 'pending') {
+  if (!customFields || !flatRundown) {
    return <EmptyPage text='Loading...' />;
  }

@@ -28,11 +28,6 @@ $table-header-font-size: calc(1rem - 2px);
    position: relative;
    @include ellipsis-overflow;
  }
-
-  th:focus,
-  td:focus {
-    outline: 2px solid $ui-white;
-  }
 }

 .tableHeader,
@@ -1,14 +1,27 @@
 import { useCallback, useRef } from 'react';
-import { useTableNav } from '@table-nav/react';
 import { ColumnDef, getCoreRowModel, useReactTable } from '@tanstack/react-table';
-import { isOntimeEvent, MaybeString, OntimeEvent, OntimeRundown, OntimeRundownEntry, TimeField } from 'ontime-types';
+import Color from 'color';
+import {
+  isOntimeBlock,
+  isOntimeDelay,
+  isOntimeEvent,
+  MaybeString,
+  OntimeEvent,
+  OntimeRundown,
+  OntimeRundownEntry,
+  TimeField,
+} from 'ontime-types';

 import { useEventAction } from '../../../common/hooks/useEventAction';
 import useFollowComponent from '../../../common/hooks/useFollowComponent';
+import { useSelectedEventId } from '../../../common/hooks/useSocket';
+import { getAccessibleColour } from '../../../common/utils/styleUtils';
 import { useCuesheetOptions } from '../cuesheet.options';

-import CuesheetBody from './cuesheet-table-elements/CuesheetBody';
+import BlockRow from './cuesheet-table-elements/BlockRow';
 import CuesheetHeader from './cuesheet-table-elements/CuesheetHeader';
+import DelayRow from './cuesheet-table-elements/DelayRow';
+import EventRow from './cuesheet-table-elements/EventRow';
 import CuesheetTableMenu from './cuesheet-table-menu/CuesheetTableMenu';
 import CuesheetTableSettings from './cuesheet-table-settings/CuesheetTableSettings';
 import useColumnManager from './useColumnManager';
@@ -25,7 +38,8 @@ export default function CuesheetTable(props: CuesheetTableProps) {
  const { data, columns, showModal } = props;

  const { updateEvent, updateTimer } = useEventAction();
-  const { followSelected, showDelayedTimes, hideTableSeconds } = useCuesheetOptions();
+  const { selectedEventId } = useSelectedEventId();
+  const { followSelected, hideDelays, hidePast, showDelayedTimes, hideTableSeconds } = useCuesheetOptions();
  const { columnVisibility, columnOrder, columnSizing, resetColumnOrder, setColumnVisibility, setColumnSizing } =
    useColumnManager(columns);

@@ -33,8 +47,6 @@ export default function CuesheetTable(props: CuesheetTableProps) {
  const tableContainerRef = useRef<HTMLDivElement | null>(null);
  useFollowComponent({ followRef: selectedRef, scrollRef: tableContainerRef, doFollow: followSelected });

-  const { listeners } = useTableNav();
-
  const table = useReactTable({
    data,
    columns,
@@ -51,7 +63,6 @@ export default function CuesheetTable(props: CuesheetTableProps) {
      handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom = false) => {
        // check if value is the same
        const event = data[rowIndex];
-
        if (!event || !isOntimeEvent(event)) {
          return;
        }
@@ -93,6 +104,10 @@ export default function CuesheetTable(props: CuesheetTableProps) {
  const rowModel = table.getRowModel();
  const allLeafColumns = table.getAllLeafColumns();

+  let eventIndex = 0;
+  // for the first event, it will be past if there is something selected
+  let isPast = Boolean(selectedEventId);
+
  return (
    <>
      <CuesheetTableSettings
@@ -102,9 +117,74 @@ export default function CuesheetTable(props: CuesheetTableProps) {
        handleClearToggles={setAllVisible}
      />
      <div ref={tableContainerRef} className={style.cuesheetContainer}>
-        <table className={style.cuesheet} id='cuesheet' {...listeners}>
+        <table className={style.cuesheet} id='cuesheet'>
          <CuesheetHeader headerGroups={headerGroups} />
-          <CuesheetBody rowModel={rowModel} selectedRef={selectedRef} table={table} columnSizing={columnSizing} />
+          <tbody>
+            {rowModel.rows.map((row, index) => {
+              const key = row.original.id;
+              const isSelected = selectedEventId === key;
+              const entry = row.original;
+              if (isSelected) {
+                isPast = false;
+              }
+
+              if (isOntimeBlock(entry)) {
+                return <BlockRow key={key} title={entry.title} hidePast={isPast && hidePast} />;
+              }
+              if (isOntimeDelay(entry)) {
+                if (isPast && hidePast) {
+                  return null;
+                }
+                const delayVal = entry.duration;
+                if (hideDelays || delayVal === 0) {
+                  return null;
+                }
+
+                return <DelayRow key={key} duration={delayVal} />;
+              }
+              if (isOntimeEvent(entry)) {
+                eventIndex++;
+                const isSelected = key === selectedEventId;
+
+                if (isPast && hidePast) {
+                  return null;
+                }
+
+                let rowBgColour: string | undefined;
+                if (isSelected) {
+                  rowBgColour = '#D20300'; // $red-700
+                } else if (entry.colour) {
+                  try {
+                    // the colour is user defined and might be invalid
+                    const accessibleBackgroundColor = Color(getAccessibleColour(entry.colour).backgroundColor);
+                    rowBgColour = accessibleBackgroundColor.fade(0.75).hexa();
+                  } catch (_error) {
+                    /* we do not handle errors here */
+                  }
+                }
+
+                return (
+                  <EventRow
+                    key={`${row.id}-${entry.revision}`}
+                    rowId={row.id}
+                    eventId={entry.id}
+                    eventIndex={eventIndex}
+                    rowIndex={index}
+                    isPast={isPast}
+                    selectedRef={isSelected ? selectedRef : undefined}
+                    skip={entry.skip}
+                    colour={entry.colour}
+                    rowBgColour={rowBgColour}
+                    table={table}
+                    columnSizing={columnSizing}
+                  />
+                );
+              }
+
+              // currently there is no scenario where entryType is not handled above, either way...
+              return null;
+            })}
+          </tbody>
        </table>
      </div>
      <CuesheetTableMenu showModal={showModal} />
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Valente	b13d5792f3	fixup! feat: implement speed controls	2025-03-02 14:45:40 +01:00
Carlos Valente	d0027d4016	fixup! feat: implement speed controls	2025-03-02 14:45:32 +01:00
Carlos Valente	ae1639802c	feat: implement speed controls	2025-03-02 14:13:53 +01:00