Merge branch 'feat/add-sourcelayer-studio-screen' into feat/R51-live-…

…status-gateway-on-R50

meteor/client/ui/PieceIcons/PieceCountdown.tsx

@@ -24,6 +24,7 @@ export interface IPropsHeader {
 
 const supportedLayers = new Set([
 	SourceLayerType.GRAPHICS,
+	SourceLayerType.STUDIO_SCREEN,
 	SourceLayerType.LIVE_SPEAK,
 	SourceLayerType.REMOTE,
 	SourceLayerType.SPLITS,

meteor/client/ui/SegmentContainer/PieceMultistepChevron.tsx

@@ -12,7 +12,9 @@ export const PieceMultistepChevron = function PieceMultistepChevron({
 	const noraContent = piece.instance.piece.content as NoraContent | undefined
 
 	const hasStepChevron =
-		(piece.sourceLayer?.type === SourceLayerType.GRAPHICS || piece.sourceLayer?.type === SourceLayerType.LOWER_THIRD) &&
+		(piece.sourceLayer?.type === SourceLayerType.GRAPHICS ||
+			piece.sourceLayer?.type === SourceLayerType.LOWER_THIRD ||
+			piece.sourceLayer?.type === SourceLayerType.STUDIO_SCREEN) &&
 		noraContent?.payload?.step?.enabled
 
 	if (!hasStepChevron) return null

meteor/client/ui/SegmentList/PieceHoverInspector.tsx

@@ -62,6 +62,7 @@ export function PieceHoverInspector({
 			)
 		case SourceLayerType.GRAPHICS:
 		case SourceLayerType.LOWER_THIRD:
+		case SourceLayerType.STUDIO_SCREEN:
 			return (
 				<L3rdFloatingInspector
 					showMiniInspector={hovering}

meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSecondaryPiece.tsx

@@ -40,6 +40,7 @@ function renderPieceInside(
 			return ScriptRenderer({ ...props, elementOffset, hovering, typeClass })
 		case SourceLayerType.GRAPHICS:
 		case SourceLayerType.LOWER_THIRD:
+		case SourceLayerType.STUDIO_SCREEN:
 			return GraphicsRenderer({ ...props, elementOffset, hovering, typeClass })
 		case SourceLayerType.SPLITS:
 			return SplitsRenderer({ ...props, elementOffset, hovering, typeClass })

meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/ThumbnailRendererFactory.ts

@@ -40,6 +40,7 @@ export default function renderThumbnail(props: IProps): JSX.Element {
 			return SplitsThumbnailRenderer(props)
 		case SourceLayerType.GRAPHICS:
 		case SourceLayerType.LOWER_THIRD:
+		case SourceLayerType.STUDIO_SCREEN:
 			return GraphicsThumbnailRenderer(props)
 		case SourceLayerType.LOCAL:
 			return LocalThumbnailRenderer(props)

meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx

@@ -563,6 +563,7 @@ export const SourceLayerItem = withTranslation()(
 					)
 				case SourceLayerType.GRAPHICS:
 				case SourceLayerType.LOWER_THIRD:
+				case SourceLayerType.STUDIO_SCREEN:
 					return (
 						<L3rdSourceRenderer
 							key={unprotectString(this.props.piece.instance._id)}

meteor/client/ui/Settings/ShowStyle/SourceLayer.tsx

@@ -61,6 +61,8 @@ function sourceLayerString(t: TFunction<'translation', undefined>, type: SourceL
 		// 	return t('Lights')
 		case SourceLayerType.LOCAL:
 			return t('Local')
+		case SourceLayerType.STUDIO_SCREEN:
+			return t('Studio Screen')
 		default:
 			assertNever(type)
 			return SourceLayerType[type]

meteor/client/ui/Shelf/DashboardPieceButton.tsx

@@ -455,7 +455,8 @@ export class DashboardPieceButtonBase<T = {}> extends MeteorReactComponent<
 						: this.props.layer.type === SourceLayerType.SPLITS
 						? this.renderSplits(isList && this.props.showThumbnailsInList)
 						: this.props.layer.type === SourceLayerType.GRAPHICS ||
-						  this.props.layer.type === SourceLayerType.LOWER_THIRD
+						  this.props.layer.type === SourceLayerType.LOWER_THIRD ||
+						  this.props.layer.type === SourceLayerType.STUDIO_SCREEN
 						? this.renderGraphics(isButtons || (isList && this.props.showThumbnailsInList))
 						: null}
 

meteor/client/ui/Shelf/Renderers/ItemRendererFactory.ts

@@ -27,6 +27,7 @@ export default function renderItem(props: ILayerItemRendererProps): JSX.Element
 			return React.createElement(VTListItemRenderer, props)
 		case SourceLayerType.GRAPHICS:
 		case SourceLayerType.LOWER_THIRD:
+		case SourceLayerType.STUDIO_SCREEN:
 			return React.createElement(L3rdListItemRenderer, props)
 	}