Merge remote-tracking branch 'upstream/release53' into bbc-release53

Author: PeterC89

.husky/pre-commit

@@ -0,0 +1 @@
+yarn lint-staged

packages/job-worker/src/playout/timeline/piece.ts

@@ -106,7 +106,7 @@ export function getPieceEnableInsidePart(
 
 	// If the part has an end time, we can consider post-roll
 	if (partHasEndTime && partTimings.toPartPostroll) {
-		if (!pieceEnable.duration) {
+		if (pieceEnable.duration === undefined) {
 			// make sure that the control object is shortened correctly
 			pieceEnable.end = `#${partGroupId} - ${partTimings.toPartPostroll}`
 		}

packages/webui/src/client/styles/shelf/shelf.scss

@@ -11,7 +11,7 @@
 	left: 0;
 	right: 60px;
 	bottom: 0;
-	z-index: 291;
+	z-index: 289;
 	box-shadow: 0 0 20px #000;
 
 	&.full-viewport {

packages/webui/src/client/styles/supportAndSwitchboardPanel.scss

@@ -42,6 +42,7 @@
 	z-index: 290;
 	min-height: rem(50px);
 	max-width: rem(350px);
+	color-scheme: light;
 
 	.support-pop-up-panel__actions {
 		margin-top: 1em;

packages/webui/src/client/ui/PreviewPopUp/PreviewPopUpContext.tsx

@@ -170,9 +170,11 @@ export function convertSourceLayerItemToPreview(
 	) {
 		try {
 			const payload = JSONBlobParse<NoraPayload>(item.content.previewPayload)
-			const tableProps = Object.entries<unknown>(payload.content)
-				.filter(([key, value]) => !(key.startsWith('_') || key.startsWith('@') || value === ''))
-				.map(([key, value]) => ({ key, value }))
+			const tableProps = payload.content
+				? Object.entries<unknown>(payload.content)
+						.filter(([key, value]) => !(key.startsWith('_') || key.startsWith('@') || value === ''))
+						.map(([key, value]) => ({ key, value }))
+				: []
 
 			return {
 				contents: _.compact([

packages/webui/src/client/ui/Prompter/PrompterView.tsx

@@ -321,18 +321,9 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 		const target = document.querySelector<HTMLElement>(`[data-part-instance-id="${partInstanceId}"]`)
 
 		if (!target) return
-		const offsetTop = window.scrollY + target.offsetTop
-		this._lastAnimation?.stop()
-		this._lastAnimation = animate(
-			window,
-			{
-				scrollY: offsetTop + -1 * scrollMargin,
-			},
-			{
-				duration: 0.4,
-				ease: 'easeOut',
-			}
-		)
+
+		const targetOffsetTop = target.getBoundingClientRect().top + window.scrollY
+		this.animateScrollTo(targetOffsetTop - scrollMargin)
 	}
 	scrollToLive(): void {
 		const scrollMargin = this.calculateScrollPosition()
@@ -341,37 +332,17 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 
 		if (!current) return
 
-		const offsetTop = window.scrollY + current.offsetTop
-		this._lastAnimation?.stop()
-		this._lastAnimation = animate(
-			window,
-			{
-				scrollY: offsetTop + -1 * scrollMargin,
-			},
-			{
-				duration: 0.4,
-				ease: 'easeOut',
-			}
-		)
+		const targetOffsetTop = current.getBoundingClientRect().top + window.scrollY
+		this.animateScrollTo(targetOffsetTop - scrollMargin)
 	}
 	scrollToNext(): void {
 		const scrollMargin = this.calculateScrollPosition()
 		const next = document.querySelector<HTMLElement>('.prompter .next')
 
 		if (!next) return
 
-		const offsetTop = window.scrollY + next.offsetTop
-		this._lastAnimation?.stop()
-		this._lastAnimation = animate(
-			window,
-			{
-				scrollY: offsetTop + -1 * scrollMargin,
-			},
-			{
-				duration: 0.4,
-				ease: 'easeOut',
-			}
-		)
+		const targetOffsetTop = next.getBoundingClientRect().top + window.scrollY
+		this.animateScrollTo(targetOffsetTop - scrollMargin)
 	}
 	scrollToPrevious(): void {
 		const scrollMargin = this.calculateScrollPosition()
@@ -380,18 +351,8 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 		const target = anchors[anchors.length - 2] || anchors[0]
 		if (!target) return
 
-		const offsetTop = window.scrollY + target[0]
-		this._lastAnimation?.stop()
-		this._lastAnimation = animate(
-			window,
-			{
-				scrollY: offsetTop + -1 * scrollMargin,
-			},
-			{
-				duration: 0.4,
-				ease: 'easeOut',
-			}
-		)
+		const targetOffsetTop = target[0] + window.scrollY
+		this.animateScrollTo(targetOffsetTop - scrollMargin)
 	}
 	scrollToFollowing(): void {
 		const scrollMargin = this.calculateScrollPosition()
@@ -400,18 +361,16 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 		const target = anchors[0]
 		if (!target) return
 
-		const offsetTop = window.scrollY + target[0]
+		const targetOffsetTop = target[0] + window.scrollY
+		this.animateScrollTo(targetOffsetTop - scrollMargin)
+	}
+	private animateScrollTo(scrollToPosition: number) {
 		this._lastAnimation?.stop()
-		this._lastAnimation = animate(
-			window,
-			{
-				scrollY: offsetTop + -1 * scrollMargin,
-			},
-			{
-				duration: 0.4,
-				ease: 'easeOut',
-			}
-		)
+		this._lastAnimation = animate(window.scrollY, scrollToPosition, {
+			duration: 0.4,
+			ease: 'easeOut',
+			onUpdate: (latest: number) => window.scrollTo(0, latest),
+		})
 	}
 	listAnchorPositions(startY: number, endY: number, sortDirection = 1): [number, Element][] {
 		let foundPositions: [number, Element][] = []

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

@@ -3178,6 +3178,26 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 														showStyleVariant={showStyleVariant}
 													/>
 												</ErrorBoundary>
+												<ErrorBoundary>
+													<Shelf
+														buckets={this.props.buckets}
+														isExpanded={
+															this.state.isInspectorShelfExpanded ||
+															(!this.state.wasShelfResizedByUser && this.state.shelfLayout?.openByDefault)
+														}
+														onChangeExpanded={this.onShelfChangeExpanded}
+														hotkeys={this.defaultHotkeys(t)}
+														playlist={this.props.playlist}
+														showStyleBase={this.props.showStyleBase}
+														showStyleVariant={this.props.showStyleVariant}
+														studioMode={this.props.userPermissions.studio}
+														onChangeBottomMargin={this.onChangeBottomMargin}
+														rundownLayout={this.state.shelfLayout}
+														shelfDisplayOptions={this.props.shelfDisplayOptions}
+														bucketDisplayFilter={this.props.bucketDisplayFilter}
+														studio={this.props.studio}
+													/>
+												</ErrorBoundary>
 												<ErrorBoundary>
 													{this.props.userPermissions.studio && !Settings.disableBlurBorder && (
 														<KeyboardFocusIndicator userPermissions={this.props.userPermissions}>
@@ -3314,26 +3334,6 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 												<ErrorBoundary>
 													<PointerLockCursor />
 												</ErrorBoundary>
-												<ErrorBoundary>
-													<Shelf
-														buckets={this.props.buckets}
-														isExpanded={
-															this.state.isInspectorShelfExpanded ||
-															(!this.state.wasShelfResizedByUser && this.state.shelfLayout?.openByDefault)
-														}
-														onChangeExpanded={this.onShelfChangeExpanded}
-														hotkeys={this.defaultHotkeys(t)}
-														playlist={this.props.playlist}
-														showStyleBase={this.props.showStyleBase}
-														showStyleVariant={this.props.showStyleVariant}
-														studioMode={this.props.userPermissions.studio}
-														onChangeBottomMargin={this.onChangeBottomMargin}
-														rundownLayout={this.state.shelfLayout}
-														shelfDisplayOptions={this.props.shelfDisplayOptions}
-														bucketDisplayFilter={this.props.bucketDisplayFilter}
-														studio={this.props.studio}
-													/>
-												</ErrorBoundary>
 												<ErrorBoundary>
 													{this.props.playlist && this.props.studio && this.props.showStyleBase && (
 														<RundownNotifier playlistId={this.props.playlist._id} studio={this.props.studio} />