@designcrowd/library.brand-page 5.18.1-undo-34 → 5.18.2-ast-padding-1

package/lib/src/{CreatedOnBrandCrowd-de-de-D-2WhY-F.js → CreatedOnBrandCrowd-de-de-GFYl8DtL.js}

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

package/lib/src/{CreatedOnBrandCrowd-en-us-B7ldKpJK.js → CreatedOnBrandCrowd-en-us-D5CcXf2I.js}

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

package/lib/src/{CreatedOnBrandCrowd-es-es-BatQY8Tt.js → CreatedOnBrandCrowd-es-es-Cr7J3ooe.js}

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

package/lib/src/{CreatedOnBrandCrowd-fr-fr-CFivOJkN.js → CreatedOnBrandCrowd-fr-ca-BC1NFFIW.js}

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

package/lib/src/{CreatedOnBrandCrowd-fr-ca-CFivOJkN.js → CreatedOnBrandCrowd-fr-fr-BC1NFFIW.js}

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

package/lib/src/{CreatedOnBrandCrowd-pt-pt-wHkXfYLP.js → CreatedOnBrandCrowd-pt-br-BdiCcpwi.js}

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

package/lib/src/{CreatedOnBrandCrowd-pt-br-wHkXfYLP.js → CreatedOnBrandCrowd-pt-pt-BdiCcpwi.js}

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

package/lib/src/{CreatedOnDcom-de-de--HwniV-Y.js → CreatedOnDcom-de-de-d4TmC_lo.js}

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

package/lib/src/{CreatedOnDcom-en-us-Bqm5NnRX.js → CreatedOnDcom-en-us-DlvLEF-R.js}

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

package/lib/src/{CreatedOnDcom-es-es-COGQIuEn.js → CreatedOnDcom-es-es-BulpVp3k.js}

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

package/lib/src/{CreatedOnDcom-fr-ca-eVDHO7MX.js → CreatedOnDcom-fr-ca-M4xqunZe.js}

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

package/lib/src/{CreatedOnDcom-fr-fr-BhGKbdoG.js → CreatedOnDcom-fr-fr-BFqUXgzb.js}

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

package/lib/src/{CreatedOnDcom-pt-br-5kDZKPZc.js → CreatedOnDcom-pt-br-CUVcVkV2.js}

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

package/lib/src/{CreatedOnDcom-pt-pt-CnTcVxct.js → CreatedOnDcom-pt-pt-Dc4CZ4xW.js}

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

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

@@ -45,6 +45,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }, {
     submitButtonStyle(): BrandPageCssStyle;
     submitButtonTextStyle(): BrandPageCssStyle;
+    contentPaddingStyle(): {
+        paddingTop: string;
+        paddingBottom: string;
+    };
     hasCard(): boolean;
     hasBgImage(): boolean;
     hasBgColor(): boolean;

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

@@ -4,7 +4,7 @@ import { getEmailValidationError, getMessageValidationError, getNameValidationEr
 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';
-import { getRenderText } from '@brand-page/utils';
+import { getRenderText, contentPaddingStyle as toContentPaddingStyle, } from '@brand-page/utils';
 import { hasRTEContent } from '@brand-page-maker/utils';
 import { useReCaptcha } from '../../composables/recaptcha.composable';
 export default defineComponent({
@@ -64,6 +64,9 @@ export default defineComponent({
             };
             return buttonTextStyle;
         },
+        contentPaddingStyle() {
+            return toContentPaddingStyle(this.viewModel);
+        },
         hasCard() {
             return (this.viewModel.layoutStyle === ALIGN_CARD_CENTER ||
                 this.viewModel.layoutStyle === ALIGN_CARD_CENTER_IMAGE);
@@ -72,9 +75,10 @@ export default defineComponent({
             return this.viewModel.layoutStyle === ALIGN_CARD_CENTER_IMAGE;
         },
         hasBgColor() {
-            return (this.viewModel.layoutStyle === ALIGN_CARD_CENTER ||
-                this.viewModel.layoutStyle === TEXT_ONLY ||
-                this.viewModel.layoutStyle === ALIGN_CENTERED);
+            // Every brandSite layout applies the background colour on the section
+            // root (banner-style) so the padding control reveals it; for the image
+            // layouts it only shows in the padding bands around the image block.
+            return Boolean(this.viewModel.layoutStyle);
         },
         isCenteredLayout() {
             return (this.viewModel.layoutStyle === ALIGN_CARD_CENTER ||

package/lib/src/brand-page/components/image-gallery/ImageGallery.mixin.d.ts

@@ -23,6 +23,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }>, {}, {
     imageModalSelectedImageIndex: number | undefined;
 }, {
+    contentPaddingStyle(): {
+        paddingTop: string;
+        paddingBottom: string;
+    };
     getContainerStyle(): BrandPageCssStyle;
     images(): any[] | undefined;
     galleryType(): GalleryType;

package/lib/src/brand-page/components/image-gallery/ImageGallery.mixin.js

@@ -1,4 +1,5 @@
 import { defineComponent } from 'vue';
+import { contentPaddingStyle as toContentPaddingStyle } from '@brand-page/utils';
 import ComponentCommonMixin from '../mixins/component-common.mixin';
 import ImageModalMixin from '../mixins/image-modal.mixin';
 import { GALLERY_TYPES } from '@brand-page/models';
@@ -29,6 +30,9 @@ export default defineComponent({
         };
     },
     computed: {
+        contentPaddingStyle() {
+            return toContentPaddingStyle(this.viewModel);
+        },
         getContainerStyle() {
             if (this.galleryType === 'carousel') {
                 const maxWidth = this.containerClientWidth

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

@@ -39,6 +39,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     isSubmitting: boolean;
     show: boolean;
 }, {
+    contentPaddingStyle(): {
+        paddingTop: string;
+        paddingBottom: string;
+    };
     hasNameError(): boolean;
     hasEmailError(): boolean;
     hasFormError(): boolean;

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

@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
 import brandPageClient from '../../clients/brand-page.client';
-import { getEmailValidationError } from '@brand-page/utils';
+import { getEmailValidationError, contentPaddingStyle as toContentPaddingStyle, } from '@brand-page/utils';
 import { contentSettingsTr, mailingListTr, } from '@src/composables/useTranslate';
 import { useReCaptcha } from '../../composables/recaptcha.composable';
 import { RECAPTCHA_ACTION_MAILING_LIST } from '../../constants';
@@ -51,6 +51,9 @@ export default defineComponent({
         }
     },
     computed: {
+        contentPaddingStyle() {
+            return toContentPaddingStyle(this.viewModel);
+        },
         hasNameError() {
             return !!this.nameError;
         },

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

@@ -145,8 +145,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }>, {
     viewport: ViewportsType;
     isMobileDevice: boolean;
-    containerClientWidth: number | undefined;
     containerClientHeight: number | undefined;
+    containerClientWidth: number | undefined;
     isContentSelected: boolean;
     isHeaderSelected: boolean;
     isFooterSelected: boolean;

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

@@ -78,7 +78,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }>> & Readonly<{}>, {
     brandPageToken: string;
     isMobileDevice: boolean;
-    containerClientWidth: number;
     containerClientHeight: number;
+    containerClientWidth: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/lib/src/brand-page/components/payment/request-payment/RequestPayment.mixin.d.ts

@@ -21,6 +21,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     selectedPaymentOptionIds: string[];
     imageType: string;
 }, {
+    contentPaddingStyle(): {
+        paddingTop: string;
+        paddingBottom: string;
+    };
     isCustomerRequestDetailsValid(): boolean;
     paymentRequestDetails(): PaymentRequestDetails;
     paymentOptions(): PaymentOption[];

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

@@ -2,6 +2,7 @@ import { defineComponent } from 'vue';
 import { PAYMENT_OPTION_DISPLAY_TYPES, PAYMENT_OPTION_IMAGE_TYPES, } from '../../../models';
 import { DEFAULT_CURRENCY_SYMBOL } from '../../../constants';
 import { addOpacityToHex } from '../../../utils/color.util';
+import { contentPaddingStyle as toContentPaddingStyle } from '../../../utils';
 import { RGBAtoHex } from '@utils/helpers';
 const MAX_CUSTOM_REQUEST_CHARS = 500;
 export default defineComponent({
@@ -28,6 +29,9 @@ export default defineComponent({
         };
     },
     computed: {
+        contentPaddingStyle() {
+            return toContentPaddingStyle(this.viewModel);
+        },
         isCustomerRequestDetailsValid() {
             return (!this.viewModel.requestPaymentConfig.isCustomerRequestDetailsEnabled ||
                 this.customerRequestDetails === undefined ||

package/lib/src/brand-page/components/payment/support-me/SupportMe.mixin.d.ts

@@ -17,6 +17,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     prevCustomAmount: string;
     customAmount: string;
 }, {
+    contentPaddingStyle(): {
+        paddingTop: string;
+        paddingBottom: string;
+    };
     isCustomAmountFieldVisible(): boolean;
     isCustomerMessageFieldVisible(): boolean;
     isCustomerMessageValid(): boolean;

package/lib/src/brand-page/components/payment/support-me/SupportMe.mixin.js

@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
 import { SUPPORT_ME_CUSTOM_PRODUCT_NAME } from '../../../constants';
-import { isPaymentAmountValid } from '../../../utils';
+import { isPaymentAmountValid, contentPaddingStyle as toContentPaddingStyle, } from '../../../utils';
 import { DEFAULT_CURRENCY_SYMBOL, DEFAULT_CURRENCY_CODE, } from '../../../constants';
 import { paymentTr } from '@src/composables/useTranslate';
 const MAX_CUSTOM_MESSAGE_CHARS = 500;
@@ -24,6 +24,9 @@ export default defineComponent({
         };
     },
     computed: {
+        contentPaddingStyle() {
+            return toContentPaddingStyle(this.viewModel);
+        },
         isCustomAmountFieldVisible() {
             return this.viewModel.supportMeConfig.paymentOptions.some((o) => o.name === SUPPORT_ME_CUSTOM_PRODUCT_NAME);
         },

package/lib/src/brand-page/components/video/Video.mixin.d.ts

@@ -11,6 +11,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     isCollapsed: boolean;
     title: string;
 }, {
+    contentPaddingStyle(): {
+        paddingTop: string;
+        paddingBottom: string;
+    };
     arrowStyle(): BrandPageCssStyle;
     containerStyle(): BrandPageCssStyle;
     videoUrl(): string;

package/lib/src/brand-page/components/video/Video.mixin.js

@@ -1,4 +1,5 @@
 import { defineComponent } from 'vue';
+import { contentPaddingStyle as toContentPaddingStyle } from '@brand-page/utils';
 import ComponentCommonMixin from '../mixins/component-common.mixin';
 import { DISPLAY_STYLE_PREVIEW, DISPLAY_STYLE_COLLAPSED, } from '../../constants';
 export default defineComponent({
@@ -16,6 +17,9 @@ export default defineComponent({
         title: 'Video',
     }),
     computed: {
+        contentPaddingStyle() {
+            return toContentPaddingStyle(this.viewModel);
+        },
         arrowStyle() {
             return {
                 color: this.viewModel.buttonStyles.style?.color,

package/lib/src/brand-page/constants/misc.constants.d.ts

@@ -12,6 +12,12 @@ export declare const ALIGN_LEFT_BIG_IMAGE = "left-aligned-big-image";
 export declare const ALIGN_CARD_CENTER_IMAGE = "center-card-aligned-image";
 export declare const ALIGN_CARD_CENTER = "center-card-aligned";
 export declare const ALIGN_CARD_LEFT_IMAGE = "left-card-aligned-image";
+export declare const ALIGN_TOP_CARD_IMAGE = "top-card-aligned-image";
+export declare const ALIGN_BOTTOM_CARD_IMAGE = "bottom-card-aligned-image";
+export declare const ALIGN_MIDDLE_CARD_IMAGE = "middle-card-aligned-image";
+export declare const ALIGN_TOP_FULL_IMAGE = "top-aligned-full-image";
+export declare const ALIGN_BOTTOM_FULL_IMAGE = "bottom-aligned-full-image";
+export declare const ALIGN_MIDDLE_FULL_IMAGE = "middle-aligned-full-image";
 export declare const MAX_IMAGES_SECTION_ALIGNMENT_ITEMS_LENGTH = 3;
 export declare const TEXT_COLUMNS: {
     readonly 1: "1";
@@ -23,6 +29,17 @@ export declare const TEXT_ONLY = "text-only";
 export declare const ALIGN_LEFT_FULL_IMAGE = "left-aligned-full-image";
 export declare const ALIGN_RIGHT_FULL_IMAGE = "right-aligned-full-image";
 export declare const ALTERNATE_IMAGE = "alternate-image";
+/**
+ * Padding Control (BP-5699): the top/bottom padding each Contact Form layout
+ * had hard-coded before the sliders existed. Single source for new-block
+ * defaults (content-settings) and the migration backfill for existing pages.
+ * The image layouts (full-image divided and card-over-image) are 0: their
+ * padding sits on the section root and reveals the background colour around
+ * the image block (same as the banner), while the spacing inside/over the
+ * image stays fixed — existing pages rendered the image flush to the section
+ * edges.
+ */
+export declare const CONTACT_FORM_LAYOUT_DEFAULT_PADDING: Record<string, number>;
 export declare const BIG_IMAGE = "big-image";
 export declare const MEDIA_ONLY = "media-only";
 export declare const COLUMNS = "columns";

package/lib/src/brand-page/constants/misc.constants.js

@@ -13,6 +13,12 @@ export const ALIGN_LEFT_BIG_IMAGE = 'left-aligned-big-image';
 export const ALIGN_CARD_CENTER_IMAGE = 'center-card-aligned-image';
 export const ALIGN_CARD_CENTER = 'center-card-aligned';
 export const ALIGN_CARD_LEFT_IMAGE = 'left-card-aligned-image';
+export const ALIGN_TOP_CARD_IMAGE = 'top-card-aligned-image';
+export const ALIGN_BOTTOM_CARD_IMAGE = 'bottom-card-aligned-image';
+export const ALIGN_MIDDLE_CARD_IMAGE = 'middle-card-aligned-image';
+export const ALIGN_TOP_FULL_IMAGE = 'top-aligned-full-image';
+export const ALIGN_BOTTOM_FULL_IMAGE = 'bottom-aligned-full-image';
+export const ALIGN_MIDDLE_FULL_IMAGE = 'middle-aligned-full-image';
 export const MAX_IMAGES_SECTION_ALIGNMENT_ITEMS_LENGTH = 3;
 export const TEXT_COLUMNS = {
     1: '1',
@@ -24,6 +30,25 @@ export const TEXT_ONLY = 'text-only';
 export const ALIGN_LEFT_FULL_IMAGE = 'left-aligned-full-image';
 export const ALIGN_RIGHT_FULL_IMAGE = 'right-aligned-full-image';
 export const ALTERNATE_IMAGE = 'alternate-image';
+/**
+ * Padding Control (BP-5699): the top/bottom padding each Contact Form layout
+ * had hard-coded before the sliders existed. Single source for new-block
+ * defaults (content-settings) and the migration backfill for existing pages.
+ * The image layouts (full-image divided and card-over-image) are 0: their
+ * padding sits on the section root and reveals the background colour around
+ * the image block (same as the banner), while the spacing inside/over the
+ * image stays fixed — existing pages rendered the image flush to the section
+ * edges.
+ */
+export const CONTACT_FORM_LAYOUT_DEFAULT_PADDING = {
+    '': 0, // collapsible (default on Brand Page / Brand Contact)
+    [ALIGN_CENTERED]: 24,
+    [ALIGN_CARD_CENTER]: 32,
+    [ALIGN_CARD_CENTER_IMAGE]: 0,
+    [TEXT_ONLY]: 32,
+    [ALIGN_LEFT_FULL_IMAGE]: 0,
+    [ALIGN_RIGHT_FULL_IMAGE]: 0,
+};
 export const BIG_IMAGE = 'big-image';
 export const MEDIA_ONLY = 'media-only';
 export const COLUMNS = 'columns';

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

@@ -47,6 +47,8 @@ export interface Content {
     id: string;
     type: ContentType;
     personalisationRole?: PersonalisationRole;
+    topPadding?: number;
+    bottomPadding?: number;
     imageUrlOverride?: string;
     imageUrlsOverride?: string;
     avatarImageUrlOverride?: string;

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

@@ -0,0 +1,13 @@
+/**
+ * Block top/bottom padding (BP-5687) as a bindable CSS style object. Defaults
+ * live in the data — `content-settings` for new content, a migration for
+ * existing — so this just reads the stored value (`?? 0` covers content from
+ * before the field existed).
+ */
+export declare const contentPaddingStyle: (content: {
+    topPadding?: number;
+    bottomPadding?: number;
+}) => {
+    paddingTop: string;
+    paddingBottom: string;
+};

package/lib/src/brand-page/utils/content-padding.util.js

@@ -0,0 +1,10 @@
+/**
+ * Block top/bottom padding (BP-5687) as a bindable CSS style object. Defaults
+ * live in the data — `content-settings` for new content, a migration for
+ * existing — so this just reads the stored value (`?? 0` covers content from
+ * before the field existed).
+ */
+export const contentPaddingStyle = (content) => ({
+    paddingTop: `${content.topPadding ?? 0}px`,
+    paddingBottom: `${content.bottomPadding ?? 0}px`,
+});

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

@@ -1,4 +1,5 @@
 export * from './style.util';
+export * from './content-padding.util';
 export * from './view-model.util';
 export * from './text.util';
 export * from './model.util';

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

@@ -1,4 +1,5 @@
 export * from './style.util';
+export * from './content-padding.util';
 export * from './view-model.util';
 export * from './text.util';
 export * from './model.util';

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

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

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

@@ -0,0 +1,37 @@
+import { CONTACT_FORM_LAYOUT_DEFAULT_PADDING } from '../../constants';
+/**
+ * Tier 2 Padding Control (BP-5699): blocks that already had hard-coded
+ * top/bottom spacing. Backfill that spacing as the block's explicit
+ * topPadding/bottomPadding so existing pages render unchanged once the spacing
+ * moves to the Padding Control sliders. Type-scoped and idempotent — only the
+ * listed types, and only when the value isn't already set.
+ */
+const TIER2_DEFAULT_PADDING = {
+    text: 12,
+    'images-section': 32,
+    'social-links': 32,
+    'shapes-section': 32,
+    'booking-section': 32,
+};
+export const migration16 = async (migrationResult) => {
+    const { brandPageModel } = migrationResult;
+    brandPageModel.pages.forEach((page) => {
+        page.contents.forEach((content) => {
+            // Contact Form's previous hard-coded spacing varies by layout, so it's
+            // keyed by layoutStyle rather than a single per-type value.
+            const value = content.type === 'contact-form'
+                ? CONTACT_FORM_LAYOUT_DEFAULT_PADDING[content.layoutStyle ?? '']
+                : TIER2_DEFAULT_PADDING[content.type];
+            if (value === undefined) {
+                return;
+            }
+            if (content.topPadding === undefined) {
+                content.topPadding = value;
+            }
+            if (content.bottomPadding === undefined) {
+                content.bottomPadding = value;
+            }
+        });
+    });
+    return migrationResult;
+};

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

@@ -18,6 +18,7 @@ import { migration12_1 } from './migration/migration-12_1';
 import { migration13 } from './migration/migration-13';
 import { migration14 } from './migration/migration-14';
 import { migration15 } from './migration/migration-15';
+import { migration16 } from './migration/migration-16';
 const MIGRATION_TABLE = [
     {
         version: 1,
@@ -115,6 +116,11 @@ const MIGRATION_TABLE = [
         migrateFn: migration15,
         description: 'Adding default mediaOverlayStyle to background styles',
     },
+    {
+        version: 16,
+        migrateFn: migration16,
+        description: 'Tier 2 Padding Control (BP-5699): backfill existing top/bottom spacing as explicit padding for text (12px), images, social links, shapes and booking (32px), and contact form (per layout)',
+    },
 ];
 export const GetLatestModelVersion = () => Math.max(...MIGRATION_TABLE.map((x) => x.version));
 export const migrateBrandPageModel = async (brandPageModel, options) => {

package/lib/src/brand-page-maker/components/action-bar/ActionBar.mixin.d.ts

@@ -107,21 +107,16 @@ declare const _default: import("vue").DefineComponent<{}, {
         hideChangeTemplateConfirmModal(): void;
         onBackgroundChanged(): void;
         onChangeTemplateConfirmModalCancel(): void;
-        onChangeTemplateConfirmModalConfirm(): Promise<void>;
+        onChangeTemplateConfirmModalConfirm(): void;
         onContentChanged(): void;
         onStyleChanged(): void;
-        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): Promise<void>;
+        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): void;
         setSelectedTabName(payload: any): void;
         showNextNotificationMessage(): Promise<void>;
         updateContent<TContent extends import("@brand-page/models").Content, P extends {
             id: string;
             content: TContent;
         }>(payload: P): Promise<void>;
-        _captureTemplateSwitchIfEnabled(): void;
-        applyHistorySnapshot(snapshot: import("@brand-page/models").BrandPageModel, activePageId?: string | undefined, logoEditsStr?: string | undefined): Promise<void>;
-        _syncLogoSettingsFromSnapshot(snapshot: import("@brand-page/models").BrandPageModel, logoEditsStr?: string | undefined): Promise<void>;
-        _navigateToActivePage(activePageId?: string | undefined): void;
-        _fallbackSidebarIfSelectedContentMissing(snapshot: import("@brand-page/models").BrandPageModel): void;
         export(): import("@brand-page/models").BrandPageModel;
         setBrandPageType({ brandPageType }: {
             brandPageType: "default" | "brandSite" | "brandContact";

package/lib/src/brand-page-maker/components/admin-logo-settings/AdminLogoSettings.mixin.d.ts

@@ -8,6 +8,8 @@ declare const _default: import("vue").DefineComponent<{}, {
                 id: string;
                 type: "website" | "image" | "email" | "phone" | "logo" | "general-link" | "profile" | "video" | "text" | "facebook" | "x" | "instagram" | "youtube" | "linkedin" | "pinterest" | "twitch" | "tiktok" | "map" | "image-gallery" | "mailing-list" | "request-payment" | "support-me" | "contact-form" | "banner-section" | "about-section" | "divider-section" | "images-section" | "testimonial-section" | "social-links" | "shapes-section" | "shop-section" | "booking-section";
                 personalisationRole?: "website" | "email" | "phone" | "profile" | "about" | "information" | "media" | undefined;
+                topPadding?: number | undefined;
+                bottomPadding?: number | undefined;
                 imageUrlOverride?: string | undefined;
                 imageUrlsOverride?: string | undefined;
                 avatarImageUrlOverride?: string | undefined;