@designcrowd/library.brand-page 5.17.27-shape-memory-2 → 5.17.28-ast-padding

package/src/brand-page/utils/__snapshots__/migration.util.test.ts.snap

@@ -454,7 +454,7 @@ exports[`migration.util > Banner Contents - text Align and Font Family should no
         },
       },
     },
-    "v": 15,
+    "v": 16,
   },
   "useOldLogoRenderSize": true,
 }
@@ -751,6 +751,7 @@ exports[`migration.util > migrateBrandPageModel should return brand page model w
       {
         "contents": [
           {
+            "bottomPadding": 12,
             "id": "bec5aca6-e3c5-4d4c-93fa-2894816a8040",
             "text": "",
             "textColor": {},
@@ -774,6 +775,7 @@ exports[`migration.util > migrateBrandPageModel should return brand page model w
               "textAlign": "center",
               "textStyleType": "paragraphs",
             },
+            "topPadding": 12,
             "type": "text",
           },
         ],
@@ -897,7 +899,7 @@ exports[`migration.util > migrateBrandPageModel should return brand page model w
         },
       },
     },
-    "v": 15,
+    "v": 16,
   },
   "useOldLogoRenderSize": true,
 }
@@ -1194,6 +1196,7 @@ exports[`migration.util > migrateBrandPageModel should return brand page model w
       {
         "contents": [
           {
+            "bottomPadding": 12,
             "id": "bec5aca6-e3c5-4d4c-93fa-2894816a8040",
             "text": "",
             "textColor": {},
@@ -1224,6 +1227,7 @@ exports[`migration.util > migrateBrandPageModel should return brand page model w
               "textAlign": "center",
               "textStyleType": "paragraphs",
             },
+            "topPadding": 12,
             "type": "text",
           },
         ],
@@ -1347,7 +1351,7 @@ exports[`migration.util > migrateBrandPageModel should return brand page model w
         },
       },
     },
-    "v": 15,
+    "v": 16,
   },
   "useOldLogoRenderSize": true,
 }

package/src/brand-page/utils/content-padding.util.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 const contentPaddingStyle = (content: {
+  topPadding?: number;
+  bottomPadding?: number;
+}): { paddingTop: string; paddingBottom: string } => ({
+  paddingTop: `${content.topPadding ?? 0}px`,
+  paddingBottom: `${content.bottomPadding ?? 0}px`,
+});

package/src/brand-page/utils/index.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/src/brand-page/utils/migration/migration-16.ts

@@ -0,0 +1,42 @@
+import type { MigrationData } from '../migration.util';
+
+/**
+ * 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: Partial<Record<string, number>> = {
+  text: 12,
+  'images-section': 32,
+  'social-links': 32,
+  'shapes-section': 32,
+  'booking-section': 32,
+};
+
+export const migration16 = async (
+  migrationResult: MigrationData,
+): Promise<MigrationData> => {
+  const { brandPageModel } = migrationResult;
+
+  brandPageModel.pages.forEach((page) => {
+    page.contents.forEach((content) => {
+      const value = 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/src/brand-page/utils/migration.util.ts

@@ -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';
 
 export interface MigrationData {
   brandPageModel: BrandPageModel;
@@ -141,6 +142,12 @@ 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) and images, social links, shapes and booking (32px)',
+  },
 ] as MigrationTableItem[];
 
 export const GetLatestModelVersion = () =>

package/src/brand-page-maker/composables/rich-text-editor/useRichTextEditor.ts

@@ -614,10 +614,11 @@ export const useRichTextEditor = (
         globalStyles ?? {},
       );
 
-      if (!currentAlignment?.textAlign) {
-        props.styles &&
-          props.styles.textAlign &&
-          toggleTextAlign(props.styles.textAlign ?? 'none');
+      if (
+        props.styles?.textAlign &&
+        currentAlignment?.textAlign !== props.styles.textAlign
+      ) {
+        toggleTextAlign(props.styles.textAlign);
       }
     } else if (props.styles) {
       // copy the content settings styles to the editor
@@ -643,10 +644,11 @@ export const useRichTextEditor = (
         props.styles ?? {},
       );
 
-      if (!currentAlignment?.textAlign) {
-        props.styles &&
-          props.styles.textAlign &&
-          toggleTextAlign(props.styles.textAlign ?? 'none');
+      if (
+        props.styles?.textAlign &&
+        currentAlignment?.textAlign !== props.styles.textAlign
+      ) {
+        toggleTextAlign(props.styles.textAlign);
       }
     }
   };

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

@@ -201,6 +201,34 @@ const SETTINGS_STYLE_FIElD_GROUPS = (): ContentSettingsFieldGroup[] => {
   ];
 };
 
+/**
+ * Shared Top/Bottom padding sliders (BP-5687). Reuses the same `slider` control
+ * as the Divider block (track + editable number box), range 0–100, continuous.
+ * Spread into a block's `fields` to expose the Padding Control on that block.
+ * Pass the Style field-group id for blocks that use grouped panels.
+ */
+const PADDING_CONTROL_FIELDS = (
+  groupId?: string,
+): {
+  topPadding: ContentSettingsField<Content>;
+  bottomPadding: ContentSettingsField<Content>;
+} => ({
+  topPadding: {
+    type: 'slider',
+    title: contentSettingsTr(`topPaddingTitle`),
+    minLength: 0,
+    maxLength: 100,
+    groupId,
+  },
+  bottomPadding: {
+    type: 'slider',
+    title: contentSettingsTr(`bottomPaddingTitle`),
+    minLength: 0,
+    maxLength: 100,
+    groupId,
+  },
+});
+
 const DEFAULT_TITLE_STYLE_SETTINGS_FILED =
   (): ContentSettingsField<Content> => ({
     type: 'text-style',
@@ -1097,6 +1125,7 @@ export const IMAGE_GALLERY_CONTENT_SETTINGS_CONFIG = (): ContentSettingsConfig<
       defaultValue: false,
       visibilityAssessor: imageGalleryFieldVisibilityAssessor,
     },
+    ...PADDING_CONTROL_FIELDS(),
   },
   isEnabled: true,
   isLocked: (features) => !features.canAddImageContents,
@@ -1136,6 +1165,7 @@ export const VIDEO_CONTENT_SETTINGS_CONFIG = (): ContentSettingsConfig<
       label: contentSettingsTr(`muteLabel`),
       valueConvertor: videoContentStateConvertor,
     },
+    ...PADDING_CONTROL_FIELDS(),
   },
   isEnabled: true,
   isLocked: (features) => !features.canAddVideoContents,
@@ -1287,6 +1317,7 @@ export const TEXT_CONTENT_SETTINGS_CONFIG = (): ContentSettingsConfig<
       valueConvertor: backgroundColorConvertor,
       groupId: SETTINGS_STYLE_FIELD_GROUP_IDS.style,
     },
+    ...PADDING_CONTROL_FIELDS(SETTINGS_STYLE_FIELD_GROUP_IDS.style),
   },
   isEnabled: true,
   isLocked: false,
@@ -1736,6 +1767,7 @@ export const MAP_CONTENT_SETTINGS_CONFIG =
         type: 'address',
         title: contentSettingsTr(`addressTitle`),
       },
+      ...PADDING_CONTROL_FIELDS(),
     },
     isEnabled: true,
     isLocked: (features) => !features.canAddMapContents,
@@ -1787,6 +1819,7 @@ 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),
     },
     isEnabled: true,
     isLocked: false,
@@ -1971,6 +2004,7 @@ export const REQUEST_PAYMENT_CONTENT_SETTINGS_CONFIG =
         defaultValue: {},
         label: contentSettingsTr(`buttonTextStyleLabel`),
       },
+      ...PADDING_CONTROL_FIELDS(REQUEST_PAYMENT_GROUPS.style),
     },
     isEnabled: (features) => features.canAddRequestPaymentContents,
     isLocked: false,
@@ -2038,6 +2072,7 @@ export const SUPPORT_ME_CONTENT_SETTINGS_CONFIG =
         label: contentSettingsTr(`itemStyleLabel`),
       },
       buttonTextStyle: DEFAULT_BUTTON_TEXT_STYLE_FIELD(),
+      ...PADDING_CONTROL_FIELDS(SETTINGS_STYLE_FIELD_GROUP_IDS.style),
     },
     isEnabled: (features) => features.canAddRequestPaymentContents,
     isLocked: false,
@@ -2656,6 +2691,7 @@ export const IMAGES_SECTION_SETTINGS_CONFIG =
             ? MAX_BS_MEDIA_AND_IMAGE_ITEMS
             : MAX_BP_MEDIA_AND_IMAGE_ITEMS,
       },
+      ...PADDING_CONTROL_FIELDS(SETTINGS_STYLE_FIELD_GROUP_IDS.style),
     },
     isEnabled: true,
     isLocked: false,
@@ -2829,6 +2865,7 @@ export const SOCIAL_LINKS_SETTINGS_CONFIG =
         title: contentSettingsTr(`backgroundColorTitle`),
         valueConvertor: backgroundColorConvertor,
       },
+      ...PADDING_CONTROL_FIELDS(SOCIAL_LINKS_GROUPS.style),
     },
     isEnabled: true,
     isLocked: false,
@@ -2942,6 +2979,7 @@ export const SHAPES_SECTION_SETTINGS_CONFIG =
             ? MAX_BS_MEDIA_AND_IMAGE_ITEMS
             : MAX_BP_MEDIA_AND_IMAGE_ITEMS,
       },
+      ...PADDING_CONTROL_FIELDS(SETTINGS_STYLE_FIELD_GROUP_IDS.style),
     },
     isEnabled: true,
     isLocked: false,
@@ -3202,6 +3240,7 @@ export const BOOKING_SECTION_SETTINGS_CONFIG =
         validator: urlValidator,
         defaultValue: '',
       },
+      ...PADDING_CONTROL_FIELDS(SETTINGS_STYLE_FIELD_GROUP_IDS.style),
     },
     isEnabled: true,
     isLocked: false,

package/src/brand-page-maker/models/content-settings.ts

@@ -171,6 +171,8 @@ export const createInitialImageGalleryContent = (): ImageGalleryContent => {
     galleryStyles: {
       galleryType: 'grid',
     },
+    topPadding: 0,
+    bottomPadding: 0,
   };
 };
 
@@ -182,6 +184,8 @@ export const createInitialVideoContent = (): VideoContent => {
     displayStyle: DISPLAY_STYLE_PREVIEW,
     mute: false,
     videoUrl: '',
+    topPadding: 0,
+    bottomPadding: 0,
   };
 };
 
@@ -239,6 +243,8 @@ export const createInitialTextContent = (
           ]
         : undefined,
     type: 'text',
+    topPadding: 12,
+    bottomPadding: 12,
     textSize: {
       fontSize: FONT_SIZE_BODY,
       lineHeight: LINE_HEIGHT_BODY,
@@ -282,6 +288,8 @@ export const createInitialMapContent = (): MapContent => {
       formattedAddress: '',
       placeId: '',
     },
+    topPadding: 0,
+    bottomPadding: 0,
   };
 };
 
@@ -291,6 +299,8 @@ export const createInitialMailingListContent = (
   return {
     id: uuid.v4(),
     type: 'mailing-list',
+    topPadding: 0,
+    bottomPadding: 0,
     title: contentSettingsTr(`mailingListTitle`),
     buttonText: contentSettingsTr(`subscribePlaceholder`),
     acceptedFields: 'emailOnly',
@@ -324,6 +334,8 @@ export const createInitialRequestPaymentContent = (
     successMessage: '',
     title: contentSettingsTr(`buyNowTitle`),
     type: 'request-payment',
+    topPadding: 0,
+    bottomPadding: 0,
     fillColor: {},
     defaultBorderColor: {},
     selectedBorderColor: {},
@@ -415,6 +427,8 @@ export const createInitialSupportMeContent = (
     successMessage: contentSettingsTr(`successSupportPlaceholder`),
     description: contentSettingsTr(`makeADonationDescription`),
     type: 'support-me',
+    topPadding: 0,
+    bottomPadding: 0,
     titleStyle: {
       applyAutoScale: options?.brandPageType === BRAND_PAGE_TYPES.brandSite,
       textStyleType: TEXT_STYLE_TYPES.headings,
@@ -599,6 +613,8 @@ export const createInitialBookingSectionContent: CreateInitialContentFunction<
     buttonText: contentSettingsTr(`bookNowLabel`),
     url: '',
     type: 'booking-section',
+    topPadding: 32,
+    bottomPadding: 32,
     descriptionStyle: {
       applyAutoScale: options?.brandPageType === BRAND_PAGE_TYPES.brandSite,
       textStyleType: TEXT_STYLE_TYPES.paragraphs,
@@ -628,6 +644,8 @@ export const createInitialImagesSectionContent: CreateInitialContentFunction<
     title: contentSettingsTr(`imagesTitle`),
     description: '',
     type: 'images-section',
+    topPadding: 32,
+    bottomPadding: 32,
     displayStyle: 'centered',
     aspectRatio: 'Default',
     areImagesFullWidth: false,
@@ -793,6 +811,8 @@ export const createInitialSocialLinksContent = (
   return {
     id: uuid.v4(),
     type: 'social-links',
+    topPadding: 32,
+    bottomPadding: 32,
     title: contentSettingsTr(`followUsOnTitle`),
     links: [
       {
@@ -846,6 +866,8 @@ export const createInitialShapesSectionContent: CreateInitialContentFunction<
     title: contentSettingsTr(`shapesTitle`),
     description: '',
     type: 'shapes-section',
+    topPadding: 32,
+    bottomPadding: 32,
     displayStyle: 'centered',
     items: [
       {

package/src/bundles/bundled-translations.json

@@ -1544,6 +1544,8 @@
     "iconFillColorTitle": "Icon fill color",
     "iconBackgroundColorTitle": "Icon background color",
     "paddingTitle": "Padding",
+    "topPaddingTitle": "Top padding",
+    "bottomPaddingTitle": "Bottom padding",
     "dividerStyleTitle": "Divider Style",
     "dividerColorTitle": "Divider color",
     "addItemTitle": "Add Item",

package/src/shared/content-settings/components/content-settings/i18n/content-settings.json

@@ -113,6 +113,8 @@
     "iconFillColorTitle": "Icon fill color",
     "iconBackgroundColorTitle": "Icon background color",
     "paddingTitle": "Padding",
+    "topPaddingTitle": "Top padding",
+    "bottomPaddingTitle": "Bottom padding",
     "dividerStyleTitle": "Divider Style",
     "dividerColorTitle": "Divider color",
     "addItemTitle": "Add Item",

package/src/utils/minify-brand-page-metadata.ts

@@ -74,7 +74,17 @@ const includeString = (value: unknown): string | undefined => {
 };
 
 const minifyContent = (content: Content): MinifiedContent => {
-  const base: MinifiedContent = { id: content.id, type: content.type };
+  const base: MinifiedContent = {
+    id: content.id,
+    type: content.type,
+    // Padding Control (BP-5687) — shared across every block, persist when set.
+    ...(typeof content.topPadding === 'number' && {
+      topPadding: content.topPadding,
+    }),
+    ...(typeof content.bottomPadding === 'number' && {
+      bottomPadding: content.bottomPadding,
+    }),
+  };
   const c = content as any;
 
   if (BUTTON_TYPES.includes(content.type)) {