fixup! Contextual consent

Author: felixgirault

site/features/contextual.html

@@ -39,7 +39,11 @@
 				purposes: [
 					{
 						id: 'youtube',
-						title: 'YouTube'
+						title: 'YouTube videos'
+					},
+					{
+						id: 'other',
+						title: 'Another purpose'
 					}
 				],
 				privacyPolicyUrl: '#'

src/ui/components/types/ContextualNotice.ts

@@ -1,14 +1,18 @@
 import {FunctionComponent} from 'preact';
 import {Purpose} from '../../types';
 
-export type ContextualNoticeOptions = Record<string, string>;
+export interface ContextualNoticeOptions extends Record<string, string> {
+	titleLevel?: '1' | '2' | '3' | '4' | '5' | '6';
+}
 
-export interface ContextualNoticeProps<Data extends ContextualNoticeOptions> {
+export interface ContextualNoticeProps<
+	Data extends ContextualNoticeOptions
+> {
 	purpose: Purpose;
 	data: Data;
 	onAccept: () => void;
 }
 
 export type ContextualNoticeComponent<
-	Data extends ContextualNoticeOptions
+	Data extends ContextualNoticeOptions = ContextualNoticeOptions
 > = FunctionComponent<ContextualNoticeProps<Data>>;

src/ui/themes/dsfr/ContextualNotice.tsx

@@ -5,18 +5,17 @@ import type {
 } from '../../components/types/ContextualNotice';
 import {template} from '../../utils/template';
 
-interface DsfrContextualNoticeData extends ContextualNoticeOptions {
-	titleLevel?: string;
-}
-
-const ContextualNotice: ContextualNoticeComponent<DsfrContextualNoticeData> = ({
+const ContextualNotice: ContextualNoticeComponent = ({
 	purpose,
 	data,
 	onAccept
 }) => {
 	const t = useTranslations();
 	const {titleLevel} = data;
-	const TitleTag = titleLevel ? `h${titleLevel}` : 'h4';
+	const TitleTag: `h${ContextualNoticeOptions['titleLevel']}` = titleLevel
+		? `h${titleLevel}`
+		: 'h4';
+
 	const templateProps = {
 		purpose: purpose.title
 	};

src/ui/themes/standard/ContextualNotice.tsx

@@ -5,18 +5,16 @@ import type {
 } from '../../components/types/ContextualNotice';
 import {template} from '../../utils/template';
 
-interface StandardContextualNoticeOptions extends ContextualNoticeOptions {
-	titleLevel?: string;
-}
-
-const ContextualNotice: ContextualNoticeComponent<StandardContextualNoticeOptions> = ({
+const ContextualNotice: ContextualNoticeComponent = ({
 	purpose,
 	data,
 	onAccept
 }) => {
 	const t = useTranslations();
 	const {titleLevel} = data;
-	const TitleTag = titleLevel ? `h${data.titleLevel}` : 'h2';
+	const TitleTag:
+		| `h${ContextualNoticeOptions['titleLevel']}`
+		| 'strong' = titleLevel ? `h${titleLevel}` : 'strong';
 	const templateProps = {
 		purpose: purpose.title
 	};