@designcrowd/library.brand-page 6.0.21 → 6.0.23-ast-remove

package/lib/src/{CreatedOnBrandCrowd-de-de-C52IyXZu.js → CreatedOnBrandCrowd-de-de-C2IaS_Mb.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CK2FPBv5.js";
+import { _ as t } from "./lib-aLiBOhnh.js";
 const i = {}, h = {
   width: "275",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-en-us-DhTy_dEV.js → CreatedOnBrandCrowd-en-us-AtykytDu.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CK2FPBv5.js";
+import { _ as t } from "./lib-aLiBOhnh.js";
 const i = {}, h = {
   width: "251",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-es-es-BJelIAQ4.js → CreatedOnBrandCrowd-es-es-CBzMnp_n.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CK2FPBv5.js";
+import { _ as t } from "./lib-aLiBOhnh.js";
 const i = {}, h = {
   width: "250",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-fr-fr-DwJohy0T.js → CreatedOnBrandCrowd-fr-ca-Cz7WzWc3.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CK2FPBv5.js";
+import { _ as t } from "./lib-aLiBOhnh.js";
 const i = {}, h = {
   width: "237",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-fr-ca-DwJohy0T.js → CreatedOnBrandCrowd-fr-fr-Cz7WzWc3.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CK2FPBv5.js";
+import { _ as t } from "./lib-aLiBOhnh.js";
 const i = {}, h = {
   width: "237",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-pt-pt-CMzKbxdG.js → CreatedOnBrandCrowd-pt-br-DE3vjPyC.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CK2FPBv5.js";
+import { _ as t } from "./lib-aLiBOhnh.js";
 const i = {}, h = {
   width: "263",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-pt-br-CMzKbxdG.js → CreatedOnBrandCrowd-pt-pt-DE3vjPyC.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CK2FPBv5.js";
+import { _ as t } from "./lib-aLiBOhnh.js";
 const i = {}, h = {
   width: "263",
   height: "36",

package/lib/src/{CreatedOnDcom-de-de-DAy1GHrw.js → CreatedOnDcom-de-de-DlcGgBF6.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CK2FPBv5.js";
+import { _ as e } from "./lib-aLiBOhnh.js";
 const M = {}, Z = {
   width: "242",
   height: "36",

package/lib/src/{CreatedOnDcom-en-us-CgBDAkJN.js → CreatedOnDcom-en-us-D5jdeN_E.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CK2FPBv5.js";
+import { _ as e } from "./lib-aLiBOhnh.js";
 const i = {}, M = {
   width: "231",
   height: "36",

package/lib/src/{CreatedOnDcom-es-es-Ds9d5rem.js → CreatedOnDcom-es-es-BBB7ZE8B.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CK2FPBv5.js";
+import { _ as e } from "./lib-aLiBOhnh.js";
 const M = {}, Z = {
   width: "230",
   height: "36",

package/lib/src/{CreatedOnDcom-fr-ca-CZL0BQ-u.js → CreatedOnDcom-fr-ca-odHmWYoP.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CK2FPBv5.js";
+import { _ as e } from "./lib-aLiBOhnh.js";
 const i = {}, l = {
   width: "216",
   height: "36",

package/lib/src/{CreatedOnDcom-fr-fr-BVYh5Wvo.js → CreatedOnDcom-fr-fr-DKr11T_P.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CK2FPBv5.js";
+import { _ as e } from "./lib-aLiBOhnh.js";
 const i = {}, l = {
   width: "216",
   height: "36",

package/lib/src/{CreatedOnDcom-pt-br-1hsWNXfq.js → CreatedOnDcom-pt-br-s8blQRF7.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as M } from "./lib-CK2FPBv5.js";
+import { _ as M } from "./lib-aLiBOhnh.js";
 const Z = {}, e = {
   width: "232",
   height: "36",

package/lib/src/{CreatedOnDcom-pt-pt-DvM0N-3M.js → CreatedOnDcom-pt-pt-Dga4RM96.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as M } from "./lib-CK2FPBv5.js";
+import { _ as M } from "./lib-aLiBOhnh.js";
 const Z = {}, e = {
   width: "232",
   height: "36",

package/lib/src/brand-page/components/collapsible/Collapsible.mixin.d.ts

@@ -25,6 +25,11 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         required: false;
         default: undefined;
     };
+    backgroundStyle: {
+        type: PropType<BrandPageCssStyle>;
+        required: false;
+        default: undefined;
+    };
     context: {
         type: PropType<BrandPageContext>;
         required: true;
@@ -61,6 +66,11 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         required: false;
         default: undefined;
     };
+    backgroundStyle: {
+        type: PropType<BrandPageCssStyle>;
+        required: false;
+        default: undefined;
+    };
     context: {
         type: PropType<BrandPageContext>;
         required: true;
@@ -68,6 +78,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }>> & Readonly<{}>, {
     titleStyle: BrandPageCssStyle;
     cardStyle: BrandPageCssStyle;
+    backgroundStyle: BrandPageCssStyle;
     buttonStyles: BrandPageCssStyle;
     canCollapse: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/lib/src/brand-page/components/collapsible/Collapsible.mixin.js

@@ -25,6 +25,11 @@ export default defineComponent({
             required: false,
             default: undefined,
         },
+        backgroundStyle: {
+            type: Object,
+            required: false,
+            default: undefined,
+        },
         context: {
             type: Object,
             required: true,
@@ -40,9 +45,16 @@ export default defineComponent({
             if (borderRadius === '9999px') {
                 containerStyle.borderRadius = '26px';
             }
-            if (this.cardStyle) {
+            // Guarded on backgroundColor so an empty {} never blanks the container
+            // (BP/BC contact-form card colour defaults to the button fill).
+            if (this.cardStyle?.backgroundColor) {
                 containerStyle.backgroundColor = this.cardStyle.backgroundColor;
             }
+            // Own background colour decouples the container from the button fill (BP-5800).
+            // Guarded on backgroundColor so an empty {} never blanks the container.
+            if (this.backgroundStyle?.backgroundColor) {
+                containerStyle.backgroundColor = this.backgroundStyle.backgroundColor;
+            }
             return containerStyle;
         },
         arrowStyle() {

package/lib/src/brand-page/components/contact-form/ContactForm.mixin.d.ts

@@ -43,6 +43,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     isSubmitting: boolean;
     submitError: string | undefined;
 }, {
+    isDecorativeSubmitStyle(): boolean;
     submitButtonStyle(): BrandPageCssStyle;
     submitButtonTextStyle(): BrandPageCssStyle;
     contentPaddingStyle(): {

package/lib/src/brand-page/components/contact-form/ContactForm.mixin.js

@@ -1,6 +1,7 @@
 import { defineComponent } from 'vue';
 import { FORM_FIELD_TYPES } from '@brand-page/models';
 import { getEmailValidationError, getMessageValidationError, getNameValidationError, getPhoneValidationError, } from '@brand-page/utils';
+import { isDecorativeButtonStyle } from '../../utils/button.util';
 import brandPageClient from '../../clients/brand-page.client';
 import { isEmail } from '../../../utils/validator.util';
 import { ALIGN_CARD_CENTER, ALIGN_CARD_CENTER_IMAGE, ALIGN_CENTERED, ALIGN_LEFT_FULL_IMAGE, ALIGN_RIGHT_FULL_IMAGE, DISPLAY_STYLE_COLLAPSED, RECAPTCHA_ACTION_CONTACT_FORM, TEXT_ONLY, } from '../../constants';
@@ -44,6 +45,12 @@ export default defineComponent({
         submitError: undefined,
     }),
     computed: {
+        // Decorative styles (brushstroke/arrow/paper) render a shape that needs width
+        // to read — at pure w-fit the arrow chevron collapses. Give the submit button a
+        // ~200px min-width so the decoration looks intentional without going full-width.
+        isDecorativeSubmitStyle() {
+            return isDecorativeButtonStyle(this.viewModel.buttonStyles?.selectedButtonStyleId);
+        },
         submitButtonStyle() {
             const buttonStyle = { ...this.viewModel.buttonStyles?.style };
             const buttonTextStyle = {
@@ -151,8 +158,8 @@ export default defineComponent({
             // differs by website type:
             // - brandSite: the card style (card + divided layouts) or the section
             //   background (other layouts).
-            // - brand.page / brand.contact: there's no section background, so the
-            //   coloured surface is the global button fill.
+            // - brand.page / brand.contact: the container is the collapsible, whose
+            //   colour is the card colour (defaulting to the global button fill).
             // Falls back to the title colour when there's no solid colour to anchor to.
             const style = this.context.isBrandSite
                 ? this.hasCard || this.isDividedContent
@@ -160,7 +167,9 @@ export default defineComponent({
                     : this.hasBgColor
                         ? this.viewModel.backgroundStyle
                         : undefined
-                : this.viewModel.buttonStyles?.style;
+                : this.viewModel.cardStyle?.backgroundColor
+                    ? this.viewModel.cardStyle
+                    : this.viewModel.buttonStyles?.style;
             return (mutedTextForBackground(backgroundColorFromStyle(style)) ??
                 this.viewModel.titleStyle?.color);
         },

package/lib/src/brand-page/components/mailing-list/MailingList.mixin.js

@@ -94,6 +94,11 @@ export default defineComponent({
             if (borderRadius === '9999px') {
                 buttonStyle.borderRadius = '24px';
             }
+            // Own background colour decouples the container from the button fill (BP-5800).
+            if (this.viewModel.backgroundStyle?.backgroundColor) {
+                buttonStyle.backgroundColor =
+                    this.viewModel.backgroundStyle.backgroundColor;
+            }
             return buttonStyle;
         },
         isFormDisabled() {

package/lib/src/brand-page/components/payment/Payment.mixin.js

@@ -77,6 +77,11 @@ export default defineComponent({
             if (borderRadius === '9999px') {
                 buttonStyle.borderRadius = '26px';
             }
+            // Own background colour decouples the container from the button fill (BP-5800).
+            if (this.viewModel.backgroundStyle?.backgroundColor) {
+                buttonStyle.backgroundColor =
+                    this.viewModel.backgroundStyle.backgroundColor;
+            }
             return buttonStyle;
         },
         continueButtonStyle() {

package/lib/src/brand-page/models/index.d.ts

@@ -195,6 +195,7 @@ export interface MailingListContent extends Content {
     buttonText: string;
     titleStyle: TextStyleDeclaration;
     buttonTextStyle: TextStyleDeclaration;
+    backgroundStyle?: BrandPageCssStyle;
 }
 export declare const FORM_FIELD_TYPES: {
     readonly text: "text";
@@ -560,7 +561,6 @@ export interface SaveContactOptions {
 }
 export declare class BrandPageModel {
     v: number;
-    userPromptContentKey?: string;
     styles: PageStyles;
     /** @deprecated */
     headerStyles?: AbstractPageHeaderStyles;

package/lib/src/brand-page/models/index.js

@@ -404,9 +404,6 @@ export class PageFooterMobile extends AbstractPageFooterStyles {
 export class BrandPageModel {
     // Model version
     v;
-    // AI personalisation key persisted with the draft so previews survive login/checkout-back/
-    // refresh - content is retrieved by this token (user-agnostic), not regenerated (bp-5742).
-    userPromptContentKey;
     styles;
     /** @deprecated */
     headerStyles;

package/lib/src/brand-page/models/payment.model.d.ts

@@ -134,6 +134,7 @@ export interface RequestPaymentContent extends Content {
     descriptionStyle?: TextStyleDeclaration;
     itemTextStyle: TextStyleDeclaration;
     buttonTextStyle?: TextStyleDeclaration;
+    backgroundStyle?: BrandPageCssStyle;
 }
 export interface ShopContentConfig extends PaymentConfig {
     paymentOptionDisplayType: PaymentOptionDisplayType;
@@ -174,6 +175,7 @@ export interface SupportMeContent extends Content {
     descriptionStyle: TextStyleDeclaration;
     buttonTextStyle: TextStyleDeclaration;
     itemTextStyle: TextStyleDeclaration;
+    backgroundStyle?: BrandPageCssStyle;
 }
 export interface CreateStripePaymentIntentResponse {
     paymentIntent: StripePaymentIntent;

package/lib/src/brand-page/utils/button.util.d.ts

@@ -5,3 +5,8 @@ import type { ButtonStyles } from '../models';
  * @returns The calculated box shadow CSS value
  */
 export declare const getBoxShadowValue: (buttonStyles: ButtonStyles) => string;
+export declare const BUTTON_STYLE_BRUSHSTROKE = "BUTTON_STYLE_19";
+export declare const BUTTON_STYLE_ARROW = "BUTTON_STYLE_20";
+export declare const BUTTON_STYLE_PAPER = "BUTTON_STYLE_21";
+export declare const DECORATIVE_BUTTON_STYLE_IDS: string[];
+export declare const isDecorativeButtonStyle: (styleId?: string) => boolean;

package/lib/src/brand-page/utils/button.util.js

@@ -27,3 +27,16 @@ export const getBoxShadowValue = (buttonStyles) => {
     }
     return boxShadowValue;
 };
+// The "decorative" button styles — brushstroke / arrow / torn-paper — whose visual
+// is drawn by ButtonStyleWrapper rather than plain CSS. Their banner-like SVG
+// decoration needs the button to be reasonably wide to render legibly, so narrow
+// (w-fit) hosts should widen when one of these is active (BP-5800).
+export const BUTTON_STYLE_BRUSHSTROKE = 'BUTTON_STYLE_19';
+export const BUTTON_STYLE_ARROW = 'BUTTON_STYLE_20';
+export const BUTTON_STYLE_PAPER = 'BUTTON_STYLE_21';
+export const DECORATIVE_BUTTON_STYLE_IDS = [
+    BUTTON_STYLE_BRUSHSTROKE,
+    BUTTON_STYLE_ARROW,
+    BUTTON_STYLE_PAPER,
+];
+export const isDecorativeButtonStyle = (styleId) => !!styleId && DECORATIVE_BUTTON_STYLE_IDS.includes(styleId);

package/lib/src/brand-page/utils/migration/migration-19.d.ts

@@ -0,0 +1,2 @@
+import type { MigrationData } from '../migration.util';
+export declare const migration19: (migrationResult: MigrationData) => Promise<MigrationData>;

package/lib/src/brand-page/utils/migration/migration-19.js

@@ -0,0 +1,41 @@
+import { BRAND_PAGE_TYPES } from '../../models';
+const CONTAINER_BACKGROUND_TYPES = new Set([
+    'mailing-list',
+    'request-payment',
+    'support-me',
+]);
+export const migration19 = async (migrationResult) => {
+    const { brandPageModel } = migrationResult;
+    const buttonFill = brandPageModel.styles?.buttonStyles?.style?.backgroundColor;
+    if (buttonFill === undefined) {
+        return migrationResult;
+    }
+    const isBrandSite = brandPageModel.brandPageType === BRAND_PAGE_TYPES.brandSite;
+    brandPageModel.pages.forEach((page) => {
+        page.contents.forEach((content) => {
+            // Container-backed blocks: seed their own backgroundStyle on every type.
+            if (CONTAINER_BACKGROUND_TYPES.has(content.type)) {
+                const block = content;
+                if (block.backgroundStyle?.backgroundColor === undefined) {
+                    block.backgroundStyle = {
+                        ...block.backgroundStyle,
+                        backgroundColor: buttonFill,
+                    };
+                }
+                return;
+            }
+            // Contact form: colour moves to cardStyle — skip on brand-site, which
+            // keeps its own layout/card behaviour.
+            if (content.type === 'contact-form' && !isBrandSite) {
+                const block = content;
+                if (block.cardStyle?.backgroundColor === undefined) {
+                    block.cardStyle = {
+                        ...block.cardStyle,
+                        backgroundColor: buttonFill,
+                    };
+                }
+            }
+        });
+    });
+    return migrationResult;
+};

package/lib/src/brand-page/utils/migration.util.js

@@ -21,6 +21,7 @@ import { migration15 } from './migration/migration-15';
 import { migration16 } from './migration/migration-16';
 import { migration17 } from './migration/migration-17';
 import { migration18 } from './migration/migration-18';
+import { migration19 } from './migration/migration-19';
 const MIGRATION_TABLE = [
     {
         version: 1,
@@ -138,6 +139,16 @@ const MIGRATION_TABLE = [
         migrateFn: migration18,
         description: 'BP-5603: backfill stable item ids on all nested items (gallery/section/testimonial/text items, section + footer social links) — the item id is now non-nullable',
     },
+    {
+        version: 19,
+        migrateFn: migration19,
+        // runAlways: re-apply on every load so already-published sites pick up the seed
+        // without a version bump. Idempotent — only seeds a colour when unset, so a user
+        // colour is never clobbered. Single pass over the model seeds both container types
+        // and the contact form.
+        runAlways: true,
+        description: 'BP-5800: seed the button fill colour as each block’s own container colour so it is independent of the site button (existing sites render unchanged) — backgroundStyle for mailing-list, request-payment and support-me (all types); cardStyle for the BP/BC contact form (skipped on brand-site)',
+    },
 ];
 export const GetLatestModelVersion = () => Math.max(...MIGRATION_TABLE.map((x) => x.version));
 export const migrateBrandPageModel = async (brandPageModel, options) => {

package/lib/src/brand-page/utils/view-model.util.js

@@ -526,6 +526,7 @@ const mapToShapesSectionViewModel = (content, styles, brandPageType) => {
 };
 const mapToShopViewModel = (content, styles) => {
     const buttonStyles = new ButtonStyles({
+        selectedButtonStyleId: styles.buttonStyles.selectedButtonStyleId,
         style: {
             ...styles.buttonStyles.style,
         },

package/lib/src/brand-page-maker/assessors/contact-form-visibility.assessor.d.ts

@@ -1,6 +1,7 @@
 import { type ContactFormContent } from '@brand-page';
 import type { VisibilityAssessor } from '../models';
 export declare const contactCardDisplayTypeVisibilityAssessor: VisibilityAssessor<ContactFormContent | undefined>;
+export declare const contactCardColorVisibilityAssessor: VisibilityAssessor<ContactFormContent | undefined>;
 export declare const displayTypeVisibilityAssessor: VisibilityAssessor<ContactFormContent | undefined>;
 export declare const imageUrlVisibilityAssessor: VisibilityAssessor<ContactFormContent | undefined>;
 export declare const contactBackgroundDisplayTypeVisibilityAssessor: VisibilityAssessor<ContactFormContent | undefined>;

package/lib/src/brand-page-maker/assessors/contact-form-visibility.assessor.js

@@ -1,26 +1,35 @@
 import {} from '@brand-page';
 import { ALIGN_CARD_CENTER, ALIGN_CARD_CENTER_IMAGE, ALIGN_CENTERED, ALIGN_LEFT_FULL_IMAGE, ALIGN_RIGHT_FULL_IMAGE, TEXT_ONLY, } from '@brand-page/constants';
 export const contactCardDisplayTypeVisibilityAssessor = (content, context) => {
-    return (Boolean(content?.layoutStyle &&
+    return Boolean(content?.layoutStyle &&
         [
             ALIGN_CARD_CENTER_IMAGE,
             ALIGN_CARD_CENTER,
             ALIGN_LEFT_FULL_IMAGE,
             ALIGN_RIGHT_FULL_IMAGE,
-        ].includes(content?.layoutStyle)) && context.isBrandSite);
+        ].includes(content?.layoutStyle) &&
+        context?.isBrandSite);
+};
+// Card colour picker: on brand-page/brand-contact it's the collapsible container
+// colour (shown for every layout); on brand-site it's the card in card layouts.
+export const contactCardColorVisibilityAssessor = (content, context) => {
+    return (!context?.isBrandSite ||
+        contactCardDisplayTypeVisibilityAssessor(content, context));
 };
 export const displayTypeVisibilityAssessor = (content, context) => {
-    return Boolean(content?.layoutStyle === '' || context.isBrandPage);
+    return Boolean(content?.layoutStyle === '' || context?.isBrandPage);
 };
 export const imageUrlVisibilityAssessor = (content, context) => {
-    return (Boolean(content?.layoutStyle &&
+    return Boolean(content?.layoutStyle &&
         [
             ALIGN_CARD_CENTER_IMAGE,
             ALIGN_LEFT_FULL_IMAGE,
             ALIGN_RIGHT_FULL_IMAGE,
-        ].includes(content?.layoutStyle)) && context.isBrandSite);
+        ].includes(content?.layoutStyle) &&
+        context?.isBrandSite);
 };
 export const contactBackgroundDisplayTypeVisibilityAssessor = (content, context) => {
-    return (Boolean(content?.layoutStyle &&
-        [ALIGN_CARD_CENTER, ALIGN_CENTERED, TEXT_ONLY].includes(content?.layoutStyle)) && context.isBrandSite);
+    return Boolean(content?.layoutStyle &&
+        [ALIGN_CARD_CENTER, ALIGN_CENTERED, TEXT_ONLY].includes(content?.layoutStyle) &&
+        context?.isBrandSite);
 };

package/lib/src/brand-page-maker/constants/config-settings-constant.js

@@ -3,8 +3,8 @@ import { createInitialButtonContent, createInitialImageContent, createInitialPro
 import * as uuid from 'uuid';
 import { colorConvertor, backgroundColorConvertor, borderColorConvertor, displayStyleConvertor, galleryTypeConvertor, imageAspectRatioConvertor, textAlignmentOptionsConvertor, videoContentStateConvertor, fillColorConvertor, bannerAlignDisplayStyleConvertor, aboutDisplayStyleConvertor, dividerStyleConvertor, shapeSizeOptionsConvertor, buttonLinkStyleConvertor, textSizeValueConvertor, textColumnStyleConvertor, contactLayoutStyleConvertor, paymentLinkDisplayStyleConvertor, shopDisplayConvertor, shopAspectRatioConvertor, } from '../convertors';
 import { ALIGN_CENTERED, DISPLAY_STYLE_COLLAPSED, DISPLAY_STYLE_PREVIEW, } from '@brand-page';
-import { imageFieldVisibilityAssessor, imageOptionVisibilityAssessor, imageGalleryFieldVisibilityAssessor, cardFillVisibilityAssessor, mediaSectionItemsFieldTypeAssessor, dividerToggleFieldVisibilityAssessor, shapeSectionItemsFieldTypeAssessor, colorReplacementVisibilityTypeAssessor, colorReplacementProfileVisibilityTypeAssessor, colorReplacementIconVisibilityTypeAssessor, imagesSectionCardStyleVisibilityAssessor, contactCardDisplayTypeVisibilityAssessor, imageUrlVisibilityAssessor, displayTypeVisibilityAssessor, logoFieldVisibilityAssessor, shapesSectionCardStyleVisibilityAssessor, shopImageOptionVisibilityAssessor, shopItemColorVisibility, personalisationOverrideVisibility, } from '../assessors';
-import { logoBackgroundColorDefaultGetter, paymentFillColorFieldDefaultGetter, paymentTextAndBorderColorFieldDefaultGetter, shopBorderColorFieldDefaultGetter, shopFillColorFieldDefaultGetter, textColorFieldDefaultGetter, } from '../default-getters';
+import { imageFieldVisibilityAssessor, imageOptionVisibilityAssessor, imageGalleryFieldVisibilityAssessor, cardFillVisibilityAssessor, mediaSectionItemsFieldTypeAssessor, dividerToggleFieldVisibilityAssessor, shapeSectionItemsFieldTypeAssessor, colorReplacementVisibilityTypeAssessor, colorReplacementProfileVisibilityTypeAssessor, colorReplacementIconVisibilityTypeAssessor, imagesSectionCardStyleVisibilityAssessor, contactCardColorVisibilityAssessor, imageUrlVisibilityAssessor, displayTypeVisibilityAssessor, logoFieldVisibilityAssessor, shapesSectionCardStyleVisibilityAssessor, shopImageOptionVisibilityAssessor, shopItemColorVisibility, personalisationOverrideVisibility, } from '../assessors';
+import { contactFormCardColorDefaultGetter, logoBackgroundColorDefaultGetter, paymentFillColorFieldDefaultGetter, paymentTextAndBorderColorFieldDefaultGetter, shopBorderColorFieldDefaultGetter, shopFillColorFieldDefaultGetter, textColorFieldDefaultGetter, } from '../default-getters';
 import { socialLinksIconDisplayStyleConvertor } from '../convertors/social-links-icon-display-style.convertor';
 import { getTextMediaOptionsConverterByMediaType } from '../convertors/text-image-display-style.convertor';
 import { testimonialDisplayStyleConvertor } from '../convertors/testimonial-display-style-convertor';
@@ -455,6 +455,7 @@ const testimonialReplaceImageSettings = () => ({
     desiredWidth: undefined,
     mediaType: MEDIA_TYPES.image,
 });
+const disableTransparentOffBrandSite = (brandPageType) => brandPageType !== BRAND_PAGE_TYPES.brandSite;
 export const LOGO_SETTINGS_CONFIG = () => ({
     createInitialContent: createInitialLogoContent,
     type: 'logo',
@@ -1463,6 +1464,17 @@ export const MAILING_LIST_CONTENT_SETTINGS_CONFIG = () => ({
         titleStyle: DEFAULT_TITLE_STYLE_SETTINGS_FILED_WITH_TITLE(),
         buttonTextStyle: DEFAULT_BUTTON_TEXT_STYLE_FIELD(),
         ...PADDING_CONTROL_FIELDS(SETTINGS_STYLE_FIELD_GROUP_IDS.style),
+        backgroundStyle: {
+            type: 'color',
+            groupId: SETTINGS_STYLE_FIELD_GROUP_IDS.style,
+            defaultValue: {},
+            isInline: true,
+            showToggle: false,
+            title: contentSettingsTr(`backgroundColorTitle`),
+            disableTransparent: true,
+            valueConvertor: backgroundColorConvertor,
+            defaultGetter: paymentFillColorFieldDefaultGetter,
+        },
     },
     isEnabled: true,
     isLocked: false,
@@ -1634,6 +1646,17 @@ export const REQUEST_PAYMENT_CONTENT_SETTINGS_CONFIG = () => ({
             label: contentSettingsTr(`buttonTextStyleLabel`),
         },
         ...PADDING_CONTROL_FIELDS(REQUEST_PAYMENT_GROUPS.style),
+        backgroundStyle: {
+            type: 'color',
+            groupId: REQUEST_PAYMENT_GROUPS.style,
+            defaultValue: {},
+            isInline: true,
+            showToggle: false,
+            title: contentSettingsTr(`backgroundColorTitle`),
+            disableTransparent: true,
+            valueConvertor: backgroundColorConvertor,
+            defaultGetter: paymentFillColorFieldDefaultGetter,
+        },
     },
     isEnabled: (features) => features.canAddRequestPaymentContents,
     isLocked: false,
@@ -1699,6 +1722,17 @@ export const SUPPORT_ME_CONTENT_SETTINGS_CONFIG = () => ({
         },
         buttonTextStyle: DEFAULT_BUTTON_TEXT_STYLE_FIELD(),
         ...PADDING_CONTROL_FIELDS(SETTINGS_STYLE_FIELD_GROUP_IDS.style),
+        backgroundStyle: {
+            type: 'color',
+            groupId: SETTINGS_STYLE_FIELD_GROUP_IDS.style,
+            defaultValue: {},
+            isInline: true,
+            showToggle: false,
+            title: contentSettingsTr(`backgroundColorTitle`),
+            disableTransparent: true,
+            valueConvertor: backgroundColorConvertor,
+            defaultGetter: paymentFillColorFieldDefaultGetter,
+        },
     },
     isEnabled: (features) => features.canAddRequestPaymentContents,
     isLocked: false,
@@ -1837,7 +1871,8 @@ export const CONTACT_FORM_SETTINGS_CONFIG = () => ({
             disableTransparent: true,
             title: contentSettingsTr(`cardColorTitle`),
             valueConvertor: backgroundColorConvertor,
-            visibilityAssessor: contactCardDisplayTypeVisibilityAssessor,
+            visibilityAssessor: contactCardColorVisibilityAssessor,
+            defaultGetter: contactFormCardColorDefaultGetter,
         },
         backgroundStyle: {
             type: 'color',
@@ -1846,7 +1881,9 @@ export const CONTACT_FORM_SETTINGS_CONFIG = () => ({
             isInline: true,
             showToggle: false,
             title: contentSettingsTr(`backgroundColorTitle`),
+            disableTransparent: disableTransparentOffBrandSite,
             valueConvertor: backgroundColorConvertor,
+            visibilityAssessor: brandSiteTypeVisibilityAssessor,
         },
     },
     isEnabled: true,

package/lib/src/brand-page-maker/default-getters/contact-form-card-color.default-getter.d.ts

@@ -0,0 +1,8 @@
+import type { DefaultGetter } from '../models';
+/**
+ * Contact-form "Card color" default (BP-5800). On brand-page/brand-contact the
+ * collapsible container takes the button fill, so default the Card color picker to
+ * it. On brand-site the Card color applies to the card in card layouts and keeps its
+ * own seeded default — so no default here.
+ */
+export declare const contactFormCardColorDefaultGetter: DefaultGetter<BrandPageCssStyle>;

package/lib/src/brand-page-maker/default-getters/contact-form-card-color.default-getter.js

@@ -0,0 +1,16 @@
+import { RGBAtoHex } from '@utils/helpers';
+import { BRAND_PAGE_TYPES } from '@brand-page';
+/**
+ * Contact-form "Card color" default (BP-5800). On brand-page/brand-contact the
+ * collapsible container takes the button fill, so default the Card color picker to
+ * it. On brand-site the Card color applies to the card in card layouts and keeps its
+ * own seeded default — so no default here.
+ */
+export const contactFormCardColorDefaultGetter = (brandPage) => {
+    if (brandPage.brandPageType === BRAND_PAGE_TYPES.brandSite) {
+        return {};
+    }
+    return {
+        backgroundColor: RGBAtoHex(brandPage.styles.buttonStyles.style.backgroundColor),
+    };
+};

package/lib/src/brand-page-maker/default-getters/index.d.ts

@@ -2,3 +2,4 @@ export * from './text-color.default-getter';
 export * from './payment-fill-color.default-getter';
 export * from './payment-text-and-border-color.default-getter';
 export * from './logo-background-fill.default-getter';
+export * from './contact-form-card-color.default-getter';

package/lib/src/brand-page-maker/default-getters/index.js

@@ -2,3 +2,4 @@ export * from './text-color.default-getter';
 export * from './payment-fill-color.default-getter';
 export * from './payment-text-and-border-color.default-getter';
 export * from './logo-background-fill.default-getter';
+export * from './contact-form-card-color.default-getter';

package/lib/src/brand-page-maker/models/button-styles-config.js

@@ -352,7 +352,11 @@ export const availableButtonStyleConfigs = [
         iconName: 'button-brushstroke',
         iconViewBox: '0 0 60 20',
         options: ['buttonFillColor', 'buttonIconColor'],
-        brandPageType: [BRAND_PAGE_TYPES.default, BRAND_PAGE_TYPES.brandContact],
+        brandPageType: [
+            BRAND_PAGE_TYPES.default,
+            BRAND_PAGE_TYPES.brandContact,
+            BRAND_PAGE_TYPES.brandSite,
+        ],
     },
     {
         id: 'BUTTON_STYLE_20',
@@ -369,7 +373,11 @@ export const availableButtonStyleConfigs = [
         iconName: 'button-arrow',
         iconViewBox: '0 0 60 20',
         options: ['buttonFillColor', 'buttonIconColor'],
-        brandPageType: [BRAND_PAGE_TYPES.default, BRAND_PAGE_TYPES.brandContact],
+        brandPageType: [
+            BRAND_PAGE_TYPES.default,
+            BRAND_PAGE_TYPES.brandContact,
+            BRAND_PAGE_TYPES.brandSite,
+        ],
     },
     {
         id: 'BUTTON_STYLE_21',
@@ -386,6 +394,10 @@ export const availableButtonStyleConfigs = [
         iconName: 'button-paper',
         iconViewBox: '0 0 60 20',
         options: ['buttonFillColor', 'buttonIconColor'],
-        brandPageType: [BRAND_PAGE_TYPES.default, BRAND_PAGE_TYPES.brandContact],
+        brandPageType: [
+            BRAND_PAGE_TYPES.default,
+            BRAND_PAGE_TYPES.brandContact,
+            BRAND_PAGE_TYPES.brandSite,
+        ],
     },
 ];