@designcrowd/library.brand-page 5.6.4-scroll-3 → 5.6.4

package/lib/src/shared/style-settings/components/StyleSettings.mixin.d.ts

@@ -70,7 +70,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             fontWeight?: string | undefined;
             height?: string | undefined;
             left?: string | undefined;
-            right?: string | undefined;
             letterSpacing?: string | undefined;
             lineHeight?: string | undefined;
             marginBottom?: string | undefined;
@@ -83,7 +82,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             textAlign?: string | undefined;
             textDecoration?: string | undefined;
             top?: string | undefined;
-            bottom?: string | undefined;
             transform?: string | undefined;
             transformOrigin?: string | undefined;
             transition?: string | undefined;
@@ -120,7 +118,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             fontWeight?: string | undefined;
             height?: string | undefined;
             left?: string | undefined;
-            right?: string | undefined;
             letterSpacing?: string | undefined;
             lineHeight?: string | undefined;
             marginBottom?: string | undefined;
@@ -133,7 +130,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             textAlign?: string | undefined;
             textDecoration?: string | undefined;
             top?: string | undefined;
-            bottom?: string | undefined;
             transform?: string | undefined;
             transformOrigin?: string | undefined;
             transition?: string | undefined;
@@ -169,7 +165,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             fontWeight?: string | undefined;
             height?: string | undefined;
             left?: string | undefined;
-            right?: string | undefined;
             letterSpacing?: string | undefined;
             lineHeight?: string | undefined;
             marginBottom?: string | undefined;
@@ -182,7 +177,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             textAlign?: string | undefined;
             textDecoration?: string | undefined;
             top?: string | undefined;
-            bottom?: string | undefined;
             transform?: string | undefined;
             transformOrigin?: string | undefined;
             transition?: string | undefined;
@@ -216,7 +210,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             fontWeight?: string | undefined;
             height?: string | undefined;
             left?: string | undefined;
-            right?: string | undefined;
             letterSpacing?: string | undefined;
             lineHeight?: string | undefined;
             marginBottom?: string | undefined;
@@ -229,7 +222,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             textAlign?: string | undefined;
             textDecoration?: string | undefined;
             top?: string | undefined;
-            bottom?: string | undefined;
             transform?: string | undefined;
             transformOrigin?: string | undefined;
             transition?: string | undefined;
@@ -265,7 +257,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             fontWeight?: string | undefined;
             height?: string | undefined;
             left?: string | undefined;
-            right?: string | undefined;
             letterSpacing?: string | undefined;
             lineHeight?: string | undefined;
             marginBottom?: string | undefined;
@@ -278,7 +269,6 @@ declare const _default: import("vue").DefineComponent<{}, {
             textAlign?: string | undefined;
             textDecoration?: string | undefined;
             top?: string | undefined;
-            bottom?: string | undefined;
             transform?: string | undefined;
             transformOrigin?: string | undefined;
             transition?: string | undefined;

package/package.json

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

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

@@ -107,28 +107,7 @@ export default defineComponent({
       return backgroundShapes;
     },
 
-    rootElementStyles(): BrandPageCssStyle {
-      const styles: BrandPageCssStyle = {};
-
-      Object.assign(styles, this.viewModel?.styles?.textStyles?.style);
-
-      const textFontFamilyKey =
-        this.viewModel.styles?.textStyles.textFontFamily ||
-        DEFAULT_FONT_FAMILY_KEY;
-
-      const textFontFamilyConfig = FONT_FAMILY_CONFIGS[textFontFamilyKey];
-
-      if (textFontFamilyConfig) {
-        styles.fontFamily = [
-          `"${textFontFamilyConfig.name}"`,
-          ...FALLBACK_FONT_FAMILIES,
-        ].join(', ');
-      }
-
-      return styles;
-    },
-
-    rootBackgroundStyles(): BrandPageCssStyle {
+    rootStyles(): BrandPageCssStyle {
       const styles: BrandPageCssStyle = {
         ...(this.viewModel?.styles?.backgroundStyles?.style || {}),
       };
@@ -161,10 +140,7 @@ export default defineComponent({
 
           if (!this.context.isTemplate) {
             styles.position = 'fixed';
-            styles.top = '0';
-            styles.bottom = '0';
-            styles.left = '0';
-            styles.right = '0';
+            styles.width = '100%';
           }
 
           delete styles.background;
@@ -180,6 +156,21 @@ export default defineComponent({
         styles.backgroundAttachment = 'fixed';
       }
 
+      Object.assign(styles, this.viewModel?.styles?.textStyles?.style);
+
+      const textFontFamilyKey =
+        this.viewModel.styles?.textStyles.textFontFamily ||
+        DEFAULT_FONT_FAMILY_KEY;
+
+      const textFontFamilyConfig = FONT_FAMILY_CONFIGS[textFontFamilyKey];
+
+      if (textFontFamilyConfig) {
+        styles.fontFamily = [
+          `"${textFontFamilyConfig.name}"`,
+          ...FALLBACK_FONT_FAMILIES,
+        ].join(', ');
+      }
+
       return styles;
     },
 
@@ -339,10 +330,7 @@ export default defineComponent({
     },
   },
   watch: {
-    rootElementStyles() {
-      this.setRootStyles();
-    },
-    rootBackgroundStyles() {
+    rootStyles() {
       this.setRootStyles();
     },
   },
@@ -377,19 +365,12 @@ export default defineComponent({
      */
     setRootStyles() {
       if (this.context.isPreview) {
-        this.$emit(
-          'on-set-preview-styles',
-          Object.assign({}, this.rootElementStyles, this.rootBackgroundStyles),
-        );
+        this.$emit('on-set-preview-styles', this.rootStyles);
 
         return;
       }
 
-      this.styles = Object.assign(
-        this.styles,
-        this.rootElementStyles,
-        this.rootBackgroundStyles,
-      );
+      this.styles = Object.assign(this.styles, this.rootStyles);
     },
     scrollToLastContent() {
       if (!this.contents.length) {

package/src/brand-page/components/page/Page.vue

@@ -1,8 +1,7 @@
 <template>
-  <div class="brand-page-root-background" :style="rootBackgroundStyles" />
   <div
     class="brand-page-root"
-    :style="rootElementStyles"
+    :style="styles"
     :data-test-device-type="
       typeof isMobileDevice !== 'undefined'
         ? isMobileDevice

package/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.ts

@@ -164,7 +164,7 @@ export default defineComponent({
       : null;
 
     if (!this.containerStore.baseFabricRenderUrl) {
-      // throw new Error('base fabric render url is undefined');
+      throw new Error('base fabric render url is undefined');
     }
 
     FabricRenderClient.setInstance({

package/src/brand-page-maker/components/shop/ProductConfigModal.vue

@@ -30,7 +30,7 @@
         <AddOrEditProductContainer v-if="!isImageUpload" />
         <ImageUpload v-else />
       </template>
-      <template v-if="!isImageUpload" #footer>
+      <template #footer v-if="!isImageUpload">
         <div
           class="tw-flex tw-justify-center tw-pt-4 tw-border-t tw-border-solid tw-border-grayscale-500"
         >