From 9e771a2f2433a4f22c99e9dedd2d6768ec2762db Mon Sep 17 00:00:00 2001
From: Brian Rodgers <Brian@brianmrodgers.com>
Date: Sun, 29 Mar 2026 15:51:14 -0500
Subject: [PATCH] refactor: format times in editor based on project time format

---
 .../components/input/time-input/TimeInput.tsx       | 13 ++++++++++---
 apps/client/src/common/utils/time.ts                |  2 +-
 .../panel/settings-panel/GeneralSettings.tsx        |  2 +-
 .../app-settings/quick-start/QuickStart.tsx         |  2 +-
 .../client/src/features/overview/EditorOverview.tsx | 12 ++++++------
 .../features/rundown/entry-editor/GroupEditor.tsx   |  7 ++++---
 .../entry-editor/composite/EventEditorTimes.tsx     |  7 +++----
 .../features/rundown/rundown-group/RundownGroup.tsx | 10 +++++-----
 .../rundown/time-input-flow/TimeInputFlow.tsx       |  2 ++
 .../time-input-flow/TimeInputGroup.module.scss      |  2 +-
 10 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/apps/client/src/common/components/input/time-input/TimeInput.tsx b/apps/client/src/common/components/input/time-input/TimeInput.tsx
index 9ce94785d..98136c402 100644
--- a/apps/client/src/common/components/input/time-input/TimeInput.tsx
+++ b/apps/client/src/common/components/input/time-input/TimeInput.tsx
@@ -1,7 +1,8 @@
 import { millisToString, parseUserTime } from 'ontime-utils';
-import { FocusEvent, KeyboardEvent, useCallback, useEffect, useRef, useState } from 'react';
+import { FocusEvent, KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { cx } from '../../../utils/styleUtils';
+import { formatTime, getFormatFromSettings } from '../../../utils/time';
 import Input from '../input/Input';
 
 import style from './TimeInput.module.scss';
@@ -16,6 +17,7 @@ interface TimeInputProps<T extends string> {
   align?: 'left' | 'center';
   delayed?: boolean;
   className?: string;
+  shouldFormat?: boolean;
 }
 
 export default function TimeInput<T extends string>({
@@ -28,10 +30,12 @@ export default function TimeInput<T extends string>({
   align = 'center',
   delayed,
   className,
+  shouldFormat,
 }: TimeInputProps<T>) {
   const inputRef = useRef<HTMLInputElement | null>(null);
   const [value, setValue] = useState<string>('');
   const ignoreChange = useRef(false);
+  const formatAs12Hr = useMemo(() => shouldFormat && getFormatFromSettings() === '12', [shouldFormat]);
 
   /**
    * @description Resets input value to given
@@ -39,10 +43,12 @@ export default function TimeInput<T extends string>({
   const resetValue = useCallback(() => {
     if (typeof time !== 'number' || isNaN(time)) {
       setValue('00:00:00');
+    } else if (shouldFormat) {
+      setValue(formatTime(time));
     } else {
       setValue(millisToString(time));
     }
-  }, [time]);
+  }, [time, shouldFormat]);
 
   /**
    * @description Selects input text on focus
@@ -139,9 +145,10 @@ export default function TimeInput<T extends string>({
       onBlur={onBlurHandler}
       onKeyDown={onKeyDownHandler}
       value={value}
-      maxLength={8}
+      maxLength={formatAs12Hr ? 11 : 8}
       style={{
         textAlign: align,
+        width: formatAs12Hr ? '7.5em' : '6.5em',
       }}
     />
   );
diff --git a/apps/client/src/common/utils/time.ts b/apps/client/src/common/utils/time.ts
index 392ab6320..0dce7c63a 100644
--- a/apps/client/src/common/utils/time.ts
+++ b/apps/client/src/common/utils/time.ts
@@ -42,7 +42,7 @@ function getFormatFromParams() {
  * Gets the format options from the applicaton settings
  * @returns a string equivalent to the format, ie: hh:mm:ss a or HH:mm:ss
  */
-function getFormatFromSettings(): TimeFormat {
+export function getFormatFromSettings(): TimeFormat {
   const settings: Settings | undefined = ontimeQueryClient.getQueryData(APP_SETTINGS);
   return settings?.timeFormat ?? '24';
 }
diff --git a/apps/client/src/features/app-settings/panel/settings-panel/GeneralSettings.tsx b/apps/client/src/features/app-settings/panel/settings-panel/GeneralSettings.tsx
index 5478d9e0e..1f402581c 100644
--- a/apps/client/src/features/app-settings/panel/settings-panel/GeneralSettings.tsx
+++ b/apps/client/src/features/app-settings/panel/settings-panel/GeneralSettings.tsx
@@ -94,7 +94,7 @@ export default function GeneralSettings() {
           {submitError && <Panel.Error>{submitError}</Panel.Error>}
           <Panel.Divider />
           <Panel.Section>
-            <Info>Changes to the time format and views language do not affect the editor view</Info>
+            <Info>Changes to the views language does not affect the editor view</Info>
             <Panel.Loader isLoading={isLoading} />
             <Panel.ListGroup>
               <Panel.ListItem>
diff --git a/apps/client/src/features/app-settings/quick-start/QuickStart.tsx b/apps/client/src/features/app-settings/quick-start/QuickStart.tsx
index 991fbf748..a6e3dcfa9 100644
--- a/apps/client/src/features/app-settings/quick-start/QuickStart.tsx
+++ b/apps/client/src/features/app-settings/quick-start/QuickStart.tsx
@@ -69,7 +69,7 @@ export default function QuickStart({ isOpen, onClose }: QuickStartProps) {
             <Panel.ListItem>
               <Panel.Field
                 title='Time format'
-                description='Default time format to show in views 12 / 24 hours (does not affect editor)'
+                description='Default time format to show in views 12 / 24 hours'
                 error={errors.settings?.timeFormat?.message}
               />
               <Select
diff --git a/apps/client/src/features/overview/EditorOverview.tsx b/apps/client/src/features/overview/EditorOverview.tsx
index 70e53662d..ef05a8455 100644
--- a/apps/client/src/features/overview/EditorOverview.tsx
+++ b/apps/client/src/features/overview/EditorOverview.tsx
@@ -34,10 +34,10 @@ function OverviewPlanning() {
     <>
       <div className={style.inline}>
         <TitleOverview />
-        <StartTimesPlanning />
+        <StartTimesPlanning shouldFormat />
         <PlanningStats />
       </div>
-      <ClockOverview />
+      <ClockOverview shouldFormat />
     </>
   );
 }
@@ -46,12 +46,12 @@ function OverviewTracking() {
   return (
     <>
       <div className={style.inline}>
-        <StartTimesRuntime />
+        <StartTimesRuntime shouldFormat />
         <ProgressOverview />
         <OffsetOverview />
       </div>
       <MetadataTimes />
-      <ClockOverview />
+      <ClockOverview shouldFormat />
     </>
   );
 }
@@ -61,12 +61,12 @@ function OverviewControl() {
     <>
       <TitleOverview />
       <div className={style.inline}>
-        <StartTimesRuntime />
+        <StartTimesRuntime shouldFormat />
         <ProgressOverview />
         <OffsetOverview />
       </div>
       <MetadataTimes />
-      <ClockOverview />
+      <ClockOverview shouldFormat />
     </>
   );
 }
diff --git a/apps/client/src/features/rundown/entry-editor/GroupEditor.tsx b/apps/client/src/features/rundown/entry-editor/GroupEditor.tsx
index 9f447eba0..f1508cd93 100644
--- a/apps/client/src/features/rundown/entry-editor/GroupEditor.tsx
+++ b/apps/client/src/features/rundown/entry-editor/GroupEditor.tsx
@@ -8,7 +8,8 @@ import AppLink from '../../../common/components/link/app-link/AppLink';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
 import { getOffsetState } from '../../../common/utils/offset';
-import { cx, enDash, timerPlaceholder } from '../../../common/utils/styleUtils';
+import { cx, enDash } from '../../../common/utils/styleUtils';
+import { formatTime } from '../../../common/utils/time';
 import TextLikeInput from '../../../views/cuesheet/cuesheet-table/cuesheet-table-elements/TextLikeInput';
 import EntryEditorCustomFields from './composite/EventEditorCustomFields';
 import EventTextArea from './composite/EventTextArea';
@@ -60,13 +61,13 @@ export default function GroupEditor({ group }: GroupEditorProps) {
           <div>
             <Editor.Label>First event start</Editor.Label>
             <TextLikeInput className={style.textLikeInput} disabled>
-              {millisToString(group.timeStart, { fallback: timerPlaceholder })}
+              {formatTime(group.timeStart)}
             </TextLikeInput>
           </div>
           <div>
             <Editor.Label>Last event end</Editor.Label>
             <TextLikeInput className={style.textLikeInput} disabled>
-              {millisToString(group.timeEnd, { fallback: timerPlaceholder })}
+              {formatTime(group.timeEnd)}
             </TextLikeInput>
           </div>
           <div>
diff --git a/apps/client/src/features/rundown/entry-editor/composite/EventEditorTimes.tsx b/apps/client/src/features/rundown/entry-editor/composite/EventEditorTimes.tsx
index 0dfb7307c..d682fac1c 100644
--- a/apps/client/src/features/rundown/entry-editor/composite/EventEditorTimes.tsx
+++ b/apps/client/src/features/rundown/entry-editor/composite/EventEditorTimes.tsx
@@ -1,5 +1,5 @@
 import { EndAction, TimeStrategy, TimerType } from 'ontime-types';
-import { millisToString, parseUserTime } from 'ontime-utils';
+import { parseUserTime } from 'ontime-utils';
 import { memo } from 'react';
 import { IoInformationCircle } from 'react-icons/io5';
 
@@ -10,6 +10,7 @@ import Switch from '../../../../common/components/switch/Switch';
 import Tooltip from '../../../../common/components/tooltip/Tooltip';
 import { useEntryActionsContext } from '../../../../common/context/EntryActionsContext';
 import { millisToDelayString } from '../../../../common/utils/dateConfig';
+import { formatTime } from '../../../../common/utils/time';
 import TimeInputFlow from '../../time-input-flow/TimeInputFlow';
 
 import style from '../EntryEditor.module.scss';
@@ -68,9 +69,7 @@ function EventEditorTimes({
 
   const hasDelay = delay !== 0;
   const delayLabel = hasDelay
-    ? `Event is ${millisToDelayString(delay, 'expanded')}. New schedule ${millisToString(
-        timeStart + delay,
-      )} → ${millisToString(timeEnd + delay)}`
+    ? `Event is ${millisToDelayString(delay, 'expanded')}. New schedule ${formatTime(timeStart + delay)} → ${formatTime(timeEnd + delay)}`
     : '';
 
   return (
diff --git a/apps/client/src/features/rundown/rundown-group/RundownGroup.tsx b/apps/client/src/features/rundown/rundown-group/RundownGroup.tsx
index 1db4796ad..22044ac2c 100644
--- a/apps/client/src/features/rundown/rundown-group/RundownGroup.tsx
+++ b/apps/client/src/features/rundown/rundown-group/RundownGroup.tsx
@@ -1,7 +1,7 @@
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { EntryId, OntimeGroup } from 'ontime-types';
-import { MILLIS_PER_MINUTE, millisToString } from 'ontime-utils';
+import { MILLIS_PER_MINUTE } from 'ontime-utils';
 import { MouseEvent, useRef } from 'react';
 import {
   IoChevronDown,
@@ -19,8 +19,8 @@ import { useContextMenu } from '../../../common/hooks/useContextMenu';
 import { useEntryCopy } from '../../../common/stores/entryCopyStore';
 import { deviceMod } from '../../../common/utils/deviceUtils';
 import { getOffsetState } from '../../../common/utils/offset';
-import { cx, getAccessibleColour, timerPlaceholder } from '../../../common/utils/styleUtils';
-import { formatDuration } from '../../../common/utils/time';
+import { cx, getAccessibleColour } from '../../../common/utils/styleUtils';
+import { formatDuration, formatTime } from '../../../common/utils/time';
 import TitleEditor from '../common/TitleEditor';
 import { canDrop } from '../rundown.utils';
 import { useEventSelection } from '../useEventSelection';
@@ -168,11 +168,11 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
           </div>
           <div className={style.metaEntry}>
             <div className={style.metaLabel}>Start</div>
-            <div>{millisToString(data.timeStart, { fallback: timerPlaceholder })}</div>
+            <div>{formatTime(data.timeStart)}</div>
           </div>
           <div className={style.metaEntry}>
             <div className={style.metaLabel}>End</div>
-            <div>{millisToString(data.timeEnd, { fallback: timerPlaceholder })}</div>
+            <div>{formatTime(data.timeEnd)}</div>
           </div>
           <div className={style.metaEntry}>
             <div className={style.metaLabel}>Duration</div>
diff --git a/apps/client/src/features/rundown/time-input-flow/TimeInputFlow.tsx b/apps/client/src/features/rundown/time-input-flow/TimeInputFlow.tsx
index a2edabcfa..ba1e33a9a 100644
--- a/apps/client/src/features/rundown/time-input-flow/TimeInputFlow.tsx
+++ b/apps/client/src/features/rundown/time-input-flow/TimeInputFlow.tsx
@@ -77,6 +77,7 @@ function TimeInputFlow({
             placeholder='Start'
             align='left'
             disabled={linkStart}
+            shouldFormat
           />
           <Tooltip
             text='Link start to previous end'
@@ -99,6 +100,7 @@ function TimeInputFlow({
             placeholder='End'
             align='left'
             disabled={isLockedDuration}
+            shouldFormat
           />
           <Tooltip
             text='Lock end'
diff --git a/apps/client/src/features/rundown/time-input-flow/TimeInputGroup.module.scss b/apps/client/src/features/rundown/time-input-flow/TimeInputGroup.module.scss
index 316e10b01..95d852ca0 100644
--- a/apps/client/src/features/rundown/time-input-flow/TimeInputGroup.module.scss
+++ b/apps/client/src/features/rundown/time-input-flow/TimeInputGroup.module.scss
@@ -10,7 +10,7 @@
   }
 
   input {
-    max-width: 6.5em;
+    max-width: fit-content;
     border-radius: $component-border-radius-md 0 0 $component-border-radius-md;
     border: none;
     padding-right: 0;