diff --git a/apps/client/src/common/components/schedule/Schedule.scss b/apps/client/src/common/components/schedule/Schedule.scss index aa2e8d2ca..c7239904c 100644 --- a/apps/client/src/common/components/schedule/Schedule.scss +++ b/apps/client/src/common/components/schedule/Schedule.scss @@ -31,6 +31,12 @@ text-overflow: ellipsis; } + .entry-secondary { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + &:not(:last-child) { padding-bottom: 8px; } @@ -68,4 +74,3 @@ } } } - diff --git a/apps/client/src/common/components/schedule/ScheduleContext.tsx b/apps/client/src/common/components/schedule/ScheduleContext.tsx index 40497ee43..34337ce4e 100644 --- a/apps/client/src/common/components/schedule/ScheduleContext.tsx +++ b/apps/client/src/common/components/schedule/ScheduleContext.tsx @@ -2,8 +2,8 @@ import { createContext, PropsWithChildren, useContext, useState } from 'react'; import { useSearchParams } from 'react-router-dom'; import { OntimeEvent } from 'ontime-types'; +import { isStringBoolean } from '../../../features/viewers/common/viewUtils'; import { useInterval } from '../../hooks/useInterval'; -import { isStringBoolean } from '../../utils/viewUtils'; interface ScheduleContextState { events: OntimeEvent[]; diff --git a/apps/client/src/common/components/schedule/ScheduleItem.tsx b/apps/client/src/common/components/schedule/ScheduleItem.tsx index 102ee7f4c..a1029b51f 100644 --- a/apps/client/src/common/components/schedule/ScheduleItem.tsx +++ b/apps/client/src/common/components/schedule/ScheduleItem.tsx @@ -13,14 +13,13 @@ interface ScheduleItemProps { timeStart: number; timeEnd: number; title: string; - presenter?: string; backstageEvent: boolean; colour: string; skip: boolean; } export default function ScheduleItem(props: ScheduleItemProps) { - const { selected, timeStart, timeEnd, title, presenter, backstageEvent, colour, skip } = props; + const { selected, timeStart, timeEnd, title, backstageEvent, colour, skip } = props; const start = formatTime(timeStart, formatOptions); const end = formatTime(timeEnd, formatOptions); @@ -39,7 +38,6 @@ export default function ScheduleItem(props: ScheduleItemProps) {
(Component: ComponentType
) => { const { data: project } = useProjectData(); const { data: viewSettings } = useViewSettings(); const { data: settings } = useSettings(); + const { data: customFields } = useCustomFields(); const publicEvents = useMemo(() => { if (Array.isArray(rundownData)) { @@ -83,25 +95,26 @@ const withData =
(Component: ComponentType
) => {
return (