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

package/src/brand-page/components/banner-section/BannerSection.mixin.ts

@@ -0,0 +1,210 @@
+import { defineComponent } from 'vue';
+import type { PropType } from 'vue';
+import ComponentCommonMixin from '../mixins/component-common.mixin';
+import type {
+  BannerSectionViewModel,
+  ButtonViewModel,
+} from '@brand-page/view-models';
+import { hasValidButton as shouldShowButtonUtil } from '../../../utils/validator.util';
+import type { BrandPageContext } from '@brand-page/models';
+import {
+  ALIGN_CENTERED,
+  ALIGN_LEFT_ALIGNED,
+  ALIGN_RIGHT_ALIGNED,
+  BIG_IMAGE,
+  ALIGN_LEFT_BIG_IMAGE,
+  ALIGN_RIGHT_FULL_IMAGE,
+  ALIGN_LEFT_FULL_IMAGE,
+  ALIGN_CARD_CENTER_IMAGE,
+  ALIGN_CARD_LEFT_IMAGE,
+} from '../../constants';
+import { getRenderText, escapeContentText } from '@brand-page/utils';
+import { hasRTEContent } from '@brand-page-maker/utils';
+
+export default defineComponent({
+  mixins: [ComponentCommonMixin],
+  props: {
+    viewModel: {
+      type: Object as PropType<BannerSectionViewModel>,
+      required: true,
+    },
+    context: {
+      type: Object as PropType<BrandPageContext>,
+      required: true,
+    },
+    containerClientWidth: {
+      type: Number as PropType<number | undefined>,
+      required: false,
+      default: undefined,
+    },
+    containerClientHeight: {
+      type: Number as PropType<number | undefined>,
+      required: false,
+      default: undefined,
+    },
+    contentIndex: {
+      type: Number,
+      required: false,
+      default: undefined,
+    },
+  },
+  data() {
+    return {
+      shouldStackOnTop: false,
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      window.addEventListener('resize', this.onResize);
+    });
+  },
+  unmounted() {
+    if (typeof window !== undefined) {
+      window.removeEventListener(`resize`, this.onResize);
+    }
+  },
+  computed: {
+    displayAlignClass() {
+      switch (this.viewModel.displayStyle) {
+        case ALIGN_CENTERED:
+          return 'tw-items-center tw-w-full';
+        case BIG_IMAGE:
+          return 'tw-items-center tw-w-full';
+        case ALIGN_LEFT_ALIGNED:
+          return 'tw-items-start tw-w-2/3';
+        case ALIGN_RIGHT_ALIGNED:
+          return 'tw-items-end tw-w-2/3';
+        case ALIGN_LEFT_BIG_IMAGE:
+          return 'tw-items-start tw-w-2/3';
+        case ALIGN_CARD_CENTER_IMAGE:
+          return 'tw-items-center tw-w-full';
+        case ALIGN_CARD_LEFT_IMAGE:
+          return 'tw-items-end';
+        default:
+          return '';
+      }
+    },
+    displayButtonClass() {
+      if (this.viewModel.buttonTextStyle) {
+        switch (this.viewModel.buttonTextStyle.textAlign) {
+          case 'left':
+            return 'tw-justify-start';
+          case 'center':
+            return 'tw-justify-center';
+          case 'right':
+            return 'tw-justify-end';
+          default:
+            return '';
+        }
+      } else {
+        return this.viewModel.displayStyle === ALIGN_CARD_CENTER_IMAGE ||
+          this.viewModel.displayStyle === ALIGN_CENTERED
+          ? 'tw-justify-center'
+          : 'tw-justify-start';
+      }
+    },
+    isLeftImageAligned(): boolean {
+      if (this.viewModel.displayStyle === ALIGN_LEFT_FULL_IMAGE) {
+        return true;
+      }
+
+      return false;
+    },
+    isRightImageAligned(): boolean {
+      if (this.viewModel.displayStyle === ALIGN_RIGHT_FULL_IMAGE) {
+        return true;
+      }
+
+      return false;
+    },
+
+    isDividedContent(): boolean {
+      if (
+        this.viewModel.displayStyle === ALIGN_RIGHT_FULL_IMAGE ||
+        this.viewModel.displayStyle === ALIGN_LEFT_FULL_IMAGE
+      ) {
+        return true;
+      }
+
+      return false;
+    },
+    isCardBannerContent(): boolean {
+      if (
+        this.viewModel.displayStyle === ALIGN_CARD_CENTER_IMAGE ||
+        this.viewModel.displayStyle === ALIGN_CARD_LEFT_IMAGE
+      ) {
+        return true;
+      }
+
+      return false;
+    },
+    isCardAlignedOnLeft() {
+      return this.viewModel.displayStyle === ALIGN_CARD_LEFT_IMAGE;
+    },
+    getbuttonViewModel(): ButtonViewModel {
+      const { buttonViewModel, buttonLinkType, pageSlug } = this.viewModel;
+
+      buttonViewModel.buttonLinkType = buttonLinkType;
+      buttonViewModel.pageSlug = pageSlug;
+
+      return buttonViewModel;
+    },
+
+    shouldShowButton(): boolean {
+      return shouldShowButtonUtil({
+        buttonText: this.viewModel.buttonText,
+        buttonViewModel: this.viewModel.buttonViewModel,
+      });
+    },
+
+    isHorizontalAligned(): boolean {
+      return (
+        this.viewModel.displayStyle === ALIGN_LEFT_ALIGNED ||
+        this.viewModel.displayStyle === ALIGN_RIGHT_ALIGNED ||
+        this.viewModel.displayStyle === ALIGN_LEFT_FULL_IMAGE ||
+        this.viewModel.displayStyle === ALIGN_RIGHT_FULL_IMAGE
+      );
+    },
+    isBigImageAligned(): boolean {
+      return (
+        this.viewModel.displayStyle === ALIGN_LEFT_BIG_IMAGE ||
+        this.viewModel.displayStyle === ALIGN_CARD_LEFT_IMAGE
+      );
+    },
+    renderText(): string {
+      if (!this.viewModel.description) {
+        return '';
+      }
+
+      if (hasRTEContent(this.viewModel.description)) {
+        return this.viewModel.description;
+      } else {
+        return getRenderText(this.viewModel.description);
+      }
+    },
+    hasDescriptionText(): boolean {
+      if (hasRTEContent(this.viewModel.description)) {
+        return escapeContentText(this.viewModel.description) !== '';
+      } else {
+        return this.viewModel?.description?.length > 0;
+      }
+    },
+    overlayColor(): BrandPageCssStyle {
+      return this.viewModel.overlayColor || 'rgb(0,0,0)';
+    },
+    opacity(): number {
+      return this.viewModel.overlayOpacity;
+    },
+    backgroundOverlay(): BrandPageCssStyle {
+      return {
+        background: this.overlayColor.backgroundColor,
+        opacity: `${this.opacity}%`,
+      };
+    },
+  },
+  methods: {
+    onResize() {
+      this.shouldStackOnTop = window.innerWidth < 640;
+    },
+  },
+});

package/src/brand-page/components/banner-section/BannerSection.vue

@@ -7,9 +7,8 @@
           viewModel.isBigImageType,
         'c_banner--with-image-overlay tw-flex tw-flex-col': isDividedContent,
         'tw-px-6': !isDividedContent,
-        'tw-py-8': !isDividedContent && !isStackedFullWidth,
       }"
-      :style="viewModel.backgroundStyle"
+      :style="[viewModel.backgroundStyle, contentPaddingStyle]"
       style="container-type: inline-size"
     >
       <Media
@@ -201,7 +200,7 @@
             <div
               class="!tw-text-center tw-flex tw-flex-col tw-gap-5"
               :class="{
-                'tw-px-6 tw-py-8': isDividedContent,
+                'tw-px-6': isDividedContent,
               }"
             >
               <TextWrapper
@@ -332,7 +331,11 @@ import type {
 } from '@brand-page/view-models';
 import type { BrandPageContext } from '@brand-page/models';
 import { hasValidButton } from '../../../utils/validator.util';
-import { getRenderText, escapeContentText } from '@brand-page/utils';
+import {
+  getRenderText,
+  escapeContentText,
+  contentPaddingStyle as toContentPaddingStyle,
+} from '@brand-page/utils';
 import { hasRTEContent } from '@brand-page-maker/utils';
 import {
   ALIGN_CENTERED,
@@ -490,6 +493,10 @@ const layout = computed<BannerLayoutConfig>(
   () => BANNER_LAYOUTS[props.viewModel.displayStyle] ?? DEFAULT_LAYOUT,
 );
 
+const contentPaddingStyle = computed(() =>
+  toContentPaddingStyle(props.viewModel),
+);
+
 const displayAlignClass = computed(() => layout.value.alignClass);
 const isHorizontalAligned = computed(() => !!layout.value.hasSideImage);
 const isDividedContent = computed(() => layout.value.layout === 'divided');

package/src/brand-page/components/booking-section/BookingSection.vue

@@ -1,8 +1,8 @@
 <template>
   <section data-component="booking-section">
     <div
-      class="tw-relative tw-px-6 tw-py-8"
-      :style="viewModel.backgroundStyle"
+      class="tw-relative tw-px-6"
+      :style="[viewModel.backgroundStyle, contentPaddingStyle]"
       style="container-type: inline-size"
     >
       <div
@@ -45,7 +45,11 @@ import type {
   ButtonViewModel,
 } from '@brand-page/view-models';
 import type { BrandPageContext } from '@brand-page/models';
-import { getRenderText, escapeContentText } from '@brand-page/utils';
+import {
+  getRenderText,
+  escapeContentText,
+  contentPaddingStyle as toContentPaddingStyle,
+} from '@brand-page/utils';
 import { hasRTEContent } from '@brand-page-maker/utils';
 import { hasValidButton as shouldShowButtonUtil } from '../../../utils/validator.util';
 import Button from '../button/Button.vue';
@@ -71,6 +75,10 @@ const props = defineProps({
   },
 });
 
+const contentPaddingStyle = computed(() =>
+  toContentPaddingStyle(props.viewModel),
+);
+
 const renderText = computed((): string => {
   if (!props.viewModel.description) {
     return '';

package/src/brand-page/components/brand-page-footer/BrandPageFooter.vue

@@ -32,7 +32,7 @@
   </footer>
 </template>
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref, watch, shallowRef } from 'vue';
+import { computed, onMounted, reactive, watch, shallowRef } from 'vue';
 import { BRAND_PAGE_TYPES, type BrandPageContext } from '@brand-page/models';
 import {
   Icon,

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

@@ -25,7 +25,10 @@ import {
   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';
 
@@ -97,6 +100,10 @@ export default defineComponent({
       return buttonTextStyle;
     },
 
+    contentPaddingStyle(): { paddingTop: string; paddingBottom: string } {
+      return toContentPaddingStyle(this.viewModel);
+    },
+
     hasCard(): boolean {
       return (
         this.viewModel.layoutStyle === ALIGN_CARD_CENTER ||
@@ -109,11 +116,10 @@ export default defineComponent({
     },
 
     hasBgColor(): boolean {
-      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(): boolean {

package/src/brand-page/components/contact-form/ContactForm.vue

@@ -2,11 +2,13 @@
   <section data-component="contact-form">
     <div
       :class="{
-        'tw-flex': isCenteredLayout && !hasBgImage,
         'tw-block': !viewModel.layoutStyle,
-        'tw-relative': hasBgImage,
+        'tw-relative tw-overflow-hidden': hasBgImage,
       }"
-      :style="hasBgColor ? viewModel.backgroundStyle : {}"
+      :style="[
+        hasBgColor ? viewModel.backgroundStyle : {},
+        contentPaddingStyle,
+      ]"
     >
       <Media
         v-if="hasBgImage && isCenteredLayout"
@@ -108,110 +110,115 @@
       </Collapsible>
       <div
         v-else-if="isCenteredLayout"
-        class="contact-container tw-py-4"
-        :class="{
-          'tw-px-6 tw-py-8': hasCard,
-          'tw-py-6': !hasCard,
-          'tw-w-full': !hasBgImage,
-        }"
+        :class="{ 'tw-relative': hasBgImage, 'tw-flex': !hasBgImage }"
       >
         <div
-          :style="hasCard ? viewModel.cardStyle : {}"
-          class="tw-relative tw-block tw-px-6 tw-py-8 tw-rounded-2xl"
+          class="contact-container"
+          :class="{
+            'tw-px-6': hasCard,
+            'tw-py-8': hasBgImage,
+            'tw-w-full': !hasBgImage,
+          }"
         >
-          <form v-if="!hasSubmitted" @submit.prevent="submitContactForm">
-            <TextWrapper
-              v-if="viewModel.title"
-              :text-style="viewModel.titleStyle"
-              :text="viewModel.title"
-              element="h1"
-              class="tw-mb-4 tw-text-base"
-            />
-            <TextWrapper
-              v-if="renderText"
-              :text-style="viewModel.descriptionStyle"
-              :text="renderText"
-              element="div"
-              class="tw-mb-4 tw-text-base"
-            />
-            <div v-if="!isSubmitting" class="tw-grid tw-grid-cols-2 tw-gap-4">
-              <div
-                v-for="(value, index) in values"
-                :key="index"
-                class="tw-text-secondary-500 c-col-span-2"
-                :class="{
-                  'tw-col-span-2':
-                    value.field.type === 'text-area' || isMobileDevice,
-                }"
-              >
-                <TextInput
-                  v-if="value.field.type !== 'text-area'"
-                  v-model="value.value"
-                  :placeholder="`${value.field.name}${
-                    value.field.required ? '*' : ''
-                  }`"
-                  :label="`${value.field.name}${value.field.required ? '*' : ''}`"
-                  :show-label-screen-reader-only="true"
-                  size="sm"
-                  :error="!!value.error"
-                  :type="getTextInputTypeByFieldType(value.field.type)"
-                  class="tw-w-full"
-                  @input="onValueChange(index)"
-                />
-                <Textarea
-                  v-if="value.field.type === 'text-area'"
-                  v-model="value.value"
-                  :placeholder="`${value.field.name}${
-                    value.field.required ? '*' : ''
-                  }`"
-                  :label="`${value.field.name}${value.field.required ? '*' : ''}`"
-                  :show-label-screen-reader-only="true"
-                  size="sm"
-                  :error="!!value.error"
-                  :resize="false"
-                  class="tw-w-full"
-                  @input="onValueChange(index)"
-                />
-                <p v-if="!!value.error" class="form-error">
-                  {{ value.error }}
-                </p>
-              </div>
-              <div class="tw-flex tw-w-full tw-justify-center tw-col-span-2">
-                <button
-                  v-if="isSubmitButtonVisible"
-                  class="tw-block tw-border-0 tw-py-2 tw-select-none tw-text-base tw-text-center tw-w-fit hover:tw-cursor-pointer tw-px-8 tw-py-3 c-button-full"
-                  :style="submitButtonStyle"
-                  :class="{ 'tw-w-full': isMobileDevice }"
+          <div
+            :style="hasCard ? viewModel.cardStyle : {}"
+            class="tw-relative tw-block tw-px-6 tw-rounded-2xl"
+            :class="{ 'tw-py-8': hasCard }"
+          >
+            <form v-if="!hasSubmitted" @submit.prevent="submitContactForm">
+              <TextWrapper
+                v-if="viewModel.title"
+                :text-style="viewModel.titleStyle"
+                :text="viewModel.title"
+                element="h1"
+                class="tw-mb-4 tw-text-base"
+              />
+              <TextWrapper
+                v-if="renderText"
+                :text-style="viewModel.descriptionStyle"
+                :text="renderText"
+                element="div"
+                class="tw-mb-4 tw-text-base"
+              />
+              <div v-if="!isSubmitting" class="tw-grid tw-grid-cols-2 tw-gap-4">
+                <div
+                  v-for="(value, index) in values"
+                  :key="index"
+                  class="tw-text-secondary-500 c-col-span-2"
+                  :class="{
+                    'tw-col-span-2':
+                      value.field.type === 'text-area' || isMobileDevice,
+                  }"
                 >
-                  <TextWrapper
-                    :text-style="submitButtonTextStyle"
-                    :text="viewModel.buttonText"
-                    class="tw-text-center tw-text-base"
+                  <TextInput
+                    v-if="value.field.type !== 'text-area'"
+                    v-model="value.value"
+                    :placeholder="`${value.field.name}${
+                      value.field.required ? '*' : ''
+                    }`"
+                    :label="`${value.field.name}${value.field.required ? '*' : ''}`"
+                    :show-label-screen-reader-only="true"
+                    size="sm"
+                    :error="!!value.error"
+                    :type="getTextInputTypeByFieldType(value.field.type)"
+                    class="tw-w-full"
+                    @input="onValueChange(index)"
                   />
-                </button>
+                  <Textarea
+                    v-if="value.field.type === 'text-area'"
+                    v-model="value.value"
+                    :placeholder="`${value.field.name}${
+                      value.field.required ? '*' : ''
+                    }`"
+                    :label="`${value.field.name}${value.field.required ? '*' : ''}`"
+                    :show-label-screen-reader-only="true"
+                    size="sm"
+                    :error="!!value.error"
+                    :resize="false"
+                    class="tw-w-full"
+                    @input="onValueChange(index)"
+                  />
+                  <p v-if="!!value.error" class="form-error">
+                    {{ value.error }}
+                  </p>
+                </div>
+                <div class="tw-flex tw-w-full tw-justify-center tw-col-span-2">
+                  <button
+                    v-if="isSubmitButtonVisible"
+                    class="tw-block tw-border-0 tw-py-2 tw-select-none tw-text-base tw-text-center tw-w-fit hover:tw-cursor-pointer tw-px-8 tw-py-3 c-button-full"
+                    :style="submitButtonStyle"
+                    :class="{ 'tw-w-full': isMobileDevice }"
+                  >
+                    <TextWrapper
+                      :text-style="submitButtonTextStyle"
+                      :text="viewModel.buttonText"
+                      class="tw-text-center tw-text-base"
+                    />
+                  </button>
+                </div>
               </div>
+              <div v-else class="tw-w-full tw-flex tw-justify-center">
+                <Loader />
+              </div>
+              <p
+                v-if="hasSubmitError"
+                class="tw-text-center tw-mt-2 form-error"
+              >
+                {{ submitError }}
+              </p>
+            </form>
+            <div v-else :style="successMessageColorStyle">
+              <TextWrapper
+                v-if="viewModel.successMessage"
+                :text="renderSuccessText"
+                element="p"
+                :class="'tw-my-0.5'"
+              />
             </div>
-            <div v-else class="tw-w-full tw-flex tw-justify-center">
-              <Loader />
-            </div>
-            <p v-if="hasSubmitError" class="tw-text-center tw-mt-2 form-error">
-              {{ submitError }}
-            </p>
-          </form>
-          <div v-else :style="successMessageColorStyle">
-            <TextWrapper
-              v-if="viewModel.successMessage"
-              :text="renderSuccessText"
-              element="p"
-              :class="'tw-my-0.5'"
-            />
           </div>
         </div>
       </div>
-      <div
-        v-else-if="isTextOnly"
-        class="tw-px-6 tw-py-8 tw-gap-2 contact-container"
-      >
+      <div v-else-if="isTextOnly" class="tw-px-6 tw-gap-2 contact-container">
         <span v-if="!hasSubmitted" class="tw-grid tw-grid-cols-2">
           <div
             v-if="!isSubmitting"
@@ -350,10 +357,7 @@
             }"
           >
             <div
-              class="tw-flex tw-flex-col tw-gap-2 tw-px-8 tw-w-full tw-justify-center c-py-6"
-              :class="{
-                'tw-py-6': isMobileDevice,
-              }"
+              class="tw-flex tw-flex-col tw-gap-2 tw-px-8 tw-py-6 tw-w-full tw-justify-center"
             >
               <span v-if="!hasSubmitted">
                 <TextWrapper
@@ -516,9 +520,6 @@ export default {
   .c-text-padding {
     @apply tw-px-0 tw-col-span-2;
   }
-  .c-py-6 {
-    @apply tw-py-6;
-  }
   .c-divided-container {
     @apply tw-flex-col;
   }

package/src/brand-page/components/image/Image.mixin.ts

@@ -52,7 +52,7 @@ export default defineComponent({
     shouldFitImage(): boolean {
       return Boolean(
         this.viewModel.aspectRatio &&
-          ASPECT_RATIOS[this.viewModel.aspectRatio as string],
+        ASPECT_RATIOS[this.viewModel.aspectRatio as string],
       );
     },
     altText(): string {

package/src/brand-page/components/image/Image.test.ts

@@ -1,4 +1,4 @@
-import { mount, shallowMount } from '@vue/test-utils';
+import { mount } from '@vue/test-utils';
 import { faker } from '@faker-js/faker';
 import Image from './Image.vue';
 import {

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

@@ -1,6 +1,7 @@
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import type { ImageGalleryViewModel } from '@brand-page/view-models';
+import { contentPaddingStyle as toContentPaddingStyle } from '@brand-page/utils';
 import ComponentCommonMixin from '../mixins/component-common.mixin';
 import ImageModalMixin from '../mixins/image-modal.mixin';
 import type { ImageGalleryImageClickPayload } from './models';
@@ -34,6 +35,10 @@ export default defineComponent({
     };
   },
   computed: {
+    contentPaddingStyle(): { paddingTop: string; paddingBottom: string } {
+      return toContentPaddingStyle(this.viewModel);
+    },
+
     getContainerStyle(): BrandPageCssStyle {
       if (this.galleryType === 'carousel') {
         const maxWidth = this.containerClientWidth

package/src/brand-page/components/image-gallery/ImageGallery.vue

@@ -10,7 +10,7 @@
       'c-carousel-full-width':
         viewModel.isFullWidth && isPreview && galleryType === 'carousel',
     }"
-    :style="getContainerStyle"
+    :style="[getContainerStyle, contentPaddingStyle]"
   >
     <component
       :is="galleryType"

package/src/brand-page/components/images-section/ImagesSection.vue

@@ -57,7 +57,6 @@
 </template>
 <script setup lang="ts">
 import { computed, reactive, ref, watch } from 'vue';
-import type { PropType } from 'vue';
 import TextMediaSection from '../text-media-section/TextMediaSection.vue';
 import ImageGalleryModal from '../image-gallery/ImageGalleryModal.vue';
 import BpImage from '../image/Image.vue';