From 6facd6a666ab744071e9985d8843f7f89398b162 Mon Sep 17 00:00:00 2001
From: Carlos Valente <carlosvalente@pm.me>
Date: Sun, 6 Jul 2025 09:27:49 +0200
Subject: [PATCH] refactor: improve editor and cuesheet headers

- consistent behaviour for app mode
- improve navigation
---
 .../components/buttons/IconButton.module.scss |   5 +
 .../components/editor-utils/EditorUtils.tsx   |   2 +-
 apps/client/src/common/stores/appModeStore.ts |  32 ----
 .../playback/tap-button/TapButton.module.scss |   5 +
 apps/client/src/features/rundown/Rundown.tsx  |  15 +-
 .../src/features/rundown/RundownExport.tsx    |  10 +-
 .../rundown/quick-add-block/QuickAddBlock.tsx |  19 +-
 .../rundown-header/RundownHeader.module.scss  |   5 +-
 .../rundown/rundown-header/RundownHeader.tsx  |  18 +-
 .../rundown-header/RundownHeaderMobile.tsx    |  13 +-
 .../rundown/rundown-header/RundownMenu.tsx    |  22 ++-
 apps/client/src/ontimeConfig.ts               |  10 +
 .../cuesheet/cuesheet-table/CuesheetTable.tsx |   9 +-
 .../cuesheet-table-elements/BlockRow.tsx      |   9 +-
 .../CuesheetHeader.tsx                        |   9 +-
 .../cuesheet-table-elements/EventRow.tsx      |  10 +-
 .../CuesheetShareModal.tsx                    |   5 +-
 .../CuesheetTableSettings.module.scss         |  56 +++++-
 .../CuesheetTableSettings.tsx                 | 177 ++++++++++--------
 .../src/views/cuesheet/cuesheet.options.ts    |   4 -
 20 files changed, 263 insertions(+), 172 deletions(-)
 delete mode 100644 apps/client/src/common/stores/appModeStore.ts

diff --git a/apps/client/src/common/components/buttons/IconButton.module.scss b/apps/client/src/common/components/buttons/IconButton.module.scss
index 1b10acad6..06960483d 100644
--- a/apps/client/src/common/components/buttons/IconButton.module.scss
+++ b/apps/client/src/common/components/buttons/IconButton.module.scss
@@ -11,6 +11,11 @@
 
   cursor: pointer;
 
+  &:focus-visible {
+    outline: 2px solid $blue-500;
+    outline-offset: 2px;
+  }
+
   &:disabled {
     opacity: 0.4;
     cursor: not-allowed;
diff --git a/apps/client/src/common/components/editor-utils/EditorUtils.tsx b/apps/client/src/common/components/editor-utils/EditorUtils.tsx
index 09c686fea..4737fe905 100644
--- a/apps/client/src/common/components/editor-utils/EditorUtils.tsx
+++ b/apps/client/src/common/components/editor-utils/EditorUtils.tsx
@@ -33,5 +33,5 @@ interface SeparatorProps extends HTMLAttributes<HTMLDivElement> {
 }
 
 export function Separator({ className, orientation = 'vertical', ...elementProps }: SeparatorProps) {
-  return <div className={cx([style.separator, style[orientation], className])} {...elementProps} />;
+  return <div className={cx([style.separator, style[orientation], className])} role='separator' {...elementProps} />;
 }
diff --git a/apps/client/src/common/stores/appModeStore.ts b/apps/client/src/common/stores/appModeStore.ts
deleted file mode 100644
index b40d18c78..000000000
--- a/apps/client/src/common/stores/appModeStore.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { create } from 'zustand';
-
-export enum AppMode {
-  Run = 'run',
-  Edit = 'edit',
-}
-
-const appModeKey = 'ontime-app-mode';
-
-function getModeFromSession() {
-  return sessionStorage.getItem(appModeKey) === AppMode.Run ? AppMode.Run : AppMode.Edit;
-}
-
-function persistModeToSession(mode: AppMode) {
-  sessionStorage.setItem(appModeKey, mode);
-}
-
-type AppModeStore = {
-  mode: AppMode;
-  setMode: (mode: AppMode) => void;
-};
-
-export const useAppMode = create<AppModeStore>()((set) => ({
-  mode: getModeFromSession(),
-  setMode: (mode: AppMode) => {
-    persistModeToSession(mode);
-
-    return set(() => {
-      return { mode };
-    });
-  },
-}));
diff --git a/apps/client/src/features/control/playback/tap-button/TapButton.module.scss b/apps/client/src/features/control/playback/tap-button/TapButton.module.scss
index 38585de59..e091dbbb7 100644
--- a/apps/client/src/features/control/playback/tap-button/TapButton.module.scss
+++ b/apps/client/src/features/control/playback/tap-button/TapButton.module.scss
@@ -20,6 +20,11 @@ $button-color-white: $gray-50;
     opacity: $opacity-disabled;
   }
 
+  &:focus-visible {
+    outline: 2px solid $blue-500;
+    outline-offset: 2px;
+  }
+
   &:hover:not(:disabled) {
     color: $button-color-white;
     background-color: $theme-color;
diff --git a/apps/client/src/features/rundown/Rundown.tsx b/apps/client/src/features/rundown/Rundown.tsx
index 99c865f71..afd61774b 100644
--- a/apps/client/src/features/rundown/Rundown.tsx
+++ b/apps/client/src/features/rundown/Rundown.tsx
@@ -35,9 +35,9 @@ import {
 import { type EventOptions, useEntryActions } from '../../common/hooks/useEntryAction';
 import useFollowComponent from '../../common/hooks/useFollowComponent';
 import { useRundownEditor } from '../../common/hooks/useSocket';
-import { AppMode, useAppMode } from '../../common/stores/appModeStore';
 import { useEntryCopy } from '../../common/stores/entryCopyStore';
 import { cloneEvent } from '../../common/utils/clone';
+import { AppMode, sessionKeys } from '../../ontimeConfig';
 
 import QuickAddBlock from './quick-add-block/QuickAddBlock';
 import BlockEnd from './rundown-block/BlockEnd';
@@ -70,12 +70,15 @@ export default function Rundown({ data }: RundownProps) {
   const { entryCopyId, setEntryCopyId } = useEntryCopy();
 
   // cursor
-  const { mode: appMode } = useAppMode();
+  const [editorMode] = useSessionStorage<AppMode>({
+    key: sessionKeys.editorMode,
+    defaultValue: AppMode.Edit,
+  });
   const { clearSelectedEvents, setSelectedEvents, cursor } = useEventSelection();
 
   const cursorRef = useRef<HTMLDivElement | null>(null);
   const scrollRef = useRef<HTMLDivElement | null>(null);
-  useFollowComponent({ followRef: cursorRef, scrollRef, doFollow: appMode === AppMode.Run });
+  useFollowComponent({ followRef: cursorRef, scrollRef, doFollow: editorMode === AppMode.Run });
 
   // DND KIT
   const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 10 } }));
@@ -283,12 +286,12 @@ export default function Rundown({ data }: RundownProps) {
 
   // in run mode, we follow selection
   useEffect(() => {
-    if (appMode !== AppMode.Run || !featureData?.selectedEventId) {
+    if (editorMode !== AppMode.Run || !featureData?.selectedEventId) {
       return;
     }
     const index = order.findIndex((id) => id === featureData.selectedEventId);
     setSelectedEvents({ id: featureData.selectedEventId, selectMode: 'click', index });
-  }, [appMode, featureData.selectedEventId, order, setSelectedEvents]);
+  }, [editorMode, featureData.selectedEventId, order, setSelectedEvents]);
 
   /**
    * On drag end, we reorder the events
@@ -359,7 +362,7 @@ export default function Rundown({ data }: RundownProps) {
   }
 
   // 1. gather presentation options
-  const isEditMode = appMode === AppMode.Edit;
+  const isEditMode = editorMode === AppMode.Edit;
 
   // 2. initialise rundown metadata
   const { metadata, process } = makeRundownMetadata(featureData?.selectedEventId);
diff --git a/apps/client/src/features/rundown/RundownExport.tsx b/apps/client/src/features/rundown/RundownExport.tsx
index d35b1e1bc..3073c3a3f 100644
--- a/apps/client/src/features/rundown/RundownExport.tsx
+++ b/apps/client/src/features/rundown/RundownExport.tsx
@@ -1,4 +1,5 @@
 import { memo } from 'react';
+import { useSessionStorage } from '@mantine/hooks';
 
 import { ContextMenu } from '../../common/components/context-menu/ContextMenu';
 import { Corner } from '../../common/components/editor-utils/EditorUtils';
@@ -6,9 +7,9 @@ import ErrorBoundary from '../../common/components/error-boundary/ErrorBoundary'
 import ViewNavigationMenu from '../../common/components/navigation-menu/ViewNavigationMenu';
 import ProtectRoute from '../../common/components/protect-route/ProtectRoute';
 import { useIsSmallDevice } from '../../common/hooks/useIsSmallDevice';
-import { useAppMode } from '../../common/stores/appModeStore';
 import { handleLinks } from '../../common/utils/linkUtils';
 import { cx } from '../../common/utils/styleUtils';
+import { AppMode, sessionKeys } from '../../ontimeConfig';
 
 import RundownEntryEditor from './entry-editor/RundownEntryEditor';
 import FinderPlacement from './placements/FinderPlacement';
@@ -20,7 +21,10 @@ export default memo(RundownExport);
 
 function RundownExport() {
   const isExtracted = window.location.pathname.includes('/rundown');
-  const appMode = useAppMode((state) => state.mode);
+  const [editorMode] = useSessionStorage({
+    key: sessionKeys.editorMode,
+    defaultValue: AppMode.Edit,
+  });
   const isSmallDevice = useIsSmallDevice();
 
   if (isSmallDevice && isExtracted) {
@@ -45,7 +49,7 @@ function RundownExport() {
     );
   }
 
-  const hideSideBar = isExtracted && appMode === 'run';
+  const hideSideBar = isExtracted && editorMode === 'run';
 
   return (
     <ProtectRoute permission='editor'>
diff --git a/apps/client/src/features/rundown/quick-add-block/QuickAddBlock.tsx b/apps/client/src/features/rundown/quick-add-block/QuickAddBlock.tsx
index 66fe499f9..b88a5bcc4 100644
--- a/apps/client/src/features/rundown/quick-add-block/QuickAddBlock.tsx
+++ b/apps/client/src/features/rundown/quick-add-block/QuickAddBlock.tsx
@@ -1,5 +1,6 @@
 import { memo, useRef } from 'react';
 import { IoAdd } from 'react-icons/io5';
+import { Toolbar } from '@base-ui-components/react/toolbar';
 import { MaybeString, SupportedEntry } from 'ontime-types';
 
 import Button from '../../../common/components/buttons/Button';
@@ -64,21 +65,23 @@ function QuickAddBlock({ previousEventId, parentBlock, backgroundColor }: QuickA
   const blockColour = backgroundColor === '' ? '#9d9d9d' : backgroundColor;
 
   return (
-    <div className={style.quickAdd} style={blockColour ? { '--user-bg': blockColour } : {}}>
-      <Button onClick={addEvent} size='small' variant='subtle-white'>
+    <Toolbar.Root className={style.quickAdd} style={blockColour ? { '--user-bg': blockColour } : {}}>
+      <Toolbar.Button render={<Button size='small' variant='subtle-white' />} onClick={addEvent}>
         <IoAdd />
         Event
-      </Button>
-      <Button onClick={addDelay} size='small' variant='subtle-white'>
+      </Toolbar.Button>
+
+      <Toolbar.Button render={<Button size='small' variant='subtle-white' />} onClick={addDelay}>
         <IoAdd />
         Delay
-      </Button>
+      </Toolbar.Button>
+
       {parentBlock === null && (
-        <Button onClick={addBlock} size='small' variant='subtle-white'>
+        <Toolbar.Button render={<Button size='small' variant='subtle-white' />} onClick={addBlock}>
           <IoAdd />
           Block
-        </Button>
+        </Toolbar.Button>
       )}
-    </div>
+    </Toolbar.Root>
   );
 }
diff --git a/apps/client/src/features/rundown/rundown-header/RundownHeader.module.scss b/apps/client/src/features/rundown/rundown-header/RundownHeader.module.scss
index fca79357e..a2dcd61fe 100644
--- a/apps/client/src/features/rundown/rundown-header/RundownHeader.module.scss
+++ b/apps/client/src/features/rundown/rundown-header/RundownHeader.module.scss
@@ -9,6 +9,7 @@
   }
 }
 
+/** styles should match CuesheetTableSettings.module.scss */
 .group {
   display: flex;
   align-items: center;
@@ -19,7 +20,8 @@
   height: 2rem;
 }
 
-.button {
+/** styles should match CuesheetTableSettings.module.scss */
+.radioButton {
   box-sizing: border-box;
   display: flex;
   align-items: center;
@@ -34,6 +36,7 @@
 
   &:focus-visible {
     background: transparent;
+    outline: 1px solid $blue-500;
   }
 
   &:hover:not(:disabled):not(:active) {
diff --git a/apps/client/src/features/rundown/rundown-header/RundownHeader.tsx b/apps/client/src/features/rundown/rundown-header/RundownHeader.tsx
index d7152fd5b..ebd568f20 100644
--- a/apps/client/src/features/rundown/rundown-header/RundownHeader.tsx
+++ b/apps/client/src/features/rundown/rundown-header/RundownHeader.tsx
@@ -2,11 +2,12 @@ import { memo } from 'react';
 import { Toggle } from '@base-ui-components/react/toggle';
 import { ToggleGroup } from '@base-ui-components/react/toggle-group';
 import { Toolbar } from '@base-ui-components/react/toolbar';
+import { useSessionStorage } from '@mantine/hooks';
 import { OffsetMode } from 'ontime-types';
 
 import * as Editor from '../../../common/components/editor-utils/EditorUtils';
 import { setOffsetMode, useOffsetMode } from '../../../common/hooks/useSocket';
-import { AppMode, useAppMode } from '../../../common/stores/appModeStore';
+import { AppMode, sessionKeys } from '../../../ontimeConfig';
 
 import RundownMenu from './RundownMenu';
 
@@ -14,8 +15,7 @@ import style from './RundownHeader.module.scss';
 
 export default memo(RundownHeader);
 function RundownHeader() {
-  const appMode = useAppMode((state) => state.mode);
-  const setAppMode = useAppMode((state) => state.setMode);
+  const [editorMode, setEditorMode] = useSessionStorage({ key: sessionKeys.editorMode, defaultValue: AppMode.Edit });
 
   const { offsetMode } = useOffsetMode();
 
@@ -23,7 +23,7 @@ function RundownHeader() {
     // we need to stop user from deselecting a mode
     const newValue = mode.at(0);
     if (!newValue) return;
-    setAppMode(newValue);
+    setEditorMode(newValue);
   };
 
   const toggleOffsetMode = (mode: OffsetMode[]) => {
@@ -35,11 +35,11 @@ function RundownHeader() {
 
   return (
     <Toolbar.Root className={style.header}>
-      <ToggleGroup value={[appMode]} onValueChange={toggleAppMode} className={style.group}>
-        <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.button}>
+      <ToggleGroup value={[editorMode]} onValueChange={toggleAppMode} className={style.group}>
+        <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.radioButton}>
           Run
         </Toolbar.Button>
-        <Toolbar.Button render={<Toggle />} value={AppMode.Edit} className={style.button}>
+        <Toolbar.Button render={<Toggle />} value={AppMode.Edit} className={style.radioButton}>
           Edit
         </Toolbar.Button>
       </ToggleGroup>
@@ -47,10 +47,10 @@ function RundownHeader() {
       <Editor.Separator className={style.separator} />
 
       <ToggleGroup value={[offsetMode]} onValueChange={toggleOffsetMode} className={style.group}>
-        <Toolbar.Button render={<Toggle />} value={OffsetMode.Absolute} className={style.button}>
+        <Toolbar.Button render={<Toggle />} value={OffsetMode.Absolute} className={style.radioButton}>
           Absolute
         </Toolbar.Button>
-        <Toolbar.Button render={<Toggle />} value={OffsetMode.Relative} className={style.button}>
+        <Toolbar.Button render={<Toggle />} value={OffsetMode.Relative} className={style.radioButton}>
           Relative
         </Toolbar.Button>
       </ToggleGroup>
diff --git a/apps/client/src/features/rundown/rundown-header/RundownHeaderMobile.tsx b/apps/client/src/features/rundown/rundown-header/RundownHeaderMobile.tsx
index f3f1aec1d..ea7912516 100644
--- a/apps/client/src/features/rundown/rundown-header/RundownHeaderMobile.tsx
+++ b/apps/client/src/features/rundown/rundown-header/RundownHeaderMobile.tsx
@@ -2,18 +2,21 @@ import { memo } from 'react';
 import { Toggle } from '@base-ui-components/react/toggle';
 import { ToggleGroup } from '@base-ui-components/react/toggle-group';
 import { Toolbar } from '@base-ui-components/react/toolbar';
+import { useSessionStorage } from '@mantine/hooks';
 import { OffsetMode } from 'ontime-types';
 
 import * as Editor from '../../../common/components/editor-utils/EditorUtils';
 import { setOffsetMode, useOffsetMode } from '../../../common/hooks/useSocket';
-import { AppMode, useAppMode } from '../../../common/stores/appModeStore';
+import { AppMode, sessionKeys } from '../../../ontimeConfig';
 
 import style from './RundownHeader.module.scss';
 
 export default memo(RundownHeader);
 function RundownHeader() {
-  const appMode = useAppMode((state) => state.mode);
-  const setAppMode = useAppMode((state) => state.setMode);
+  const [editorMode, setEditorMode] = useSessionStorage<AppMode>({
+    key: sessionKeys.editorMode,
+    defaultValue: AppMode.Edit,
+  });
 
   const { offsetMode } = useOffsetMode();
 
@@ -21,7 +24,7 @@ function RundownHeader() {
     // we need to stop user from deselecting a mode
     const newValue = mode.at(0);
     if (!newValue) return;
-    setAppMode(newValue);
+    setEditorMode(newValue);
   };
 
   const toggleOffsetMode = (mode: OffsetMode[]) => {
@@ -33,7 +36,7 @@ function RundownHeader() {
 
   return (
     <Toolbar.Root className={style.header}>
-      <ToggleGroup value={[appMode]} onValueChange={toggleAppMode} className={style.group}>
+      <ToggleGroup value={[editorMode]} onValueChange={toggleAppMode} className={style.group}>
         <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.button}>
           Run
         </Toolbar.Button>
diff --git a/apps/client/src/features/rundown/rundown-header/RundownMenu.tsx b/apps/client/src/features/rundown/rundown-header/RundownMenu.tsx
index faa3daee2..5e3fe4ecf 100644
--- a/apps/client/src/features/rundown/rundown-header/RundownMenu.tsx
+++ b/apps/client/src/features/rundown/rundown-header/RundownMenu.tsx
@@ -1,11 +1,12 @@
 import { memo, useCallback } from 'react';
 import { IoTrash } from 'react-icons/io5';
-import { useDisclosure } from '@mantine/hooks';
+import { Toolbar } from '@base-ui-components/react/toolbar';
+import { useDisclosure, useSessionStorage } from '@mantine/hooks';
 
 import Button from '../../../common/components/buttons/Button';
 import Dialog from '../../../common/components/dialog/Dialog';
 import { useEntryActions } from '../../../common/hooks/useEntryAction';
-import { AppMode, useAppMode } from '../../../common/stores/appModeStore';
+import { AppMode, sessionKeys } from '../../../ontimeConfig';
 import { useEventSelection } from '../useEventSelection';
 
 import style from './RundownHeader.module.scss';
@@ -15,7 +16,10 @@ function RundownMenu() {
   const [isOpen, handlers] = useDisclosure();
 
   const clearSelectedEvents = useEventSelection((state) => state.clearSelectedEvents);
-  const appMode = useAppMode((state) => state.mode);
+  const [editorMode] = useSessionStorage({
+    key: sessionKeys.cuesheetMode,
+    defaultValue: AppMode.Edit,
+  });
   const { deleteAllEntries } = useEntryActions();
 
   const deleteAll = useCallback(() => {
@@ -26,15 +30,15 @@ function RundownMenu() {
 
   return (
     <>
-      <Button
-        variant='subtle-destructive'
+      <Toolbar.Button
+        render={<Button variant='subtle-destructive' />}
+        onClick={handlers.open}
+        disabled={editorMode === AppMode.Run}
         className={style.apart}
-        onClick={() => handlers.open()}
-        disabled={appMode === AppMode.Run}
       >
         <IoTrash />
         Clear all
-      </Button>
+      </Toolbar.Button>
       <Dialog
         isOpen={isOpen}
         onClose={handlers.close}
@@ -48,7 +52,7 @@ function RundownMenu() {
         }
         footerElements={
           <>
-            <Button size='large' onClick={handlers.close}>
+            <Button variant='ghosted-white' size='large' onClick={handlers.close}>
               Cancel
             </Button>
             <Button variant='destructive' size='large' onClick={deleteAll}>
diff --git a/apps/client/src/ontimeConfig.ts b/apps/client/src/ontimeConfig.ts
index 3883a352c..31dd53712 100644
--- a/apps/client/src/ontimeConfig.ts
+++ b/apps/client/src/ontimeConfig.ts
@@ -4,3 +4,13 @@ export const tooltipDelayFast = 300;
 
 export const queryRefetchInterval = 60000; // 60 seconds
 export const queryRefetchIntervalSlow = 120000; // 120 seconds
+
+export const sessionKeys = {
+  cuesheetMode: 'cuesheet-mode',
+  editorMode: 'editor-mode',
+};
+
+export enum AppMode {
+  Run = 'run',
+  Edit = 'edit',
+}
diff --git a/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx b/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx
index 497ec6d35..53d8b619c 100644
--- a/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx
+++ b/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx
@@ -1,10 +1,12 @@
 import { memo, useCallback, useMemo } from 'react';
+import { useSessionStorage } from '@mantine/hooks';
 import { useTableNav } from '@table-nav/react';
 import { ColumnDef, getCoreRowModel, useReactTable } from '@tanstack/react-table';
 import { OntimeEntry, TimeField } from 'ontime-types';
 
 import { useEntryActions } from '../../../common/hooks/useEntryAction';
 import { useFollowSelected } from '../../../common/hooks/useFollowComponent';
+import { AppMode,sessionKeys } from '../../../ontimeConfig';
 import { usePersistedCuesheetOptions } from '../cuesheet.options';
 
 import CuesheetBody from './cuesheet-table-elements/CuesheetBody';
@@ -22,11 +24,14 @@ interface CuesheetTableProps {
 
 export default function CuesheetTable({ data, columns }: CuesheetTableProps) {
   const { updateEntry, updateTimer } = useEntryActions();
-  const followPlayback = usePersistedCuesheetOptions((state) => state.followPlayback);
   const showDelayedTimes = usePersistedCuesheetOptions((state) => state.showDelayedTimes);
   const hideTableSeconds = usePersistedCuesheetOptions((state) => state.hideTableSeconds);
+  const [cuesheetMode] = useSessionStorage({
+    key: sessionKeys.cuesheetMode,
+    defaultValue: AppMode.Edit,
+  });
 
-  const { selectedRef, scrollRef } = useFollowSelected(followPlayback);
+  const { selectedRef, scrollRef } = useFollowSelected(cuesheetMode === AppMode.Run);
 
   const { listeners } = useTableNav();
 
diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/BlockRow.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/BlockRow.tsx
index a16304c48..0fa0fef20 100644
--- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/BlockRow.tsx
+++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/BlockRow.tsx
@@ -1,9 +1,11 @@
 import { IoEllipsisHorizontal } from 'react-icons/io5';
+import { useSessionStorage } from '@mantine/hooks';
 import { flexRender, Table } from '@tanstack/react-table';
 import { EntryId, OntimeEntry } from 'ontime-types';
 
 import IconButton from '../../../../common/components/buttons/IconButton';
 import { useCurrentBlockId } from '../../../../common/hooks/useSocket';
+import { AppMode, sessionKeys } from '../../../../ontimeConfig';
 import { usePersistedCuesheetOptions } from '../../cuesheet.options';
 import { useCuesheetTableMenu } from '../cuesheet-table-menu/useCuesheetTableMenu';
 
@@ -22,7 +24,10 @@ export default function BlockRow({ blockId, colour, hidePast, rowId, rowIndex, t
   const { currentBlockId } = useCurrentBlockId();
 
   const hideIndexColumn = usePersistedCuesheetOptions((state) => state.hideIndexColumn);
-  const showActionMenu = usePersistedCuesheetOptions((state) => state.showActionMenu);
+  const [cuesheetMode] = useSessionStorage<AppMode>({
+    key: sessionKeys.cuesheetMode,
+    defaultValue: AppMode.Edit,
+  });
   const openMenu = useCuesheetTableMenu((store) => store.openMenu);
 
   if (hidePast && !currentBlockId) {
@@ -31,7 +36,7 @@ export default function BlockRow({ blockId, colour, hidePast, rowId, rowIndex, t
 
   return (
     <tr className={style.blockRow} style={{ '--user-bg': colour }} data-testid='cuesheet-block'>
-      {showActionMenu && (
+      {cuesheetMode === AppMode.Edit && (
         <td className={style.actionColumn} tabIndex={-1} role='cell'>
           <IconButton
             aria-label='Options'
diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/CuesheetHeader.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/CuesheetHeader.tsx
index 89d74c90b..0681dcf6c 100644
--- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/CuesheetHeader.tsx
+++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/CuesheetHeader.tsx
@@ -1,8 +1,10 @@
 import { horizontalListSortingStrategy, SortableContext } from '@dnd-kit/sortable';
+import { useSessionStorage } from '@mantine/hooks';
 import { flexRender, HeaderGroup } from '@tanstack/react-table';
 import { OntimeEntry } from 'ontime-types';
 
 import { getAccessibleColour } from '../../../../common/utils/styleUtils';
+import { AppMode, sessionKeys } from '../../../../ontimeConfig';
 import { usePersistedCuesheetOptions } from '../../cuesheet.options';
 
 import { SortableCell } from './SortableCell';
@@ -15,7 +17,10 @@ interface CuesheetHeaderProps {
 
 export default function CuesheetHeader({ headerGroups }: CuesheetHeaderProps) {
   const hideIndexColumn = usePersistedCuesheetOptions((state) => state.hideIndexColumn);
-  const showActionMenu = usePersistedCuesheetOptions((state) => state.showActionMenu);
+  const [cuesheetMode] = useSessionStorage<AppMode>({
+    key: sessionKeys.cuesheetMode,
+    defaultValue: AppMode.Edit,
+  });
 
   return (
     <thead className={style.tableHeader}>
@@ -24,7 +29,7 @@ export default function CuesheetHeader({ headerGroups }: CuesheetHeaderProps) {
 
         return (
           <tr key={headerGroup.id}>
-            {showActionMenu && <th className={style.actionColumn} tabIndex={-1} />}
+            {cuesheetMode === AppMode.Edit && <th className={style.actionColumn} tabIndex={-1} />}
             {!hideIndexColumn && (
               <th className={style.indexColumn} tabIndex={-1}>
                 #
diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/EventRow.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/EventRow.tsx
index 246d315a2..796bcce9d 100644
--- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/EventRow.tsx
+++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/EventRow.tsx
@@ -1,11 +1,13 @@
 import { MutableRefObject, useEffect, useRef } from 'react';
 import { IoEllipsisHorizontal } from 'react-icons/io5';
+import { useSessionStorage } from '@mantine/hooks';
 import { flexRender, Table } from '@tanstack/react-table';
 import { OntimeEntry, OntimeEvent, RGBColour } from 'ontime-types';
 import { colourToHex, cssOrHexToColour } from 'ontime-utils';
 
 import IconButton from '../../../../common/components/buttons/IconButton';
 import { cx, getAccessibleColour } from '../../../../common/utils/styleUtils';
+import { AppMode, sessionKeys } from '../../../../ontimeConfig';
 import { usePersistedCuesheetOptions } from '../../cuesheet.options';
 import { useCuesheetTableMenu } from '../cuesheet-table-menu/useCuesheetTableMenu';
 
@@ -44,8 +46,10 @@ export default function EventRow({
   firstAfterBlock,
 }: EventRowProps) {
   const hideIndexColumn = usePersistedCuesheetOptions((state) => state.hideIndexColumn);
-  const showActionMenu = usePersistedCuesheetOptions((state) => state.showActionMenu);
-  const ownRef = useRef<HTMLTableRowElement>(null);
+  const [cuesheetMode] = useSessionStorage<AppMode>({
+    key: sessionKeys.cuesheetMode,
+    defaultValue: AppMode.Edit,
+  });  const ownRef = useRef<HTMLTableRowElement>(null);
 
   const isVisible = useVisibleRowsStore((state) => state.visibleRows.has(rowId));
 
@@ -86,7 +90,7 @@ export default function EventRow({
       ref={selectedRef ?? ownRef}
       data-testid='cuesheet-event'
     >
-      {showActionMenu && (
+      {cuesheetMode === AppMode.Edit && (
         <td className={style.actionColumn} tabIndex={-1} role='cell'>
           <IconButton
             aria-label='Options'
diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetShareModal.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetShareModal.tsx
index 7b27904a3..481127f4c 100644
--- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetShareModal.tsx
+++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetShareModal.tsx
@@ -1,3 +1,4 @@
+import { Toolbar } from '@base-ui-components/react/toolbar';
 import { useDisclosure } from '@mantine/hooks';
 
 import Button from '../../../../common/components/buttons/Button';
@@ -17,10 +18,10 @@ function CuesheetShareModal() {
 
   return (
     <>
-      <Button variant='subtle' onClick={handler.open}>
+      <Toolbar.Button onClick={handler.open} render={<Button />}>
         <RotatedLink />
         Share...
-      </Button>
+      </Toolbar.Button>
       <Modal
         isOpen={isOpen}
         onClose={handler.close}
diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.module.scss b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.module.scss
index 43f3270f2..18c26b206 100644
--- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.module.scss
+++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.module.scss
@@ -5,7 +5,7 @@
   padding: 0.5rem 1rem;
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  gap: 1rem;
   font-size: $inner-section-text-size;
   border-radius: 3px 3px 0 0;
 }
@@ -39,4 +39,56 @@
   display: flex;
   align-items: center;
   gap: 1rem;
-}
\ No newline at end of file
+}
+
+.apart {
+  margin-left: auto;
+}
+
+/** styles should match RundownHeader.module.scss */
+.group {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  padding-inline: 2px;
+  background: $gray-1100;
+  border-radius: $component-border-radius-md;
+  height: 2rem;
+}
+
+/** styles should match RundownHeader.module.scss */
+.radioButton {
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: calc(2rem - 4px); // padding inline * 2
+  padding-inline: 1em;
+  border: 1px solid transparent;
+  border-radius: $component-border-radius-md;
+  color: $gray-400;
+  font-size: calc(1rem - 2px);
+  font-weight: 600;
+
+  &:focus-visible {
+    background: transparent;
+    outline: 1px solid $blue-500;
+  }
+
+  &:hover:not(:disabled):not(:active) {
+    background: $gray-1000;
+  }
+
+  &:active {
+    background: $gray-1100;
+  }
+
+  &[data-pressed] {
+    background: $blue-700;
+    color: $ui-white;
+
+    &:hover:not(:disabled):not(:active) {
+      background: $blue-600;
+    }
+  }
+}
diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.tsx
index 48cd7c1b0..72585c852 100644
--- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.tsx
+++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.tsx
@@ -1,6 +1,10 @@
 import { memo, ReactNode } from 'react';
-import { IoChevronDown, IoLocate, IoOptions, IoSettingsOutline } from 'react-icons/io5';
+import { IoChevronDown, IoOptions, IoSettingsOutline } from 'react-icons/io5';
 import { Popover } from '@base-ui-components/react/popover';
+import { Toggle } from '@base-ui-components/react/toggle';
+import { ToggleGroup } from '@base-ui-components/react/toggle-group';
+import { Toolbar } from '@base-ui-components/react/toolbar';
+import { useSessionStorage } from '@mantine/hooks';
 import type { Column } from '@tanstack/react-table';
 import { OntimeEntry } from 'ontime-types';
 
@@ -8,6 +12,8 @@ import Button from '../../../../common/components/buttons/Button';
 import Checkbox from '../../../../common/components/checkbox/Checkbox';
 import * as Editor from '../../../../common/components/editor-utils/EditorUtils';
 import PopoverContents from '../../../../common/components/popover/Popover';
+import { cx } from '../../../../common/utils/styleUtils';
+import { AppMode, sessionKeys } from '../../../../ontimeConfig';
 import { usePersistedCuesheetOptions } from '../../cuesheet.options';
 
 import CuesheetShareModal from './CuesheetShareModal';
@@ -28,36 +34,40 @@ function CuesheetTableSettings({
   handleResetReordering,
   handleClearToggles,
 }: CuesheetTableSettingsProps) {
-  return (
-    <div className={style.tableSettings}>
-      <div className={style.inline}>
-        <ViewSettings />
-        <ColumnSettings
-          columns={columns}
-          handleResetResizing={handleResetResizing}
-          handleResetReordering={handleResetReordering}
-          handleClearToggles={handleClearToggles}
-        />
-      </div>
+  const [cuesheetMode, setCuesheetMode] = useSessionStorage({
+    key: sessionKeys.cuesheetMode,
+    defaultValue: AppMode.Edit,
+  });
 
-      <div className={style.inline}>
-        <ViewSettingsFollowButton />
-        <Editor.Separator orientation='vertical' />
-        <CuesheetShareModal />
-      </div>
-    </div>
-  );
-}
-
-function ViewSettingsFollowButton() {
-  const followPlayback = usePersistedCuesheetOptions((state) => state.followPlayback);
-  const toggle = usePersistedCuesheetOptions((state) => state.toggleOption);
+  const toggleCuesheetMode = (mode: AppMode[]) => {
+    // we need to stop user from deselecting a mode
+    const newValue = mode.at(0);
+    if (!newValue) return;
+    setCuesheetMode(newValue);
+  };
 
   return (
-    <Button variant={followPlayback ? 'primary' : 'subtle'} onClick={() => toggle('followPlayback')}>
-      <IoLocate />
-      {followPlayback ? 'Following playback' : 'Follow playback'}
-    </Button>
+    <Toolbar.Root className={style.tableSettings}>
+      <ViewSettings />
+      <ColumnSettings
+        columns={columns}
+        handleResetResizing={handleResetResizing}
+        handleResetReordering={handleResetReordering}
+        handleClearToggles={handleClearToggles}
+      />
+
+      <ToggleGroup value={[cuesheetMode]} onValueChange={toggleCuesheetMode} className={cx([style.group, style.apart])}>
+        <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.radioButton}>
+          Run
+        </Toolbar.Button>
+        <Toolbar.Button render={<Toggle />} value={AppMode.Edit} className={style.radioButton}>
+          Edit
+        </Toolbar.Button>
+      </ToggleGroup>
+
+      <Editor.Separator orientation='vertical' />
+      <CuesheetShareModal />
+    </Toolbar.Root>
   );
 }
 
@@ -68,59 +78,60 @@ function ViewSettings() {
     <Popover.Root>
       <Popover.Trigger
         render={
-          <Button variant='ghosted-white'>
-            <IoSettingsOutline /> Settings
-            <IoChevronDown />
-          </Button>
+          <Toolbar.Button
+            render={
+              <Button variant='ghosted-white'>
+                <IoSettingsOutline /> Settings
+                <IoChevronDown />
+              </Button>
+            }
+          />
         }
       />
 
-      <PopoverContents align='start' className={style.column}>
-        <Editor.Label className={style.sectionTitle}>Element visibility</Editor.Label>
-        <Editor.Label className={style.option}>
-          <Checkbox
-            defaultChecked={options.showActionMenu}
-            onCheckedChange={(checked) => options.setOption('showActionMenu', checked)}
-          />
-          Show action menu
-        </Editor.Label>
-        <Editor.Label className={style.option}>
-          <Checkbox
-            defaultChecked={options.hideTableSeconds}
-            onCheckedChange={(checked) => options.setOption('hideTableSeconds', checked)}
-          />
-          Hide seconds in table
-        </Editor.Label>
-        <Editor.Label className={style.option}>
-          <Checkbox
-            defaultChecked={options.hidePast}
-            onCheckedChange={(checked) => options.setOption('hidePast', checked)}
-          />
-          Hide past events
-        </Editor.Label>
-        <Editor.Label className={style.option}>
-          <Checkbox
-            defaultChecked={options.hideIndexColumn}
-            onCheckedChange={(checked) => options.setOption('hideIndexColumn', checked)}
-          />
-          Hide index column
-        </Editor.Label>
+      <PopoverContents align='start' className={style.inline}>
+        <div className={style.column}>
+          <Editor.Label className={style.sectionTitle}>Element visibility</Editor.Label>
+          <Editor.Label className={style.option}>
+            <Checkbox
+              defaultChecked={options.hideTableSeconds}
+              onCheckedChange={(checked) => options.setOption('hideTableSeconds', checked)}
+            />
+            Hide seconds in table
+          </Editor.Label>
+          <Editor.Label className={style.option}>
+            <Checkbox
+              defaultChecked={options.hidePast}
+              onCheckedChange={(checked) => options.setOption('hidePast', checked)}
+            />
+            Hide past events
+          </Editor.Label>
+          <Editor.Label className={style.option}>
+            <Checkbox
+              defaultChecked={options.hideIndexColumn}
+              onCheckedChange={(checked) => options.setOption('hideIndexColumn', checked)}
+            />
+            Hide index column
+          </Editor.Label>
+        </div>
 
-        <Editor.Label className={style.sectionTitle}>Table Behaviour</Editor.Label>
-        <Editor.Label className={style.option}>
-          <Checkbox
-            defaultChecked={options.showDelayedTimes}
-            onCheckedChange={(checked) => options.setOption('showDelayedTimes', checked)}
-          />
-          Show delayed times
-        </Editor.Label>
-        <Editor.Label className={style.option}>
-          <Checkbox
-            defaultChecked={options.hideDelays}
-            onCheckedChange={(checked) => options.setOption('hideDelays', checked)}
-          />
-          Hide delay entries
-        </Editor.Label>
+        <div className={style.column}>
+          <Editor.Label className={style.sectionTitle}>Table Behaviour</Editor.Label>
+          <Editor.Label className={style.option}>
+            <Checkbox
+              defaultChecked={options.showDelayedTimes}
+              onCheckedChange={(checked) => options.setOption('showDelayedTimes', checked)}
+            />
+            Show delayed times
+          </Editor.Label>
+          <Editor.Label className={style.option}>
+            <Checkbox
+              defaultChecked={options.hideDelays}
+              onCheckedChange={(checked) => options.setOption('hideDelays', checked)}
+            />
+            Hide delay entries
+          </Editor.Label>
+        </div>
       </PopoverContents>
     </Popover.Root>
   );
@@ -136,10 +147,14 @@ function ColumnSettings({
     <Popover.Root>
       <Popover.Trigger
         render={
-          <Button variant='ghosted-white'>
-            <IoOptions /> View
-            <IoChevronDown />
-          </Button>
+          <Toolbar.Button
+            render={
+              <Button variant='ghosted-white'>
+                <IoOptions /> View
+                <IoChevronDown />
+              </Button>
+            }
+          />
         }
       />
       <PopoverContents align='start' className={style.inline}>
diff --git a/apps/client/src/views/cuesheet/cuesheet.options.ts b/apps/client/src/views/cuesheet/cuesheet.options.ts
index daa06ea46..feb76eec7 100644
--- a/apps/client/src/views/cuesheet/cuesheet.options.ts
+++ b/apps/client/src/views/cuesheet/cuesheet.options.ts
@@ -2,9 +2,7 @@ import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 
 type OptionValues = {
-  showActionMenu: boolean;
   hideTableSeconds: boolean;
-  followPlayback: boolean;
   hidePast: boolean;
   hideIndexColumn: boolean;
   showDelayedTimes: boolean;
@@ -12,9 +10,7 @@ type OptionValues = {
 };
 
 const defaultOptions: OptionValues = {
-  showActionMenu: false,
   hideTableSeconds: false,
-  followPlayback: false,
   hidePast: false,
   hideIndexColumn: false,
   showDelayedTimes: false,