@designcrowd/library.brand-page 5.19.1-error-html2canvas-2 → 5.19.1-error-html2canvas-3

package/lib/src/metadata-builder/builders/footer-builder.js

@@ -1,7 +1,7 @@
 import {} from '../../brand-page/models';
 import { BaseMetadataBuilder, } from '../models';
 import { FOOTER_CHECKS } from './section-rules/footer.rules';
-import { applyDetachedStyleOverride } from './section-field-utils';
+import { applyDetachedStyleOverride, normalizeStyleValue, } from './section-field-utils';
 const normaliseSocialUrl = (url) => {
     for (const prefix of ['mailto:', 'tel:']) {
         if (url.startsWith(prefix))
@@ -89,8 +89,21 @@ const computeSocialLinks = (current, args) => {
 const applyGlobalFooterChanges = (footer, args, textStyleOptions) => {
     if (args.copyright_text !== undefined)
         footer.copyrightText = args.copyright_text;
-    if (args.copyright_text_font_family !== undefined)
-        footer.copyrightStyle = applyDetachedStyleOverride(footer.copyrightStyle, { fontFamily: args.copyright_text_font_family }, textStyleOptions);
+    // copyright_text_style is the same text-style object sections use (typography
+    // + colour). Normalise each value the way section styles are normalised
+    // (letterSpacing int→em, lineHeight snap, null→''), then detach from the
+    // global preset via the override helper so a single call resolves the preset
+    // and clears textStyleType once — see resolveGlobalPresetIntoStyle (BP-5420).
+    if (args.copyright_text_style) {
+        const updates = {};
+        for (const [key, value] of Object.entries(args.copyright_text_style)) {
+            const normalized = normalizeStyleValue(key, value);
+            if (normalized !== undefined)
+                updates[key] = normalized;
+        }
+        if (Object.keys(updates).length > 0)
+            footer.copyrightStyle = applyDetachedStyleOverride(footer.copyrightStyle, updates, textStyleOptions);
+    }
 };
 const applyViewportFooterChanges = (footer, overrides) => {
     if (overrides.display_style !== undefined)
@@ -107,11 +120,6 @@ const applyViewportFooterChanges = (footer, overrides) => {
             color: overrides.icon_color,
             fill: overrides.icon_color,
         };
-    if (overrides.copyright_text_color !== undefined)
-        footer.copyrightStyle = {
-            ...footer.copyrightStyle,
-            color: overrides.copyright_text_color,
-        };
     if (overrides.is_logo_visible !== undefined)
         footer.isLogoVisible = overrides.is_logo_visible;
     if (overrides.logo_image_height !== undefined)

package/lib/src/metadata-builder/builders/section-field-utils.d.ts

@@ -21,6 +21,13 @@ interface ButtonLinkArgs {
  */
 export declare const applyButtonLink: (content: ButtonLinkContent, args: ButtonLinkArgs) => void;
 export declare const applyScalarFields: (content: Content, args: SectionToolArguments, sectionType: string) => void;
+/**
+ * Convert AI-sent style value to the format expected by the model.
+ * - letterSpacing: unitless 0-100 → em string (e.g., 50 → '0.5em')
+ * - null → '' (explicitly clear/reset the property)
+ * - everything else passes through as-is
+ */
+export declare const normalizeStyleValue: (key: string, value: unknown) => unknown;
 /**
  * When an executor is about to mark a content-level text style "custom" by
  * clearing `textStyleType`, the resolved preset values (font, size, spacing,

package/lib/src/metadata-builder/builders/section-field-utils.js

@@ -58,7 +58,7 @@ export const applyScalarFields = (content, args, sectionType) => {
  * - null → '' (explicitly clear/reset the property)
  * - everything else passes through as-is
  */
-const normalizeStyleValue = (key, value) => {
+export const normalizeStyleValue = (key, value) => {
     if (value === null)
         return '';
     if (value === undefined)

package/lib/src/metadata-builder/parsers/ai-toolcall-parser.d.ts

@@ -1,6 +1,6 @@
 import type { AiAssistantToolCall } from '../../clients/ai-assistant-client';
 import type { FooterDisplayStyle, HeaderDisplayStyle, NavigationDisplayType } from '../../brand-page/constants';
-import type { SectionType } from './section-tool-arguments';
+import type { SectionType, TextStyleArguments } from './section-tool-arguments';
 export declare const AI_ASSISTANT_TOOL_NAMES: {
     readonly UPDATE_TEXT: "updateText";
     readonly UPDATE_STYLE: "updateStyle";
@@ -111,7 +111,6 @@ export interface FooterSocialLinkItem {
 export interface ViewportFooterOverrides {
     display_style?: FooterDisplayStyle;
     background_color?: string | null;
-    copyright_text_color?: string;
     icon_color?: string;
     is_logo_visible?: boolean;
     logo_image_height?: string;
@@ -119,7 +118,8 @@ export interface ViewportFooterOverrides {
 }
 export interface UpdateFooterArguments {
     copyright_text?: string;
-    copyright_text_font_family?: string;
+    /** Copyright line text-style object (typography + colour) — same shape as a section's *_style. Global: applies to both viewports. */
+    copyright_text_style?: TextStyleArguments;
     social_links?: FooterSocialLinkItem[];
     _replace_social_links?: boolean;
     _remove_social_link_indices?: number[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@designcrowd/library.brand-page",
   "description": "A collection of Maker/Designer applications",
-  "version": "5.19.1-error-html2canvas-2",
+  "version": "5.19.1-error-html2canvas-3",
   "author": "Design.com Eng",
   "license": "UNLICENSED",
   "type": "module",

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

@@ -57,7 +57,7 @@ describe('FooterBuilder — copyright font vs global style', () => {
     });
 
     const { model: out } = await run(
-      { copyright_text_font_family: 'Anton' },
+      { copyright_text_style: { fontFamily: 'Anton' } },
       model,
     );
 
@@ -73,6 +73,68 @@ describe('FooterBuilder — copyright font vs global style', () => {
     expect(style.color).toBe('#2d0b3f');
     expect(style.textAlign).toBe('center');
   });
+
+  it('applies copyright font size + weight via the style object, detaches, preserves the text', async () => {
+    const model = makeModel({
+      textStyleType: 'paragraphs',
+      textAlign: 'center',
+      fontWeight: 'bold',
+    });
+
+    const { model: out } = await run(
+      { copyright_text_style: { fontSize: '0.875em', fontWeight: 'normal' } },
+      model,
+    );
+
+    const desktop = out.pageFooterDesktop!;
+    const style = desktop.copyrightStyle as Record<string, unknown>;
+
+    expect(style.fontSize).toBe('0.875em');
+    expect(style.fontWeight).toBe('normal');
+    expect(style.textStyleType).toBeUndefined();
+    // preset values resolved in, not lost
+    expect(style.fontFamily).toBe('Inter');
+    expect(style.textAlign).toBe('center');
+    // style-only change must NOT touch the copyright text itself
+    expect(desktop.copyrightText).toBeUndefined();
+  });
+
+  it('applies copyright style to both viewports', async () => {
+    const model = makeModel({ textStyleType: 'paragraphs' });
+
+    const { model: out } = await run(
+      { copyright_text_style: { fontSize: '0.75em', fontWeight: 'normal' } },
+      model,
+    );
+
+    for (const vp of [out.pageFooterDesktop!, out.pageFooterMobile!]) {
+      const style = vp.copyrightStyle as Record<string, unknown>;
+
+      expect(style.fontSize).toBe('0.75em');
+      expect(style.fontWeight).toBe('normal');
+      expect(style.textStyleType).toBeUndefined();
+    }
+  });
+
+  it('applies copyright colour and normalises letterSpacing (int→em) via the style object', async () => {
+    const model = makeModel({ textStyleType: 'paragraphs' });
+
+    const { model: out } = await run(
+      { copyright_text_style: { color: '#f5f5f5', letterSpacing: 50 } },
+      model,
+    );
+
+    const style = out.pageFooterDesktop!.copyrightStyle as Record<
+      string,
+      unknown
+    >;
+
+    expect(style.color).toBe('#f5f5f5');
+    // letterSpacing int 0–100 is normalised to an em string (50 → '0.5em'),
+    // exactly as section *_style values are.
+    expect(style.letterSpacing).toBe('0.5em');
+    expect(style.textStyleType).toBeUndefined();
+  });
 });
 
 type Link = { imageUrl: string; url: string };

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

@@ -13,9 +13,15 @@ import type {
   FooterSocialLinkItem,
 } from '../parsers/ai-toolcall-parser';
 import type { Logger } from '../logger';
-import type { TextStyleOptions } from '../../brand-page/models/styles.model';
+import type {
+  TextStyleDeclaration,
+  TextStyleOptions,
+} from '../../brand-page/models/styles.model';
 import { FOOTER_CHECKS } from './section-rules/footer.rules';
-import { applyDetachedStyleOverride } from './section-field-utils';
+import {
+  applyDetachedStyleOverride,
+  normalizeStyleValue,
+} from './section-field-utils';
 
 type FooterSocialLink = NonNullable<
   AbstractPageFooterStyles['socialLinks']
@@ -144,12 +150,28 @@ const applyGlobalFooterChanges = (
   if (args.copyright_text !== undefined)
     footer.copyrightText = args.copyright_text;
 
-  if (args.copyright_text_font_family !== undefined)
-    footer.copyrightStyle = applyDetachedStyleOverride(
-      footer.copyrightStyle,
-      { fontFamily: args.copyright_text_font_family },
-      textStyleOptions,
-    );
+  // copyright_text_style is the same text-style object sections use (typography
+  // + colour). Normalise each value the way section styles are normalised
+  // (letterSpacing int→em, lineHeight snap, null→''), then detach from the
+  // global preset via the override helper so a single call resolves the preset
+  // and clears textStyleType once — see resolveGlobalPresetIntoStyle (BP-5420).
+  if (args.copyright_text_style) {
+    const updates: Partial<TextStyleDeclaration> = {};
+
+    for (const [key, value] of Object.entries(args.copyright_text_style)) {
+      const normalized = normalizeStyleValue(key, value);
+
+      if (normalized !== undefined)
+        (updates as Record<string, unknown>)[key] = normalized;
+    }
+
+    if (Object.keys(updates).length > 0)
+      footer.copyrightStyle = applyDetachedStyleOverride(
+        footer.copyrightStyle,
+        updates,
+        textStyleOptions,
+      );
+  }
 };
 
 const applyViewportFooterChanges = (
@@ -173,12 +195,6 @@ const applyViewportFooterChanges = (
       fill: overrides.icon_color,
     };
 
-  if (overrides.copyright_text_color !== undefined)
-    footer.copyrightStyle = {
-      ...footer.copyrightStyle,
-      color: overrides.copyright_text_color,
-    };
-
   if (overrides.is_logo_visible !== undefined)
     footer.isLogoVisible = overrides.is_logo_visible;
 

package/src/metadata-builder/builders/section-field-utils.ts

@@ -109,7 +109,7 @@ export const applyScalarFields = (
  * - null → '' (explicitly clear/reset the property)
  * - everything else passes through as-is
  */
-const normalizeStyleValue = (key: string, value: unknown): unknown => {
+export const normalizeStyleValue = (key: string, value: unknown): unknown => {
   if (value === null) return '';
 
   if (value === undefined) return undefined;

package/src/metadata-builder/parsers/ai-toolcall-parser.ts

@@ -4,7 +4,7 @@ import type {
   HeaderDisplayStyle,
   NavigationDisplayType,
 } from '../../brand-page/constants';
-import type { SectionType } from './section-tool-arguments';
+import type { SectionType, TextStyleArguments } from './section-tool-arguments';
 
 // Tool names — must match the function names generated by the AI pipeline.
 // Text element tools use camelCase names.
@@ -215,7 +215,6 @@ export interface FooterSocialLinkItem {
 export interface ViewportFooterOverrides {
   display_style?: FooterDisplayStyle;
   background_color?: string | null;
-  copyright_text_color?: string;
   icon_color?: string;
   is_logo_visible?: boolean;
   logo_image_height?: string;
@@ -224,7 +223,8 @@ export interface ViewportFooterOverrides {
 
 export interface UpdateFooterArguments {
   copyright_text?: string;
-  copyright_text_font_family?: string;
+  /** Copyright line text-style object (typography + colour) — same shape as a section's *_style. Global: applies to both viewports. */
+  copyright_text_style?: TextStyleArguments;
   social_links?: FooterSocialLinkItem[];
   _replace_social_links?: boolean;
   _remove_social_link_indices?: number[];