chore: fix some z-order issues

Author: jstarpl

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/RundownView.tsx

@@ -3156,6 +3156,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}>
@@ -3292,26 +3312,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} />