@designcrowd/library.brand-page 6.2.16 → 6.2.17-header-logo-2

package/src/brand-page-maker/utils/apply-color-strategy.test.ts

@@ -14,6 +14,7 @@ import {
   STYLE_FIELDS_OUTSIDE_CONFIG,
 } from '@shared/color-strategies/color-strategies';
 import { pageStrategyAnchors } from '@shared/color-strategies/page-anchors';
+import { RTE_ITEM_FIELD_PAIRS } from '@shared/color-strategies/rte-field-pairs';
 import type { ColorStrategy } from '@shared/color-strategies/models';
 
 const backgroundConvertor = {
@@ -1830,12 +1831,102 @@ describe('every colour field is bound or deliberately unbound (BP-5886)', () =>
     // `successMessageStyle` is a content-model field with no settings-config
     // entry. The applier reaches it only through `STYLE_FIELDS_OUTSIDE_CONFIG`
     // (payment and shop); the contact form's stays unwritten. This pins that the
-    // phantom set never grows silently.
+    // phantom set never grows silently. Item-level styles (each FAQ item's
+    // `questionStyle`) are declared by RTE_ITEM_FIELD_PAIRS, not by a config field.
+    const itemStyleFields = new Set(
+      Object.values(RTE_ITEM_FIELD_PAIRS).flatMap((pairs) =>
+        pairs.map((pair) => pair.styleField),
+      ),
+    );
     const phantoms = [
       ...Object.keys(FIELD_SLOT_MAP),
       ...Object.values(SECTION_RAISED_LAYER).flatMap((layer) => layer.content),
-    ].filter((name) => !configColourFields.has(name));
+    ].filter(
+      (name) => !configColourFields.has(name) && !itemStyleFields.has(name),
+    );
 
     expect(new Set(phantoms)).toEqual(new Set(['successMessageStyle']));
   });
 });
+
+describe('buildColorStrategyValues — FAQ section', () => {
+  const doc = (text: string) => ({
+    type: 'doc',
+    content: [
+      {
+        type: 'paragraph',
+        content: [
+          {
+            type: 'text',
+            text,
+            marks: [{ type: 'textStyle', attrs: { color: '#123456' } }],
+          },
+        ],
+      },
+    ],
+  });
+
+  const faq = () => ({
+    type: 'faq-section',
+    displayStyle: 'faq-centered',
+    backgroundStyle: {},
+    titleStyle: {},
+    descriptionStyle: {},
+    questionStyle: { textStyleType: 'heading5', backgroundColor: '#fff' },
+    answerStyle: { textStyleType: 'paragraph2' },
+    items: [
+      { id: 'q1', question: doc('Q1'), answer: 'Plain answer' },
+      { id: 'q2', question: 'Plain question', answer: doc('A2') },
+    ],
+  });
+
+  it('repaints the shared question and answer styles and every rich-text document', () => {
+    const config = CONTENT_SETTINGS_CONFIGS()['faq-section'];
+    const content = faq();
+    const values: Record<string, any> = buildColorStrategyValues(
+      config,
+      content,
+      'duotone',
+    );
+    const [q1, q2] = values.items;
+    const questionRef = values.questionStyle.color;
+
+    expect(values.backgroundStyle).toBeDefined();
+    expect(questionRef).toMatch(/^var\(--palette-\d\)$/);
+    expect(values.answerStyle.color).toMatch(/^var\(--palette-\d\)$/);
+    // Text on the band never takes the band's own role.
+    expect(questionRef).not.toBe(values.backgroundStyle?.backgroundColor);
+    // The strategy owns the text treatment: background cleared, typography kept.
+    expect('backgroundColor' in values.questionStyle).toBe(false);
+    expect(values.questionStyle.textStyleType).toBe('heading5');
+    // RTE documents take the colour in their marks; plain text is left as text.
+    expect(JSON.stringify(q1.question)).toContain(questionRef);
+    expect(JSON.stringify(q1.question)).not.toContain('#123456');
+    expect(q1.answer).toBe('Plain answer');
+    expect(JSON.stringify(q2.answer)).toContain(values.answerStyle.color);
+    // A new list — never the stored one mutated.
+    expect(values.items).not.toBe(content.items);
+    expect(content.questionStyle.backgroundColor).toBe('#fff');
+  });
+
+  it('asks the live editors to re-seed when an item document was replaced', () => {
+    const updateItemValue = vi.fn();
+    const markRteResync = vi.fn();
+
+    applyColorStrategyToItem(
+      { updateItemValue },
+      {
+        id: 'faq-1',
+        config: CONTENT_SETTINGS_CONFIGS()['faq-section'],
+        content: faq(),
+        strategyId: 'duotone',
+        markRteResync,
+      },
+    );
+
+    expect(updateItemValue).toHaveBeenCalledWith(
+      expect.objectContaining({ name: 'items' }),
+    );
+    expect(markRteResync).toHaveBeenCalledTimes(1);
+  });
+});

package/src/brand-page-maker/utils/apply-color-strategy.ts

@@ -11,12 +11,16 @@ import {
   type DisableTransparent,
 } from '@shared/content-settings/disable-transparent.util';
 import { setRteTextColor } from '@shared/color-strategies/rte-color';
+import { isTiptapDocument } from '@shared/rte-shape.util';
 import type {
   ColorStrategyId,
   SectionLayers,
   StrategyAnchors,
 } from '@shared/color-strategies/models';
-import { pairedRteTextField } from '@shared/color-strategies/rte-field-pairs';
+import {
+  pairedRteTextField,
+  RTE_ITEM_FIELD_PAIRS,
+} from '@shared/color-strategies/rte-field-pairs';
 import { isCanonicalTextStyleType } from '@brand-page/models/styles.model';
 
 // A section colour field, narrowed to what the macro reads. Config is declared `<any>`,
@@ -147,6 +151,23 @@ const sectionLayers = (
   };
 };
 
+/**
+ * The strategy's text treatment for one text-style field: `color` set, text background
+ * cleared (matching the highlight strip in `setRteTextColor` — the toolbar writes both).
+ * The key is deleted rather than set undefined so `'backgroundColor' in style` checks
+ * downstream stay honest.
+ */
+const withStrategyTextStyle = (
+  current: Record<string, unknown> | undefined,
+  ref: string,
+): Record<string, unknown> => {
+  const nextStyle: Record<string, unknown> = { ...(current ?? {}), color: ref };
+
+  delete nextStyle.backgroundColor;
+
+  return nextStyle;
+};
+
 /**
  * Build the per-field colour writes a strategy stamps onto a section. Pure — reads the
  * section config + current content and returns a `{ fieldName: value }` partial. Each
@@ -201,18 +222,7 @@ export const buildColorStrategyValues = (
         | Record<string, unknown>
         | undefined;
 
-      const nextStyle: Record<string, unknown> = {
-        ...(current ?? {}),
-        color: ref,
-      };
-
-      // A strategy owns the text treatment, so it clears the text background colour
-      // too — matching the highlight strip in `setRteTextColor` (the toolbar writes
-      // both). Delete the key rather than set it undefined so `'backgroundColor' in
-      // style` checks downstream stay honest.
-      delete nextStyle.backgroundColor;
-
-      values[name] = nextStyle;
+      values[name] = withStrategyTextStyle(current, ref);
 
       // Also stamp the colour into the paired RTE document, if this field drives one.
       // `setRteTextColor` returns undefined for a plain string or legacy HTML RTE, so
@@ -251,6 +261,40 @@ export const buildColorStrategyValues = (
     values[name] = field.valueConvertor.convertBack(ref);
   });
 
+  // Item-level RTE fields (each FAQ question) share the section's style but carry their own
+  // document, and neither is a settings field, so the loop above never sees them.
+  const itemPairs =
+    typeof contentRecord.type === 'string'
+      ? (RTE_ITEM_FIELD_PAIRS[contentRecord.type] ?? [])
+      : [];
+
+  itemPairs.forEach((pair) => {
+    const ref = strategyRoleRefForField(
+      strategyId,
+      pair.styleField,
+      content,
+      context,
+      layers,
+      anchors,
+    );
+    const items = (values[pair.itemsField] ??
+      contentRecord[pair.itemsField]) as Record<string, unknown>[] | undefined;
+
+    if (!ref || !Array.isArray(items)) {
+      return;
+    }
+
+    values[pair.styleField] = withStrategyTextStyle(
+      contentRecord[pair.styleField] as Record<string, unknown> | undefined,
+      ref,
+    );
+    values[pair.itemsField] = items.map((item) => {
+      const nextDoc = setRteTextColor(item[pair.textField], ref);
+
+      return nextDoc ? { ...item, [pair.textField]: nextDoc } : item;
+    });
+  });
+
   return values;
 };
 
@@ -306,14 +350,20 @@ export const applyColorStrategyToItem = (
     store.updateItemValue({ id, name, value });
   });
 
-  // A recoloured RTE field is emitted as a whole Tiptap document; the paired
-  // style-object writes are plain objects. Only the former needs the live editor
-  // to re-seed, so signal it just when a doc was among the writes.
+  // A recoloured RTE field is emitted as a whole Tiptap document (at the top level,
+  // or inside a rewritten item list); the paired style-object writes are plain
+  // objects. Only the former needs the live editor to re-seed, so signal it just
+  // when a doc was among the writes.
   const replacedRteDoc = Object.values(values).some(
     (value) =>
-      typeof value === 'object' &&
-      value !== null &&
-      (value as { type?: unknown }).type === 'doc',
+      isTiptapDocument(value) ||
+      (Array.isArray(value) &&
+        value.some(
+          (item) =>
+            typeof item === 'object' &&
+            item !== null &&
+            Object.values(item).some(isTiptapDocument),
+        )),
   );
 
   if (replacedRteDoc) {

package/src/brand-page-maker/utils/rte-authoring.util.test.ts

@@ -242,3 +242,33 @@ describe('authorContentRteFields — enriching a factory-authored doc', () => {
     expect(fields.titleStyle.color).toBe('var(--palette-0)');
   });
 });
+
+describe('list items (FAQ) are authored from the shared section style', () => {
+  it('every item gets the shared colour in its marks, and the shared style keeps it', () => {
+    const content = asContent({
+      type: 'faq-section',
+      title: 'T',
+      titleStyle: { textStyleType: 'heading4' },
+      questionStyle: { textStyleType: 'heading5', color: 'var(--palette-1)' },
+      answerStyle: { textStyleType: 'paragraph2', textAlign: 'left' },
+      items: [
+        { id: 'q1', question: 'Q1?', answer: rteDoc('A1.') },
+        { id: 'q2', question: 'Q2?', answer: rteDoc('A2.') },
+      ],
+    });
+
+    authorContentRteFields(content);
+
+    const { items, questionStyle } = content as unknown as {
+      items: Record<string, any>[];
+      questionStyle: { color?: string };
+    };
+
+    expect(items.map((item) => firstRunMarkColor(item.question))).toEqual([
+      'var(--palette-1)',
+      'var(--palette-1)',
+    ]);
+    expect(questionStyle.color).toBe('var(--palette-1)');
+    expect(items[1].answer.content[0].attrs.textAlign).toBe('left');
+  });
+});

package/src/brand-page-maker/utils/rte-authoring.util.ts

@@ -1,6 +1,7 @@
 import type { JSONContent } from '@tiptap/vue-3';
 import type { Content, TextStyleOptions, TextStyleType } from '@brand-page';
 import {
+  forEachRteItemField,
   rteStyleFieldsFor,
   pairedRteTextField,
 } from '@shared/color-strategies/rte-field-pairs';
@@ -157,6 +158,19 @@ export const authorContentRteFields = (
     if (doc) fields[textField] = doc;
   }
 
+  // List items (each FAQ question and answer) share the section's style. Each is authored from a
+  // copy, as authoring moves the colour off the style it is given.
+  forEachRteItemField(content.type, content, (item, pair) => {
+    const style = fields[pair.styleField] as AuthoredStyle;
+    const doc = authorRteDoc(
+      item[pair.textField],
+      { ...style },
+      roleStyleFor(textStyleOptions, style?.textStyleType),
+    );
+
+    if (doc) item[pair.textField] = doc;
+  });
+
   const textItems = fields.textItems as
     | { text?: unknown; textStyle?: AuthoredStyle }[]
     | undefined;

package/src/brand-page-maker/validators/field.validator.ts

@@ -161,6 +161,7 @@ export const validatorDict: Record<ItemFieldType, Validator> = {
   'color-replacements': dummyValidator,
   'testimonial-items': dummyValidator,
   'text-items': dummyValidator,
+  'faq-items': dummyValidator,
   'page-dropdown': dummyValidator,
   shape: dummyValidator,
   'logo-selection': dummyValidator,
@@ -204,6 +205,7 @@ export const adminValidatorsDict: Record<ItemFieldType, Validator> = {
   'color-replacements': dummyValidator,
   'testimonial-items': dummyValidator,
   'text-items': dummyValidator,
+  'faq-items': dummyValidator,
   'page-dropdown': dummyValidator,
   shape: dummyValidator,
   'logo-selection': dummyValidator,

package/src/bundles/bundled-translations.de-DE.json

@@ -1650,7 +1650,15 @@
     "enterTextHerePlaceholder": "Text hier eingeben ...",
     "bookNowLabel": "Jetzt buchen",
     "shippingLabel": "Lieferadresse aktivieren",
-    "shippingPlaceholder": "Fordern Sie Kunden auf, während des Bezahlvorgangs eine Lieferadresse einzugeben."
+    "shippingPlaceholder": "Fordern Sie Kunden auf, während des Bezahlvorgangs eine Lieferadresse einzugeben.",
+    "faqSectionDisplayName": "FAQ",
+    "faqItemsDisplayName": "Artikel",
+    "defaultFaqTitle": "Häufig gestellte Fragen",
+    "defaultFaqDescription": "Finden Sie Antworten auf häufig gestellte Fragen zu unseren Produkten, Dienstleistungen oder unserem Unternehmen",
+    "defaultFaqQuestion": "Welche Dienstleistungen bieten Sie an?",
+    "defaultFaqAnswer": "Wir bieten eine Reihe von Produkten und Dienstleistungen, die auf Ihre Bedürfnisse zugeschnitten sind. Kontaktieren Sie uns, um mehr darüber zu erfahren, wie wir Ihnen helfen können.",
+    "faqQuestionTitle": "Frage",
+    "faqAnswerTitle": "Antwort"
   },
   "formFields": {
     "field": "Feld",
@@ -1878,7 +1886,6 @@
     "duplicatePageTitle": "{{title}} Kopieren"
   },
   "pageSettingsSection": {
-    "showNavigationBelow": "Navigation unter dem Logo anzeigen",
     "previewDescription": "Eine Vorschau ist für diese Bildschirmgröße nicht verfügbar.",
     "navigationStyle": "Navigationsstil",
     "navigationType": "Navigationstyp",

package/src/bundles/bundled-translations.es-ES.json

@@ -1650,7 +1650,15 @@
     "enterTextHerePlaceholder": "Introduce el texto aquí...",
     "bookNowLabel": "Reserva ahora",
     "shippingLabel": "Habilitar dirección de envío",
-    "shippingPlaceholder": "Exigir a los clientes que introduzcan una dirección de envío al finalizar la compra."
+    "shippingPlaceholder": "Exigir a los clientes que introduzcan una dirección de envío al finalizar la compra.",
+    "faqSectionDisplayName": "Preguntas frecuentes",
+    "faqItemsDisplayName": "Artículos",
+    "defaultFaqTitle": "Preguntas frecuentes",
+    "defaultFaqDescription": "Encuentra respuestas a preguntas comunes sobre nuestros productos, servicios o negocio",
+    "defaultFaqQuestion": "¿Qué servicios ofreces?",
+    "defaultFaqAnswer": "Ofrecemos una variedad de productos y servicios adaptados a tus necesidades. Ponte en contacto con nosotros para obtener más información sobre cómo podemos ayudarte.",
+    "faqQuestionTitle": "Pregunta",
+    "faqAnswerTitle": "Respuesta"
   },
   "formFields": {
     "field": "Campo",
@@ -1878,7 +1886,6 @@
     "duplicatePageTitle": "{{title}} copia"
   },
   "pageSettingsSection": {
-    "showNavigationBelow": "Muestra la navegación debajo del logo",
     "previewDescription": "La vista previa no está disponible en este tamaño de pantalla.",
     "navigationStyle": "Estilo de navegación",
     "navigationType": "Tipo de navegación",

package/src/bundles/bundled-translations.fr-CA.json

@@ -1650,7 +1650,15 @@
     "enterTextHerePlaceholder": "Saisir le texte ici...",
     "bookNowLabel": "Prendre RDV",
     "shippingLabel": "Activer l'adresse de livraison",
-    "shippingPlaceholder": "Exigez des clients qu'ils saisissent une adresse de livraison lors de la validation de leur commande."
+    "shippingPlaceholder": "Exigez des clients qu'ils saisissent une adresse de livraison lors de la validation de leur commande.",
+    "faqSectionDisplayName": "FAQ",
+    "faqItemsDisplayName": "Articles",
+    "defaultFaqTitle": "Questions fréquemment posées",
+    "defaultFaqDescription": "Trouvez des réponses aux questions fréquentes sur nos produits, nos services ou notre entreprise",
+    "defaultFaqQuestion": "Quels services offrez-vous?",
+    "defaultFaqAnswer": "Nous offrons une gamme de produits et services adaptés à vos besoins. Contactez-nous pour en savoir plus sur la façon dont nous pouvons vous aider.",
+    "faqQuestionTitle": "Question",
+    "faqAnswerTitle": "Réponse"
   },
   "formFields": {
     "field": "Champ",
@@ -1878,7 +1886,6 @@
     "duplicatePageTitle": "{{title}} Copie"
   },
   "pageSettingsSection": {
-    "showNavigationBelow": "Afficher la navigation sous le logo",
     "previewDescription": "L'aperçu n'est pas disponible pour cette taille d'écran.",
     "navigationStyle": "Style de navigation",
     "navigationType": "Type de navigation",

package/src/bundles/bundled-translations.fr-FR.json

@@ -1650,7 +1650,15 @@
     "enterTextHerePlaceholder": "Saisir le texte ici...",
     "bookNowLabel": "Prendre RDV",
     "shippingLabel": "Activer l'adresse de livraison",
-    "shippingPlaceholder": "Exigez des clients qu'ils saisissent une adresse de livraison lors de la validation de leur commande."
+    "shippingPlaceholder": "Exigez des clients qu'ils saisissent une adresse de livraison lors de la validation de leur commande.",
+    "faqSectionDisplayName": "FAQ",
+    "faqItemsDisplayName": "Articles",
+    "defaultFaqTitle": "Questions fréquemment posées",
+    "defaultFaqDescription": "Trouvez des réponses aux questions fréquentes sur nos produits, nos services, ou notre entreprise",
+    "defaultFaqQuestion": "Quels services proposez-vous ?",
+    "defaultFaqAnswer": "Nous proposons une gamme de produits et services adaptés à vos besoins. Contactez-nous pour en savoir plus sur la façon dont nous pouvons vous aider.",
+    "faqQuestionTitle": "Question",
+    "faqAnswerTitle": "Réponse"
   },
   "formFields": {
     "field": "Champ",
@@ -1878,7 +1886,6 @@
     "duplicatePageTitle": "Copie de {{title}}"
   },
   "pageSettingsSection": {
-    "showNavigationBelow": "Afficher la navigation sous le logo",
     "previewDescription": "L'aperçu n'est pas disponible pour cette taille d'écran.",
     "navigationStyle": "Style de navigation",
     "navigationType": "Type de navigation",

package/src/bundles/bundled-translations.json

@@ -1650,7 +1650,15 @@
     "enterTextHerePlaceholder": "Enter text here...",
     "bookNowLabel": "Book Now",
     "shippingLabel": "Enable Shipping Address",
-    "shippingPlaceholder": "Require customers to enter a shipping address during checkout."
+    "shippingPlaceholder": "Require customers to enter a shipping address during checkout.",
+    "faqSectionDisplayName": "FAQ",
+    "faqItemsDisplayName": "Items",
+    "defaultFaqTitle": "Frequently Asked Questions",
+    "defaultFaqDescription": "Find answers to common questions about our products, services, or business",
+    "defaultFaqQuestion": "What services do you offer?",
+    "defaultFaqAnswer": "We provide a range of products and services tailored to meet your needs. Contact us to learn more about how we can help.",
+    "faqQuestionTitle": "Question",
+    "faqAnswerTitle": "Answer"
   },
   "formFields": {
     "field": "Field",
@@ -1859,6 +1867,7 @@
     "navigationSectionTitle": "Navigation",
     "headerSectionTitle": "Header",
     "backgroundOpacity": "Background opacity",
+    "logoBackgroundColor": "Logo background color",
     "buttonSectionTitle": "Button",
     "footerSettings": "Footer Settings",
     "managePages": "Manage Pages",
@@ -1878,7 +1887,6 @@
     "duplicatePageTitle": "{{title}} Copy"
   },
   "pageSettingsSection": {
-    "showNavigationBelow": "Show navigation below logo",
     "previewDescription": "Preview is not available on this screen size.",
     "navigationStyle": "Navigation style",
     "navigationType": "Navigation type",

package/src/bundles/bundled-translations.pt-BR.json

@@ -1650,7 +1650,15 @@
     "enterTextHerePlaceholder": "Insira o texto aqui...",
     "bookNowLabel": "Reserve agora",
     "shippingLabel": "Ativar endereço para envio",
-    "shippingPlaceholder": "Exija que os clientes informem um endereço para envio na finalização da compra."
+    "shippingPlaceholder": "Exija que os clientes informem um endereço para envio na finalização da compra.",
+    "faqSectionDisplayName": "Perguntas frequentes",
+    "faqItemsDisplayName": "Itens",
+    "defaultFaqTitle": "Perguntas frequentes",
+    "defaultFaqDescription": "Encontre respostas para perguntas comuns sobre nossos produtos, serviços ou empresa",
+    "defaultFaqQuestion": "Quais serviços você oferece?",
+    "defaultFaqAnswer": "Oferecemos uma variedade de produtos e serviços personalizados para atender às suas necessidades. Entre em contato conosco para saber mais sobre como podemos ajudar.",
+    "faqQuestionTitle": "Pergunta",
+    "faqAnswerTitle": "Resposta"
   },
   "formFields": {
     "field": "Campo",
@@ -1878,7 +1886,6 @@
     "duplicatePageTitle": "{{title}} Copiar"
   },
   "pageSettingsSection": {
-    "showNavigationBelow": "Mostrar navegação abaixo do logotipo",
     "previewDescription": "A visualização não está disponível neste tamanho de tela.",
     "navigationStyle": "Estilo de navegação",
     "navigationType": "Tipo de navegação",

package/src/bundles/bundled-translations.pt-PT.json

@@ -1650,7 +1650,15 @@
     "enterTextHerePlaceholder": "Introduza o texto aqui...",
     "bookNowLabel": "Reservar já",
     "shippingLabel": "Ativar morada de envio",
-    "shippingPlaceholder": "Exija que os clientes introduzam uma morada de envio durante o processo de finalização da compra."
+    "shippingPlaceholder": "Exija que os clientes introduzam uma morada de envio durante o processo de finalização da compra.",
+    "faqSectionDisplayName": "Perguntas frequentes",
+    "faqItemsDisplayName": "Itens",
+    "defaultFaqTitle": "Perguntas frequentes",
+    "defaultFaqDescription": "Encontre respostas a perguntas frequentes sobre os nossos produtos, serviços ou empresa",
+    "defaultFaqQuestion": "Que serviços oferece?",
+    "defaultFaqAnswer": "Disponibilizamos uma variedade de produtos e serviços adaptados para satisfazer as suas necessidades. Contacte-nos para saber mais sobre como podemos ajudar.",
+    "faqQuestionTitle": "Pergunta",
+    "faqAnswerTitle": "Resposta"
   },
   "formFields": {
     "field": "Campo",
@@ -1878,7 +1886,6 @@
     "duplicatePageTitle": "{{title}} Cópia"
   },
   "pageSettingsSection": {
-    "showNavigationBelow": "Mostrar a navegação por baixo do logótipo",
     "previewDescription": "A pré-visualização não está disponível neste tamanho de ecrã.",
     "navigationStyle": "Estilo de navegação",
     "navigationType": "Tipo de navegação",

package/src/lib.ts

@@ -22,6 +22,7 @@ export {
   isUrlType,
   HEADER_DISPLAY,
   NAVIGATION_DISPLAY,
+  STACKED_LOGO_LAYOUTS,
   STYLE_THEME_KEYS,
   RECAPTCHA_ACTION_MAILING_LIST,
   RECAPTCHA_ACTION_CONTACT_FORM,

package/src/metadata-builder/builders/header-builder.test.ts

@@ -3,7 +3,7 @@ import type {
   BrandPageModel,
   TextStyleDeclaration,
 } from '../../brand-page/models';
-import { TextStyles } from '../../brand-page/models';
+import { BRAND_PAGE_TYPES, TextStyles } from '../../brand-page/models';
 import type { TextStyleOptions } from '../../brand-page/models/styles.model';
 import {
   resolveTextStyle,
@@ -12,6 +12,7 @@ import {
 import type { UpdateHeaderArguments } from '../parsers/ai-toolcall-parser';
 import { BUILDER_TYPES } from '../models';
 import { HeaderBuilder } from './header-builder';
+import { HEADER_DISPLAY, NAVIGATION_DISPLAY } from '../../brand-page/constants';
 
 /**
  * BP-5420: changing the nav menu font had no effect when the nav button style was bound to a
@@ -221,3 +222,56 @@ describe('HeaderBuilder — nav menu font reaches the hamburger overlay (BP-6079
     ).toBeUndefined();
   });
 });
+
+describe("HeaderBuilder — a BP/BC hamburger can't show the header logo", () => {
+  const runFor = (
+    brandPageType: string,
+    args: UpdateHeaderArguments,
+  ): Promise<{ model: BrandPageModel; errors?: string[] }> =>
+    new HeaderBuilder({
+      id: 'h1',
+      type: BUILDER_TYPES.UPDATE_HEADER,
+      payload: args,
+    }).buildAsync({ brandPageType } as unknown as BrandPageModel);
+
+  it('rejects a with-logo hamburger display_style for BP', async () => {
+    const { errors } = await runFor(BRAND_PAGE_TYPES.default, {
+      desktop: { display_style: HEADER_DISPLAY.DESKTOP_HAMBURGER_1 },
+    });
+
+    expect(errors).toHaveLength(1);
+    expect(errors![0]).toContain('desktop.display_style');
+  });
+
+  it('rejects is_logo_visible:true alongside a hamburger nav_display_type for BC', async () => {
+    const { errors } = await runFor(BRAND_PAGE_TYPES.brandContact, {
+      mobile: {
+        nav_display_type: NAVIGATION_DISPLAY.HAMBURGER_1,
+        is_logo_visible: true,
+      },
+    });
+
+    expect(errors).toHaveLength(1);
+    expect(errors![0]).toContain('mobile.is_logo_visible');
+  });
+
+  it('allows a no-logo hamburger layout for BP', async () => {
+    const { errors } = await runFor(BRAND_PAGE_TYPES.default, {
+      desktop: { display_style: HEADER_DISPLAY.DESKTOP_HAMBURGER_NO_LOGO_1 },
+    });
+
+    expect(errors ?? []).toEqual([]);
+  });
+
+  it('allows the same with-logo hamburger layout for brand site', async () => {
+    const { errors } = await runFor(BRAND_PAGE_TYPES.brandSite, {
+      desktop: { display_style: HEADER_DISPLAY.DESKTOP_HAMBURGER_1 },
+      mobile: {
+        nav_display_type: NAVIGATION_DISPLAY.HAMBURGER_1,
+        is_logo_visible: true,
+      },
+    });
+
+    expect(errors ?? []).toEqual([]);
+  });
+});

package/src/metadata-builder/builders/header-builder.ts

@@ -1,5 +1,6 @@
 import {
   type BrandPageModel,
+  type BrandPageType,
   type AbstractPageHeaderStyles,
 } from '../../brand-page/models';
 import {
@@ -217,6 +218,8 @@ const applyNavRouteChanges = (
 };
 
 export class HeaderBuilder extends BaseMetadataBuilder<UpdateHeaderArguments> {
+  private brandPageType: BrandPageType | undefined;
+
   constructor(
     request: MetadataBuilderRequest<UpdateHeaderArguments>,
     logger?: Logger,
@@ -229,7 +232,7 @@ export class HeaderBuilder extends BaseMetadataBuilder<UpdateHeaderArguments> {
 
     try {
       const errors = HEADER_CHECKS.flatMap((check) => {
-        const err = check(args);
+        const err = check(args, this.brandPageType);
 
         return err ? [err] : [];
       });
@@ -248,6 +251,8 @@ export class HeaderBuilder extends BaseMetadataBuilder<UpdateHeaderArguments> {
   async buildAsync(model: BrandPageModel): Promise<BuilderResult> {
     this.log('Build called');
 
+    this.brandPageType = model.brandPageType;
+
     const validation = await this.validateAsync();
 
     if (validation.errors.length) {