@deneb-ui/ui 2.0.123 → 2.0.124

package/dist/SiteDataProvider.js

@@ -594,17 +594,35 @@ function SiteDataProvider({ children, initialSiteData, fallbackSiteData, liveCat
             return;
         const sd = siteData;
         const common = isRecord(sd?.content?.common) ? sd.content.common : null;
-        const shop = isRecord(sd?.shop) ? sd.shop : null;
+        const hasKeys = (o) => isRecord(o) && Object.keys(o).length > 0;
+        const shop = hasKeys(sd?.shop) ? sd.shop : (hasKeys(sd?.merchant) ? sd.merchant : (isRecord(sd?.shop) ? sd.shop : null));
         const site = isRecord(sd?.site) ? sd.site : null;
-        const candidateTitle = (typeof common?.websiteTitle === "string" && common.websiteTitle.trim()) ||
-            (typeof shop?.businessName === "string" && shop.businessName.trim()) ||
-            (typeof site?.name === "string" && site.name.trim());
+        const merchant = isRecord(sd?.merchant) ? sd.merchant : null;
+        const seo = isRecord(sd?.seo) ? sd.seo : null;
+        const seoSite = isRecord(seo?.site) ? seo.site : null;
+        const isPlaceholderTitle = (val) => typeof val !== "string" ||
+            !val.trim() ||
+            /^(demo|template|storefront|website|my shop|coffee)$/i.test(val.trim());
+        const realShopName = (typeof shop?.businessName === "string" && shop.businessName.trim()) ||
+            (typeof merchant?.businessName === "string" && merchant.businessName.trim()) ||
+            "";
+        const candidateTitle = realShopName ||
+            (!isPlaceholderTitle(common?.websiteTitle) ? (common?.websiteTitle).trim() : "") ||
+            (typeof site?.name === "string" && site.name.trim()) ||
+            (typeof common?.websiteTitle === "string" ? common.websiteTitle.trim() : "");
         if (candidateTitle) {
             document.title = candidateTitle;
         }
-        const candidateIcon = (typeof common?.logoUrl === "string" && common.logoUrl.trim()) ||
-            (typeof shop?.logoUrl === "string" && shop.logoUrl.trim()) ||
-            (typeof site?.logoUrl === "string" && site.logoUrl.trim());
+        const isPlaceholderLogo = (url) => typeof url !== "string" ||
+            !url.trim() ||
+            url === "/fivora-logo.png" ||
+            url.includes("fivora-logo") ||
+            url === "/favicon.ico";
+        const candidateIcon = (!isPlaceholderLogo(seoSite?.favicon) ? (seoSite?.favicon).trim() : "") ||
+            (!isPlaceholderLogo(shop?.logoUrl) ? (shop?.logoUrl).trim() : "") ||
+            (!isPlaceholderLogo(merchant?.logoUrl) ? (merchant?.logoUrl).trim() : "") ||
+            (!isPlaceholderLogo(site?.logoUrl) ? (site?.logoUrl).trim() : "") ||
+            (!isPlaceholderLogo(common?.logoUrl) ? (common?.logoUrl).trim() : "");
         if (candidateIcon) {
             let link = document.querySelector("link[rel*='icon']");
             if (!link) {
@@ -1015,6 +1033,10 @@ function useSiteCatalog() {
  */
 function useShop(fallback = {}) {
     const siteData = useSiteData();
+    if (isRecord(siteData?.shop) && Object.keys(siteData.shop).length > 0)
+        return siteData.shop;
+    if (isRecord(siteData?.merchant) && Object.keys(siteData.merchant).length > 0)
+        return siteData.merchant;
     if (isRecord(siteData?.shop))
         return siteData.shop;
     if (isRecord(siteData?.merchant))

package/dist/contact/ContactButton.d.ts

@@ -5,6 +5,7 @@ export interface ContactButtonProps extends React.AnchorHTMLAttributes<HTMLAncho
     value?: string | null;
     label?: React.ReactNode;
     fieldPath?: string;
+    labelFieldPath?: string;
     targetPage?: string;
     variant?: 'primary' | 'secondary' | 'outline' | 'ghost' | 'whatsapp';
     size?: 'sm' | 'md' | 'lg';
@@ -12,4 +13,4 @@ export interface ContactButtonProps extends React.AnchorHTMLAttributes<HTMLAncho
     message?: string;
     subject?: string;
 }
-export declare function ContactButton({ type, value, href, label, children, fieldPath, targetPage, variant, size, icon, message, subject, className, style, ...rest }: ContactButtonProps): React.JSX.Element | null;
+export declare function ContactButton({ type, value, href, label, children, fieldPath, labelFieldPath, targetPage, variant, size, icon, message, subject, className, style, ...rest }: ContactButtonProps): React.JSX.Element | null;

package/dist/contact/ContactButton.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContactButton = ContactButton;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const urls_1 = require("../utils/urls");
-function ContactButton({ type = 'whatsapp', value, href, label, children, fieldPath, targetPage, variant, size = 'md', icon, message, subject, className = '', style, ...rest }) {
+function ContactButton({ type = 'whatsapp', value, href, label, children, fieldPath, labelFieldPath, targetPage, variant, size = 'md', icon, message, subject, className = '', style, ...rest }) {
     // If no fieldPath and no value/href/label/children, do not render broken button
     if (!fieldPath && !value && !href && !children && !label) {
         return null;
@@ -87,7 +87,16 @@ function ContactButton({ type = 'whatsapp', value, href, label, children, fieldP
         ...sizeStyles[size],
         ...variantStyles[resolvedVariant],
     };
-    const buttonElement = ((0, jsx_runtime_1.jsxs)("a", { href: resolvedHref, "data-preview-field-path": fieldPath, target: shouldOpenNewTab ? '_blank' : undefined, rel: shouldOpenNewTab ? 'noopener noreferrer' : undefined, className: `deneb-contact-btn deneb-contact-${type} ${className}`.trim(), style: mergedStyles, ...rest, children: [icon !== undefined ? icon : defaultIcon, children || label] }));
+    const textContent = typeof children === 'string' ? children : (typeof label === 'string' ? label : '');
+    const digitsOnly = (str) => str.replace(/\D/g, '');
+    const matchesValue = Boolean(value &&
+        textContent &&
+        (digitsOnly(textContent) === digitsOnly(String(value)) || textContent.trim().toLowerCase() === String(value).trim().toLowerCase()));
+    const staticMarker = rest['data-preview-static'] || `${type}-action`;
+    const staticLabelMarker = rest['data-preview-static'] || `${type}-label`;
+    const buttonElement = ((0, jsx_runtime_1.jsxs)("a", { href: resolvedHref, ...(fieldPath && (matchesValue || labelFieldPath)
+            ? { 'data-preview-field-path': fieldPath }
+            : { 'data-preview-static': staticMarker }), target: shouldOpenNewTab ? '_blank' : undefined, rel: shouldOpenNewTab ? 'noopener noreferrer' : undefined, className: `deneb-contact-btn deneb-contact-${type} ${className}`.trim(), style: mergedStyles, ...rest, children: [icon !== undefined ? icon : defaultIcon, labelFieldPath ? ((0, jsx_runtime_1.jsx)("span", { "data-preview-field-path": labelFieldPath, children: children || label })) : fieldPath && matchesValue ? (children || label) : ((0, jsx_runtime_1.jsx)("span", { "data-preview-static": staticLabelMarker, children: children || label }))] }));
     if (targetPage) {
         return ((0, jsx_runtime_1.jsx)("span", { "data-target-page": targetPage, style: { display: 'inline-block' }, children: buttonElement }));
     }

package/dist/contact/WhatsAppButton.js

@@ -16,26 +16,41 @@ function WhatsAppButton({ phoneNumber, value, label = 'Chat on WhatsApp', fieldP
     const isPreview = (0, SiteDataProvider_1.isPreviewValidation)(siteData);
     const content = (siteData?.content && typeof siteData.content === 'object' ? siteData.content : {});
     const common = (content.common && typeof content.common === 'object' ? content.common : {});
+    const business = (common.business && typeof common.business === 'object' ? common.business : {});
     const contact = (content.contact && typeof content.contact === 'object' ? content.contact : (common.contact && typeof common.contact === 'object' ? common.contact : {}));
     const home = (content.home && typeof content.home === 'object' ? content.home : {});
     const merchant = (siteData && 'merchant' in siteData && typeof siteData.merchant === 'object' ? siteData.merchant : {});
+    const shop = (siteData && 'shop' in siteData && typeof siteData.shop === 'object' ? siteData.shop : {});
+    const isDemoNumber = (val) => {
+        if (typeof val !== "string" || !val.trim())
+            return true;
+        const digits = val.replace(/\D/g, "");
+        return digits.length < 7 || digits.startsWith("123456") || /^0+$/.test(digits);
+    };
     const liveNumber = liveShop?.contact?.whatsapp ||
-        (typeof liveShop?.businessWhatsapp === 'string' ? liveShop.businessWhatsapp : null) ||
+        (typeof liveShop?.businessWhatsapp === "string" ? liveShop.businessWhatsapp : null) ||
+        (typeof shop?.businessWhatsapp === "string" ? shop.businessWhatsapp : null) ||
+        shop?.whatsapp ||
+        merchant?.businessWhatsapp ||
+        merchant?.whatsapp ||
+        (!isDemoNumber(contact.whatsapp) ? contact.whatsapp : null) ||
+        (!isDemoNumber(contact.whatsappNumber) ? contact.whatsappNumber : null) ||
+        (!isDemoNumber(common.whatsapp) ? common.whatsapp : null) ||
+        (!isDemoNumber(common.whatsappNumber) ? common.whatsappNumber : null) ||
         liveShop?.contact?.phone ||
-        (typeof liveShop?.businessPhone === 'string' ? liveShop.businessPhone : null);
-    const effectiveNumber = phoneNumber ||
-        (!isPreview ? liveNumber : null) ||
-        value ||
-        contact.whatsapp ||
-        contact.whatsappNumber ||
+        (typeof liveShop?.businessPhone === "string" ? liveShop.businessPhone : null) ||
+        shop?.phone ||
+        merchant?.phone ||
+        (!isDemoNumber(business.whatsapp) ? business.whatsapp : null) ||
+        business.phone ||
         contact.phone ||
         home.whatsappNumber ||
-        home.whatsappCtaUrl ||
-        common.whatsapp ||
-        common.whatsappNumber ||
-        merchant.whatsapp ||
-        merchant.phone ||
-        (isPreview ? SiteDataProvider_1.DUMMY_PREVIEW_WHATSAPP : '');
+        home.whatsappCtaUrl;
+    const effectiveNumber = (!isPreview ? (liveNumber || null) : null) ||
+        (!isDemoNumber(phoneNumber) ? phoneNumber : null) ||
+        value ||
+        liveNumber ||
+        (isPreview ? SiteDataProvider_1.DUMMY_PREVIEW_WHATSAPP : "");
     if (!effectiveNumber && !fieldPath)
         return null;
     return ((0, jsx_runtime_1.jsx)(ContactButton_1.ContactButton, { type: "whatsapp", value: effectiveNumber, label: label, fieldPath: fieldPath, variant: variant, message: message, ...rest }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deneb-ui/ui",
-  "version": "2.0.123",
+  "version": "2.0.124",
   "description": "Visual-first React component library for editable commerce storefronts. Built for Next.js and Fivora.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@deneb-ui/core": "^2.0.123"
+    "@deneb-ui/core": "^2.0.124"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",