@gem-sdk/pages 1.56.0 → 1.57.0-dev.53

package/dist/esm/components/builder/Toolbox.js

@@ -6,6 +6,8 @@ import { createFontUrl } from '../../libs/google-fonts.js';
 import { genCSS } from '../../libs/helpers/gen-css.js';
 import { getFontsFromDataBuilder } from '../../libs/helpers/gen-fonts.js';
 import { shopifyCdnWithGoogleFonts } from '../../libs/shopify-cdn-with-google-fonts.js';
+import { libsStore } from '../../store/libs-store.js';
+import { checkNotInOptionFont } from '../../libs/helpers/check-option-font.js';
 
 const globalStyleId = 'global-style';
 const Toolbox = ()=>{
@@ -31,8 +33,15 @@ const Toolbox = ()=>{
     const changeLayoutSettings = useShopStore((s)=>s.changeLayoutSettings);
     const changeCreateThemeSectionCount = useShopStore((s)=>s.changeCreateThemeSectionCount);
     const changeShopPlan = useShopStore((s)=>s.changeShopPlan);
+    const changeFontType = libsStore((s)=>s.changeFontType);
+    const fontType = libsStore((s)=>s.fontType);
     const clearModal = useModalStore((s)=>s.clearModal);
     const changeLimitCreateThemeSection = useShopStore((s)=>s.changeLimitCreateThemeSection);
+    const setInteractionIsSelectOnPage = usePageStore((s)=>s.setInteractionIsSelectOnPage);
+    const setInteractionItem = usePageStore((s)=>s.setInteractionItem);
+    const setInteractionSelectType = usePageStore((s)=>s.setInteractionSelectType);
+    const setInteractionSettingType = usePageStore((s)=>s.setInteractionSettingType);
+    const setSidebarMode = usePageStore((s)=>s.setSidebarMode);
     const fonts = useMemo(()=>getFontsFromDataBuilder(state), [
         state
     ]);
@@ -61,6 +70,12 @@ const Toolbox = ()=>{
         });
         // append new fonts
         for (const font of fonts){
+            if ([
+                'bunny',
+                'google'
+            ].includes(font.type) && checkNotInOptionFont(font.family, fontType)) {
+                return;
+            }
             if (font.type !== 'custom') {
                 if (font.variants?.length) {
                     for (const variant of font.variants){
@@ -72,7 +87,7 @@ const Toolbox = ()=>{
                         const variantName = variant;
                         const url = createFontUrl([
                             cloneFont
-                        ]);
+                        ], undefined, fontType);
                         if (url) {
                             const googleFont = document.querySelector(`.${className}[data-font="${fontName}"][data-font-variant="${variantName}"]`);
                             if (googleFont) {
@@ -275,6 +290,13 @@ const Toolbox = ()=>{
     }, [
         changeShopPlan
     ]);
+    const onUpdateFontType = useCallback((e)=>{
+        const fontType = e.detail;
+        if (!fontType) return;
+        changeFontType(fontType);
+    }, [
+        changeFontType
+    ]);
     const onUpdateDynamicProduct = useCallback((e)=>{
         const product = e.detail;
         if (!product) return;
@@ -333,6 +355,37 @@ const Toolbox = ()=>{
     }, [
         changeLimitCreateThemeSection
     ]);
+    const onUpdateInteractionIsSelectOnPage = useCallback((e)=>{
+        const isSelectOnPage = e.detail.value;
+        const mode = e.detail.mode;
+        const settingType = e.detail.settingType;
+        setInteractionIsSelectOnPage(isSelectOnPage);
+        setInteractionSelectType(mode);
+        setInteractionSettingType(settingType);
+    }, [
+        setInteractionIsSelectOnPage,
+        setInteractionSelectType,
+        setInteractionSettingType
+    ]);
+    const onUpdateInteractionSettingType = useCallback((e)=>{
+        const settingType = e.detail.settingType;
+        setInteractionSettingType(settingType);
+    }, [
+        setInteractionSettingType
+    ]);
+    const onChangeSidebarMode = useCallback((e)=>{
+        const mode = e.detail.mode;
+        console.log(mode);
+        setSidebarMode(mode);
+    }, [
+        setSidebarMode
+    ]);
+    const onUpdateInteractionItem = useCallback((e)=>{
+        const interactionItem = e.detail;
+        setInteractionItem(interactionItem);
+    }, [
+        setInteractionItem
+    ]);
     useEffect(()=>{
         if (fonts) {
             setFontsToHead('google-font-element', fonts);
@@ -361,6 +414,11 @@ const Toolbox = ()=>{
         window.addEventListener('set-product-offer', onUpdateProductOffers);
         window.addEventListener('update-sale-page-product-id', onUpdateSalePageProductId);
         window.addEventListener('limit-create-theme-section', onLimitCreateThemeSection);
+        window.addEventListener('update-interaction-is-select-on-page', onUpdateInteractionIsSelectOnPage);
+        window.addEventListener('update-interaction-item', onUpdateInteractionItem);
+        window.addEventListener('update-interaction-setting-type', onUpdateInteractionSettingType);
+        window.addEventListener('change-sidebar-mode', onChangeSidebarMode);
+        window.addEventListener('update-font-type', onUpdateFontType);
         return ()=>{
             window.removeEventListener('update-shop-info', onChangeShopInfo);
             window.removeEventListener('revalidate-query', onRevalidateQuery);
@@ -381,6 +439,10 @@ const Toolbox = ()=>{
             window.removeEventListener('set-product-offer', onUpdateProductOffers);
             window.removeEventListener('update-sale-page-product-id', onUpdateSalePageProductId);
             window.removeEventListener('limit-create-theme-section', onLimitCreateThemeSection);
+            window.removeEventListener('update-interaction-is-select-on-page', onUpdateInteractionIsSelectOnPage);
+            window.removeEventListener('update-interaction-item', onUpdateInteractionItem);
+            window.removeEventListener('update-interaction-setting-type', onUpdateInteractionSettingType);
+            window.removeEventListener('update-font-type', onUpdateFontType);
         };
     }, [
         onAddEntity,
@@ -402,7 +464,12 @@ const Toolbox = ()=>{
         onUpdateItemAttribute,
         onUpdateProductOffers,
         onUpdateSalePageProductId,
-        onLimitCreateThemeSection
+        onLimitCreateThemeSection,
+        onUpdateInteractionItem,
+        onUpdateInteractionIsSelectOnPage,
+        onUpdateInteractionSettingType,
+        onUpdateFontType,
+        onChangeSidebarMode
     ]);
     return /*#__PURE__*/ jsx("div", {
         className: "toolbox"

package/dist/esm/components/builder/toolbar/const.js

@@ -0,0 +1,4 @@
+const TOOLBAR_HOVER_HEIGHT = 24;
+const TOOLBAR_ACTIVE_HEIGHT = 32;
+
+export { TOOLBAR_ACTIVE_HEIGHT, TOOLBAR_HOVER_HEIGHT };

package/dist/esm/components/builder/toolbar/utils/findDOMClosest.js

@@ -0,0 +1,39 @@
+const findDOMClosest = ($target, selectors)=>{
+    const closestElements = {
+        $childrenSlot: null,
+        $productFeatureImg: null,
+        $section: null,
+        $component: null,
+        $disableIframeClick: null,
+        $stickyMinimize: null,
+        $toolbar: null,
+        $gpText: null,
+        $imageDetection: null,
+        $popupTriggerButton: null
+    };
+    let currentElement = $target;
+    while(currentElement){
+        // Check for stop conditions
+        if (currentElement.matches('[data-uid="ROOT"], .builder, #storefront')) {
+            break;
+        }
+        // Check if currentElement matches any of the selectors
+        for (const [key, selector] of Object.entries(selectors)){
+            if (!closestElements[key] && currentElement.matches(selector)) {
+                closestElements[key] = currentElement;
+            }
+        }
+        // If all closest elements are found, break the loop
+        if (Object.values(closestElements).every((el)=>el !== null)) {
+            break;
+        }
+        // Move up to the parent element
+        currentElement = currentElement.parentElement;
+    }
+    // Reset ram
+    currentElement = null;
+    // Return
+    return closestElements;
+};
+
+export { findDOMClosest };

package/dist/esm/components/builder/toolbar/utils/findOverflowParent.js

@@ -0,0 +1,18 @@
+import { isOverToolbarPosition } from './isOverToolbarPosition.js';
+import { isSection } from './isSection.js';
+import { notVisible } from './notVisible.js';
+
+const findOverflowParent = (element, initEl)=>{
+    const thisEl = element;
+    const origEl = initEl || thisEl;
+    if (!thisEl) return;
+    if (isSection(thisEl)) return;
+    if (notVisible(thisEl) && isOverToolbarPosition(initEl, thisEl)) return thisEl;
+    if (thisEl.parentElement) {
+        return findOverflowParent(thisEl.parentElement, origEl);
+    } else {
+        return;
+    }
+};
+
+export { findOverflowParent };

package/dist/esm/components/builder/toolbar/utils/getChildrenByAttrSelector.js

@@ -0,0 +1,16 @@
+const getChildrenByAttrSelector = ($el, attrSelector)=>{
+    const childLen = $el.children.length;
+    if (childLen) {
+        for(let i = 0; i < childLen; i++){
+            const children = $el.children[i];
+            if (children) {
+                const is = children.getAttribute(attrSelector);
+                if (is) {
+                    return children;
+                }
+            }
+        }
+    }
+};
+
+export { getChildrenByAttrSelector };

package/dist/esm/components/builder/toolbar/utils/getDOMElementParents.js

@@ -0,0 +1,30 @@
+const getDOMElementParents = ($el, selector, limit)=>{
+    // Set up a parent array
+    const parents = [];
+    // Push each parent $elms to the array
+    while($el){
+        $el = $el.parentElement ?? undefined;
+        if ($el) {
+            if ($el.tagName === 'BODY' || $el.getAttribute('data-uid') === 'ROOT') {
+                break;
+            }
+            if (selector) {
+                if ($el.matches(selector)) {
+                    parents.push($el);
+                    if (limit && parents.length == limit) {
+                        return parents;
+                    }
+                }
+                continue;
+            }
+            parents.push($el);
+            if (limit && parents.length == limit) {
+                return parents;
+            }
+        }
+    }
+    // Return our parent array
+    return parents;
+};
+
+export { getDOMElementParents };

package/dist/esm/components/builder/toolbar/utils/isOverParent.js

@@ -0,0 +1,14 @@
+import { TOOLBAR_HOVER_HEIGHT } from '../const.js';
+
+const isOverParent = ({ current, parent, index, revert })=>{
+    for(let i = 0; i < index; i++){
+        let is = current.top - (TOOLBAR_HOVER_HEIGHT - 1) * i >= parent.top && current.top - (TOOLBAR_HOVER_HEIGHT - 1) * i <= parent.top + parent.height || current.top - (TOOLBAR_HOVER_HEIGHT - 1) * i >= parent.top + parent.height && current.top - (TOOLBAR_HOVER_HEIGHT - 1) * i <= parent.top;
+        if (revert) {
+            is = current.bottom + (TOOLBAR_HOVER_HEIGHT - 1) * i >= parent.bottom && current.bottom + (TOOLBAR_HOVER_HEIGHT - 1) * i <= parent.bottom - parent.height || current.bottom + (TOOLBAR_HOVER_HEIGHT - 1) * i >= parent.bottom - parent.height && current.bottom + (TOOLBAR_HOVER_HEIGHT - 1) * i <= parent.bottom;
+        }
+        if (is) return true;
+    }
+    return false;
+};
+
+export { isOverParent };

package/dist/esm/components/builder/toolbar/utils/isOverToolbarPosition.js

@@ -0,0 +1,10 @@
+import { TOOLBAR_ACTIVE_HEIGHT } from '../const.js';
+
+const isOverToolbarPosition = (el, parent)=>{
+    const rect = el.getBoundingClientRect();
+    const rectP = parent.getBoundingClientRect();
+    // 32px = toolbar active height
+    return rect.top - rectP.top < TOOLBAR_ACTIVE_HEIGHT + 1;
+};
+
+export { isOverToolbarPosition };

package/dist/esm/components/builder/toolbar/utils/isSection.js

@@ -0,0 +1,6 @@
+const isSection = (el)=>{
+    const tag = el.getAttribute('data-component-tag');
+    return tag === 'Section';
+};
+
+export { isSection };

package/dist/esm/components/builder/toolbar/utils/notVisible.js

@@ -0,0 +1,6 @@
+const notVisible = (el)=>{
+    const overflow = getComputedStyle(el).overflow;
+    return overflow !== 'visible';
+};
+
+export { notVisible };

package/dist/esm/components/builder/toolbar/utils/waitForElementToExist.js

@@ -0,0 +1,25 @@
+const waitForElementToExist = (selector, timeout = 200)=>{
+    return new Promise((resolve)=>{
+        let intervalID = null;
+        let timeoutID = null;
+        const findEl = ()=>{
+            const el = document.body.querySelector('#storefront')?.querySelector(selector);
+            if (el) {
+                if (intervalID) clearInterval(intervalID);
+                if (timeoutID) clearTimeout(timeoutID);
+                resolve(el);
+            }
+        };
+        findEl();
+        intervalID = setInterval(()=>{
+            findEl();
+        }, 50);
+        timeoutID = setTimeout(()=>{
+            if (intervalID) clearInterval(intervalID);
+            if (timeoutID) clearTimeout(timeoutID);
+            resolve(null);
+        }, timeout);
+    });
+};
+
+export { waitForElementToExist };

package/dist/esm/components/image-to-layout/DropElement.js

@@ -104,11 +104,13 @@ const DropElement = ()=>{
                         className: "gp-flex gp-w-[291px] gp-justify-between",
                         children: [
                             /*#__PURE__*/ jsx("button", {
+                                "data-button-add-section": true,
                                 onClick: ()=>dispatchEventBuildWithSectionActiveTab(true),
                                 className: "gp-flex gp-h-[40px] gp-w-[136px] gp-items-center gp-font-medium gp-justify-center gp-rounded-[8px] gp-bg-[#1C1C1C] gp-text-[14px] gp-text-white hover:gp-bg-[#3B3B3B]",
                                 children: "Add sections"
                             }),
                             /*#__PURE__*/ jsx("button", {
+                                "data-button-add-elements": true,
                                 onClick: ()=>dispatchEventBuildWithSectionActiveTab(false),
                                 className: "gp-flex gp-h-[40px] gp-w-[136px] gp-items-center gp-font-medium gp-justify-center gp-rounded-[8px] gp-bg-[#f4f4f4] gp-text-[14px] gp-text-[#212121] hover:gp-bg-[#E2E2E2]",
                                 children: "Add elements"

package/dist/esm/libs/api/get-static-page-props-v2.js

@@ -1,4 +1,4 @@
-import { PublishedThemePagesDocument, StorePropertyDocument } from '@gem-sdk/core';
+import { PublishedThemePagesDocument, StorePropertyDocument, PublishedShopMetasDocument } from '@gem-sdk/core';
 import { ShopMetaDocument } from '@gem-sdk/adapter-shopify';
 import { getFontStyleFromPageTemplate, getFontFromGlobalStyle } from '../google-fonts.js';
 import { genCSS } from '../helpers/gen-css.js';
@@ -16,7 +16,7 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
                 slug,
                 slugType: pageType
             };
-            const [theme, storeProperty, shopifyMeta] = await Promise.allSettled([
+            const [theme, storeProperty, shopifyMeta, publishedShopMetas] = await Promise.allSettled([
                 fetcher([
                     PublishedThemePagesDocument,
                     variables
@@ -26,11 +26,21 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
                 ]),
                 shopifyFetcher([
                     ShopMetaDocument
+                ]),
+                fetcher([
+                    PublishedShopMetasDocument,
+                    {
+                        keys: [
+                            'source_font'
+                        ]
+                    }
                 ])
             ]);
             if (theme.status === 'rejected') {
                 throw new Error(theme.reason?.[0]);
             }
+            const publishedShopMetaValue = publishedShopMetas.status === 'fulfilled' ? publishedShopMetas.value : undefined;
+            const sourceFont = publishedShopMetaValue?.publishedShopMetas?.find((item)=>item?.key === 'source_font');
             const dataBuilder = theme.value.publishedThemePages?.[0];
             const themePageCustomFonts = theme.value?.publishedThemePages?.[0]?.themePageCustomFonts;
             if (!dataBuilder) {
@@ -38,8 +48,8 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
             }
             const pageTemplate = parseBuilderTemplateV2(dataBuilder);
             const [elementFontStyle, fontStyle, fallback, customFonts] = await Promise.all([
-                getFontStyleFromPageTemplate(pageTemplate),
-                getFontFromGlobalStyle(dataBuilder?.pageStyle?.data),
+                getFontStyleFromPageTemplate(pageTemplate, sourceFont?.value),
+                getFontFromGlobalStyle(dataBuilder?.pageStyle?.data, sourceFont?.value),
                 getFallbackV2(fetcher, pageTemplate),
                 getCustomFonts(themePageCustomFonts)
             ]);
@@ -139,7 +149,8 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
                 customCodeHeader: dataBuilder.themePageCustomCode?.header ?? null,
                 customCodeBody: dataBuilder.themePageCustomCode?.body ?? null,
                 pageHandle: dataBuilder.handle ?? null,
-                customFonts
+                customFonts,
+                interaction: dataBuilder?.interaction
             });
         } catch (err) {
             captureException(err);

package/dist/esm/libs/google-fonts.js

@@ -1,3 +1,4 @@
+import { checkNotInOptionFont } from './helpers/check-option-font.js';
 import { getFontsFromDataBuilder } from './helpers/gen-fonts.js';
 
 const CHROME_UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36';
@@ -33,12 +34,17 @@ const composeFonts = (fonts)=>{
         };
     });
 };
-const createFontUrl = (fonts, option)=>{
-    const googleFonts = fonts.filter((font)=>font.type === 'google' || !font.type);
-    if (!googleFonts.length) return;
+const createFontUrl = (fonts, option, fontType)=>{
+    const mainFonts = fonts.filter((font)=>{
+        return !([
+            'bunny',
+            'google'
+        ].includes(font.type) && checkNotInOptionFont(font.family, fontType || 'google')) && (font.type === 'google' || font.type === 'bunny' || !font.type);
+    });
+    if (!mainFonts.length) return;
     const params = new URLSearchParams();
     const display = option?.display || 'swap';
-    const uniqFonts = googleFonts.filter((font, index, arr)=>{
+    const uniqFonts = mainFonts.filter((font, index, arr)=>{
         return index === arr.findIndex((t)=>t.family === font.family);
     });
     const family = composeFonts(uniqFonts).map((font)=>{
@@ -52,13 +58,16 @@ const createFontUrl = (fonts, option)=>{
     if (option?.effect) {
         params.append('effect', option.effect);
     }
-    return `https://fonts.googleapis.com/css?${decodeURIComponent(params.toString())}`;
+    const bunnyFontUrl = `https://fonts.bunny.net/css?family=${family}`;
+    const googleFontUrl = `https://fonts.googleapis.com/css?${decodeURIComponent(params.toString())}`;
+    return fontType === 'bunny' ? bunnyFontUrl : googleFontUrl;
 };
-async function getFonts(fonts, option, isImportFontByUrl = true) {
+// eslint-disable-next-line max-params
+async function getFonts(fonts, option, isImportFontByUrl = true, fontType) {
     /**
    * The order of IE -> Chrome is important, other wise chrome starts loading woff1.
    * CSS cascading 🤷‍♂️.
-   */ const url = createFontUrl(fonts, option);
+   */ const url = createFontUrl(fonts, option, fontType);
     if (!url) return '';
     try {
         if (isImportFontByUrl) return `@import url('${url}');`;
@@ -80,7 +89,7 @@ async function getFonts(fonts, option, isImportFontByUrl = true) {
         return '';
     }
 }
-const getFontFromGlobalStyle = (data)=>{
+const getFontFromGlobalStyle = (data, sourceFont)=>{
     if (!data) return '';
     try {
         const globalStyle = JSON.parse(data);
@@ -88,14 +97,14 @@ const getFontFromGlobalStyle = (data)=>{
         const fonts = Object.entries(fontData).map(([, value])=>{
             return value;
         });
-        return getFonts(fonts);
+        return getFonts(fonts, undefined, undefined, sourceFont);
     } catch  {
         return '';
     }
 };
-async function getFontStyleFromPageTemplate(pageTemplate) {
+async function getFontStyleFromPageTemplate(pageTemplate, sourceFont) {
     const fontStyle = pageTemplate.map((sectionData)=>{
-        return getFonts(getFontsFromDataBuilder(sectionData.data));
+        return getFonts(getFontsFromDataBuilder(sectionData.data), undefined, undefined, sourceFont);
     });
     return await Promise.all(fontStyle);
 }

package/dist/esm/libs/helpers/check-option-font.js

@@ -0,0 +1,63 @@
+const listFontsNotInBunny = [
+    'Anton SC',
+    'Arsenal SC',
+    'Baskervville SC',
+    'Beiruti',
+    'Bodoni Moda SC',
+    'Bona Nova SC',
+    'Bungee Tint',
+    'Edu AU VIC WA NT Hand',
+    'Fustat',
+    'Ga Maamli',
+    'Kalnia Glaze',
+    'Maname',
+    'Matemasie',
+    'Material Icons',
+    'Material Icons Outlined',
+    'Material Icons Round',
+    'Material Icons Sharp',
+    'Material Icons Two Tone',
+    'Material Symbols Outlined',
+    'Material Symbols Rounded',
+    'Material Symbols Sharp',
+    'Moderustic',
+    'New Amsterdam',
+    'Playwrite AR',
+    'Playwrite AT',
+    'Playwrite BE VLG',
+    'Playwrite BE WAL',
+    'Playwrite CL',
+    'Playwrite CU',
+    'Playwrite CZ',
+    'Playwrite DK Loopet',
+    'Playwrite DK Uloopet',
+    'Playwrite HR',
+    'Playwrite HR Lijeva',
+    'Playwrite HU',
+    'Playwrite PE',
+    'SUSE',
+    'Sankofa Display',
+    'Wittgenstein',
+    'Zain'
+];
+const listFontsNotInGoogle = [
+    'Arima Madurai',
+    'Coda Caption',
+    'Fredoka One',
+    'Gentium Book Basic',
+    'Kantumruy',
+    'Merienda One',
+    'Source Sans Pro',
+    'Source Serif Pro',
+    'Briem Hand',
+    'Pushster'
+];
+const objectFont = {
+    bunny: listFontsNotInBunny,
+    google: listFontsNotInGoogle
+};
+const checkNotInOptionFont = (currentfont, type)=>{
+    return objectFont?.[type]?.includes(currentfont);
+};
+
+export { checkNotInOptionFont };

package/dist/esm/pages/builder.js

@@ -1,17 +1,17 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
-import { PageProvider, BuilderComponentProvider, SectionProvider, BuilderPreviewProvider, RenderPreview } from '@gem-sdk/core';
+import { PageProvider, BuilderComponentProvider, SectionProvider, BuilderPreviewProvider } from '@gem-sdk/core';
 import { NextSeo } from 'next-seo';
 import Head from 'next/head';
 import { useState, useMemo, useEffect } from 'react';
 import Toolbox from '../components/builder/Toolbox.js';
 import Header from '../components/builder/Header.js';
 import Footer from '../components/builder/Footer.js';
-import CollectionGlobalProvider from './CollectionGlobalProvider.js';
 import PopupManager from '../components/builder/PopupManager.js';
 import ImageToLayout from '../components/image-to-layout/ImageToLayout.js';
 import AddSectionImageToLayout from '../components/image-to-layout/AddSectionImageToLayout.js';
 import Toolbar from '../components/builder/Toolbar.js';
 import Devices from '../components/builder/SwitchView.js';
+import Body from '../components/builder/Body.js';
 
 const BuilderPage = ({ components, seo, themeStyle, fontStyle, sectionData, pageType, editorImageToLayout, isThemeSectionEditor, hiddenToolbar, pageName, isOriginTemplate })=>{
     const [loadSuccess, setLoadSuccess] = useState(false);
@@ -81,16 +81,9 @@ const BuilderPage = ({ components, seo, themeStyle, fontStyle, sectionData, page
                                             isOriginTemplate: isOriginTemplate,
                                             openPageSetting: openPageSetting
                                         })),
-                                        /*#__PURE__*/ jsx("div", {
-                                            id: "storefront",
-                                            className: `${isThemeSectionEditor ? 'theme-section-editor' : ''} ${pageType === 'POST_PURCHASE' ? 'post-purchase-page' : ''}`,
-                                            children: pageType === 'GP_COLLECTION' ? /*#__PURE__*/ jsx(CollectionGlobalProvider, {
-                                                children: /*#__PURE__*/ jsx(RenderPreview, {
-                                                    uid: "ROOT"
-                                                })
-                                            }) : /*#__PURE__*/ jsx(RenderPreview, {
-                                                uid: "ROOT"
-                                            })
+                                        /*#__PURE__*/ jsx(Body, {
+                                            pageType: pageType,
+                                            isThemeSectionEditor: isThemeSectionEditor
                                         }),
                                         /*#__PURE__*/ jsx(ImageToLayout, {
                                             editorImageToLayout: editorImageToLayout || false

package/dist/esm/pages/static-v2.js

@@ -7,9 +7,11 @@ import { useTrackingView } from '../libs/hooks/use-tracking-view.js';
 import { parseHtml } from '../libs/parse-html.js';
 import Header from '../components/builder/Header.js';
 import FooterForPostPurchase from '../components/FooterForPostPurchase.js';
+import Script from 'next/script';
 
-const StaticPageV2 = ({ components, builderData, sectionData, seo, themeStyle, fontStyle, elementFontStyle, customCodeHeader, shopToken, pageHandle, customFonts, isPostPurchase, shopName, productOffers, publicStoreFrontData, isPreview })=>{
+const StaticPageV2 = ({ components, builderData, sectionData, seo, themeStyle, fontStyle, elementFontStyle, customCodeHeader, shopToken, pageHandle, customFonts, isPostPurchase, shopName, productOffers, publicStoreFrontData, isPreview, interaction })=>{
     const router = useRouter();
+    const baseAssetURL = process.env.NEXT_GP_BASE_ASSET_URL || 'https://d3kbi0je7pp4lw.cloudfront.net';
     useTrackingView(shopToken, pageHandle, router.isFallback);
     if (router.isFallback) {
         return /*#__PURE__*/ jsx("div", {
@@ -79,17 +81,28 @@ const StaticPageV2 = ({ components, builderData, sectionData, seo, themeStyle, f
                             isPostPurchase && /*#__PURE__*/ jsx(Header, {
                                 pageType: "POST_PURCHASE"
                             }),
+                            /*#__PURE__*/ jsx("div", {
+                                dangerouslySetInnerHTML: {
+                                    __html: `<div id="gp-interaction" style="display: none;">${JSON.stringify(interaction?.value || [])}</div>`
+                                }
+                            }),
                             /*#__PURE__*/ jsx(SectionProvider, {
                                 data: sectionData,
-                                children: builderData?.map((builder)=>/*#__PURE__*/ jsx(BuilderProvider, {
+                                children: builderData?.map((builder)=>/*#__PURE__*/ jsxs(BuilderProvider, {
                                         state: builder.data,
                                         lazy: builder.lazy,
                                         priority: builder.priority,
                                         isPostPurchase: isPostPurchase,
                                         isPreview: isPreview,
-                                        children: /*#__PURE__*/ jsx(Render, {
-                                            uid: builder.uid
-                                        })
+                                        children: [
+                                            /*#__PURE__*/ jsx(Render, {
+                                                uid: builder.uid
+                                            }),
+                                            /*#__PURE__*/ jsx(Script, {
+                                                defer: true,
+                                                src: `${baseAssetURL}/assets-v2/gp-flow-action-lip.js`
+                                            })
+                                        ]
                                     }, builder.uid))
                             }),
                             isPostPurchase && /*#__PURE__*/ jsx(FooterForPostPurchase, {

package/dist/esm/store/libs-store.js

@@ -0,0 +1,12 @@
+import { create } from 'zustand';
+
+const libsStore = create((set)=>({
+        fontType: 'google',
+        changeFontType: (fontType)=>{
+            set({
+                fontType
+            });
+        }
+    }));
+
+export { libsStore };

package/dist/types/index.d.ts

@@ -40,6 +40,7 @@ type PageBuilderProps = {
     customCodeBody?: string | null;
     isStorefront?: boolean;
     customFonts?: string | null;
+    interaction?: ShopType.Maybe<Pick<ShopType.PublishedPageInteraction, "id" | "value">>;
 };
 type PageBuilderPropsV2 = {
     builderData?: {
@@ -188,7 +189,9 @@ declare const BuilderPage: React.FC<BuilderPageProps>;
 
 declare const getStaticPaths: GetStaticPaths;
 
-type TypographyV2FontFamilyType = 'google' | 'custom' | 'theme';
+type TypographyV2FontFamilyType = 'google' | 'custom' | 'theme' | 'bunny';
+
+type FontType = 'bunny' | 'google';
 
 type FontItem = {
     type: TypographyV2FontFamilyType;
@@ -201,8 +204,8 @@ type FontOption = {
     subset?: string;
     effect?: string;
 };
-declare function getFonts(fonts: FontItem[], option?: FontOption, isImportFontByUrl?: boolean): Promise<string>;
-declare const getFontFromGlobalStyle: (data?: string) => "" | Promise<string>;
+declare function getFonts(fonts: FontItem[], option?: FontOption, isImportFontByUrl?: boolean, fontType?: FontType): Promise<string>;
+declare const getFontFromGlobalStyle: (data?: string, sourceFont?: FontType) => "" | Promise<string>;
 
 declare const getFontsFromDataBuilder: (dataBuilder: Record<string, any>) => FontItem[];
 declare const getFontFromGroupSetting: (fonts: FontItem[], groupSetting: Record<string, any>) => void;