Skip to content

Commit c2224d6

Browse files
author
Ivan Maretić
committed
fix: resolve segment list header glitches
1 parent 43c1aaa commit c2224d6

File tree

6 files changed

+19
-1
lines changed

6 files changed

+19
-1
lines changed

packages/webui/src/client/lib/viewPort.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Settings } from '../lib/Settings.js'
55
import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
66
import { UIPartInstances, UIParts } from '../ui/Collections.js'
77
import { logger } from './logging.js'
8+
import { parse as queryStringParse } from 'query-string'
89

910
const HEADER_MARGIN = 24 // TODOSYNC: TV2 uses 15. If it's needed to be different, it needs to be made generic somehow..
1011
const FALLBACK_HEADER_HEIGHT = 65
@@ -102,6 +103,10 @@ export async function scrollToPart(
102103
let HEADER_HEIGHT: number | undefined = undefined
103104

104105
export function getHeaderHeight(): number {
106+
if (queryStringParse(location.search)['hideRundownHeader'] === '1') {
107+
return 0
108+
}
109+
105110
if (HEADER_HEIGHT === undefined) {
106111
const root = document.querySelector(
107112
'#render-target > .container-fluid-custom > .rundown-view > .rundown-header'

packages/webui/src/client/ui/RundownView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady & ITrackedProps,
10911091
case SegmentViewMode.Storyboard:
10921092
return <SegmentStoryboardContainer {...resolvedSegmentProps} />
10931093
case SegmentViewMode.List:
1094-
return <SegmentListContainer {...resolvedSegmentProps} />
1094+
return <SegmentListContainer {...resolvedSegmentProps} hideRundownHeader={this.props.hideRundownHeader} />
10951095
case SegmentViewMode.Timeline:
10961096
default:
10971097
return <SegmentTimelineContainer {...resolvedSegmentProps} />

packages/webui/src/client/ui/SegmentList/SegmentList.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,10 @@ $identifier-area-width: 3em;
701701
padding: $segment-margin-y $segment-margin-x 0;
702702
overflow: hidden;
703703

704+
&.no-rundown-header {
705+
margin-top: 0;
706+
}
707+
704708
.segment-opl__title {
705709
background: $segment-background-color;
706710
border-top-left-radius: $segment-border-radius;

packages/webui/src/client/ui/SegmentList/SegmentList.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ interface IProps {
3939
onContextMenu?: (contextMenuContext: IContextMenuContext) => void
4040
onSwitchViewMode?: (newViewMode: SegmentViewMode) => void
4141
onPieceDoubleClick?: (item: PieceUi, e: React.MouseEvent<HTMLDivElement>) => void
42+
43+
hideRundownHeader?: boolean
4244
}
4345

4446
const SegmentListInner = React.forwardRef<HTMLDivElement, IProps>(function SegmentList(props, ref) {
@@ -238,6 +240,7 @@ const SegmentListInner = React.forwardRef<HTMLDivElement, IProps>(function Segme
238240
onTimeUntilClick={onTimeUntilClick}
239241
onSwitchViewMode={props.onSwitchViewMode}
240242
onHeaderNoteClick={props.onHeaderNoteClick}
243+
hideRundownHeader={props.hideRundownHeader}
241244
/>
242245
<div className="segment-opl__part-list">{parts}</div>
243246
</div>

packages/webui/src/client/ui/SegmentList/SegmentListContainer.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export const LIVELINE_HISTORY_SIZE = TIMELINE_LIVELINE_HISTORY_SIZE
1919

2020
interface IProps extends IResolvedSegmentProps {
2121
id: string
22+
hideRundownHeader?: boolean
2223
}
2324

2425
export const SegmentListContainer = withResolvedSegment<IProps>(function SegmentListContainer({
@@ -211,6 +212,7 @@ export const SegmentListContainer = withResolvedSegment<IProps>(function Segment
211212
onSwitchViewMode={props.onSwitchViewMode}
212213
onHeaderNoteClick={props.onHeaderNoteClick}
213214
onPieceDoubleClick={props.onPieceDoubleClick}
215+
hideRundownHeader={props.hideRundownHeader}
214216
/>
215217
{props.segmentui.showShelf && props.adLibSegmentUi && (
216218
<RundownViewShelf

packages/webui/src/client/ui/SegmentList/SegmentListHeader.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export function SegmentListHeader({
3535
getSegmentContext,
3636
onTimeUntilClick,
3737
onHeaderNoteClick,
38+
hideRundownHeader,
3839
}: Readonly<{
3940
isDetached: boolean
4041
isDetachedStick: boolean
@@ -54,6 +55,7 @@ export function SegmentListHeader({
5455
onTimeUntilClick: () => void
5556
getSegmentContext: () => IContextMenuContext
5657
onHeaderNoteClick?: (segmentId: SegmentId, level: NoteSeverity) => void
58+
hideRundownHeader?: boolean
5759
}>): JSX.Element {
5860
const { t } = useTranslation()
5961

@@ -194,6 +196,8 @@ export function SegmentListHeader({
194196
'invert-flash': highlight,
195197

196198
'time-of-day-countdowns': useTimeOfDayCountdowns,
199+
200+
'no-rundown-header': hideRundownHeader,
197201
})}
198202
>
199203
{contents}

0 commit comments

Comments
 (0)